From e0ece9c18aa3d542639207056b46bc50e0f968eb Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Fri, 9 Sep 2016 10:38:58 +0200
Subject: [PATCH] Stripe checkout: Fixed retry order

---
 ...checkout_payment_form_stripe_checkout.html | 20 +++++++++++--------
 .../pretixpresale/event/order_pay.html        |  2 +-
 .../pretixpresale/event/order_pay_change.html |  2 +-
 src/pretix/presale/views/order.py             |  1 +
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/pretix/plugins/stripe/templates/pretixplugins/stripe/checkout_payment_form_stripe_checkout.html b/src/pretix/plugins/stripe/templates/pretixplugins/stripe/checkout_payment_form_stripe_checkout.html
index 2b25d036f0..23409544af 100644
--- a/src/pretix/plugins/stripe/templates/pretixplugins/stripe/checkout_payment_form_stripe_checkout.html
+++ b/src/pretix/plugins/stripe/templates/pretixplugins/stripe/checkout_payment_form_stripe_checkout.html
@@ -17,13 +17,17 @@
             Stripe and never touches our servers.
         {% endblocktrans %}</em>
     </p>
-    <input type="hidden" name="stripe_token" value="" id="stripe_token" />
-    <input type="hidden" name="stripe_card_last4" value="" id="stripe_card_last4" />
-    <input type="hidden" name="stripe_card_brand" value="" id="stripe_card_brand" />
-    <input type="hidden" id="organizer_name" value="{{ event.organizer.name }}" />
-    <input type="hidden" id="event_name" value="{{ event.name }}" />
-    <input type="hidden" id="stripe_currency" value="{{ event.currency }}" />
-    <input type="hidden" id="event_name" value="{{ event.name }}" />
-    <input type="hidden" id="stripe_email" value="{{ request.session.email }}" />
+    <input type="hidden" name="stripe_token" value="" id="stripe_token"/>
+    <input type="hidden" name="stripe_card_last4" value="" id="stripe_card_last4"/>
+    <input type="hidden" name="stripe_card_brand" value="" id="stripe_card_brand"/>
+    <input type="hidden" id="organizer_name" value="{{ event.organizer.name }}"/>
+    <input type="hidden" id="event_name" value="{{ event.name }}"/>
+    <input type="hidden" id="stripe_currency" value="{{ event.currency }}"/>
+    <input type="hidden" id="event_name" value="{{ event.name }}"/>
+    {% if order %}
+        <input type="hidden" id="stripe_email" value="{{ order.email }}"/>
+    {% else %}
+        <input type="hidden" id="stripe_email" value="{{ request.session.email }}"/>
+    {% endif %}
 </div>
 
diff --git a/src/pretix/presale/templates/pretixpresale/event/order_pay.html b/src/pretix/presale/templates/pretixpresale/event/order_pay.html
index 9abc608ff7..c0d81e13f5 100644
--- a/src/pretix/presale/templates/pretixpresale/event/order_pay.html
+++ b/src/pretix/presale/templates/pretixpresale/event/order_pay.html
@@ -9,7 +9,7 @@
         {% endblocktrans %}
     </h2>
 
-    <form method="post" class="form-horizontal" href="">
+    <form method="post" class="form-horizontal" href="" data-total="{{ order.total|floatformat:2 }}">
         {% csrf_token %}
         <div class="form-horizontal payment-redo-form">
             {{ form }}
diff --git a/src/pretix/presale/templates/pretixpresale/event/order_pay_change.html b/src/pretix/presale/templates/pretixpresale/event/order_pay_change.html
index 85d8d4be61..968949abb2 100644
--- a/src/pretix/presale/templates/pretixpresale/event/order_pay_change.html
+++ b/src/pretix/presale/templates/pretixpresale/event/order_pay_change.html
@@ -18,7 +18,7 @@
         {% csrf_token %}
         <div class="panel-group" id="payment_accordion">
             {% for p in providers %}
-                <div class="panel panel-default">
+                <div class="panel panel-default" data-total="{{ p.total|floatformat:2 }}">
                     <div class="panel-heading">
                         <h4 class="panel-title">
                             <label class="radio">
diff --git a/src/pretix/presale/views/order.py b/src/pretix/presale/views/order.py
index de97d5778e..90a6354104 100644
--- a/src/pretix/presale/views/order.py
+++ b/src/pretix/presale/views/order.py
@@ -273,6 +273,7 @@ class OrderPayChangeMethod(EventViewMixin, OrderDetailMixin, TemplateView):
                 'fee': fee,
                 'fee_diff': fee - self.order.payment_fee,
                 'fee_diff_abs': abs(fee - self.order.payment_fee),
+                'total': abs(self._total_order_value + fee),
                 'form': provider.payment_form_render(self.request)
             })
         return providers