Commit cbfaf135 authored by Skia's avatar Skia

Merge branch 'counter' into 'master'

Add CB sums in invoice calls

See merge request !64
parents ec8ee15d edc438bc
Pipeline #880 passed with stage
in 3 minutes and 27 seconds
......@@ -15,6 +15,9 @@
<input type="submit" value="{% trans %}Go{% endtrans %}" />
<p>{% trans %}CB Payments{% endtrans %} : {{ sum_cb }}</p>
<td>{% trans %}Club{% endtrans %}</td>
......@@ -1031,6 +1031,10 @@ class InvoiceCallView(CounterAdminTabsMixin, CounterAdminMixin, TemplateView):
start_date = start_date.replace(tzinfo=pytz.UTC)
end_date = (start_date + timedelta(days=32)).replace(day=1, hour=0, minute=0, microsecond=0)
from django.db.models import Sum, Case, When, F, DecimalField
kwargs['sum_cb'] = sum([r.amount for r in Refilling.objects.filter(payment_method='CARD', is_validated=True,
date__gte=start_date, date__lte=end_date)])
kwargs['sum_cb'] += sum([s.quantity*s.unit_price for s in Selling.objects.filter(payment_method='CARD', is_validated=True,
date__gte=start_date, date__lte=end_date)])
kwargs['start_date'] = start_date
kwargs['sums'] = Selling.objects.values('club__name').annotate(selling_sum=Sum(
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment