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

Order list export: Include canceled positions (#2612)

Browse Source 
* Order list exporter: Include canceled positions

* Review fix
This commit is contained in:
Raphael Michel
2022-04-29 12:10:41 +02:00
committed by GitHub
parent e1db207487
commit 657cdd07ab
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -424,13 +424,13 @@ class OrderListExporter(MultiSheetListExporter):
).values( ).values(
'm' 'm'
).order_by() ).order_by()
qs = OrderFee.objects.filter( qs = OrderFee.all.filter(
order__event__in=self.events, order__event__in=self.events,
).annotate( ).annotate(
payment_providers=Subquery(p_providers, output_field=CharField()), payment_providers=Subquery(p_providers, output_field=CharField()),
).select_related('order', 'order__invoice_address', 'tax_rule') ).select_related('order', 'order__invoice_address', 'tax_rule')
if form_data['paid_only']: 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__') qs = self._date_filter(qs, form_data, rel='order__')
@@ -469,7 +469,7 @@ class OrderListExporter(MultiSheetListExporter):
row = [ row = [
self.event_object_cache[order.event_id].slug, self.event_object_cache[order.event_id].slug,
order.code, order.code,
order.get_status_display(), _("canceled") if op.canceled else order.get_status_display(),
order.email, order.email,
str(order.phone) if order.phone else '', str(order.phone) if order.phone else '',
order.datetime.astimezone(tz).strftime('%Y-%m-%d'), order.datetime.astimezone(tz).strftime('%Y-%m-%d'),
@@ -518,7 +518,7 @@ class OrderListExporter(MultiSheetListExporter):
).values( ).values(
'm' 'm'
).order_by() ).order_by()
base_qs = OrderPosition.objects.filter( base_qs = OrderPosition.all.filter(
order__event__in=self.events, order__event__in=self.events,
) )
qs = base_qs.annotate( qs = base_qs.annotate(
@@ -530,7 +530,7 @@ class OrderListExporter(MultiSheetListExporter):
'answers', 'answers__question', 'answers__options' 'answers', 'answers__question', 'answers__options'
) )
if form_data['paid_only']: 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__') qs = self._date_filter(qs, form_data, rel='order__')
@@ -628,7 +628,7 @@ class OrderListExporter(MultiSheetListExporter):
self.event_object_cache[order.event_id].slug, self.event_object_cache[order.event_id].slug,
order.code, order.code,
op.positionid, op.positionid,
order.get_status_display(), _("canceled") if op.canceled else order.get_status_display(),
order.email, order.email,
str(order.phone) if order.phone else '', str(order.phone) if order.phone else '',
order.datetime.astimezone(tz).strftime('%Y-%m-%d'), order.datetime.astimezone(tz).strftime('%Y-%m-%d'),