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

Revert "Order overview PDF: Allow to filter by subevent date"

Browse Source 
This reverts commit 08f0150177.
This commit is contained in:
Raphael Michel
2024-01-12 15:54:59 +01:00
parent 08f0150177
commit 24dd065839
3 changed files with 7 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/pretix/base/services/stats.py
View File

@@ -112,7 +112,7 @@ def dictsum(*dicts) -> dict:
def order_overview(
event: Event, subevent: SubEvent=None, date_filter='', date_from=None, date_until=None, fees=False,
admission_only=False, base_qs=None, base_fees_qs=None, subevent_date_from=None, subevent_date_until=None
admission_only=False, base_qs=None, base_fees_qs=None,
) -> Tuple[List[Tuple[ItemCategory, List[Item]]], Dict[str, Tuple[Decimal, Decimal]]]:
items = event.items.all().select_related(
'category', # for re-grouping
@@ -125,11 +125,6 @@ def order_overview(
qs = qs.filter(subevent__in=subevent)
elif subevent:
qs = qs.filter(subevent=subevent)
if subevent_date_from:
qs = qs.filter(subevent__date_from__gte=subevent_date_from)
if subevent_date_until:
qs = qs.filter(subevent__date_from__lt=subevent_date_until)
if admission_only:
qs = qs.filter(item__admission=True)
items = items.filter(admission=True)
@@ -237,7 +232,7 @@ def order_overview(
payment_cat_obj.name = _('Fees')
payment_items = []
if subevent is None and not subevent_date_from and not subevent_date_until and fees:
if subevent is None and fees:
qs = OrderFee.all if base_fees_qs is None else base_fees_qs
qs = qs.filter(
order__event=event