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

Merge branch 'master' of github.com:pretix/pretix

Browse Source
This commit is contained in:
Raphael Michel
2020-09-02 18:58:22 +02:00
parent 860f4c36a4 311dcfaab0
commit 78c5eb4516
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -126,7 +126,7 @@ class OrderListExporter(MultiSheetListExporter):
headers = [ headers = [
_('Event slug'), _('Order code'), _('Order total'), _('Status'), _('Email'), _('Order date'), _('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 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: if name_scheme and len(name_scheme['fields']) > 1:
@@ -181,6 +181,7 @@ class OrderListExporter(MultiSheetListExporter):
order.get_status_display(), order.get_status_display(),
order.email, order.email,
order.datetime.astimezone(tz).strftime('%Y-%m-%d'), order.datetime.astimezone(tz).strftime('%Y-%m-%d'),
order.datetime.astimezone(tz).strftime('%H:%M:%S'),
] ]
try: try:
row += [ row += [
@@ -259,6 +260,7 @@ class OrderListExporter(MultiSheetListExporter):
_('Status'), _('Status'),
_('Email'), _('Email'),
_('Order date'), _('Order date'),
_('Order time'),
_('Fee type'), _('Fee type'),
_('Description'), _('Description'),
_('Price'), _('Price'),
@@ -289,6 +291,7 @@ class OrderListExporter(MultiSheetListExporter):
order.get_status_display(), order.get_status_display(),
order.email, order.email,
order.datetime.astimezone(tz).strftime('%Y-%m-%d'), order.datetime.astimezone(tz).strftime('%Y-%m-%d'),
order.datetime.astimezone(tz).strftime('%H:%M:%S'),
op.get_fee_type_display(), op.get_fee_type_display(),
op.description, op.description,
op.value, op.value,
@@ -356,6 +359,7 @@ class OrderListExporter(MultiSheetListExporter):
_('Status'), _('Status'),
_('Email'), _('Email'),
_('Order date'), _('Order date'),
_('Order time'),
] ]
if has_subevents: if has_subevents:
headers.append(pgettext('subevent', 'Date')) headers.append(pgettext('subevent', 'Date'))
@@ -428,6 +432,7 @@ class OrderListExporter(MultiSheetListExporter):
order.get_status_display(), order.get_status_display(),
order.email, order.email,
order.datetime.astimezone(tz).strftime('%Y-%m-%d'), order.datetime.astimezone(tz).strftime('%Y-%m-%d'),
order.datetime.astimezone(tz).strftime('%H:%M:%S'),
] ]
if has_subevents: if has_subevents:
if op.subevent: if op.subevent:

3
src/pretix/base/settings.py
View File

@@ -935,7 +935,8 @@ DEFAULTS = {
('list', _('List')), ('list', _('List')),
('week', _('Week calendar')), ('week', _('Week calendar')),
('calendar', _('Month 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': { 'last_order_modification_date': {