From b32249d48b47161de8ac4cee42a6598f38067e6c Mon Sep 17 00:00:00 2001
From: Raphael Michel <michel@rami.io>
Date: Fri, 27 Oct 2023 11:47:22 +0200
Subject: [PATCH] Make redirections after voucher redemption more consistent

---
 .../pretixpresale/event/fragment_voucher_form.html   |  2 +-
 .../templates/pretixpresale/event/voucher_form.html  |  6 +++++-
 src/pretix/presale/views/cart.py                     | 12 +++++++++---
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/pretix/presale/templates/pretixpresale/event/fragment_voucher_form.html b/src/pretix/presale/templates/pretixpresale/event/fragment_voucher_form.html
index a2e0addf5f..7fcdd8fd15 100644
--- a/src/pretix/presale/templates/pretixpresale/event/fragment_voucher_form.html
+++ b/src/pretix/presale/templates/pretixpresale/event/fragment_voucher_form.html
@@ -20,7 +20,7 @@
             </div>
         </div>
         <input type="hidden" name="subevent" value="{{ subevent.id|default_if_none:"" }}" />
-        <input type="hidden" name="next" value="{{ request.path }}" />
+        <input type="hidden" name="next" value="{% if next_url %}{{ next_url }}{% else %}{{ request.path }}{% endif %}" />
         <div class="col-md-4 col-sm-6 col-xs-12">
             <button class="btn btn-block btn-primary" type="submit">
                 {% trans "Redeem voucher" %}
diff --git a/src/pretix/presale/templates/pretixpresale/event/voucher_form.html b/src/pretix/presale/templates/pretixpresale/event/voucher_form.html
index d9b4cf7f61..0cb3d840f5 100644
--- a/src/pretix/presale/templates/pretixpresale/event/voucher_form.html
+++ b/src/pretix/presale/templates/pretixpresale/event/voucher_form.html
@@ -9,6 +9,10 @@
 {% block title %}{% trans "Voucher redemption" %}{% endblock %}
 
 {% block content %}
+    {% if show_cart %}
+        {% include "pretixpresale/event/fragment_cart_box.html" with open=request.GET.show_cart %}
+    {% endif %}
+
     <h2>{% trans "Redeem a voucher" %}</h2>
-    {% include "pretixpresale/event/fragment_voucher_form.html" %}
+    {% include "pretixpresale/event/fragment_voucher_form.html" with next_url=request.path|add:"?show_cart=true" %}
 {% endblock %}
diff --git a/src/pretix/presale/views/cart.py b/src/pretix/presale/views/cart.py
index 6a3fff4755..557935135c 100644
--- a/src/pretix/presale/views/cart.py
+++ b/src/pretix/presale/views/cart.py
@@ -600,8 +600,11 @@ class RedeemView(NoSearchIndexViewMixin, EventViewMixin, CartMixin, TemplateView
             context['cart_redirect'] = eventreverse(self.request.event, 'presale:event.checkout.start',
                                                     kwargs={'cart_namespace': kwargs.get('cart_namespace') or ''})
         else:
-            context['cart_redirect'] = eventreverse(self.request.event, 'presale:event.index',
-                                                    kwargs={'cart_namespace': kwargs.get('cart_namespace') or ''})
+            if 'next' in self.request.GET and url_has_allowed_host_and_scheme(self.request.GET.get("next"), allowed_hosts=None):
+                context['cart_redirect'] = self.request.GET.get('next')
+            else:
+                context['cart_redirect'] = eventreverse(self.request.event, 'presale:event.index',
+                                                        kwargs={'cart_namespace': kwargs.get('cart_namespace') or ''})
         if context['cart_redirect'].startswith('https:'):
             context['cart_redirect'] = '/' + context['cart_redirect'].split('/', 3)[3]
         return context
@@ -634,7 +637,10 @@ class RedeemView(NoSearchIndexViewMixin, EventViewMixin, CartMixin, TemplateView
                 else:
                     err = error_messages['voucher_invalid']
         else:
-            return render(request, 'pretixpresale/event/voucher_form.html')
+            context = {}
+            context['cart'] = self.get_cart()
+            context['show_cart'] = context['cart']['positions']
+            return render(request, 'pretixpresale/event/voucher_form.html', context)
 
         if request.event.presale_start and now() < request.event.presale_start:
             err = error_messages['not_started']