forked from CGM_Public/pretix_original
Checkout: Hotfix data-trigger-address-info and company_required
This commit is contained in:
@@ -1181,9 +1181,6 @@ class BaseInvoiceAddressForm(forms.ModelForm):
|
|||||||
)
|
)
|
||||||
|
|
||||||
self.fields['country'].choices = CachedCountries()
|
self.fields['country'].choices = CachedCountries()
|
||||||
self.fields['country'].widget.attrs['data-trigger-address-info'] = 'on'
|
|
||||||
self.fields['is_business'].widget.attrs['data-trigger-address-info'] = 'on'
|
|
||||||
self.fields['transmission_type'].widget.attrs['data-trigger-address-info'] = 'on'
|
|
||||||
|
|
||||||
c = [('', '---')]
|
c = [('', '---')]
|
||||||
fprefix = self.prefix + '-' if self.prefix else ''
|
fprefix = self.prefix + '-' if self.prefix else ''
|
||||||
@@ -1262,14 +1259,6 @@ class BaseInvoiceAddressForm(forms.ModelForm):
|
|||||||
else:
|
else:
|
||||||
del self.fields['custom_field']
|
del self.fields['custom_field']
|
||||||
|
|
||||||
for k, v in self.fields.items():
|
|
||||||
if v.widget.attrs.get('autocomplete') or k == 'name_parts':
|
|
||||||
autocomplete = v.widget.attrs.get('autocomplete', '')
|
|
||||||
if autocomplete.strip() == "off":
|
|
||||||
v.widget.attrs['autocomplete'] = 'off'
|
|
||||||
else:
|
|
||||||
v.widget.attrs['autocomplete'] = 'section-invoice billing ' + autocomplete
|
|
||||||
|
|
||||||
# Add transmission type specific fields
|
# Add transmission type specific fields
|
||||||
for transmission_type in get_transmission_types():
|
for transmission_type in get_transmission_types():
|
||||||
for k, f in transmission_type.invoice_address_form_fields.items():
|
for k, f in transmission_type.invoice_address_form_fields.items():
|
||||||
@@ -1308,6 +1297,18 @@ class BaseInvoiceAddressForm(forms.ModelForm):
|
|||||||
if 'required' in f.widget.attrs:
|
if 'required' in f.widget.attrs:
|
||||||
del f.widget.attrs['required']
|
del f.widget.attrs['required']
|
||||||
|
|
||||||
|
for k, v in self.fields.items():
|
||||||
|
if v.widget.attrs.get('autocomplete') or k == 'name_parts':
|
||||||
|
autocomplete = v.widget.attrs.get('autocomplete', '')
|
||||||
|
if autocomplete.strip() == "off":
|
||||||
|
v.widget.attrs['autocomplete'] = 'off'
|
||||||
|
else:
|
||||||
|
v.widget.attrs['autocomplete'] = 'section-invoice billing ' + autocomplete
|
||||||
|
|
||||||
|
self.fields['country'].widget.attrs['data-trigger-address-info'] = 'on'
|
||||||
|
self.fields['is_business'].widget.attrs['data-trigger-address-info'] = 'on'
|
||||||
|
self.fields['transmission_type'].widget.attrs['data-trigger-address-info'] = 'on'
|
||||||
|
|
||||||
def clean(self):
|
def clean(self):
|
||||||
from pretix.base.addressvalidation import \
|
from pretix.base.addressvalidation import \
|
||||||
validate_address # local import to prevent impact on startup time
|
validate_address # local import to prevent impact on startup time
|
||||||
|
|||||||
Reference in New Issue
Block a user