CGM_Public/pretix_original
3
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-08-28 13:34:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Invoice download: Properly handle serialized dates

Browse Source
This commit is contained in:
Raphael Michel
2018-01-02 00:10:36 +01:00
parent ed47e94a70
commit ff8b9e4e1a
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pretix/base/exporters/invoices.py
+9 -2
View File
@@ -3,6 +3,7 @@ import tempfile
from collections import OrderedDict from collections import OrderedDict
from zipfile import ZipFile from zipfile import ZipFile
import dateutil.parser
from django import forms from django import forms
from django.dispatch import receiver from django.dispatch import receiver
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
@@ -23,10 +24,16 @@ class InvoiceExporter(BaseExporter):
qs = qs.filter(order__payment_provider=form_data.get('payment_provider')) qs = qs.filter(order__payment_provider=form_data.get('payment_provider'))
if form_data.get('date_from'): if form_data.get('date_from'):
qs = qs.filter(date__gte=form_data.get('date_from')) date_value = form_data.get('date_from')
if isinstance(date_value, str):
date_value = dateutil.parser.parse(date_value).date()
qs = qs.filter(date__gte=date_value)
if form_data.get('date_to'): if form_data.get('date_to'):
qs = qs.filter(date__lte=form_data.get('date_to')) date_value = form_data.get('date_to')
if isinstance(date_value, str):
date_value = dateutil.parser.parse(date_value).date()
qs = qs.filter(date__lte=date_value)
with tempfile.TemporaryDirectory() as d: with tempfile.TemporaryDirectory() as d:
with ZipFile(os.path.join(d, 'tmp.zip'), 'w') as zipf: with ZipFile(os.path.join(d, 'tmp.zip'), 'w') as zipf: