From ef9043db44e28a917ba6aae3ed2d64bcc29f17d0 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 12 Nov 2020 15:37:50 +1100
Subject: [PATCH] error handling for mail

---
 app/Jobs/Mail/BaseMailerJob.php   |  4 +++-
 app/Jobs/Payment/EmailPayment.php | 13 ++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/Jobs/Mail/BaseMailerJob.php b/app/Jobs/Mail/BaseMailerJob.php
index 0a03436ace6f..af2c4afc1bf4 100644
--- a/app/Jobs/Mail/BaseMailerJob.php
+++ b/app/Jobs/Mail/BaseMailerJob.php
@@ -12,8 +12,10 @@
 namespace App\Jobs\Mail;
 
 use App\DataMapper\Analytics\EmailFailure;
+use App\Jobs\Util\SystemLogger;
 use App\Libraries\Google\Google;
 use App\Libraries\MultiDB;
+use App\Models\SystemLog;
 use App\Models\User;
 use App\Providers\MailServiceProvider;
 use App\Utils\Ninja;
@@ -75,7 +77,7 @@ class BaseMailerJob implements ShouldQueue
     }
 
     public function logMailError($errors, $recipient_object)
-    {info(print_r($errors,1));
+    {
         SystemLogger::dispatch(
             $errors,
             SystemLog::CATEGORY_MAIL,
diff --git a/app/Jobs/Payment/EmailPayment.php b/app/Jobs/Payment/EmailPayment.php
index 086153ec96cb..83af0eae8b38 100644
--- a/app/Jobs/Payment/EmailPayment.php
+++ b/app/Jobs/Payment/EmailPayment.php
@@ -94,14 +94,17 @@ class EmailPayment extends BaseMailerJob implements ShouldQueue
             }catch(\Exception $e) {
 
                 info("mailing failed with message " . $e->getMessage());
-            
+                event(new PaymentWasEmailedAndFailed($this->payment, $this->company, Mail::failures(), Ninja::eventVars()));
+                return $this->logMailError($e->getMessage(), $this->payment->client);
+
             }
 
-            if (count(Mail::failures()) > 0) {
-                event(new PaymentWasEmailedAndFailed($this->payment, Mail::failures(), Ninja::eventVars()));
+            // if (count(Mail::failures()) > 0) {
+            //     info("logging mail failures");
+            //     info(print_r(Mail::failures(),1));
 
-                return $this->logMailError(Mail::failures());
-            }
+
+            // }
 
             event(new PaymentWasEmailed($this->payment, $this->payment->company, Ninja::eventVars()));