From 681e682e73d25b0550fb0eea365735f5472434dc Mon Sep 17 00:00:00 2001
From: Raphael Michel <michel@pretix.eu>
Date: Wed, 19 Nov 2025 14:47:28 +0100
Subject: [PATCH] Bank transfer: Consistancy in order of fields (fixes #5577)
 (#5625)

* Bank transfer: Consistancy in order of fields (fixes #5577)

* Delete unused template
---
 .../banktransfer/checkout_confirm.html        | 41 -------------------
 .../banktransfer/checkout_payment_form.html   | 17 ++++----
 .../pretixplugins/banktransfer/pending.html   | 23 +++++------
 3 files changed, 19 insertions(+), 62 deletions(-)
 delete mode 100644 src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/checkout_confirm.html

diff --git a/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/checkout_confirm.html b/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/checkout_confirm.html
deleted file mode 100644
index 761c1bf11d..0000000000
--- a/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/checkout_confirm.html
+++ /dev/null
@@ -1,41 +0,0 @@
-{% load i18n %}
-{% load ibanformat %}
-{% load bootstrap3 %}
-{% load rich_text %}
-
-{% if details or code %}
-    <p>{% blocktrans trimmed %}
-        After completing your purchase, we will ask you to transfer the money to the following
-        bank account, using a personal reference code:
-    {% endblocktrans %}</p>
-
-    {% if not code %}<div class="user-select-none" data-toggle="tooltip" title="{% trans "Please do not yet start a payment. We'll assign you a personal reference code after you completed the order." %}">{% endif %}
-    {% if settings.bank_details_type == "sepa" %}
-        <dl class="dl-horizontal">
-            <dt>{% trans "Account holder" %}: </dt><dd>{{ settings.bank_details_sepa_name }}</dd>
-            <dt>{% trans "IBAN" %}: </dt><dd>{{ settings.bank_details_sepa_iban|ibanformat }}</dd>
-            <dt>{% trans "BIC" %}: </dt><dd>{{ settings.bank_details_sepa_bic }}</dd>
-            <dt>{% trans "Bank" %}: </dt><dd>{{ settings.bank_details_sepa_bank }}</dd>
-        </dl>
-    {% endif %}
-
-    {{ details | rich_text }}
-    {% if not code %}</div>{% endif %}
-
-    {% if code %}
-        <dl class="dl-horizontal">
-            <dt>{% trans "Reference code (important):" %} </dt><dd><strong>{{ code }}</strong></dd>
-        </dl>
-    {% else %}
-        <p>
-            <strong>
-                {% trans "We will assign you a personal reference code to use after you completed the order." %}
-            </strong>
-        </p>
-    {% endif %}
-{% else %}
-    <p>{% blocktrans trimmed %}
-        After completing your purchase, we will ask you to transfer the money to our bank account, using a personal
-        reference code.
-    {% endblocktrans %}</p>
-{% endif %}
diff --git a/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/checkout_payment_form.html b/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/checkout_payment_form.html
index 3ad5e526ec..11792f91f0 100644
--- a/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/checkout_payment_form.html
+++ b/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/checkout_payment_form.html
@@ -9,23 +9,22 @@
     {% endblocktrans %}</p>
 
     {% if not code %}<div class="user-select-none" data-toggle="tooltip" title="{% trans "Please do not yet start a payment. We'll assign you a personal reference code after you completed the order." %}">{% endif %}
-    {% if settings.bank_details_type == "sepa" %}
-        <dl class="dl-horizontal">
+    <dl class="dl-horizontal">
+        {% if code %}
+            <dt>{% trans "Reference code (important):" %} </dt><dd><strong>{{ code }}</strong></dd>
+        {% endif %}
+        {% if settings.bank_details_type == "sepa" %}
             <dt>{% trans "Account holder" %}: </dt><dd>{{ settings.bank_details_sepa_name }}</dd>
             <dt>{% trans "IBAN" %}: </dt><dd>{{ settings.bank_details_sepa_iban|ibanformat }}</dd>
             <dt>{% trans "BIC" %}: </dt><dd>{{ settings.bank_details_sepa_bic }}</dd>
             <dt>{% trans "Bank" %}: </dt><dd>{{ settings.bank_details_sepa_bank }}</dd>
-        </dl>
-    {% endif %}
+        {% endif %}
+    </dl>
 
     {{ details | rich_text }}
     {% if not code %}</div>{% endif %}
 
-    {% if code %}
-        <dl class="dl-horizontal">
-            <dt>{% trans "Reference code (important):" %} </dt><dd><strong>{{ code }}</strong></dd>
-        </dl>
-    {% else %}
+    {% if not code %}
         <p>
             <strong>
                 {% trans "We will assign you a personal reference code to use after you completed the order." %}
diff --git a/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/pending.html b/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/pending.html
index 06d9b6a758..028d90bac2 100644
--- a/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/pending.html
+++ b/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/pending.html
@@ -18,20 +18,19 @@
 
 <div class="row">
     <div class="{% if settings.bank_details_type == "sepa" %}col-md-6{% else %}col-md-12{% endif %} col-xs-12">
-            <dl class="dl-horizontal">
-                <dt>{% trans "Reference code (important):" %}</dt><dd><b>{{ code }}</b></dd>
-                <dt>{% trans "Amount:" %}</dt><dd>{{ amount|money:event.currency }}</dd>
-                {% if settings.bank_details_type == "sepa" %}
-                    <dt>{% trans "Account holder" %}:</dt><dd>{{ settings.bank_details_sepa_name }}</dt>
-                    <dt>{% trans "IBAN" %}:</dt><dd>{{ settings.bank_details_sepa_iban|ibanformat }}</dt>
-                    <dt>{% trans "BIC" %}:</dt><dd>{{ settings.bank_details_sepa_bic }}</dt>
-                    <dt>{% trans "Bank" %}:</dt><dd>{{ settings.bank_details_sepa_bank }}</dt>
-                {% endif %}
-            </dl>
-            {% if details %}
-                {{ details | rich_text }}
+        <dl class="dl-horizontal">
+            <dt>{% trans "Reference code (important):" %}</dt><dd><b>{{ code }}</b></dd>
+            <dt>{% trans "Amount:" %}</dt><dd>{{ amount|money:event.currency }}</dd>
+            {% if settings.bank_details_type == "sepa" %}
+                <dt>{% trans "Account holder" %}:</dt><dd>{{ settings.bank_details_sepa_name }}</dt>
+                <dt>{% trans "IBAN" %}:</dt><dd>{{ settings.bank_details_sepa_iban|ibanformat }}</dt>
+                <dt>{% trans "BIC" %}:</dt><dd>{{ settings.bank_details_sepa_bic }}</dt>
+                <dt>{% trans "Bank" %}:</dt><dd>{{ settings.bank_details_sepa_bank }}</dt>
             {% endif %}
         </dl>
+        {% if details %}
+            {{ details | rich_text }}
+        {% endif %}
         <p class="text-muted">
             {% trans "There is no further action required on this website." %}
             {% trans "We will send you an email as soon as we received your payment." %}