CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-13 16:33:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed broken grouping

Browse Source
This commit is contained in:
Raphael Michel
2015-09-09 10:56:41 +02:00
parent 79410cdb0d
commit 7b179f3ea5
1 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/pretix/base/services/stats.py
View File

@@ -21,6 +21,7 @@ def tuplesum(tuples):
def mysum(it):
sit = [i for i in it if not isinstance(i, Dontsum)]
return sum(sit)
return tuple(map(mysum, zip(*list(tuples))))
@@ -33,23 +34,24 @@ def order_overview(event):
num_total = {
(p['item'], p['variation']): (p['cnt'], p['price'])
for p in
OrderPosition.objects.current.filter(order__event=event).values('item', 'variation').annotate(
cnt=Count('id'), price=Sum('price'))
for p in (OrderPosition.objects.current
.filter(order__event=event)
.values('item', 'variation')
.annotate(cnt=Count('id'), price=Sum('price')).order_by())
}
num_cancelled = {
(p['item'], p['variation']): (p['cnt'], p['price'])
for p in (OrderPosition.objects.current
.filter(order__event=event, order__status=Order.STATUS_CANCELLED)
.values('item', 'variation')
.annotate(cnt=Count('id'), price=Sum('price')))
.annotate(cnt=Count('id'), price=Sum('price')).order_by())
}
num_refunded = {
(p['item'], p['variation']): (p['cnt'], p['price'])
for p in (OrderPosition.objects.current
.filter(order__event=event, order__status=Order.STATUS_REFUNDED)
.values('item', 'variation')
.annotate(cnt=Count('id'), price=Sum('price')))
.annotate(cnt=Count('id'), price=Sum('price')).order_by())
}
num_pending = {
(p['item'], p['variation']): (p['cnt'], p['price'])
@@ -57,14 +59,14 @@ def order_overview(event):
.filter(order__event=event,
order__status__in=(Order.STATUS_PENDING, Order.STATUS_EXPIRED))
.values('item', 'variation')
.annotate(cnt=Count('id'), price=Sum('price')))
.annotate(cnt=Count('id'), price=Sum('price')).order_by())
}
num_paid = {
(p['item'], p['variation']): (p['cnt'], p['price'])
for p in (OrderPosition.objects.current
.filter(order__event=event, order__status=Order.STATUS_PAID)
.values('item', 'variation')
.annotate(cnt=Count('id'), price=Sum('price')))
.annotate(cnt=Count('id'), price=Sum('price')).order_by())
}
for item in items:
@@ -111,37 +113,38 @@ def order_overview(event):
payment_items = []
num_total = {
o['payment_provider']: (o['cnt'], o['payment_fee'])
for o in
Order.objects.current.filter(event=event).values('payment_provider').annotate(
cnt=Count('id'), payment_fee=Sum('payment_fee'))
for o in (Order.objects.current
.filter(event=event)
.values('payment_provider')
.annotate(cnt=Count('id'), payment_fee=Sum('payment_fee')).order_by())
}
num_cancelled = {
o['payment_provider']: (o['cnt'], o['payment_fee'])
for o in (Order.objects.current
.filter(event=event, status=Order.STATUS_CANCELLED)
.values('payment_provider')
.annotate(cnt=Count('id'), payment_fee=Sum('payment_fee')))
.annotate(cnt=Count('id'), payment_fee=Sum('payment_fee')).order_by())
}
num_refunded = {
o['payment_provider']: (o['cnt'], o['payment_fee'])
for o in (Order.objects.current
.filter(event=event, status=Order.STATUS_REFUNDED)
.values('payment_provider')
.annotate(cnt=Count('id'), payment_fee=Sum('payment_fee')))
.annotate(cnt=Count('id'), payment_fee=Sum('payment_fee')).order_by())
}
num_pending = {
o['payment_provider']: (o['cnt'], o['payment_fee'])
for o in (Order.objects.current
.filter(event=event, status__in=(Order.STATUS_PENDING, Order.STATUS_EXPIRED))
.values('payment_provider')
.annotate(cnt=Count('id'), payment_fee=Sum('payment_fee')))
.annotate(cnt=Count('id'), payment_fee=Sum('payment_fee')).order_by())
}
num_paid = {
o['payment_provider']: (o['cnt'], o['payment_fee'])
for o in (Order.objects.current
.filter(event=event, status=Order.STATUS_PAID)
.values('payment_provider')
.annotate(cnt=Count('id'), payment_fee=Sum('payment_fee')))
.annotate(cnt=Count('id'), payment_fee=Sum('payment_fee')).order_by())
}
provider_names = {}