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

Fix issue in OrderListExporter when mixing subevents with non-subevents

Browse Source
This commit is contained in:
Raphael Michel
2020-07-24 09:34:54 +02:00
parent 99b42d201e
commit 41127ce978
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -430,12 +430,17 @@ class OrderListExporter(MultiSheetListExporter):
order.datetime.astimezone(tz).strftime('%Y-%m-%d'), order.datetime.astimezone(tz).strftime('%Y-%m-%d'),
] ]
if has_subevents: if has_subevents:
row.append(op.subevent.name) if op.subevent:
row.append(op.subevent.date_from.astimezone(self.event_object_cache[order.event_id].timezone).strftime('%Y-%m-%d %H:%M:%S')) row.append(op.subevent.name)
if op.subevent.date_to: row.append(op.subevent.date_from.astimezone(self.event_object_cache[order.event_id].timezone).strftime('%Y-%m-%d %H:%M:%S'))
row.append(op.subevent.date_to.astimezone(self.event_object_cache[order.event_id].timezone).strftime('%Y-%m-%d %H:%M:%S')) if op.subevent.date_to:
row.append(op.subevent.date_to.astimezone(self.event_object_cache[order.event_id].timezone).strftime('%Y-%m-%d %H:%M:%S'))
else:
row.append('')
else: else:
row.append('') row.append('')
row.append('')
row.append('')
row += [ row += [
str(op.item), str(op.item),
str(op.variation) if op.variation else '', str(op.variation) if op.variation else '',