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

Fix regression in address validation for resellers

Browse Source
This commit is contained in:
Raphael Michel
2022-12-12 17:21:32 +01:00
parent aab7042cda
commit cb1f63bf80
3 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/pretix/base/addressvalidation.py
View File

@@ -85,7 +85,7 @@ COUNTRIES_WITH_STREET_ZIPCODE_AND_CITY_REQUIRED = {
}
def validate_address(address: dict):
def validate_address(address: dict, all_optional=False):
"""
:param address: A dictionary with at least the entries ``street``, ``zipcode``, ``city``, ``country``,
``state``
@@ -100,10 +100,10 @@ def validate_address(address: dict):
if not address.get('country'):
raise ValidationError({'country': [_('This field is required.')]})
if str(address['country']) in COUNTRIES_WITH_STATE_IN_ADDRESS and not address.get('state'):
if str(address['country']) in COUNTRIES_WITH_STATE_IN_ADDRESS and not address.get('state') and not all_optional:
raise ValidationError({'state': [_('This field is required.')]})
if str(address['country']) in COUNTRIES_WITH_STREET_ZIPCODE_AND_CITY_REQUIRED:
if str(address['country']) in COUNTRIES_WITH_STREET_ZIPCODE_AND_CITY_REQUIRED and not all_optional:
for f in ('street', 'zipcode', 'city'):
if not address.get(f):
raise ValidationError({f: [_('This field is required.')]})
@@ -111,7 +111,8 @@ def validate_address(address: dict):
for klass in _validator_classes[str(address['country'])]:
validator = klass()
try:
address['zipcode'] = validator.validate_zipcode(address['zipcode'])
if address.get('zipcode'):
address['zipcode'] = validator.validate_zipcode(address['zipcode'])
except ValidationError as e:
raise ValidationError({'zipcode': list(e)})