Merge branch 'develop' into bugfix/3313-example-template-redirects

craftcms · Oct 24, 2023 · 06ff2a6 · 06ff2a6
2 parents 60e3f44 + 4eeb75c
commit 06ff2a6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Fixed a bug where it was possible to select soft-deleted tax categories.
+- Fixed a PHP error that occurred when sending an email with a missing PDF filename format. ([#3309](https://github.com/craftcms/commerce/issues/3309))
 
 ## 4.3.1 - 2023-10-18
 

diff --git a/src/services/Emails.php b/src/services/Emails.php
@@ -691,9 +691,18 @@ public function sendEmail(Email $email, Order $order, ?OrderHistory $orderHistor
 
                 file_put_contents($tempPath, $renderedPdf);
 
-                $fileName = $view->renderObjectTemplate($pdf->fileNameFormat, $order);
+                $fileName = '';
+                $defaultFileName = $pdf->handle . '-' . $order->number;
+                if ($pdf->fileNameFormat) {
+                    try {
+                        $fileName = $view->renderObjectTemplate($pdf->fileNameFormat, $order);
+                    } catch (\Throwable $e) {
+                        $fileName = $defaultFileName;
+                    }
+                }
+
                 if (!$fileName) {
-                    $fileName = $pdf->handle . '-' . $order->number;
+                    $fileName = $defaultFileName;
                 }
 
                 // Attachment information