Skip to content

[5.5] Fixed emails not rendering in the site the order was placed in #4042

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Nov 3, 2025
Merged

[5.5] Fixed emails not rendering in the site the order was placed in #4042

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d55ab12
Fixed emails not rendering in the site the order was placed in
nfourtythree Jun 11, 2025
2ea5185
Merge branch '5.x' into bugfix/send-email-with-current-site-set-to-or…
nfourtythree Jun 13, 2025
f8764f5
fix merge
nfourtythree Jun 16, 2025
5e792eb
WIP email render site
nfourtythree Jun 18, 2025
9396659
Merge branch '5.4' into bugfix/send-email-with-current-site-set-to-or…
nfourtythree Jun 18, 2025
2af05ac
Further email render site updates
nfourtythree Jun 18, 2025
cfe75a8
translations + changelog
nfourtythree Jun 18, 2025
9360c48
Merge branch '5.4' into bugfix/send-email-with-current-site-set-to-or…
nfourtythree Jun 18, 2025
f297438
fix cs
nfourtythree Jun 18, 2025
b23cb13
Merge branch '5.x' into bugfix/send-email-with-current-site-set-to-or…
nfourtythree Sep 22, 2025
52924bd
Merge branch '5.5' into bugfix/send-email-with-current-site-set-to-or…
lukeholder Oct 8, 2025
33d9826
Merge branch '5.5' into bugfix/send-email-with-current-site-set-to-or…
nfourtythree Oct 30, 2025
a573faa
Tidy version numbers
nfourtythree Oct 30, 2025
8c2721d
Merge branch '5.5' into bugfix/send-email-with-current-site-set-to-or…
nfourtythree Nov 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@

