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

Order data export: Add column with the number of positions

Browse Source
This commit is contained in:
Raphael Michel
2020-02-11 16:25:48 +01:00
parent 38d0198dea
commit d226bbda5c
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,9 @@ from decimal import Decimal
import pytz import pytz
from django import forms from django import forms
from django.db.models import DateTimeField, F, Max, OuterRef, Subquery, Sum from django.db.models import (
Count, DateTimeField, F, IntegerField, Max, OuterRef, Subquery, Sum,
)
from django.dispatch import receiver from django.dispatch import receiver
from django.utils.formats import date_format from django.utils.formats import date_format
from django.utils.translation import pgettext, ugettext as _, ugettext_lazy from django.utils.translation import pgettext, ugettext as _, ugettext_lazy
@@ -80,8 +82,12 @@ class OrderListExporter(MultiSheetListExporter):
'm' 'm'
).order_by() ).order_by()
s = OrderPosition.objects.filter(
order=OuterRef('pk')
).order_by().values('order').annotate(k=Count('id')).values('k')
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()),
pcnt=Subquery(s, output_field=IntegerField())
).select_related('invoice_address').prefetch_related('invoices') ).select_related('invoice_address').prefetch_related('invoices')
if form_data['paid_only']: if form_data['paid_only']:
qs = qs.filter(status=Order.STATUS_PAID) qs = qs.filter(status=Order.STATUS_PAID)
@@ -111,6 +117,7 @@ class OrderListExporter(MultiSheetListExporter):
headers.append(_('Sales channel')) headers.append(_('Sales channel'))
headers.append(_('Requires special attention')) headers.append(_('Requires special attention'))
headers.append(_('Comment')) headers.append(_('Comment'))
headers.append(_('Positions'))
yield headers yield headers
@@ -185,6 +192,7 @@ class OrderListExporter(MultiSheetListExporter):
row.append(order.sales_channel) row.append(order.sales_channel)
row.append(_('Yes') if order.checkin_attention else _('No')) row.append(_('Yes') if order.checkin_attention else _('No'))
row.append(order.comment or "") row.append(order.comment or "")
row.append(order.pcnt)
yield row yield row
def iterate_fees(self, form_data: dict): def iterate_fees(self, form_data: dict):