CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-07 15:34:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix stepping back to the invoice address

Browse Source
This commit is contained in:
Raphael Michel
2019-04-04 14:12:51 +02:00
parent c0df418265
commit bc01124584
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/pretix/presale/checkoutflow.py
View File

@@ -340,19 +340,22 @@ class QuestionsStep(QuestionsViewMixin, CartMixin, TemplateFlowStep):
@cached_property @cached_property
def invoice_form(self): def invoice_form(self):
initial = { if not self.invoice_address.pk:
'name_parts': { initial = {
k[21:].replace('-', '_'): v 'name_parts': {
for k, v in self.cart_session.get('widget_data', {}).items() k[21:].replace('-', '_'): v
if k.startswith('invoice-address-name-') for k, v in self.cart_session.get('widget_data', {}).items()
}, if k.startswith('invoice-address-name-')
'company': self.cart_session.get('widget_data', {}).get('invoice-address-company', ''), },
'is_business': bool(self.cart_session.get('widget_data', {}).get('invoice-address-company', '')), 'company': self.cart_session.get('widget_data', {}).get('invoice-address-company', ''),
'street': self.cart_session.get('widget_data', {}).get('invoice-address-street', ''), 'is_business': bool(self.cart_session.get('widget_data', {}).get('invoice-address-company', '')),
'zipcode': self.cart_session.get('widget_data', {}).get('invoice-address-zipcode', ''), 'street': self.cart_session.get('widget_data', {}).get('invoice-address-street', ''),
'city': self.cart_session.get('widget_data', {}).get('invoice-address-city', ''), 'zipcode': self.cart_session.get('widget_data', {}).get('invoice-address-zipcode', ''),
'country': self.cart_session.get('widget_data', {}).get('invoice-address-country', ''), 'city': self.cart_session.get('widget_data', {}).get('invoice-address-city', ''),
} 'country': self.cart_session.get('widget_data', {}).get('invoice-address-country', ''),
}
else:
initial = {}
if not self.address_asked and self.request.event.settings.invoice_name_required: if not self.address_asked and self.request.event.settings.invoice_name_required:
return InvoiceNameForm(data=self.request.POST if self.request.method == "POST" else None, return InvoiceNameForm(data=self.request.POST if self.request.method == "POST" else None,
event=self.request.event, event=self.request.event,