merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6225 from Anmol-Chauhan/flash-translation-issue 

issue #6205
This commit is contained in:
Jitendra Singh 2022-04-05 11:07:25 +05:30 committed by GitHub
parent 986ee8f4d0 51d6a98d18
commit db7e05178c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/Webkul/Admin/src/Traits/Mails.php
View File

@ -135,7 +135,7 @@ trait Mails
public function sendNewShipmentMail($shipment)
{
$customerLocale = $this->getLocale($shipment);
try {
if ($shipment->email_sent) {
return;
@ -248,7 +248,15 @@ trait Mails
app()->setLocale($locale);
Mail::queue($notification);
try {
Mail::queue($notification);
} catch(\Exception $e) {
app()->setLocale($previousLocale);
\Log::error(
'prepareMail' . $e->getMessage()
);
}
app()->setLocale($previousLocale);
}