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

Move dangerous order clause

Browse Source
This commit is contained in:
Raphael Michel
2018-08-08 09:00:44 +02:00
parent 9f2ecb67d4
commit 5dc100d900
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pretix/base/exporters/orderlist.py
View File

@@ -59,11 +59,11 @@ class OrderListExporter(BaseExporter):
order=OuterRef('pk'), order=OuterRef('pk'),
state__in=(OrderPayment.PAYMENT_STATE_CONFIRMED, OrderPayment.PAYMENT_STATE_REFUNDED), state__in=(OrderPayment.PAYMENT_STATE_CONFIRMED, OrderPayment.PAYMENT_STATE_REFUNDED),
payment_date__isnull=False payment_date__isnull=False
).order_by().values('order').annotate( ).values('order').annotate(
m=Max('payment_date') m=Max('payment_date')
).values( ).values(
'm' 'm'
) ).order_by()
qs = self.event.orders.annotate( qs = self.event.orders.annotate(
payment_date=Subquery(p_date, output_field=DateTimeField()) payment_date=Subquery(p_date, output_field=DateTimeField())

8
src/pretix/plugins/statistics/views.py
View File

@@ -41,20 +41,20 @@ class IndexView(EventPermissionRequiredMixin, ChartContainingView, TemplateView)
order=OuterRef('pk'), order=OuterRef('pk'),
state__in=(OrderPayment.PAYMENT_STATE_CONFIRMED, OrderPayment.PAYMENT_STATE_REFUNDED), state__in=(OrderPayment.PAYMENT_STATE_CONFIRMED, OrderPayment.PAYMENT_STATE_REFUNDED),
payment_date__isnull=False payment_date__isnull=False
).order_by().values('order').annotate( ).values('order').annotate(
m=Max('payment_date') m=Max('payment_date')
).values( ).values(
'm' 'm'
) ).order_by()
op_date = OrderPayment.objects.filter( op_date = OrderPayment.objects.filter(
order=OuterRef('order'), order=OuterRef('order'),
state__in=(OrderPayment.PAYMENT_STATE_CONFIRMED, OrderPayment.PAYMENT_STATE_REFUNDED), state__in=(OrderPayment.PAYMENT_STATE_CONFIRMED, OrderPayment.PAYMENT_STATE_REFUNDED),
payment_date__isnull=False payment_date__isnull=False
).order_by().values('order').annotate( ).values('order').annotate(
m=Max('payment_date') m=Max('payment_date')
).values( ).values(
'm' 'm'
) ).order_by()
# Orders by day # Orders by day
ctx['obd_data'] = cache.get('statistics_obd_data' + ckey) ctx['obd_data'] = cache.get('statistics_obd_data' + ckey)