From 2569ebec55cbdf770a4baeff2f9c935de23dc36a Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Sun, 4 Sep 2016 22:50:22 +0200
Subject: [PATCH] Add filter "pending or expired" for correct links in the
 order overview

---
 src/pretix/control/templates/pretixcontrol/orders/index.html   | 3 ++-
 .../control/templates/pretixcontrol/orders/overview.html       | 2 +-
 src/pretix/control/views/orders.py                             | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/pretix/control/templates/pretixcontrol/orders/index.html b/src/pretix/control/templates/pretixcontrol/orders/index.html
index 16ee033d64..ab2cbb2897 100644
--- a/src/pretix/control/templates/pretixcontrol/orders/index.html
+++ b/src/pretix/control/templates/pretixcontrol/orders/index.html
@@ -40,7 +40,8 @@
                 <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="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="r" {% if request.GET.status == "r" %}selected="selected"{% endif %}>{% trans "Refunded" %}</option>
             </select>
diff --git a/src/pretix/control/templates/pretixcontrol/orders/overview.html b/src/pretix/control/templates/pretixcontrol/orders/overview.html
index 6091e0c280..4dc6422d88 100644
--- a/src/pretix/control/templates/pretixcontrol/orders/overview.html
+++ b/src/pretix/control/templates/pretixcontrol/orders/overview.html
@@ -45,7 +45,7 @@
                                 </a>
                             </td>
                             <td>
-                                <a href="{{ listurl }}?item={{ item.id }}&amp;status=n">
+                                <a href="{{ listurl }}?item={{ item.id }}&amp;status=ne">
                                     {{ item.num_pending|togglesum }}
                                 </a>
                             </td>
diff --git a/src/pretix/control/views/orders.py b/src/pretix/control/views/orders.py
index d727f787ae..cc72f21336 100644
--- a/src/pretix/control/views/orders.py
+++ b/src/pretix/control/views/orders.py
@@ -59,6 +59,8 @@ class OrderList(EventPermissionRequiredMixin, ListView):
             s = self.request.GET.get("status", "")
             if s == 'o':
                 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:
                 qs = qs.filter(status=s)
         if self.request.GET.get("item", "") != "":