Let organizers specify a helptext for the custom invoice field (Z#23167497) (#4520)

This commit is contained in:
Mira
2024-10-14 09:22:58 +02:00
committed by GitHub
parent 8f0a277c7b
commit c10efc692d
5 changed files with 18 additions and 1 deletions

View File

@@ -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',

View File

@@ -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']

View File

@@ -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,

View File

@@ -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',

View File

@@ -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" %}
</fieldset>
<fieldset>