From d8070ba8a3f4030d99d53ec49f282688c92d811f Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Thu, 29 Nov 2018 10:01:20 +0100 Subject: [PATCH] Fix missing ticket attachments --- src/pretix/base/models/orders.py | 3 ++- src/pretix/base/services/tickets.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/pretix/base/models/orders.py b/src/pretix/base/models/orders.py index f7d776fdb..aa967ed32 100644 --- a/src/pretix/base/models/orders.py +++ b/src/pretix/base/models/orders.py @@ -558,7 +558,8 @@ class Order(LockModel, LoggedModel): 'subject': subject, 'message': email_content, 'recipient': recipient, - 'invoices': [i.pk for i in invoices] if invoices else [] + 'invoices': [i.pk for i in invoices] if invoices else [], + 'attach_tickets': attach_tickets, } ) diff --git a/src/pretix/base/services/tickets.py b/src/pretix/base/services/tickets.py index 23e7d2b02..06eb65fd6 100644 --- a/src/pretix/base/services/tickets.py +++ b/src/pretix/base/services/tickets.py @@ -122,7 +122,7 @@ def get_tickets_for_order(order): ).last() if not ct or not ct.file: retval = generate.apply(args=('order', order.pk, p.identifier)) - ct = CachedCombinedTicket.objects.get(pk=retval.value) + ct = CachedCombinedTicket.objects.get(pk=retval.get()) tickets.append(( "{}-{}-{}{}".format( order.event.slug.upper(), order.code, ct.provider, ct.extension, @@ -143,7 +143,7 @@ def get_tickets_for_order(order): ).last() if not ct or not ct.file: retval = generate.apply(args=('orderposition', pos.pk, p.identifier)) - ct = CachedTicket.objects.get(pk=retval.value) + ct = CachedTicket.objects.get(pk=retval.get()) tickets.append(( "{}-{}-{}-{}{}".format( order.event.slug.upper(), order.code, pos.positionid, ct.provider, ct.extension,