From 83a6041a325b1c5c0503ab55abdfa6acd7ed6436 Mon Sep 17 00:00:00 2001 From: Martin Gross Date: Wed, 2 Sep 2020 11:07:50 +0200 Subject: [PATCH 1/2] Expose Order Time in OrderData-Export --- src/pretix/base/exporters/orderlist.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/pretix/base/exporters/orderlist.py b/src/pretix/base/exporters/orderlist.py index 7f58fcaee4..bc9038a139 100644 --- a/src/pretix/base/exporters/orderlist.py +++ b/src/pretix/base/exporters/orderlist.py @@ -126,7 +126,7 @@ class OrderListExporter(MultiSheetListExporter): headers = [ _('Event slug'), _('Order code'), _('Order total'), _('Status'), _('Email'), _('Order date'), - _('Company'), _('Name'), + _('Order time'), _('Company'), _('Name'), ] name_scheme = PERSON_NAME_SCHEMES[self.event.settings.name_scheme] if not self.is_multievent else None if name_scheme and len(name_scheme['fields']) > 1: @@ -181,6 +181,7 @@ class OrderListExporter(MultiSheetListExporter): order.get_status_display(), order.email, order.datetime.astimezone(tz).strftime('%Y-%m-%d'), + order.datetime.astimezone(tz).strftime('%H:%M:%S'), ] try: row += [ @@ -259,6 +260,7 @@ class OrderListExporter(MultiSheetListExporter): _('Status'), _('Email'), _('Order date'), + _('Order time'), _('Fee type'), _('Description'), _('Price'), @@ -289,6 +291,7 @@ class OrderListExporter(MultiSheetListExporter): order.get_status_display(), order.email, order.datetime.astimezone(tz).strftime('%Y-%m-%d'), + order.datetime.astimezone(tz).strftime('%H:%M:%S'), op.get_fee_type_display(), op.description, op.value, @@ -356,6 +359,7 @@ class OrderListExporter(MultiSheetListExporter): _('Status'), _('Email'), _('Order date'), + _('Order time'), ] if has_subevents: headers.append(pgettext('subevent', 'Date')) @@ -428,6 +432,7 @@ class OrderListExporter(MultiSheetListExporter): order.get_status_display(), order.email, order.datetime.astimezone(tz).strftime('%Y-%m-%d'), + order.datetime.astimezone(tz).strftime('%H:%M:%S'), ] if has_subevents: if op.subevent: From 311dcfaab042d4b20c04e80ec82dbb7289d311be Mon Sep 17 00:00:00 2001 From: Martin Gross Date: Wed, 2 Sep 2020 15:13:59 +0200 Subject: [PATCH 2/2] Add notice that list-view is not available for eventseries with more than 100 dates. --- src/pretix/base/settings.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pretix/base/settings.py b/src/pretix/base/settings.py index 047f94e331..ba55e62deb 100644 --- a/src/pretix/base/settings.py +++ b/src/pretix/base/settings.py @@ -935,7 +935,8 @@ DEFAULTS = { ('list', _('List')), ('week', _('Week calendar')), ('calendar', _('Month calendar')), - ) + ), + help_text=_('If your event series has more than 100 dates, only the month or week calendar can be used.') ), }, 'last_order_modification_date': {