CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-07 15:34:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed order overview columns to increase usefulness

Browse Source
This commit is contained in:
Raphael Michel
2016-09-04 22:56:00 +02:00
parent 2569ebec55
commit d8f81955ba
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,7 +36,8 @@ def order_overview(event: Event) -> Tuple[List[Tuple[ItemCategory, List[Item]]],
num_total = { num_total = {
(p['item'], p['variation']): (p['cnt'], p['price']) (p['item'], p['variation']): (p['cnt'], p['price'])
for p in (OrderPosition.objects for p in (OrderPosition.objects
.filter(order__event=event) .filter(order__event=event,
order__status__in=[Order.STATUS_PENDING, Order.STATUS_EXPIRED, Order.STATUS_PAID])
.values('item', 'variation') .values('item', 'variation')
.annotate(cnt=Count('id'), price=Sum('price')).order_by()) .annotate(cnt=Count('id'), price=Sum('price')).order_by())
} }

2
src/pretix/control/templates/pretixcontrol/orders/overview.html
View File

@@ -17,7 +17,7 @@
<thead> <thead>
<tr> <tr>
<th>{% trans "Product" %}</th> <th>{% trans "Product" %}</th>
<th>{% trans "Total orders" %}</th> <th>{% trans "Total (pending or paid)" %}</th>
<th>{% trans "Payment pending" %}</th> <th>{% trans "Payment pending" %}</th>
<th>{% trans "Cancelled" %}</th> <th>{% trans "Cancelled" %}</th>
<th>{% trans "Refunded" %}</th> <th>{% trans "Refunded" %}</th>

2
src/pretix/plugins/reports/exporters.py
View File

@@ -149,7 +149,7 @@ class OverviewReport(Report):
] ]
tdata = [ tdata = [
[ [
_('Product'), _('Total orders'), '', _('Pending'), '', _('Cancelled'), '', _('Refunded'), '', _('Product'), _('Total (pending or paid)'), '', _('Pending'), '', _('Cancelled'), '', _('Refunded'), '',
_('Paid'), '' _('Paid'), ''
], ],
[ [