CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-05 15:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sendmail: Fix inconsistent handling of addons and checkins (#2914)

Browse Source
This commit is contained in:
Raphael Michel
2022-11-18 14:20:43 +01:00
committed by GitHub
parent 0691af7aa4
commit 36d20a45dd
2 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/pretix/plugins/sendmail/views.py
View File

@@ -137,9 +137,14 @@ class SenderView(EventPermissionRequiredMixin, FormView):
orders = qs.filter(statusq)
opq = OrderPosition.objects.filter(
Q(item_id__in=[i.pk for i in form.cleaned_data.get('items')]) | Q(Exists(
OrderPosition.objects.filter(
addon_to_id=OuterRef('pk'),
item_id__in=[i.pk for i in form.cleaned_data.get('items')]
)
)),
order=OuterRef('pk'),
canceled=False,
item_id__in=[i.pk for i in form.cleaned_data.get('items')],
)
if form.cleaned_data.get('filter_checkins'):
@@ -149,7 +154,7 @@ class SenderView(EventPermissionRequiredMixin, FormView):
opq = opq.alias(
any_checkins=Exists(
Checkin.all.filter(
position_id=OuterRef('pk'),
Q(position_id=OuterRef('pk')) | Q(position__addon_to_id=OuterRef('pk')),
successful=True
)
)
@@ -159,7 +164,7 @@ class SenderView(EventPermissionRequiredMixin, FormView):
opq = opq.alias(
matching_checkins=Exists(
Checkin.all.filter(
position_id=OuterRef('pk'),
Q(position_id=OuterRef('pk')) | Q(position__addon_to_id=OuterRef('pk')),
list_id__in=[i.pk for i in form.cleaned_data.get('checkin_lists', [])],
successful=True
)