From 697cdfd5c9a9da7aa2c6d73b5175db071b285402 Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Wed, 27 Mar 2019 16:45:15 +0100
Subject: [PATCH] Allow to redirect to checkout directly after adding a product
 to the cart

---
 src/pretix/base/settings.py                                  | 4 ++++
 src/pretix/control/forms/event.py                            | 4 ++++
 .../control/templates/pretixcontrol/event/display.html       | 1 +
 src/pretix/presale/templates/pretixpresale/event/index.html  | 2 +-
 .../presale/templates/pretixpresale/event/voucher.html       | 3 +--
 src/pretix/presale/views/cart.py                             | 5 +++++
 src/pretix/presale/views/event.py                            | 4 ++++
 7 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/pretix/base/settings.py b/src/pretix/base/settings.py
index 3d3ddac213..c7f7e2c1f1 100644
--- a/src/pretix/base/settings.py
+++ b/src/pretix/base/settings.py
@@ -97,6 +97,10 @@ DEFAULTS = {
         'default': '30',
         'type': int
     },
+    'redirect_to_checkout_directly': {
+        'default': 'False',
+        'type': bool
+    },
     'payment_explanation': {
         'default': '',
         'type': LazyI18nString
diff --git a/src/pretix/control/forms/event.py b/src/pretix/control/forms/event.py
index 4ad2264620..264dfa41cc 100644
--- a/src/pretix/control/forms/event.py
+++ b/src/pretix/control/forms/event.py
@@ -1074,6 +1074,10 @@ class DisplaySettingsForm(SettingsForm):
         label=_('Ask search engines not to index the ticket shop'),
         required=False
     )
+    redirect_to_checkout_directly = forms.BooleanField(
+        label=_('Directly redirect to check-out after a product has been added to the cart.'),
+        required=False
+    )
 
     def __init__(self, *args, **kwargs):
         event = kwargs['obj']
diff --git a/src/pretix/control/templates/pretixcontrol/event/display.html b/src/pretix/control/templates/pretixcontrol/event/display.html
index 80e557b7e9..09f1ac9b9f 100644
--- a/src/pretix/control/templates/pretixcontrol/event/display.html
+++ b/src/pretix/control/templates/pretixcontrol/event/display.html
@@ -17,6 +17,7 @@
             {% if form.frontpage_subevent_ordering %}
                 {% bootstrap_field form.frontpage_subevent_ordering layout="control" %}
             {% endif %}
+            {% bootstrap_field form.redirect_to_checkout_directly layout="control" %}
         </fieldset>
         <fieldset>
             <legend>{% trans "Shop design" %}</legend>
diff --git a/src/pretix/presale/templates/pretixpresale/event/index.html b/src/pretix/presale/templates/pretixpresale/event/index.html
index 4a1f6188a6..b829ec0b4d 100644
--- a/src/pretix/presale/templates/pretixpresale/event/index.html
+++ b/src/pretix/presale/templates/pretixpresale/event/index.html
@@ -182,7 +182,7 @@
             <form method="post" data-asynctask
                     data-asynctask-headline="{% trans "We're now trying to reserve this for you!" %}"
                     data-asynctask-text="{% blocktrans with time=event.settings.reservation_time %}Once the items are in your cart, you will have {{ time }} minutes to complete your purchase.{% endblocktrans %}"
-                    action="{% eventurl request.event "presale:event.cart.add" cart_namespace=cart_namespace %}?next={{ request.path|urlencode }}">
+                    action="{% eventurl request.event "presale:event.cart.add" cart_namespace=cart_namespace %}?next={{ cart_redirect|urlencode }}">
                 {% csrf_token %}
                 <input type="hidden" name="subevent" value="{{ subevent.id|default_if_none:"" }}" />
                 {% for tup in items_by_category %}
diff --git a/src/pretix/presale/templates/pretixpresale/event/voucher.html b/src/pretix/presale/templates/pretixpresale/event/voucher.html
index 8ba9981030..421576b4fb 100644
--- a/src/pretix/presale/templates/pretixpresale/event/voucher.html
+++ b/src/pretix/presale/templates/pretixpresale/event/voucher.html
@@ -20,8 +20,7 @@
     </p>
     {% if event.presale_is_running or event.settings.show_items_outside_presale_period %}
         <form method="post"
-                action="{% eventurl request.event "presale:event.cart.add" cart_namespace=cart_namespace %}?next={% eventurl request.event "presale:event.index" cart_namespace=cart_namespace %}{% if "iframe" in request.GET and not new_tab %}&iframe={{ request.GET.iframe }}{% endif %}{% if "take_cart_id" in request.GET and new_tab %}&take_cart_id={{ request.GET.take_cart_id }}{% endif %}"
-            {% if new_tab %}target="_blank"{% else %}
+                action="{% eventurl request.event "presale:event.cart.add" cart_namespace=cart_namespace %}?next={{ cart_redirect|urlencode }}{% if "iframe" in request.GET and not new_tab %}&iframe={{ request.GET.iframe }}{% endif %}{% if "take_cart_id" in request.GET and new_tab %}&take_cart_id={{ request.GET.take_cart_id }}{% endif %}" {% if new_tab %}target="_blank"{% else %}
                 data-asynctask
                 data-asynctask-headline="{% trans "We're now trying to reserve this for you!" %}"
                 data-asynctask-text="{% blocktrans with time=event.settings.reservation_time %}Once the items are in your cart, you will have {{ time }} minutes to complete your purchase.{% endblocktrans %}"
diff --git a/src/pretix/presale/views/cart.py b/src/pretix/presale/views/cart.py
index c42fbc54c6..7c0c7c9a8e 100644
--- a/src/pretix/presale/views/cart.py
+++ b/src/pretix/presale/views/cart.py
@@ -425,6 +425,11 @@ class RedeemView(NoSearchIndexViewMixin, EventViewMixin, TemplateView):
             # Cookies are not supported! Lets just make the form open in a new tab
         )
 
+        if self.request.event.settings.redirect_to_checkout_directly:
+            context['cart_redirect'] = eventreverse(self.request.event, 'presale:event.checkout.start')
+        else:
+            context['cart_redirect'] = eventreverse(self.request.event, 'presale:event.index')
+
         return context
 
     def dispatch(self, request, *args, **kwargs):
diff --git a/src/pretix/presale/views/event.py b/src/pretix/presale/views/event.py
index 2976b2d00f..e257410ee8 100644
--- a/src/pretix/presale/views/event.py
+++ b/src/pretix/presale/views/event.py
@@ -291,6 +291,10 @@ class EventIndex(EventViewMixin, EventListMixin, CartMixin, TemplateView):
                 or not self.subevent
             )
         )
+        if self.request.event.settings.redirect_to_checkout_directly:
+            context['cart_redirect'] = eventreverse(self.request.event, 'presale:event.checkout.start')
+        else:
+            context['cart_redirect'] = self.request.path
 
         return context