- Fixed a bug where purchasable cache was not cleared when stock was updated.
- Fixed a PHP error that could occur when sending emails. ([#4017](https://github.com/craftcms/commerce/issues/4017))
<<<<<<< bugfix/send-email-with-current-site-set-to-order-site
- Fixed a bug where order emails weren’t always getting rendered for the correct site.
=======
- Fixed a SQL error that could occur when upgrading to Commerce 5. ([#4044](https://github.com/craftcms/commerce/issues/4044))
>>>>>>> 5.x
## 5.3.13 - 2025-05-21

Expand Down
30 changes: 20 additions & 10 deletions src/services/Emails.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ public function sendEmail(Email $email, Order $order, ?OrderHistory $orderHistor
}
} catch (\Exception $e) {
Craft::$app->getErrorHandler()->logException($e);

$error = Craft::t('commerce', 'Email template parse error for email “{email}” in “BCC:”. Order: “{order}”. Template error: “{message}” {file}:{line}', [
'email' => $email->name,
'order' => $order->getShortNumber(),
Expand Down Expand Up @@ -577,7 +577,7 @@ public function sendEmail(Email $email, Order $order, ?OrderHistory $orderHistor
}
} catch (\Exception $e) {
Craft::$app->getErrorHandler()->logException($e);

$error = Craft::t('commerce', 'Email template parse error for email “{email}” in “CC:”. Order: “{order}”. Template error: “{message}” {file}:{line}', [
'email' => $email->name,
'order' => $order->getShortNumber(),
Expand All @@ -601,7 +601,7 @@ public function sendEmail(Email $email, Order $order, ?OrderHistory $orderHistor
$newEmail->setReplyTo($view->renderString($email->replyTo, $renderVariables));
} catch (\Exception $e) {
Craft::$app->getErrorHandler()->logException($e);

$error = Craft::t('commerce', 'Email template parse error for email “{email}” in “ReplyTo:”. Order: “{order}”. Template error: “{message}” {file}:{line}', [
'email' => $email->name,
'order' => $order->getShortNumber(),
Expand All @@ -624,7 +624,7 @@ public function sendEmail(Email $email, Order $order, ?OrderHistory $orderHistor
$newEmail->setSubject($view->renderString($email->subject, $renderVariables));
} catch (\Exception $e) {
Craft::$app->getErrorHandler()->logException($e);

$error = Craft::t('commerce', 'Email template parse error for email “{email}” in “Subject:”. Order: “{order}”. Template error: “{message}” {file}:{line}', [
'email' => $email->name,
'order' => $order->getShortNumber(),
Expand All @@ -646,7 +646,7 @@ public function sendEmail(Email $email, Order $order, ?OrderHistory $orderHistor
$templatePath = $view->renderString($email->templatePath, $renderVariables);
} catch (\Exception $e) {
Craft::$app->getErrorHandler()->logException($e);

$error = Craft::t('commerce', 'Email template path parse error for email “{email}” in “Template Path”. Order: “{order}”. Template error: “{message}” {file}:{line}', [
'email' => $email->name,
'order' => $order->getShortNumber(),
Expand Down Expand Up @@ -687,7 +687,7 @@ public function sendEmail(Email $email, Order $order, ?OrderHistory $orderHistor
$plainTextTemplatePath = $view->renderString($email->plainTextTemplatePath, $renderVariables);
} catch (\Exception $e) {
Craft::$app->getErrorHandler()->logException($e);

$error = Craft::t('commerce', 'Email plain text template path parse error for email “{email}” in “Template Path”. Order: “{order}”. Template error: “{message}” {file}:{line}', [
'email' => $email->name,
'order' => $order->getShortNumber(),
Expand Down Expand Up @@ -765,7 +765,7 @@ public function sendEmail(Email $email, Order $order, ?OrderHistory $orderHistor
$newEmail->attach($tempPath, $options);
} catch (\Exception $e) {
Craft::$app->getErrorHandler()->logException($e);

$error = Craft::t('commerce', 'Email PDF generation error for email “{email}”. Order: “{order}”. PDF Template error: “{message}” {file}:{line}', [
'email' => $email->name,
'order' => $order->getShortNumber(),
Expand All @@ -783,13 +783,17 @@ public function sendEmail(Email $email, Order $order, ?OrderHistory $orderHistor
}
}

// Switch to the site the order was placed on
$originalSiteId = Craft::$app->getSites()->getCurrentSite()->id;
Craft::$app->getSites()->setCurrentSite($order->orderSiteId);

// Render HTML body
try {
$body = $view->renderTemplate($templatePath, $renderVariables);
$newEmail->setHtmlBody($body);
} catch (\Exception $e) {
Craft::$app->getErrorHandler()->logException($e);

$error = Craft::t('commerce', 'Email template parse error for email “{email}”. Order: “{order}”. Template error: “{message}” {file}:{line}', [
'email' => $email->name,
'order' => $order->getShortNumber(),
Expand All @@ -799,6 +803,7 @@ public function sendEmail(Email $email, Order $order, ?OrderHistory $orderHistor
]);
Craft::error($error, __METHOD__);

Craft::$app->getSites()->setCurrentSite($originalSiteId);
Locale::switchAppLanguage($originalLanguage, $originalFormattingLanguage->id);
$view->setTemplateMode($oldTemplateMode);
$generalConfig->generateTransformsBeforePageLoad = $generateTransformsBeforePageLoad;
Expand All @@ -813,7 +818,7 @@ public function sendEmail(Email $email, Order $order, ?OrderHistory $orderHistor
$newEmail->setTextBody($plainTextBody);
} catch (\Exception $e) {
Craft::$app->getErrorHandler()->logException($e);

$error = Craft::t('commerce', 'Email plain text template parse error for email “{email}”. Order: “{order}”. Template error: “{message}” {file}:{line}', [
'email' => $email->name,
'order' => $order->getShortNumber(),
Expand All @@ -823,6 +828,7 @@ public function sendEmail(Email $email, Order $order, ?OrderHistory $orderHistor
]);
Craft::error($error, __METHOD__);

Craft::$app->getSites()->setCurrentSite($originalSiteId);
Locale::switchAppLanguage($originalLanguage, $originalFormattingLanguage->id);
$view->setTemplateMode($oldTemplateMode);
$generalConfig->generateTransformsBeforePageLoad = $generateTransformsBeforePageLoad;
Expand Down Expand Up @@ -850,6 +856,7 @@ public function sendEmail(Email $email, Order $order, ?OrderHistory $orderHistor

Craft::info($notice, __METHOD__);

Craft::$app->getSites()->setCurrentSite($originalSiteId);
Locale::switchAppLanguage($originalLanguage, $originalFormattingLanguage->id);
$view->setTemplateMode($oldTemplateMode);
$generalConfig->generateTransformsBeforePageLoad = $generateTransformsBeforePageLoad;
Expand All @@ -869,6 +876,7 @@ public function sendEmail(Email $email, Order $order, ?OrderHistory $orderHistor

Craft::error($error, __METHOD__);

Craft::$app->getSites()->setCurrentSite($originalSiteId);
Locale::switchAppLanguage($originalLanguage, $originalFormattingLanguage->id);
$view->setTemplateMode($oldTemplateMode);
$generalConfig->generateTransformsBeforePageLoad = $generateTransformsBeforePageLoad;
Expand All @@ -877,7 +885,7 @@ public function sendEmail(Email $email, Order $order, ?OrderHistory $orderHistor
}
} catch (\Exception $e) {
Craft::$app->getErrorHandler()->logException($e);

$error = Craft::t('commerce', 'Email “{email}” could not be sent for order “{order}”. Error: {error} {file}:{line}', [
'error' => $e->getMessage(),
'file' => $e->getFile(),
Expand All @@ -888,6 +896,7 @@ public function sendEmail(Email $email, Order $order, ?OrderHistory $orderHistor

Craft::error($error, __METHOD__);

Craft::$app->getSites()->setCurrentSite($originalSiteId);
Locale::switchAppLanguage($originalLanguage, $originalFormattingLanguage->id);
$view->setTemplateMode($oldTemplateMode);
$generalConfig->generateTransformsBeforePageLoad = $generateTransformsBeforePageLoad;
Expand All @@ -906,6 +915,7 @@ public function sendEmail(Email $email, Order $order, ?OrderHistory $orderHistor
]));
}

Craft::$app->getSites()->setCurrentSite($originalSiteId);
Locale::switchAppLanguage($originalLanguage, $originalFormattingLanguage->id);
$view->setTemplateMode($oldTemplateMode);
$generalConfig->generateTransformsBeforePageLoad = $generateTransformsBeforePageLoad;
Expand Down
Loading