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

Fix missing ticket attachments

Browse Source
This commit is contained in:
Raphael Michel
2018-11-29 10:01:20 +01:00
parent b1019672b0
commit d8070ba8a3
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/pretix/base/models/orders.py
View File

@@ -558,7 +558,8 @@ class Order(LockModel, LoggedModel):
'subject': subject, 'subject': subject,
'message': email_content, 'message': email_content,
'recipient': recipient, '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,
} }
) )

4
src/pretix/base/services/tickets.py
View File

@@ -122,7 +122,7 @@ def get_tickets_for_order(order):
).last() ).last()
if not ct or not ct.file: if not ct or not ct.file:
retval = generate.apply(args=('order', order.pk, p.identifier)) 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(( tickets.append((
"{}-{}-{}{}".format( "{}-{}-{}{}".format(
order.event.slug.upper(), order.code, ct.provider, ct.extension, order.event.slug.upper(), order.code, ct.provider, ct.extension,
@@ -143,7 +143,7 @@ def get_tickets_for_order(order):
).last() ).last()
if not ct or not ct.file: if not ct or not ct.file:
retval = generate.apply(args=('orderposition', pos.pk, p.identifier)) 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(( tickets.append((
"{}-{}-{}-{}{}".format( "{}-{}-{}-{}{}".format(
order.event.slug.upper(), order.code, pos.positionid, ct.provider, ct.extension, order.event.slug.upper(), order.code, pos.positionid, ct.provider, ct.extension,