From 4c0e8f69eaedbf021012831f5648e6d999e78982 Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Thu, 4 Apr 2019 09:57:44 +0200
Subject: [PATCH] Cancellation: Do not display refund notices if not required

---
 .../pretixpresale/event/order_cancel.html     | 30 ++++++++++---------
 src/pretix/presale/views/order.py             |  2 +-
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/pretix/presale/templates/pretixpresale/event/order_cancel.html b/src/pretix/presale/templates/pretixpresale/event/order_cancel.html
index b110891b3e..d45972f95b 100644
--- a/src/pretix/presale/templates/pretixpresale/event/order_cancel.html
+++ b/src/pretix/presale/templates/pretixpresale/event/order_cancel.html
@@ -15,22 +15,24 @@
         {% endblocktrans %}
         {% trans "This will invalidate all of your tickets." %}
     </p>
-    {% if can_auto_refund %}
-        <p>
-            <strong>
+    {% if refund_amount %}
+        {% if can_auto_refund %}
+            <p>
+                <strong>
+                    {% blocktrans trimmed with amount=refund_amount|money:request.event.currency %}
+                        The refund amount of {{ amount }} will automatically be sent back to your original payment method. Depending on the payment method,
+                        please allow for up to two weeks before this appears on your statement.
+                    {% endblocktrans %}
+                </strong>
+            </p>
+        {% else %}
+            <div class="alert alert-warning">
                 {% blocktrans trimmed with amount=refund_amount|money:request.event.currency %}
-                    The refund amount of {{ amount }} will automatically be sent back to your original payment method. Depending on the payment method,
-                    please allow for up to two weeks before this appears on your statement.
+                    With to the payment method you used, the refund amount of {{ amount }} <strong>can not be sent back to you automatically</strong>. Instead, the
+                    event organizer will need to initiate the transfer manually. Please be patient as this might take a bit longer.
                 {% endblocktrans %}
-            </strong>
-        </p>
-    {% else %}
-        <div class="alert alert-warning">
-            {% blocktrans trimmed with amount=refund_amount|money:request.event.currency %}
-                With to the payment method you used, the refund amount of {{ amount }} <strong>can not be sent back to you automatically</strong>. Instead, the
-                event organizer will need to initiate the transfer manually. Please be patient as this might take a bit longer.
-            {% endblocktrans %}
-        </div>
+            </div>
+        {% endif %}
     {% endif %}
 
     <form method="post" action="{% eventurl request.event "presale:event.order.cancel.do" secret=order.secret order=order.code %}" data-asynctask>
diff --git a/src/pretix/presale/views/order.py b/src/pretix/presale/views/order.py
index 3ff3e74e19..1abe627dff 100644
--- a/src/pretix/presale/views/order.py
+++ b/src/pretix/presale/views/order.py
@@ -583,7 +583,7 @@ class OrderCancel(EventViewMixin, OrderDetailMixin, TemplateView):
     def get_context_data(self, **kwargs):
         ctx = super().get_context_data(**kwargs)
         ctx['order'] = self.order
-        refund_amount = self.order.total - self.order.user_cancel_fee
+        refund_amount = self.order.payment_refund_sum - self.order.user_cancel_fee
         proposals = self.order.propose_auto_refunds(refund_amount)
         ctx['refund_amount'] = refund_amount
         ctx['can_auto_refund'] = sum(proposals.values()) == refund_amount