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

Invoice renderer: Unify HTML cleaning and clean intro and additional

Browse Source 
text
This commit is contained in:
Raphael Michel
2022-12-09 17:28:30 +01:00
parent 28e529995d
commit 979d23e997
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/pretix/base/invoice.py
View File

@@ -242,6 +242,12 @@ class BaseReportlabInvoiceRenderer(BaseInvoiceRenderer):
buffer.seek(0) buffer.seek(0)
return 'invoice.pdf', 'application/pdf', buffer.read() return 'invoice.pdf', 'application/pdf', buffer.read()
def _clean_text(self, text, tags=None):
return bleach.clean(
text,
tags=tags or []
).strip().replace('<br>', '<br />').replace('\n', '<br />\n')
class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer): class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
identifier = 'classic' identifier = 'classic'
@@ -266,7 +272,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
invoice_to_top = 52 * mm invoice_to_top = 52 * mm
def _draw_invoice_to(self, canvas): def _draw_invoice_to(self, canvas):
p = Paragraph(bleach.clean(self.invoice.address_invoice_to, tags=[]).strip().replace('\n', '<br />\n'), p = Paragraph(self._clean_text(self.invoice.address_invoice_to),
style=self.stylesheet['Normal']) style=self.stylesheet['Normal'])
p.wrapOn(canvas, self.invoice_to_width, self.invoice_to_height) p.wrapOn(canvas, self.invoice_to_width, self.invoice_to_height)
p_size = p.wrap(self.invoice_to_width, self.invoice_to_height) p_size = p.wrap(self.invoice_to_width, self.invoice_to_height)
@@ -279,7 +285,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
def _draw_invoice_from(self, canvas): def _draw_invoice_from(self, canvas):
p = Paragraph( p = Paragraph(
bleach.clean(self.invoice.full_invoice_from, tags=[]).strip().replace('\n', '<br />\n'), self._clean_text(self.invoice.full_invoice_from),
style=self.stylesheet['InvoiceFrom'] style=self.stylesheet['InvoiceFrom']
) )
p.wrapOn(canvas, self.invoice_from_width, self.invoice_from_height) p.wrapOn(canvas, self.invoice_from_width, self.invoice_from_height)
@@ -474,8 +480,8 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
if self.invoice.custom_field: if self.invoice.custom_field:
story.append(Paragraph( story.append(Paragraph(
'{}: {}'.format( '{}: {}'.format(
bleach.clean(str(self.invoice.event.settings.invoice_address_custom_field), tags=[]).strip().replace('\n', '<br />\n'), self._clean_text(str(self.invoice.event.settings.invoice_address_custom_field)),
bleach.clean(self.invoice.custom_field, tags=[]).strip().replace('\n', '<br />\n'), self._clean_text(self.invoice.custom_field),
), ),
self.stylesheet['Normal'] self.stylesheet['Normal']
)) ))
@@ -483,7 +489,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
if self.invoice.internal_reference: if self.invoice.internal_reference:
story.append(Paragraph( story.append(Paragraph(
pgettext('invoice', 'Customer reference: {reference}').format( pgettext('invoice', 'Customer reference: {reference}').format(
reference=bleach.clean(self.invoice.internal_reference, tags=[]).strip().replace('\n', '<br />\n'), reference=self._clean_text(self.invoice.internal_reference),
), ),
self.stylesheet['Normal'] self.stylesheet['Normal']
)) ))
@@ -491,20 +497,20 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
if self.invoice.invoice_to_vat_id: if self.invoice.invoice_to_vat_id:
story.append(Paragraph( story.append(Paragraph(
pgettext('invoice', 'Customer VAT ID') + ': ' + pgettext('invoice', 'Customer VAT ID') + ': ' +
bleach.clean(self.invoice.invoice_to_vat_id, tags=[]).replace("\n", "<br />\n"), self._clean_text(self.invoice.invoice_to_vat_id),
self.stylesheet['Normal'] self.stylesheet['Normal']
)) ))
if self.invoice.invoice_to_beneficiary: if self.invoice.invoice_to_beneficiary:
story.append(Paragraph( story.append(Paragraph(
pgettext('invoice', 'Beneficiary') + ':<br />' + pgettext('invoice', 'Beneficiary') + ':<br />' +
bleach.clean(self.invoice.invoice_to_beneficiary, tags=[]).replace("\n", "<br />\n"), self._clean_text(self.invoice.invoice_to_beneficiary),
self.stylesheet['Normal'] self.stylesheet['Normal']
)) ))
if self.invoice.introductory_text: if self.invoice.introductory_text:
story.append(Paragraph( story.append(Paragraph(
self.invoice.introductory_text, self._clean_text(self.invoice.introductory_text, tags=['br']),
self.stylesheet['Normal'] self.stylesheet['Normal']
)) ))
story.append(Spacer(1, 10 * mm)) story.append(Spacer(1, 10 * mm))
@@ -571,7 +577,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
description = description + "\n" + single_price_line description = description + "\n" + single_price_line
tdata.append(( tdata.append((
Paragraph( Paragraph(
bleach.clean(description, tags=['br']).strip().replace('<br>', '<br/>').replace('\n', '<br />\n'), self._clean_text(description, tags=['br']),
self.stylesheet['Normal'] self.stylesheet['Normal']
), ),
str(len(lines)), str(len(lines)),
@@ -587,7 +593,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
description = description + "\n" + single_price_line description = description + "\n" + single_price_line
tdata.append(( tdata.append((
Paragraph( Paragraph(
bleach.clean(description, tags=['br']).strip().replace('<br>', '<br/>').replace('\n', '<br />\n'), self._clean_text(description, tags=['br']),
self.stylesheet['Normal'] self.stylesheet['Normal']
), ),
str(len(lines)), str(len(lines)),
@@ -657,7 +663,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
if self.invoice.additional_text: if self.invoice.additional_text:
story.append(Paragraph( story.append(Paragraph(
self.invoice.additional_text, self._clean_text(self.invoice.additional_text, tags=['br']),
self.stylesheet['Normal'] self.stylesheet['Normal']
)) ))
story.append(Spacer(1, 5 * mm)) story.append(Spacer(1, 5 * mm))
@@ -794,7 +800,7 @@ class Modern1Renderer(ClassicInvoiceRenderer):
if not self.invoice.invoice_from: if not self.invoice.invoice_from:
return return
c = [ c = [
bleach.clean(l, tags=[]).strip().replace('\n', '<br />\n') self._clean_text(l)
for l in self.invoice.address_invoice_from.strip().split('\n') for l in self.invoice.address_invoice_from.strip().split('\n')
] ]
p = Paragraph(' · '.join(c), style=self.stylesheet['Sender']) p = Paragraph(' · '.join(c), style=self.stylesheet['Sender'])