diff --git a/src/pretix/base/exporters/orderlist.py b/src/pretix/base/exporters/orderlist.py index 82ef52581b..0b25256bdf 100644 --- a/src/pretix/base/exporters/orderlist.py +++ b/src/pretix/base/exporters/orderlist.py @@ -59,11 +59,11 @@ class OrderListExporter(BaseExporter): order=OuterRef('pk'), state__in=(OrderPayment.PAYMENT_STATE_CONFIRMED, OrderPayment.PAYMENT_STATE_REFUNDED), payment_date__isnull=False - ).order_by().values('order').annotate( + ).values('order').annotate( m=Max('payment_date') ).values( 'm' - ) + ).order_by() qs = self.event.orders.annotate( payment_date=Subquery(p_date, output_field=DateTimeField()) diff --git a/src/pretix/plugins/statistics/views.py b/src/pretix/plugins/statistics/views.py index 84d62273d6..5ad6ef12cc 100644 --- a/src/pretix/plugins/statistics/views.py +++ b/src/pretix/plugins/statistics/views.py @@ -41,20 +41,20 @@ class IndexView(EventPermissionRequiredMixin, ChartContainingView, TemplateView) order=OuterRef('pk'), state__in=(OrderPayment.PAYMENT_STATE_CONFIRMED, OrderPayment.PAYMENT_STATE_REFUNDED), payment_date__isnull=False - ).order_by().values('order').annotate( + ).values('order').annotate( m=Max('payment_date') ).values( 'm' - ) + ).order_by() op_date = OrderPayment.objects.filter( order=OuterRef('order'), state__in=(OrderPayment.PAYMENT_STATE_CONFIRMED, OrderPayment.PAYMENT_STATE_REFUNDED), payment_date__isnull=False - ).order_by().values('order').annotate( + ).values('order').annotate( m=Max('payment_date') ).values( 'm' - ) + ).order_by() # Orders by day ctx['obd_data'] = cache.get('statistics_obd_data' + ckey)