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

ADd some extensibility features to MultiSheetListExporter

Browse Source
This commit is contained in:
Raphael Michel
2021-02-03 17:29:15 +01:00
parent 3b4c99d450
commit 01f7a70347
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/pretix/base/exporter.py
View File

@@ -242,7 +242,10 @@ class MultiSheetListExporter(ListExporter):
pass pass
def iterate_sheet(self, form_data, sheet): def iterate_sheet(self, form_data, sheet):
raise NotImplementedError() # noqa if hasattr(self, 'iterate_' + sheet):
yield from getattr(self, 'iterate_' + sheet)(form_data)
else:
raise NotImplementedError() # noqa
def _render_sheet_csv(self, form_data, sheet, output_file=None, **kwargs): def _render_sheet_csv(self, form_data, sheet, output_file=None, **kwargs):
total = 0 total = 0
@@ -288,6 +291,9 @@ class MultiSheetListExporter(ListExporter):
n_sheets = len(self.sheets) n_sheets = len(self.sheets)
for i_sheet, (s, l) in enumerate(self.sheets): for i_sheet, (s, l) in enumerate(self.sheets):
ws = wb.create_sheet(str(l)) ws = wb.create_sheet(str(l))
if hasattr(self, 'prepare_xlsx_sheet_' + s):
getattr(self, 'prepare_xlsx_sheet_' + s)(ws)
total = 0 total = 0
counter = 0 counter = 0
for i, line in enumerate(self.iterate_sheet(form_data, sheet=s)): for i, line in enumerate(self.iterate_sheet(form_data, sheet=s)):

2
src/pretix/plugins/reports/exporters.py
View File

@@ -581,7 +581,7 @@ class OrderTaxListReport(MultiSheetListExporter):
if date_until: if date_until:
if isinstance(date_until, str): if isinstance(date_until, str):
date_from = parse(date_until).date() date_until = parse(date_until).date()
if isinstance(date_until, date): if isinstance(date_until, date):
date_until = make_aware(datetime.combine( date_until = make_aware(datetime.combine(
date_until + timedelta(days=1), date_until + timedelta(days=1),