diff --git a/src/pretix/base/models/orders.py b/src/pretix/base/models/orders.py index 305659ccde..3cc43dc1b3 100644 --- a/src/pretix/base/models/orders.py +++ b/src/pretix/base/models/orders.py @@ -1697,7 +1697,7 @@ class AbstractPosition(RoundingCorrectionMixin, models.Model): self.company, self.street, (self.zipcode or '') + ' ' + (self.city or '') + ' ' + (self.state_for_address or ''), - self.country.name + self.country.name if self.country else '' ] lines = [r.strip() for r in lines if r] return '\n'.join(lines).strip() diff --git a/src/pretix/presale/checkoutflow.py b/src/pretix/presale/checkoutflow.py index 22b16014f3..3371f46853 100644 --- a/src/pretix/presale/checkoutflow.py +++ b/src/pretix/presale/checkoutflow.py @@ -1158,7 +1158,7 @@ class QuestionsStep(QuestionsViewMixin, CartMixin, TemplateFlowStep): for a in addresses: data = { "_pk": a.pk, - "_country_for_address": a.country.name, + "_country_for_address": a.country.name if a.country else '', "_state_for_address": a.state_for_address, "_name": a.name, "is_business": "business" if a.is_business else "individual", diff --git a/src/pretix/presale/templates/pretixpresale/event/checkout_confirm.html b/src/pretix/presale/templates/pretixpresale/event/checkout_confirm.html index 40db91accc..ec7f169e82 100644 --- a/src/pretix/presale/templates/pretixpresale/event/checkout_confirm.html +++ b/src/pretix/presale/templates/pretixpresale/event/checkout_confirm.html @@ -90,7 +90,7 @@