CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Allow state selection without JavaScript

Browse Source
This commit is contained in:
Raphael Michel
2019-08-09 12:12:30 +02:00
parent 663ff60d0a
commit b0b0f7474d
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/pretix/base/forms/questions.py
View File

@@ -407,9 +407,10 @@ class BaseInvoiceAddressForm(forms.ModelForm):
del self.fields['vat_id'] del self.fields['vat_id']
c = [('', pgettext_lazy('address', 'Select state'))] c = [('', pgettext_lazy('address', 'Select state'))]
fprefix = self.prefix + '-' if self.prefix else ''
cc = None cc = None
if 'country' in self.data: if fprefix + 'country' in self.data:
cc = str(self.data['country']) cc = str(self.data[fprefix + 'country'])
elif 'country' in self.initial: elif 'country' in self.initial:
cc = str(self.initial['country']) cc = str(self.initial['country'])
elif self.instance and self.instance.country: elif self.instance and self.instance.country:
@@ -418,9 +419,9 @@ class BaseInvoiceAddressForm(forms.ModelForm):
types, form = COUNTRIES_WITH_STATE_IN_ADDRESS[cc] types, form = COUNTRIES_WITH_STATE_IN_ADDRESS[cc]
statelist = [s for s in pycountry.subdivisions.get(country_code=cc) if s.type in types] statelist = [s for s in pycountry.subdivisions.get(country_code=cc) if s.type in types]
c += sorted([(s.code[3:], s.name) for s in statelist], key=lambda s: s[1]) c += sorted([(s.code[3:], s.name) for s in statelist], key=lambda s: s[1])
elif 'state' in self.data: elif fprefix + 'state' in self.data:
self.data = self.data.copy() self.data = self.data.copy()
del self.data['state'] del self.data[fprefix + 'state']
self.fields['state'] = forms.ChoiceField( self.fields['state'] = forms.ChoiceField(
label=pgettext_lazy('address', 'State'), label=pgettext_lazy('address', 'State'),
@@ -475,6 +476,10 @@ class BaseInvoiceAddressForm(forms.ModelForm):
if 'vat_id' in self.changed_data or not data.get('vat_id'): if 'vat_id' in self.changed_data or not data.get('vat_id'):
self.instance.vat_id_validated = False self.instance.vat_id_validated = False
if data.get('city') and data.get('country') and str(data['country']) in COUNTRIES_WITH_STATE_IN_ADDRESS:
if not data.get('state'):
self.add_error('state', _('This field is required.'))
self.instance.name_parts = data.get('name_parts') self.instance.name_parts = data.get('name_parts')
if all( if all(