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

Sendmail: Fix subevent-less rules in event series

Browse Source
This commit is contained in:
Raphael Michel
2021-11-04 10:20:07 +01:00
parent e433230573
commit 754d4f4f62
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pretix/plugins/sendmail/models.py
View File

@@ -104,6 +104,8 @@ class ScheduledMail(models.Model):
orders = orders.filter( orders = orders.filter(
Exists(OrderPosition.objects.filter(order=OuterRef('pk'), subevent=self.subevent)) Exists(OrderPosition.objects.filter(order=OuterRef('pk'), subevent=self.subevent))
) )
elif e.has_subevents:
return # This rule should not even exist
if not self.rule.all_products: if not self.rule.all_products:
orders = orders.filter( orders = orders.filter(

2
src/pretix/plugins/sendmail/signals.py
View File

@@ -63,7 +63,7 @@ def scheduled_mail_create(sender, **kwargs):
existing_rules = ScheduledMail.objects.filter(subevent=subevent).values_list('rule_id', flat=True) existing_rules = ScheduledMail.objects.filter(subevent=subevent).values_list('rule_id', flat=True)
to_create = [] to_create = []
for rule in event.sendmail_rules.all(): for rule in event.sendmail_rules.all():
if rule.pk not in existing_rules: if rule.pk not in existing_rules and subevent:
sm = ScheduledMail(rule=rule, event=event, subevent=subevent) sm = ScheduledMail(rule=rule, event=event, subevent=subevent)
sm.recompute() sm.recompute()
to_create.append(sm) to_create.append(sm)