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

Stats: Allow queryset of subevents

Browse Source
This commit is contained in:
Raphael Michel
2021-07-15 13:17:34 +02:00
parent 75dc80eb09
commit a743605bd3
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,8 @@ from decimal import Decimal
from typing import Any, Dict, Iterable, List, Tuple from typing import Any, Dict, Iterable, List, Tuple
from django.db.models import ( from django.db.models import (
Case, Count, DateTimeField, F, Max, OuterRef, Subquery, Sum, Value, When, Case, Count, DateTimeField, F, Max, OuterRef, QuerySet, Subquery, Sum,
Value, When,
) )
from django.utils.timezone import make_aware from django.utils.timezone import make_aware
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
@@ -120,7 +121,9 @@ def order_overview(
).order_by('category__position', 'category_id', 'position', 'name') ).order_by('category__position', 'category_id', 'position', 'name')
qs = OrderPosition.all qs = OrderPosition.all
if subevent: if isinstance(subevent, (list, QuerySet)):
qs = qs.filter(subevent__in=subevent)
elif subevent:
qs = qs.filter(subevent=subevent) qs = qs.filter(subevent=subevent)
if admission_only: if admission_only:
qs = qs.filter(item__admission=True) qs = qs.filter(item__admission=True)
@@ -229,7 +232,7 @@ def order_overview(
payment_cat_obj.name = _('Fees') payment_cat_obj.name = _('Fees')
payment_items = [] payment_items = []
if not subevent and fees: if subevent is None and fees:
qs = OrderFee.all.filter( qs = OrderFee.all.filter(
order__event=event order__event=event
).annotate( ).annotate(