From e73e5e03409872063501fadcdd7fe86f36418e32 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Fri, 10 Nov 2023 17:20:00 +0100 Subject: [PATCH] Bank transfer: Discourage payments before an order code exists (Z#23135042) (#3692) * Bank transfer: Discourage payments befor an order code exists * Update src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/checkout_payment_form.html Co-authored-by: Mira --------- Co-authored-by: Mira --- .../banktransfer/checkout_confirm.html | 54 +++++++++++-------- .../banktransfer/checkout_payment_form.html | 54 +++++++++++-------- .../static/pretixpresale/scss/main.scss | 4 ++ 3 files changed, 66 insertions(+), 46 deletions(-) diff --git a/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/checkout_confirm.html b/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/checkout_confirm.html index 7c2ac0e88..f62dcaeb2 100644 --- a/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/checkout_confirm.html +++ b/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/checkout_confirm.html @@ -2,33 +2,41 @@ {% load ibanformat %} {% load bootstrap3 %} -

{% 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 %}

+{% if details or code %} +

{% 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 %}

-{% if settings.bank_details_type == "sepa" %} -
-
{% trans "Account holder" %}:
{{ settings.bank_details_sepa_name }}
-
{% trans "IBAN" %}:
{{ settings.bank_details_sepa_iban|ibanformat }}
-
{% trans "BIC" %}:
{{ settings.bank_details_sepa_bic }}
-
{% trans "Bank" %}:
{{ settings.bank_details_sepa_bank }}
-
-{% endif %} + {% if not code %}
{% endif %} + {% if settings.bank_details_type == "sepa" %} +
+
{% trans "Account holder" %}:
{{ settings.bank_details_sepa_name }}
+
{% trans "IBAN" %}:
{{ settings.bank_details_sepa_iban|ibanformat }}
+
{% trans "BIC" %}:
{{ settings.bank_details_sepa_bic }}
+
{% trans "Bank" %}:
{{ settings.bank_details_sepa_bank }}
+
+ {% endif %} -{% if details %} {{ details|linebreaks }} -{% endif %} -{% if code %} -
-
{% trans "Reference code (important):" %}
{{ code }}
-
+ {% if not code %}
{% endif %} + + {% if code %} +
+
{% trans "Reference code (important):" %}
{{ code }}
+
+ {% else %} +

+ + {% trans "We will assign you a personal reference code to use after you completed the order." %} + +

+ {% endif %} {% else %} -

- - {% trans "We will assign you a personal reference code to use after you completed the order." %} - -

+

{% blocktrans trimmed %} + After completing your purchase, we will ask you to transfer the money to our bank account, using a personal + reference code. + {% endblocktrans %}

{% endif %} {% if request.session.payment_banktransfer_send_invoice and request.session.payment_banktransfer_send_invoice_to %}

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 b39c04acd..7f74955da 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 @@ -2,33 +2,41 @@ {% load ibanformat %} {% load bootstrap3 %} -

{% 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 %}

+{% if details or code %} +

{% 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 %}

-{% if settings.bank_details_type == "sepa" %} -
-
{% trans "Account holder" %}:
{{ settings.bank_details_sepa_name }}
-
{% trans "IBAN" %}:
{{ settings.bank_details_sepa_iban|ibanformat }}
-
{% trans "BIC" %}:
{{ settings.bank_details_sepa_bic }}
-
{% trans "Bank" %}:
{{ settings.bank_details_sepa_bank }}
-
-{% endif %} + {% if not code %}
{% endif %} + {% if settings.bank_details_type == "sepa" %} +
+
{% trans "Account holder" %}:
{{ settings.bank_details_sepa_name }}
+
{% trans "IBAN" %}:
{{ settings.bank_details_sepa_iban|ibanformat }}
+
{% trans "BIC" %}:
{{ settings.bank_details_sepa_bic }}
+
{% trans "Bank" %}:
{{ settings.bank_details_sepa_bank }}
+
+ {% endif %} -{% if details %} {{ details|linebreaks }} -{% endif %} -{% if code %} -
-
{% trans "Reference code (important):" %}
{{ code }}
-
+ {% if not code %}
{% endif %} + + {% if code %} +
+
{% trans "Reference code (important):" %}
{{ code }}
+
+ {% else %} +

+ + {% trans "We will assign you a personal reference code to use after you completed the order." %} + +

+ {% endif %} {% else %} -

- - {% trans "We will assign you a personal reference code to use after you completed the order." %} - -

+

{% blocktrans trimmed %} + After completing your purchase, we will ask you to transfer the money to our bank account, using a personal + reference code. + {% endblocktrans %}

{% endif %} {% if form.fields %}
diff --git a/src/pretix/static/pretixpresale/scss/main.scss b/src/pretix/static/pretixpresale/scss/main.scss index 078e6e429..e439c58e2 100644 --- a/src/pretix/static/pretixpresale/scss/main.scss +++ b/src/pretix/static/pretixpresale/scss/main.scss @@ -482,6 +482,10 @@ h2 .label { } } +.user-select-none { + user-select: none; +} + @for $i from 0 through 100 { .progress-bar-#{$i} { width: 1% * $i; } }