CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Order list: Allow to filter for approved

Browse Source
This commit is contained in:
Raphael Michel
2020-11-10 11:07:10 +01:00
parent f94e8e5bdc
commit 2c1195eaa1
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pretix/control/forms/filter.py
View File

@@ -112,6 +112,7 @@ class OrderFilterForm(FilterForm):
(Order.STATUS_PENDING + Order.STATUS_EXPIRED, _('Pending or expired')), (Order.STATUS_PENDING + Order.STATUS_EXPIRED, _('Pending or expired')),
(Order.STATUS_CANCELED, _('Canceled')), (Order.STATUS_CANCELED, _('Canceled')),
('cp', _('Canceled (or with paid fee)')), ('cp', _('Canceled (or with paid fee)')),
('na', _('Approved, payment pending')),
('pa', _('Approval pending')), ('pa', _('Approval pending')),
('overpaid', _('Overpaid')), ('overpaid', _('Overpaid')),
('underpaid', _('Underpaid')), ('underpaid', _('Underpaid')),
@@ -207,6 +208,11 @@ class OrderFilterForm(FilterForm):
status=Order.STATUS_PENDING, status=Order.STATUS_PENDING,
require_approval=True require_approval=True
) )
elif s == 'na':
qs = qs.filter(
status=Order.STATUS_PENDING,
require_approval=False
)
elif s == 'testmode': elif s == 'testmode':
qs = qs.filter( qs = qs.filter(
testmode=True testmode=True

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

@@ -110,7 +110,7 @@
</a> </a>
</td> </td>
<td> <td>
<a href="{{ listurl }}?item={{ item.id }}&amp;status=n&amp;provider={{ item.provider }}"> <a href="{{ listurl }}?item={{ item.id }}&amp;status=na&amp;provider={{ item.provider }}">
{{ item.num.pending|togglesum:request.event.currency }} {{ item.num.pending|togglesum:request.event.currency }}
</a> </a>
</td> </td>
@@ -143,7 +143,7 @@
</a> </a>
</td> </td>
<td> <td>
<a href="{{ listurl }}?item={{ item.id }}-{{ var.id }}&amp;status=n&amp;provider={{ item.provider }}"> <a href="{{ listurl }}?item={{ item.id }}-{{ var.id }}&amp;status=na&amp;provider={{ item.provider }}">
{{ var.num.pending|togglesum:request.event.currency }} {{ var.num.pending|togglesum:request.event.currency }}
</a> </a>
</td> </td>