diff --git a/backend/app/Mail/Order/OrderSummary.php b/backend/app/Mail/Order/OrderSummary.php
index 5d2bc6910a..83b4fcaa2e 100644
--- a/backend/app/Mail/Order/OrderSummary.php
+++ b/backend/app/Mail/Order/OrderSummary.php
@@ -2,7 +2,6 @@
namespace HiEvents\Mail\Order;
-use Barryvdh\DomPDF\Facade\Pdf;
use HiEvents\DomainObjects\EventDomainObject;
use HiEvents\DomainObjects\EventOccurrenceDomainObject;
use HiEvents\DomainObjects\EventSettingDomainObject;
@@ -12,6 +11,7 @@
use HiEvents\Helper\Url;
use HiEvents\Mail\BaseMail;
use HiEvents\Services\Domain\Email\DTO\RenderedEmailTemplateDTO;
+use HiEvents\Services\Domain\Order\InvoicePdfRenderer;
use Illuminate\Mail\Mailables\Attachment;
use Illuminate\Mail\Mailables\Content;
use Illuminate\Mail\Mailables\Envelope;
@@ -84,13 +84,13 @@ public function attachments(): array
return [];
}
- $invoice = Pdf::loadView('invoice', [
- 'order' => $this->order,
- 'event' => $this->event,
- 'organizer' => $this->organizer,
- 'eventSettings' => $this->eventSettings,
- 'invoice' => $this->invoice,
- ]);
+ $invoice = app(InvoicePdfRenderer::class)->render(
+ order: $this->order,
+ event: $this->event,
+ organizer: $this->organizer,
+ eventSettings: $this->eventSettings,
+ invoice: $this->invoice,
+ );
return [
Attachment::fromData(
diff --git a/backend/app/Services/Domain/Order/GenerateOrderInvoicePDFService.php b/backend/app/Services/Domain/Order/GenerateOrderInvoicePDFService.php
index 27e706c20f..011c3fbd9a 100644
--- a/backend/app/Services/Domain/Order/GenerateOrderInvoicePDFService.php
+++ b/backend/app/Services/Domain/Order/GenerateOrderInvoicePDFService.php
@@ -2,7 +2,6 @@
namespace HiEvents\Services\Domain\Order;
-use Barryvdh\DomPDF\Facade\Pdf;
use HiEvents\DomainObjects\EventDomainObject;
use HiEvents\DomainObjects\EventSettingDomainObject;
use HiEvents\DomainObjects\OrganizerDomainObject;
@@ -17,6 +16,7 @@ class GenerateOrderInvoicePDFService
public function __construct(
private readonly OrderRepositoryInterface $orderRepository,
private readonly InvoiceRepositoryInterface $invoiceRepository,
+ private readonly InvoicePdfRenderer $invoicePdfRenderer,
) {}
public function generatePdfFromOrderShortId(string $orderShortId, int $eventId): InvoicePdfResponseDTO
@@ -55,13 +55,13 @@ private function generatePdf(array $whereCriteria): InvoicePdfResponseDTO
}
return new InvoicePdfResponseDTO(
- pdf: Pdf::loadView('invoice', [
- 'order' => $order,
- 'event' => $order->getEvent(),
- 'organizer' => $order->getEvent()->getOrganizer(),
- 'eventSettings' => $order->getEvent()->getEventSettings(),
- 'invoice' => $invoice,
- ]),
+ pdf: $this->invoicePdfRenderer->render(
+ order: $order,
+ event: $order->getEvent(),
+ organizer: $order->getEvent()->getOrganizer(),
+ eventSettings: $order->getEvent()->getEventSettings(),
+ invoice: $invoice,
+ ),
filename: $invoice->getInvoiceNumber().'.pdf'
);
}
diff --git a/backend/app/Services/Domain/Order/InvoicePdfRenderer.php b/backend/app/Services/Domain/Order/InvoicePdfRenderer.php
new file mode 100644
index 0000000000..3f97072067
--- /dev/null
+++ b/backend/app/Services/Domain/Order/InvoicePdfRenderer.php
@@ -0,0 +1,62 @@
+ $order,
+ 'event' => $event,
+ 'organizer' => $organizer,
+ 'eventSettings' => $eventSettings,
+ 'invoice' => $invoice,
+ 'embedCjkFont' => $this->fontCacheIsWritable(),
+ ])->setOption('isFontSubsettingEnabled', true);
+ }
+
+ private function fontCacheIsWritable(): bool
+ {
+ foreach (array_unique([config('dompdf.options.font_dir'), config('dompdf.options.font_cache')]) as $directory) {
+ if (! is_dir($directory) && ! @mkdir($directory, 0755, true) && ! is_dir($directory)) {
+ $this->logFontCacheUnavailable($directory);
+
+ return false;
+ }
+
+ if (! is_writable($directory)) {
+ $this->logFontCacheUnavailable($directory);
+
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ private function logFontCacheUnavailable(string $directory): void
+ {
+ $this->logger->warning('Invoice PDF font cache directory is not writable, rendering invoice without the CJK font', [
+ 'directory' => $directory,
+ ]);
+ }
+}
diff --git a/backend/resources/fonts/NotoSansSC-Bold.ttf b/backend/resources/fonts/NotoSansSC-Bold.ttf
new file mode 100644
index 0000000000..1e56ab5fd3
Binary files /dev/null and b/backend/resources/fonts/NotoSansSC-Bold.ttf differ
diff --git a/backend/resources/fonts/NotoSansSC-OFL.txt b/backend/resources/fonts/NotoSansSC-OFL.txt
new file mode 100644
index 0000000000..1c9f43281b
--- /dev/null
+++ b/backend/resources/fonts/NotoSansSC-OFL.txt
@@ -0,0 +1,93 @@
+Copyright 2014-2021 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+https://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/backend/resources/fonts/NotoSansSC-Regular.ttf b/backend/resources/fonts/NotoSansSC-Regular.ttf
new file mode 100644
index 0000000000..f94e068ae8
Binary files /dev/null and b/backend/resources/fonts/NotoSansSC-Regular.ttf differ
diff --git a/backend/resources/views/invoice.blade.php b/backend/resources/views/invoice.blade.php
index 9db23e8990..c4521cf69a 100644
--- a/backend/resources/views/invoice.blade.php
+++ b/backend/resources/views/invoice.blade.php
@@ -17,6 +17,22 @@
{{ $eventSettings->getInvoiceLabel() ?? __('Invoice') }} #{{ $invoice->getInvoiceNumber() }}