From d395db8142105f1056a92a3e396ce93931b3ee86 Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Fri, 5 Apr 2019 14:40:58 +0200
Subject: [PATCH] Box office payments: Always display device and receipt ID

---
 src/pretix/base/payment.py                     | 17 +++++------------
 .../{payment_sumup.html => payment.html}       | 18 ++++++++++++------
 2 files changed, 17 insertions(+), 18 deletions(-)
 rename src/pretix/control/templates/pretixcontrol/boxoffice/{payment_sumup.html => payment.html} (64%)

diff --git a/src/pretix/base/payment.py b/src/pretix/base/payment.py
index ebaa3cfca..d650c4b9a 100644
--- a/src/pretix/base/payment.py
+++ b/src/pretix/base/payment.py
@@ -721,13 +721,10 @@ class BoxOfficeProvider(BasePaymentProvider):
         return False
 
     def payment_control_render(self, request, payment) -> str:
-        template = None
-        payment_info = None
-
-        if payment.info:
-            payment_info = json.loads(payment.info)
-            if payment_info['payment_type'] == "sumup":
-                template = get_template('pretixcontrol/boxoffice/payment_sumup.html')
+        if not payment.info:
+            return
+        payment_info = json.loads(payment.info)
+        template = get_template('pretixcontrol/boxoffice/payment.html')
 
         ctx = {
             'request': request,
@@ -737,11 +734,7 @@ class BoxOfficeProvider(BasePaymentProvider):
             'payment': payment,
             'provider': self,
         }
-
-        if template:
-            return template.render(ctx)
-        else:
-            return
+        return template.render(ctx)
 
 
 class ManualPayment(BasePaymentProvider):
diff --git a/src/pretix/control/templates/pretixcontrol/boxoffice/payment_sumup.html b/src/pretix/control/templates/pretixcontrol/boxoffice/payment.html
similarity index 64%
rename from src/pretix/control/templates/pretixcontrol/boxoffice/payment_sumup.html
rename to src/pretix/control/templates/pretixcontrol/boxoffice/payment.html
index e87014b44..ecfb9372d 100644
--- a/src/pretix/control/templates/pretixcontrol/boxoffice/payment_sumup.html
+++ b/src/pretix/control/templates/pretixcontrol/boxoffice/payment.html
@@ -1,11 +1,15 @@
 {% load i18n %}
 
-{% if payment_info %}
-    <dl class="dl-horizontal">
+<dl class="dl-horizontal">
+    <dt>{% trans "Device ID" %}</dt>
+    <dd>{{ payment_info.pos_id }}</dd>
+    <dt>{% trans "Receipt ID" %}</dt>
+    <dd>{{ payment_info.receipt_id }}</dd>
+    {% if payment_info.payment_type == "sumup" %}
         <dt>{% trans "Payment provider" %}</dt>
         <dd>SumUp</dd>
         <dt>{% trans "Transaction Code" %}</dt>
-        <dd>{{ payment_info.payment_data.tx_code}}</dd>
+        <dd>{{ payment_info.payment_data.tx_code }}</dd>
         <dt>{% trans "Merchant Code" %}</dt>
         <dd>{{ payment_info.payment_data.merchant_code }}</dd>
         <dt>{% trans "Currency" %}</dt>
@@ -17,6 +21,8 @@
         <dt>{% trans "Card Entry Mode" %}</dt>
         <dd>{{ payment_info.payment_data.entry_mode }}</dd>
         <dt>{% trans "Card number" %}</dt>
-        <dd><i class="fa fa-cc-{{ payment_info.payment_data.card_type|lower }}"></i> **** **** **** {{ payment_info.payment_data.last4 }}</dd>
-    </dl>
-{% endif %}
\ No newline at end of file
+        <dd>
+            <i class="fa fa-cc-{{ payment_info.payment_data.card_type|lower }}"></i> **** **** **** {{ payment_info.payment_data.last4 }}
+        </dd>
+    {% endif %}
+</dl>