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

issue #6205
bagisto · Apr 5, 2022 · db7e051 · db7e051
2 parents 986ee8f + 51d6a98
commit db7e051
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/packages/Webkul/Admin/src/Traits/Mails.php b/packages/Webkul/Admin/src/Traits/Mails.php
@@ -135,7 +135,7 @@ public function sendNewRefundMail($refund)
     public function sendNewShipmentMail($shipment)
     {
         $customerLocale = $this->getLocale($shipment);
-
+        
         try {
             if ($shipment->email_sent) {
                 return;
@@ -248,7 +248,15 @@ private function prepareMail($locale, $notification)
 
         app()->setLocale($locale);
 
-        Mail::queue($notification);
+        try {
+            Mail::queue($notification);
+        } catch(\Exception $e) {
+            app()->setLocale($previousLocale);
+
+            \Log::error(
+                'prepareMail' . $e->getMessage()
+            );
+        }
 
         app()->setLocale($previousLocale);
     }