diff --git a/src/pretix/base/models/customers.py b/src/pretix/base/models/customers.py index 0b3ae5732b..4dd436d63f 100644 --- a/src/pretix/base/models/customers.py +++ b/src/pretix/base/models/customers.py @@ -395,7 +395,7 @@ class AttendeeProfile(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 None, ] for a in self.answers: value = a.get('value') diff --git a/src/pretix/base/models/orders.py b/src/pretix/base/models/orders.py index 305659ccde..a58b5014a3 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() @@ -3438,7 +3438,7 @@ class InvoiceAddress(models.Model): self.name, self.street, (self.zipcode or '') + ' ' + (self.city or '') + ' ' + (self.state_for_address or ''), - self.country.name, + self.country.name if self.country else '', self.vat_id, self.custom_field, self.internal_reference, diff --git a/src/pretix/presale/checkoutflow.py b/src/pretix/presale/checkoutflow.py index e6ea9d372a..4256b07cd9 100644 --- a/src/pretix/presale/checkoutflow.py +++ b/src/pretix/presale/checkoutflow.py @@ -1159,7 +1159,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", @@ -1202,7 +1202,7 @@ class QuestionsStep(QuestionsViewMixin, CartMixin, TemplateFlowStep): for p in profiles: data = { "_pk": p.pk, - "_country_for_address": p.country.name, + "_country_for_address": p.country.name if p.country else '', "_state_for_address": p.state_for_address, "_attendee_name": p.attendee_name, } diff --git a/src/pretix/presale/templates/pretixpresale/event/checkout_confirm.html b/src/pretix/presale/templates/pretixpresale/event/checkout_confirm.html index ad47ad4294..b6b7024bcb 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 @@