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

Invoice exporter: Add order ID to filename

Browse Source
This commit is contained in:
Raphael Michel
2021-02-02 15:47:25 +01:00
parent 89da0847ca
commit 3bb23bb77e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pretix/base/exporters/invoices.py
View File

@@ -66,7 +66,7 @@ class InvoiceExporterMixin:
) )
def invoices_queryset(self, form_data: dict): def invoices_queryset(self, form_data: dict):
qs = Invoice.objects.filter(event__in=self.events) qs = Invoice.objects.filter(event__in=self.events).select_related('order')
if form_data.get('payment_provider'): if form_data.get('payment_provider'):
qs = qs.annotate( qs = qs.annotate(
@@ -112,13 +112,13 @@ class InvoiceExporter(InvoiceExporterMixin, BaseExporter):
invoice_pdf_task.apply(args=(i.pk,)) invoice_pdf_task.apply(args=(i.pk,))
i.refresh_from_db() i.refresh_from_db()
i.file.open('rb') i.file.open('rb')
zipf.writestr('{}.pdf'.format(i.number), i.file.read()) zipf.writestr('{}-{}.pdf'.format(i.number, i.order.code), i.file.read())
i.file.close() i.file.close()
except FileNotFoundError: except FileNotFoundError:
invoice_pdf_task.apply(args=(i.pk,)) invoice_pdf_task.apply(args=(i.pk,))
i.refresh_from_db() i.refresh_from_db()
i.file.open('rb') i.file.open('rb')
zipf.writestr('{}.pdf'.format(i.number), i.file.read()) zipf.writestr('{}-{}.pdf'.format(i.number, i.order.code), i.file.read())
i.file.close() i.file.close()
counter += 1 counter += 1
if total and counter % max(10, total // 100) == 0: if total and counter % max(10, total // 100) == 0: