From d616b4d648c3d1ca3c3943599893fd698f53e6af Mon Sep 17 00:00:00 2001
From: luelista <weller@rami.io>
Date: Thu, 22 May 2025 12:54:59 +0200
Subject: [PATCH] Fix incorrect form tags on checkout_confirm.html (#5146)

---
 .../pretixpresale/event/checkout_confirm.html | 44 +++++++++----------
 .../pretixpresale/event/fragment_cart.html    |  6 +--
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/pretix/presale/templates/pretixpresale/event/checkout_confirm.html b/src/pretix/presale/templates/pretixpresale/event/checkout_confirm.html
index 42156a81ed..42afcfdfde 100644
--- a/src/pretix/presale/templates/pretixpresale/event/checkout_confirm.html
+++ b/src/pretix/presale/templates/pretixpresale/event/checkout_confirm.html
@@ -11,31 +11,31 @@
     <h2>{% trans "Review order" %}</h2>
     {% include "pretixpresale/event/fragment_checkoutflow.html" %}
     <p>{% trans "Please review the details below and confirm your order." %}</p>
+    <div class="panel panel-primary cart">
+        <div class="panel-heading panel-heading-flex">
+            <h3 class="panel-title">
+                <i class="fa fa-shopping-cart" aria-hidden="true"></i>
+                {% trans "Your cart" %}
+                <a href="{% eventurl request.event "presale:event.index" cart_namespace=cart_namespace|default_if_none:"" %}" class="h6">
+                    <span class="fa fa-edit" aria-hidden="true"></span>{% trans "Add or remove tickets" %}
+                </a>
+            </h3>
+            <span class="panel-heading-flex-gap"></span>
+            <strong class="helper-display-block" id="cart-deadline-short" data-expires="{{ cart.first_expiry|date:"Y-m-d H:i:sO" }}">
+                {% if cart.minutes_left > 0 or cart.seconds_left > 0 %}
+                    {{ cart.minutes_left|stringformat:"02d" }}:{{ cart.seconds_left|stringformat:"02d" }}
+                {% else %}
+                    {% trans "Cart expired" %}
+                {% endif %}
+            </strong>
+        </div>
+        <div class="panel-body">
+            {% include "pretixpresale/event/fragment_cart.html" with cart=cart event=request.event editable=False %}
+        </div>
+    </div>
     <form method="post" data-asynctask
             data-asynctask-headline="{% trans "Please hang tight, we're finalizing your order!" %}">
         {% csrf_token %}
-        <div class="panel panel-primary cart">
-            <div class="panel-heading panel-heading-flex">
-                <h3 class="panel-title">
-                    <i class="fa fa-shopping-cart" aria-hidden="true"></i>
-                    {% trans "Your cart" %}
-                    <a href="{% eventurl request.event "presale:event.index" cart_namespace=cart_namespace|default_if_none:"" %}" class="h6">
-                        <span class="fa fa-edit" aria-hidden="true"></span>{% trans "Add or remove tickets" %}
-                    </a>
-                </h3>
-                <span class="panel-heading-flex-gap"></span>
-                <strong class="helper-display-block" id="cart-deadline-short" data-expires="{{ cart.first_expiry|date:"Y-m-d H:i:sO" }}">
-                    {% if cart.minutes_left > 0 or cart.seconds_left > 0 %}
-                        {{ cart.minutes_left|stringformat:"02d" }}:{{ cart.seconds_left|stringformat:"02d" }}
-                    {% else %}
-                        {% trans "Cart expired" %}
-                    {% endif %}
-                </strong>
-            </div>
-            <div class="panel-body">
-                {% include "pretixpresale/event/fragment_cart.html" with cart=cart event=request.event editable=False %}
-            </div>
-        </div>
         {% if payments %}
             <div class="panel panel-default">
                 <div class="panel-heading">
diff --git a/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html b/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html
index 02cacd02c4..bcfb67e9b0 100644
--- a/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html
+++ b/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html
@@ -492,10 +492,10 @@
 <div class="row">
     <div class="col-md-12">
     {% if not cart.is_ordered %}
-        <form class="text-muted"
-                method="post" data-asynctask action="{% eventurl request.event "presale:event.cart.extend" cart_namespace=cart_namespace %}">
+        <form class="text-muted" id="cart-extend-form" data-asynctask data-asynctask-no-redirect
+                method="post" action="{% eventurl request.event "presale:event.cart.extend" cart_namespace=cart_namespace %}">
             {% csrf_token %}
-            <span id="cart-deadline" data-expires="{{ cart.first_expiry|date:"Y-m-d H:i:sO" }}">
+            <span id="cart-deadline" data-expires="{{ cart.first_expiry|date:"Y-m-d H:i:sO" }}" data-max-expiry-extend="{{ cart.max_expiry_extend|date:"Y-m-d H:i:sO" }}">
                 {% if cart.minutes_left > 0 or cart.seconds_left > 0 %}
                     {% blocktrans trimmed with minutes=cart.minutes_left %}
                         The items in your cart are reserved for you for {{ minutes }} minutes.