Order list export: Expose same "extended status" as in backend (#3674)

* Order list export: Expose same "extended status" as in backend

* Review notes

src/pretix/base/exporters/orderlist.py

@@ -332,7 +332,7 @@ class OrderListExporter(MultiSheetListExporter):
                 self.event_object_cache[order.event_id].slug,
                 order.code,
                 order.total,
-                order.get_status_display(),
+                order.get_extended_status_display(),
                 order.email,
                 str(order.phone) if order.phone else '',
                 order.datetime.astimezone(tz).strftime('%Y-%m-%d'),
@@ -463,7 +463,7 @@ class OrderListExporter(MultiSheetListExporter):
             row = [
                 self.event_object_cache[order.event_id].slug,
                 order.code,
-                _("canceled") if op.canceled else order.get_status_display(),
+                _("canceled") if op.canceled else order.get_extended_status_display(),
                 order.email,
                 str(order.phone) if order.phone else '',
                 order.datetime.astimezone(tz).strftime('%Y-%m-%d'),
@@ -638,7 +638,7 @@ class OrderListExporter(MultiSheetListExporter):
                     self.event_object_cache[order.event_id].slug,
                     order.code,
                     op.positionid,
-                    _("canceled") if op.canceled else order.get_status_display(),
+                    _("canceled") if op.canceled else order.get_extended_status_display(),
                     order.email,
                     str(order.phone) if order.phone else '',
                     order.datetime.astimezone(tz).strftime('%Y-%m-%d'),

src/pretix/base/models/orders.py

@@ -325,6 +325,18 @@ class Order(LockModel, LoggedModel):
     def email_confirm_hash(self):
         return hashlib.sha256(settings.SECRET_KEY.encode() + self.secret.encode()).hexdigest()[:9]
 
+    def get_extended_status_display(self):
+        # Changes in this method should to be replicated in pretixcontrol/orders/fragment_order_status.html
+        # and pretixpresale/event/fragment_order_status.html
+        if self.status == Order.STATUS_PENDING:
+            if self.require_approval:
+                return _("approval pending")
+            elif self.valid_if_pending:
+                return pgettext_lazy("order state", "pending (confirmed)")
+        elif self.status == Order.STATUS_PAID and self.count_positions == 0:
+            return _("canceled (paid fee)")
+        return self.get_status_display()
+
     @property
     def fees(self):
         """

src/pretix/control/templates/pretixcontrol/orders/fragment_order_status.html

@@ -1,5 +1,6 @@
 {% load i18n %}
 {% load bootstrap3 %}
+{# Changes should be replicated in pretixpresale/event/fragment_order_status.html and in pretix/base/models/orders.py #}
 {% if order.status == "n" %}
     {% if order.require_approval %}
         <span class="label label-warning {{ class }}">

src/pretix/presale/templates/pretixpresale/event/fragment_order_status.html

@@ -1,5 +1,6 @@
 {% load i18n %}
 {% load bootstrap3 %}
+{# Changes should be replicated in pretixcontrol/orders/fragment_order_status.html and in pretix/base/models/orders.py #}
 {% if order.status == "n" %}
     {% if order.require_approval %}
         {% trans "Approval pending" %}