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

Next try

Browse Source
This commit is contained in:
Raphael Michel
2018-02-03 16:33:12 +01:00
parent 24f47722c0
commit 7e18e89012
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pretix/plugins/checkinlists/exporters.py
View File

@@ -7,7 +7,7 @@ from django import forms
from django.db.models import Max, OuterRef, Subquery from django.db.models import Max, OuterRef, Subquery
from django.db.models.functions import Coalesce from django.db.models.functions import Coalesce
from django.utils.formats import date_format, localize from django.utils.formats import date_format, localize
from django.utils.timezone import make_aware from django.utils.timezone import is_aware, make_aware
from django.utils.translation import pgettext, ugettext as _, ugettext_lazy from django.utils.translation import pgettext, ugettext as _, ugettext_lazy
from pytz import UTC from pytz import UTC
from reportlab.lib.units import mm from reportlab.lib.units import mm
@@ -290,9 +290,11 @@ class CSVCheckinList(BaseCheckinList):
for op in qs: for op in qs:
last_checked_in = None last_checked_in = None
if isinstance(op.last_checked_in, str): # SQLite if isinstance(op.last_checked_in, str): # SQLite
last_checked_in = make_aware(dateutil.parser.parse(op.last_checked_in), UTC) last_checked_in = dateutil.parser.parse(op.last_checked_in)
elif op.last_checked_in: elif op.last_checked_in:
last_checked_in = op.last_checked_in last_checked_in = op.last_checked_in
if last_checked_in and not is_aware(last_checked_in):
last_checked_in = make_aware(last_checked_in, UTC)
row = [ row = [
op.order.code, op.order.code,
op.attendee_name or (op.addon_to.attendee_name if op.addon_to else ''), op.attendee_name or (op.addon_to.attendee_name if op.addon_to else ''),