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

Widget: Allow passing more invoice data fields (#4162)

Browse Source
This commit is contained in:
Raphael Michel
2024-05-23 11:19:59 +02:00
committed by GitHub
parent 808775c76b
commit 2619a658c9
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1171,7 +1171,7 @@ class BaseInvoiceAddressForm(forms.ModelForm):
self.instance.vat_id_validated = False
messages.warning(self.request, e.message)
else:
raise ValidationError(e.message)
raise ValidationError({"vat_id": e.message})
except VATIDTemporaryError as e:
self.instance.vat_id_validated = False
if self.request and self.vat_warning:

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

@@ -827,6 +827,9 @@ class QuestionsStep(QuestionsViewMixin, CartMixin, TemplateFlowStep):
'zipcode': wd.get('invoice-address-zipcode', ''),
'city': wd.get('invoice-address-city', ''),
'country': wd.get('invoice-address-country', ''),
'internal_reference': wd.get('invoice-address-internal-reference', ''),
'custom_field': wd.get('invoice-address-custom-field', ''),
'vat_id': wd.get('invoice-address-vat-id', ''),
}
else:
wd_initial = {
@@ -893,6 +896,15 @@ class QuestionsStep(QuestionsViewMixin, CartMixin, TemplateFlowStep):
if failed:
messages.error(request,
_("We had difficulties processing your input. Please review the errors below."))
if "vat_id" in self.invoice_form.errors:
# If an invalid VAT ID was given through the widget together with data-fix="true", let's un-block
# the field to prevent a deadlock.
widget_data = self.cart_session.get('widget_data', {})
if "invoice-address-vat-id" in widget_data:
vat_id = widget_data.pop("invoice-address-vat-id", None)
self.invoice_form.data["vat_id"] = vat_id
self.invoice_form.fields["vat_id"].disabled = False
self.cart_session['widget_data'] = widget_data
return self.render()
self.cart_session['email'] = self.contact_form.cleaned_data['email']
d = dict(self.contact_form.cleaned_data)