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

Payment export: Fix mixup of form fields

Browse Source
This commit is contained in:
Raphael Michel
2023-11-10 09:27:48 +01:00
parent dad3de9cd3
commit 99b5f3cc3b
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1007,20 +1007,20 @@ class PaymentListExporter(ListExporter):
if form_data.get('end_date_range'): if form_data.get('end_date_range'):
dt_start, dt_end = resolve_timeframe_to_datetime_start_inclusive_end_exclusive(now(), form_data['end_date_range'], self.timezone) dt_start, dt_end = resolve_timeframe_to_datetime_start_inclusive_end_exclusive(now(), form_data['end_date_range'], self.timezone)
if dt_start: if dt_start:
payments = payments.filter(created__gte=dt_start) payments = payments.filter(payment_date__gte=dt_start)
refunds = refunds .filter(created__gte=dt_start) refunds = refunds.filter(execution_date__gte=dt_start)
if dt_end: if dt_end:
payments = payments.filter(created__lt=dt_end) payments = payments.filter(payment_date__lt=dt_end)
refunds = refunds .filter(created__lt=dt_end) refunds = refunds.filter(execution_date__lt=dt_end)
if form_data.get('start_end_date_range'): if form_data.get('start_end_date_range'):
dt_start, dt_end = resolve_timeframe_to_datetime_start_inclusive_end_exclusive(now(), form_data['start_date_range'], self.timezone) dt_start, dt_end = resolve_timeframe_to_datetime_start_inclusive_end_exclusive(now(), form_data['start_date_range'], self.timezone)
if dt_start: if dt_start:
payments = payments.filter(payment_date__gte=dt_start) payments = payments.filter(created__gte=dt_start)
refunds = refunds .filter(execution_date__gte=dt_start) refunds = refunds.filter(created__gte=dt_start)
if dt_end: if dt_end:
payments = payments.filter(payment_date__lt=dt_end) payments = payments.filter(created__lt=dt_end)
refunds = refunds.filter(execution_date__lt=dt_end) refunds = refunds.filter(created__lt=dt_end)
objs = sorted(list(payments) + list(refunds), key=lambda o: o.created) objs = sorted(list(payments) + list(refunds), key=lambda o: o.created)