diff --git a/src/pretix/api/serializers/event.py b/src/pretix/api/serializers/event.py index dcd9f29454..dce96a09ff 100644 --- a/src/pretix/api/serializers/event.py +++ b/src/pretix/api/serializers/event.py @@ -772,6 +772,7 @@ class EventSettingsSerializer(SettingsSerializer): 'invoice_address_company_required', 'invoice_address_beneficiary', 'invoice_address_custom_field', + 'invoice_address_custom_field_helptext', 'invoice_name_required', 'invoice_address_not_asked_free', 'invoice_show_payments', @@ -916,6 +917,7 @@ class DeviceEventSettingsSerializer(EventSettingsSerializer): 'invoice_address_company_required', 'invoice_address_beneficiary', 'invoice_address_custom_field', + 'invoice_address_custom_field_helptext', 'invoice_name_required', 'invoice_address_not_asked_free', 'invoice_address_from_name', diff --git a/src/pretix/base/forms/questions.py b/src/pretix/base/forms/questions.py index a2acc2f487..e7e6b6a4ea 100644 --- a/src/pretix/base/forms/questions.py +++ b/src/pretix/base/forms/questions.py @@ -1122,6 +1122,7 @@ class BaseInvoiceAddressForm(forms.ModelForm): if event.settings.invoice_address_custom_field: self.fields['custom_field'].label = event.settings.invoice_address_custom_field + self.fields['custom_field'].help_text = event.settings.invoice_address_custom_field_helptext else: del self.fields['custom_field'] diff --git a/src/pretix/base/settings.py b/src/pretix/base/settings.py index 48b5cfa47e..c16e6b6e06 100644 --- a/src/pretix/base/settings.py +++ b/src/pretix/base/settings.py @@ -571,7 +571,7 @@ DEFAULTS = { 'form_class': I18nFormField, 'serializer_class': I18nField, 'form_kwargs': dict( - label=_("Custom recipient field"), + label=_("Custom recipient field label"), widget=I18nTextInput, help_text=_("If you want to add a custom text field, e.g. for a country-specific registration number, to " "your invoice address form, please fill in the label here. This label will both be used for " @@ -580,6 +580,18 @@ DEFAULTS = { "The field will not be required.") ) }, + 'invoice_address_custom_field_helptext': { + 'default': '', + 'type': LazyI18nString, + 'form_class': I18nFormField, + 'serializer_class': I18nField, + 'form_kwargs': dict( + label=_("Custom recipient field help text"), + widget=I18nTextInput, + help_text=_("If you use the custom recipient field, you can specify a help text which will be displayed " + "underneath the field. It will not be displayed on the invoice.") + ) + }, 'invoice_address_vatid': { 'default': 'False', 'type': bool, diff --git a/src/pretix/control/forms/event.py b/src/pretix/control/forms/event.py index a7f59a9439..7a63c7bc09 100644 --- a/src/pretix/control/forms/event.py +++ b/src/pretix/control/forms/event.py @@ -844,6 +844,7 @@ class InvoiceSettingsForm(EventSettingsValidationMixin, SettingsForm): 'invoice_address_company_required', 'invoice_address_beneficiary', 'invoice_address_custom_field', + 'invoice_address_custom_field_helptext', 'invoice_name_required', 'invoice_address_not_asked_free', 'invoice_include_free', diff --git a/src/pretix/control/templates/pretixcontrol/event/invoicing.html b/src/pretix/control/templates/pretixcontrol/event/invoicing.html index 6c7c47020f..a3f8b89965 100644 --- a/src/pretix/control/templates/pretixcontrol/event/invoicing.html +++ b/src/pretix/control/templates/pretixcontrol/event/invoicing.html @@ -32,6 +32,7 @@ {% bootstrap_field form.invoice_address_beneficiary layout="control" %} {% bootstrap_field form.invoice_address_not_asked_free layout="control" %} {% bootstrap_field form.invoice_address_custom_field layout="control" %} + {% bootstrap_field form.invoice_address_custom_field_helptext layout="control" %} {% bootstrap_field form.invoice_address_explanation_text layout="control" %}