Waiting list should send things out even if waiting list is disabled

This commit is contained in:
Raphael Michel
2018-10-12 10:44:21 +02:00
parent 250e0a930d
commit ddefeeaf02
3 changed files with 4 additions and 3 deletions

View File

@@ -74,5 +74,5 @@ def process_waitinglist(sender, **kwargs):
live=True
).prefetch_related('_settings_objects', 'organizer___settings_objects').select_related('organizer')
for e in qs:
if e.settings.waiting_list_enabled and e.settings.waiting_list_auto and e.presale_is_running:
if e.settings.waiting_list_auto and e.presale_is_running:
assign_automatically.apply_async(args=(e.pk,))

View File

@@ -322,7 +322,8 @@ class EventSettingsForm(SettingsForm):
label=_("Automatic waiting list assignments"),
help_text=_("If ticket capacity becomes free, automatically create a voucher and send it to the first person "
"on the waiting list for that product. If this is not active, mails will not be send automatically "
"but you can send them manually via the control panel."),
"but you can send them manually via the control panel. If you disable the waiting list but keep "
"this option enabled, tickets will still be sent out."),
required=False,
widget=forms.CheckboxInput(),
)

View File

@@ -54,7 +54,7 @@ def send_mails(event: int, user: int, subject: dict, message: dict, orders: list
'pretix.plugins.sendmail.order.email.sent',
user=user,
data={
'subject': subject.localize(o.locale),
'subject': subject.localize(o.locale).format_map(email_context),
'message': message.localize(o.locale).format_map(email_context),
'recipient': o.email
}