CGM_Public/pretix_original
3
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-10-03 19:34:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

combine address checks

Browse Source
This commit is contained in:
Kara Engelhardt
2026-10-01 11:42:29 +02:00
parent b84a1f98cf
commit 99ebd6e183
2 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pretix/plugins/sendmail/models.py
+7 -15
View File
@@ -118,7 +118,7 @@ class ScheduledMail(models.Model):
filter_orders_by_op = False
op_qs = OrderPosition.objects.filter(
order__event=self.event,
order__event=e,
canceled=False,
)
@@ -194,26 +194,18 @@ class ScheduledMail(models.Model):
# not a matching op, just there for parent_op
continue
if not p.attendee_email and p.addon_to_id:
# no email => try parent_op
p = parent_op
if not p.attendee_email:
# still no email on => send to order
send_to_order = True
continue
# attendee email available
if p.addon_to_id and p.attendee_email == parent_op.attendee_email:
# if op is add-on and parent's email match => send to parent
if p.addon_to_id and (
not p.attendee_email or p.attendee_email == parent_op.attendee_email
):
# if op is addon and either has no mail or the same as parent => send to parent
p = parent_op
if p.pk in sent_to_positions:
# this position already got an email
continue
if p.attendee_email == o.email:
if not p.attendee_email or p.attendee_email == o.email:
# no email or same as order => send to order
send_to_order = True
continue
src/pretix/plugins/sendmail/tasks.py
+4 -5
View File
@@ -110,7 +110,10 @@ def send_mails_to_orders(event: Event, user: int, subject: dict, message: dict,
if not allowed:
continue
if not p.attendee_email and p.addon_to_id:
if p.addon_to_id and (
not p.attendee_email or p.attendee_email == parent_op.attendee_email
):
# if op is addon and either has no mail or the same as parent => send to parent
p = parent_op
if subevent and p.subevent_id != subevent:
@@ -126,10 +129,6 @@ def send_mails_to_orders(event: Event, user: int, subject: dict, message: dict,
send_to_order = True
continue
if p.addon_to_id and p.attendee_email == parent_op.attendee_email:
# if op is add-on and parent's email match => send to parent
p = parent_op
if p.pk in sent_to_positions:
# this position already got an email
continue