CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

add migration

Browse Source
This commit is contained in:
Felix Rindt
2020-07-24 12:23:10 +02:00
parent 5f502776b1
commit 1b48b519e3
4 changed files with 53 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/pretix/control/forms/event.py
View File

@@ -750,6 +750,10 @@ def multimail_validate(val):
return s
def contains_web_channel_validate(val):
if "web" not in val:
raise ValidationError(_("The web channel must be selected to receive these emails."))
class MailSettingsForm(SettingsForm):
auto_fields = [
'mail_prefix',
@@ -759,23 +763,23 @@ class MailSettingsForm(SettingsForm):
]
mail_sales_channel_placed_paid = forms.MultipleChoiceField(
choices=[(ident, sc.verbose_name) for ident, sc in get_all_sales_channels().items()],
choices=lambda: [(ident, sc.verbose_name) for ident, sc in get_all_sales_channels().items()],
label=_('Sales Channels for Checkout Emails'),
help_text=_('Restrict Order placed and paid emails to orders from certain sales channels.'),
help_text=_('The order placed and paid emails will only be send to orders from these sales channels. The online shop must be enabled.'),
widget=forms.CheckboxSelectMultiple(
attrs={'class': 'scrolling-multiple-choice'}
),
required=False,
validators=[contains_web_channel_validate],
)
mail_sales_channel_ticket_reminder = forms.MultipleChoiceField(
choices=[(ident, sc.verbose_name) for ident, sc in get_all_sales_channels().items()],
label=_('Sales Channels for Ticket Emails'),
help_text=_('Restrict ticket reminder emails to orders from certain sales channels.'),
choices=lambda: [(ident, sc.verbose_name) for ident, sc in get_all_sales_channels().items()],
label=_('Sales Channels'),
help_text=_('This email will only be send to orders from these sales channels. The online shop must be enabled.'),
widget=forms.CheckboxSelectMultiple(
attrs={'class': 'scrolling-multiple-choice'}
),
required=False,
validators=[contains_web_channel_validate],
)
mail_bcc = forms.CharField(

3
src/pretix/control/templates/pretixcontrol/event/mail.html
View File

@@ -18,7 +18,6 @@
{% bootstrap_field form.mail_bcc layout="control" %}
{% bootstrap_field form.mail_attach_ical layout="control" %}
{% bootstrap_field form.mail_sales_channel_placed_paid layout="control" %}
{% bootstrap_field form.mail_sales_channel_ticket_reminder layout="control" %}
</fieldset>
<fieldset>
<legend>{% trans "E-mail design" %}</legend>
@@ -72,7 +71,7 @@
{% include "pretixcontrol/event/mail_settings_fragment.html" with pid="custom_mail" title=title_order_custom_mail items="mail_text_order_custom_mail" %}
{% blocktrans asvar title_download_tickets_reminder %}Reminder to download tickets{% endblocktrans %}
{% include "pretixcontrol/event/mail_settings_fragment.html" with pid="ticket_reminder" title=title_download_tickets_reminder items="mail_days_download_reminder,mail_text_download_reminder,mail_send_download_reminder_attendee,mail_text_download_reminder_attendee" exclude="mail_days_download_reminder,mail_send_download_reminder_attendee" %}
{% include "pretixcontrol/event/mail_settings_fragment.html" with pid="ticket_reminder" title=title_download_tickets_reminder items="mail_days_download_reminder,mail_text_download_reminder,mail_send_download_reminder_attendee,mail_text_download_reminder_attendee,mail_sales_channel_ticket_reminder" exclude="mail_days_download_reminder,mail_send_download_reminder_attendee,mail_sales_channel_ticket_reminder" %}
{% blocktrans asvar title_require_approval %}Order approval process{% endblocktrans %}
{% include "pretixcontrol/event/mail_settings_fragment.html" with pid="ticket_reminder" title=title_require_approval items="mail_text_order_placed_require_approval,mail_text_order_approved,mail_text_order_denied" %}