diff --git a/src/pretix/base/models/orders.py b/src/pretix/base/models/orders.py index 698a0a602..f48e7dd63 100644 --- a/src/pretix/base/models/orders.py +++ b/src/pretix/base/models/orders.py @@ -3410,7 +3410,7 @@ class InvoiceAddress(models.Model): 'internal_reference': self.internal_reference, 'beneficiary': self.beneficiary, 'transmission_type': self.transmission_type, - **self.transmission_info, + **(self.transmission_info or {}), }) return d diff --git a/src/pretix/base/services/mail.py b/src/pretix/base/services/mail.py index 4448e28aa..5e6a159ee 100644 --- a/src/pretix/base/services/mail.py +++ b/src/pretix/base/services/mail.py @@ -665,7 +665,7 @@ def mail_send_task(self, *args, to: List[str], subject: str, body: str, html: st (i.invoice_to_transmission_info or {}).get("transmission_email_address") or i.order.email, ] try: - expected_recipients.append(order.invoice_address.transmission_info.get("transmission_email_address") or i.order.email) + expected_recipients.append((order.invoice_address.transmission_info or {}).get("transmission_email_address") or i.order.email) except InvoiceAddress.DoesNotExist: pass if not any(t in expected_recipients for t in to): diff --git a/src/pretix/presale/checkoutflow.py b/src/pretix/presale/checkoutflow.py index f1c965124..29304b0cf 100644 --- a/src/pretix/presale/checkoutflow.py +++ b/src/pretix/presale/checkoutflow.py @@ -1144,7 +1144,7 @@ class QuestionsStep(QuestionsViewMixin, CartMixin, TemplateFlowStep): "_state_for_address": a.state_for_address, "_name": a.name, "is_business": "business" if a.is_business else "individual", - **a.transmission_info, + **(a.transmission_info or {}), } if a.name_parts: name_parts = a.name_parts