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

Fixed TypeError caused by ticket_download_date set to None

Browse Source
This commit is contained in:
Raphael Michel
2015-06-15 19:31:55 +02:00
parent 88f1ae6f89
commit 5d409e0fe3
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/pretix/presale/views/order.py
View File

@@ -63,8 +63,10 @@ class OrderDetails(EventViewMixin, EventLoginRequiredMixin, OrderDetailMixin,
ctx['order'] = self.order ctx['order'] = self.order
ctx['can_download'] = ( ctx['can_download'] = (
self.request.event.settings.ticket_download self.request.event.settings.ticket_download
and now() > self.request.event.settings.ticket_download_date and (
and self.order.status == Order.STATUS_PAID self.request.event.settings.ticket_download_date is None
or now() > self.request.event.settings.ticket_download_date
) and self.order.status == Order.STATUS_PAID
) )
ctx['download_buttons'] = self.download_buttons ctx['download_buttons'] = self.download_buttons
ctx['cart'] = self.get_cart( ctx['cart'] = self.get_cart(
@@ -182,7 +184,9 @@ class OrderDownload(EventViewMixin, EventLoginRequiredMixin, OrderDetailMixin,
if self.order.status != Order.STATUS_PAID: if self.order.status != Order.STATUS_PAID:
messages.error(request, _('Order is not paid.')) messages.error(request, _('Order is not paid.'))
return redirect(self.get_order_url()) return redirect(self.get_order_url())
if not self.request.event.settings.ticket_download or now() < self.request.event.settings.ticket_download_date: if (not self.request.event.settings.ticket_download
or (self.request.event.settings.ticket_download_date is not None
and now() < self.request.event.settings.ticket_download_date)):
messages.error(request, _('Ticket download is not (yet) enabled.')) messages.error(request, _('Ticket download is not (yet) enabled.'))
return redirect(self.get_order_url()) return redirect(self.get_order_url())
return self.output.generate(request, self.order) return self.output.generate(request, self.order)