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

Add filter "pending or expired" for correct links in the order overview

Browse Source
This commit is contained in:
Raphael Michel
2016-09-04 22:50:22 +02:00
parent a6bafd816b
commit 2569ebec55
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pretix/control/templates/pretixcontrol/orders/index.html
+2 -1
View File
@@ -40,7 +40,8 @@
<option value="p" {% if request.GET.status == "p" %}selected="selected"{% endif %}>{% trans "Paid" %}</option> <option value="p" {% if request.GET.status == "p" %}selected="selected"{% endif %}>{% trans "Paid" %}</option>
<option value="n" {% if request.GET.status == "n" %}selected="selected"{% endif %}>{% trans "Pending" %}</option> <option value="n" {% if request.GET.status == "n" %}selected="selected"{% endif %}>{% trans "Pending" %}</option>
<option value="o" {% if request.GET.status == "o" %}selected="selected"{% endif %}>{% trans "Pending (overdue)" %}</option> <option value="o" {% if request.GET.status == "o" %}selected="selected"{% endif %}>{% trans "Pending (overdue)" %}</option>
<option value="e" {% if request.GET.status == "e" %}selected="selected"{% endif %}>{% trans "Pending (expired)" %}</option> <option value="e" {% if request.GET.status == "e" %}selected="selected"{% endif %}>{% trans "Expired" %}</option>
<option value="ne" {% if request.GET.status == "ne" %}selected="selected"{% endif %}>{% trans "Pending or expired" %}</option>
<option value="c" {% if request.GET.status == "c" %}selected="selected"{% endif %}>{% trans "Cancelled" %}</option> <option value="c" {% if request.GET.status == "c" %}selected="selected"{% endif %}>{% trans "Cancelled" %}</option>
<option value="r" {% if request.GET.status == "r" %}selected="selected"{% endif %}>{% trans "Refunded" %}</option> <option value="r" {% if request.GET.status == "r" %}selected="selected"{% endif %}>{% trans "Refunded" %}</option>
</select> </select>
src/pretix/control/templates/pretixcontrol/orders/overview.html
+1 -1
View File
@@ -45,7 +45,7 @@
</a> </a>
</td> </td>
<td> <td>
<a href="{{ listurl }}?item={{ item.id }}&amp;status=n"> <a href="{{ listurl }}?item={{ item.id }}&amp;status=ne">
{{ item.num_pending|togglesum }} {{ item.num_pending|togglesum }}
</a> </a>
</td> </td>
src/pretix/control/views/orders.py
+2
View File
@@ -59,6 +59,8 @@ class OrderList(EventPermissionRequiredMixin, ListView):
s = self.request.GET.get("status", "") s = self.request.GET.get("status", "")
if s == 'o': if s == 'o':
qs = qs.filter(status=Order.STATUS_PENDING, expires__lt=now().date()) qs = qs.filter(status=Order.STATUS_PENDING, expires__lt=now().date())
elif s == 'ne':
qs = qs.filter(status__in=[Order.STATUS_PENDING, Order.STATUS_EXPIRED])
else: else:
qs = qs.filter(status=s) qs = qs.filter(status=s)
if self.request.GET.get("item", "") != "": if self.request.GET.get("item", "") != "":