CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-04 15:04:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Order overview PDF: Allow to filter by subevent date"

Browse Source 
This reverts commit 08f0150177.
This commit is contained in:
Raphael Michel
2024-01-12 15:54:59 +01:00
parent 08f0150177
commit 24dd065839
3 changed files with 7 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -296,17 +296,6 @@ class OverviewReport(Report):
subevent = self.form_data.get('subevent')
story.append(Paragraph(pgettext('subevent', 'Date: {}').format(subevent), self.get_style()))
story.append(Spacer(1, 5 * mm))
if form_data.get('subevent_date_range'):
d_start, d_end = resolve_timeframe_to_dates_inclusive(now(), form_data['subevent_date_range'], self.timezone)
story += [
Paragraph(_('{axis} between {start} and {end}').format(
axis=_('Event date'),
start=date_format(d_start, 'SHORT_DATE_FORMAT') if d_start else '–',
end=date_format(d_end, 'SHORT_DATE_FORMAT') if d_end else '–',
), self.get_style()),
Spacer(1, 5 * mm)
]
return story
def _get_data(self, form_data):
@@ -314,18 +303,12 @@ class OverviewReport(Report):
d_start, d_end = resolve_timeframe_to_dates_inclusive(now(), form_data['date_range'], self.timezone)
else:
d_start, d_end = None, None
if form_data.get('subevent_date_range'):
sd_start, sd_end = resolve_timeframe_to_dates_inclusive(now(), form_data['subevent_date_range'], self.timezone)
else:
sd_start, sd_end = None, None
return order_overview(
self.event,
subevent=form_data.get('subevent'),
date_filter=form_data.get('date_axis'),
date_from=d_start,
date_until=d_end,
subevent_date_from=sd_start,
subevent_date_until=sd_end,
fees=True
)
@@ -444,18 +427,9 @@ class OverviewReport(Report):
@property
def export_form_fields(self) -> dict:
f = OverviewFilterForm(event=self.event)
f.fields = OrderedDict(f.fields.items())
del f.fields['ordering']
del f.fields['date_from']
del f.fields['date_until']
if self.event.has_subevents:
f.fields['subevent_date_range'] = DateFrameField(
label=_('Event date'),
include_future_frames=True,
required=False,
)
f.fields.move_to_end("subevent_date_range", last=False)
f.fields.move_to_end("subevent", last=False)
f.fields['date_range'] = DateFrameField(
label=_('Date range'),
include_future_frames=False,