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

Question statistics: Do not include canceled orders

Browse Source
This commit is contained in:
Raphael Michel
2019-11-25 15:19:42 +01:00
parent 654faa5a10
commit 037644421b
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/pretix/control/views/item.py
View File

@@ -477,8 +477,8 @@ class QuestionView(EventPermissionRequiredMixin, QuestionMixin, ChartContainingV
question=self.object, orderposition__isnull=False, question=self.object, orderposition__isnull=False,
orderposition__order__event=self.request.event orderposition__order__event=self.request.event
) )
if self.request.GET.get("status", "np") != "": s = self.request.GET.get("status", "np")
s = self.request.GET.get("status", "np") if s != "":
if s == 'o': if s == 'o':
qs = qs.filter(orderposition__order__status=Order.STATUS_PENDING, qs = qs.filter(orderposition__order__status=Order.STATUS_PENDING,
orderposition__order__expires__lt=now().replace(hour=0, minute=0, second=0)) orderposition__order__expires__lt=now().replace(hour=0, minute=0, second=0))
@@ -488,6 +488,9 @@ class QuestionView(EventPermissionRequiredMixin, QuestionMixin, ChartContainingV
qs = qs.filter(orderposition__order__status__in=[Order.STATUS_PENDING, Order.STATUS_EXPIRED]) qs = qs.filter(orderposition__order__status__in=[Order.STATUS_PENDING, Order.STATUS_EXPIRED])
else: else:
qs = qs.filter(orderposition__order__status=s) qs = qs.filter(orderposition__order__status=s)
if s not in (Order.STATUS_CANCELED, ""):
qs = qs.filter(orderposition__canceled=False)
if self.request.GET.get("item", "") != "": if self.request.GET.get("item", "") != "":
i = self.request.GET.get("item", "") i = self.request.GET.get("item", "")
qs = qs.filter(orderposition__item_id__in=(i,)) qs = qs.filter(orderposition__item_id__in=(i,))