From 1d86f7a0c3839cfb5c7217558eae699694479f87 Mon Sep 17 00:00:00 2001
From: Raphael Michel <michel@rami.io>
Date: Mon, 19 Jun 2023 12:45:14 +0200
Subject: [PATCH] Bank transfer: Do not use <pre> for bank details in emails
 (#3413)

---
 src/pretix/plugins/banktransfer/payment.py    | 38 +++++++++----------
 .../banktransfer/email/order_pending.txt      |  7 ----
 2 files changed, 18 insertions(+), 27 deletions(-)
 delete mode 100644 src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/email/order_pending.txt

diff --git a/src/pretix/plugins/banktransfer/payment.py b/src/pretix/plugins/banktransfer/payment.py
index 7f6c7b81a..36c679ea4 100644
--- a/src/pretix/plugins/banktransfer/payment.py
+++ b/src/pretix/plugins/banktransfer/payment.py
@@ -33,7 +33,6 @@
 # License for the specific language governing permissions and limitations under the License.
 
 import json
-import textwrap
 from collections import OrderedDict
 from decimal import Decimal
 
@@ -56,6 +55,7 @@ from pretix.base.i18n import language
 from pretix.base.models import InvoiceAddress, Order, OrderPayment, OrderRefund
 from pretix.base.payment import BasePaymentProvider
 from pretix.base.services.mail import SendMailException, mail, render_mail
+from pretix.base.templatetags.money import money_filter
 from pretix.helpers.format import format_map
 from pretix.plugins.banktransfer.templatetags.ibanformat import ibanformat
 from pretix.presale.views.cart import cart_session
@@ -454,26 +454,24 @@ class BankTransfer(BasePaymentProvider):
         return template.render(ctx)
 
     def order_pending_mail_render(self, order, payment) -> str:
-        template = get_template('pretixplugins/banktransfer/email/order_pending.txt')
-        bankdetails = []
+        t = gettext("Please transfer the full amount to the following bank account:")
+        t += "\n\n"
+
+        md_nl2br = "  \n"
         if self.settings.get('bank_details_type') == 'sepa':
-            bankdetails += [
-                _("Account holder"), ": ", self.settings.get('bank_details_sepa_name'), "\n",
-                _("IBAN"), ": ", ibanformat(self.settings.get('bank_details_sepa_iban')), "\n",
-                _("BIC"), ": ", self.settings.get('bank_details_sepa_bic'), "\n",
-                _("Bank"), ": ", self.settings.get('bank_details_sepa_bank'),
-            ]
-        if bankdetails and self.settings.get('bank_details', as_type=LazyI18nString):
-            bankdetails.append("\n")
-        bankdetails.append(self.settings.get('bank_details', as_type=LazyI18nString))
-        ctx = {
-            'event': self.event,
-            'order': order,
-            'code': self._code(order),
-            'amount': payment.amount,
-            'details': textwrap.indent(''.join(str(i) for i in bankdetails), '    '),
-        }
-        return template.render(ctx)
+            bankdetails = (
+                (_("Reference"), self._code(order)),
+                (_("Amount"), money_filter(payment.amount, self.event.currency)),
+                (_("Account holder"), self.settings.get('bank_details_sepa_name')),
+                (_("IBAN"), ibanformat(self.settings.get('bank_details_sepa_iban'))),
+                (_("BIC"), self.settings.get('bank_details_sepa_bic')),
+                (_("Bank"), self.settings.get('bank_details_sepa_bank')),
+            )
+            t += md_nl2br.join([f"**{k}:** {v}" for k, v in bankdetails])
+            if self.settings.get('bank_details', as_type=LazyI18nString):
+                t += md_nl2br
+        t += str(self.settings.get('bank_details', as_type=LazyI18nString))
+        return t
 
     def swiss_qrbill(self, payment):
         if not self.settings.get('bank_details_sepa_iban') or not self.settings.get('bank_details_sepa_iban')[:2] in ('CH', 'LI'):
diff --git a/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/email/order_pending.txt b/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/email/order_pending.txt
deleted file mode 100644
index da176985b..000000000
--- a/src/pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/email/order_pending.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-{% load i18n %}{% load l10n %}{% load money %}{% blocktrans with bank=details|safe total=amount|money:event.currency %}
-Please transfer the full amount to the following bank account.
-
-    Reference: {{ code }}
-    Amount: {{ total }}
-{{ bank }}
-{% endblocktrans %}