From 657cdd07abd3ab175f45b5463a9bb2f5b419212c Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Fri, 29 Apr 2022 12:10:41 +0200 Subject: [PATCH] Order list export: Include canceled positions (#2612) * Order list exporter: Include canceled positions * Review fix --- src/pretix/base/exporters/orderlist.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pretix/base/exporters/orderlist.py b/src/pretix/base/exporters/orderlist.py index ecc0bf71f3..2ee2e3fa97 100644 --- a/src/pretix/base/exporters/orderlist.py +++ b/src/pretix/base/exporters/orderlist.py @@ -424,13 +424,13 @@ class OrderListExporter(MultiSheetListExporter): ).values( 'm' ).order_by() - qs = OrderFee.objects.filter( + qs = OrderFee.all.filter( order__event__in=self.events, ).annotate( payment_providers=Subquery(p_providers, output_field=CharField()), ).select_related('order', 'order__invoice_address', 'tax_rule') if form_data['paid_only']: - qs = qs.filter(order__status=Order.STATUS_PAID) + qs = qs.filter(order__status=Order.STATUS_PAID, canceled=False) qs = self._date_filter(qs, form_data, rel='order__') @@ -469,7 +469,7 @@ class OrderListExporter(MultiSheetListExporter): row = [ self.event_object_cache[order.event_id].slug, order.code, - order.get_status_display(), + _("canceled") if op.canceled else order.get_status_display(), order.email, str(order.phone) if order.phone else '', order.datetime.astimezone(tz).strftime('%Y-%m-%d'), @@ -518,7 +518,7 @@ class OrderListExporter(MultiSheetListExporter): ).values( 'm' ).order_by() - base_qs = OrderPosition.objects.filter( + base_qs = OrderPosition.all.filter( order__event__in=self.events, ) qs = base_qs.annotate( @@ -530,7 +530,7 @@ class OrderListExporter(MultiSheetListExporter): 'answers', 'answers__question', 'answers__options' ) if form_data['paid_only']: - qs = qs.filter(order__status=Order.STATUS_PAID) + qs = qs.filter(order__status=Order.STATUS_PAID, canceled=False) qs = self._date_filter(qs, form_data, rel='order__') @@ -628,7 +628,7 @@ class OrderListExporter(MultiSheetListExporter): self.event_object_cache[order.event_id].slug, order.code, op.positionid, - order.get_status_display(), + _("canceled") if op.canceled else order.get_status_display(), order.email, str(order.phone) if order.phone else '', order.datetime.astimezone(tz).strftime('%Y-%m-%d'),