From 6840e3e471f5c80b987f42aae88d89e12fed8061 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 8 Aug 2020 14:38:02 +1000 Subject: [PATCH] Fixes for mailers --- app/Jobs/Credit/EmailCredit.php | 3 ++- app/Jobs/Invoice/EmailInvoice.php | 13 ++----------- app/Jobs/Mail/EntityPaidMailer.php | 13 ++----------- app/Jobs/Mail/EntitySentMailer.php | 12 +----------- app/Jobs/Mail/EntityViewedMailer.php | 12 +----------- app/Jobs/Mail/PaymentFailureMailer.php | 13 +------------ app/Jobs/User/UserEmailChanged.php | 13 +------------ 7 files changed, 10 insertions(+), 69 deletions(-) diff --git a/app/Jobs/Credit/EmailCredit.php b/app/Jobs/Credit/EmailCredit.php index 9be6f913e5fd..6a949aa13f2f 100644 --- a/app/Jobs/Credit/EmailCredit.php +++ b/app/Jobs/Credit/EmailCredit.php @@ -76,7 +76,8 @@ class EmailCredit extends BaseMailerJob implements ShouldQueue if (count(Mail::failures()) > 0) { event(new CreditWasEmailedAndFailed($this->credit, $this->credit->company, Mail::failures(), Ninja::eventVars())); - return $this->logMailError($errors); + return $this->logMailError(Mail::failures(), $this->credit->client); + } //fire any events diff --git a/app/Jobs/Invoice/EmailInvoice.php b/app/Jobs/Invoice/EmailInvoice.php index f36629302762..63fba8364486 100644 --- a/app/Jobs/Invoice/EmailInvoice.php +++ b/app/Jobs/Invoice/EmailInvoice.php @@ -80,18 +80,9 @@ class EmailInvoice extends BaseMailerJob implements ShouldQueue ); if (count(Mail::failures()) > 0) { - return $this->logMailError(Mail::failures()); + return $this->logMailError(Mail::failures(), $this->invoice->client); } } - private function logMailError($errors) - { - SystemLogger::dispatch( - $errors, - SystemLog::CATEGORY_MAIL, - SystemLog::EVENT_MAIL_SEND, - SystemLog::TYPE_FAILURE, - $this->invoice->client - ); - } + } diff --git a/app/Jobs/Mail/EntityPaidMailer.php b/app/Jobs/Mail/EntityPaidMailer.php index b978afefa0af..5b41d5862c16 100644 --- a/app/Jobs/Mail/EntityPaidMailer.php +++ b/app/Jobs/Mail/EntityPaidMailer.php @@ -83,21 +83,12 @@ class EntityPaidMailer extends BaseMailerJob implements ShouldQueue //catch errors if (count(Mail::failures()) > 0) { - $this->logMailError(Mail::failures()); + return $this->logMailError(Mail::failures(), $this->payment->client); } } - private function logMailError($errors) - { - SystemLogger::dispatch( - $errors, - SystemLog::CATEGORY_MAIL, - SystemLog::EVENT_MAIL_SEND, - SystemLog::TYPE_FAILURE, - $this->payment->client - ); - } + } diff --git a/app/Jobs/Mail/EntitySentMailer.php b/app/Jobs/Mail/EntitySentMailer.php index 58a2d73c49b4..d666b20c2ee7 100644 --- a/app/Jobs/Mail/EntitySentMailer.php +++ b/app/Jobs/Mail/EntitySentMailer.php @@ -82,21 +82,11 @@ class EntitySentMailer extends BaseMailerJob implements ShouldQueue //catch errors if (count(Mail::failures()) > 0) { - $this->logMailError(Mail::failures()); + return $this->logMailError(Mail::failures(), $this->entity->client); } } - private function logMailError($errors) - { - SystemLogger::dispatch( - $errors, - SystemLog::CATEGORY_MAIL, - SystemLog::EVENT_MAIL_SEND, - SystemLog::TYPE_FAILURE, - $this->entity->client - ); - } } diff --git a/app/Jobs/Mail/EntityViewedMailer.php b/app/Jobs/Mail/EntityViewedMailer.php index 140ce8806bcc..5186b03d86e5 100644 --- a/app/Jobs/Mail/EntityViewedMailer.php +++ b/app/Jobs/Mail/EntityViewedMailer.php @@ -83,21 +83,11 @@ class EntityViewedMailer extends BaseMailerJob implements ShouldQueue //catch errors if (count(Mail::failures()) > 0) { - $this->logMailError(Mail::failures()); + return $this->logMailError(Mail::failures(), $this->invoice->client); } } - private function logMailError($errors) - { - SystemLogger::dispatch( - $errors, - SystemLog::CATEGORY_MAIL, - SystemLog::EVENT_MAIL_SEND, - SystemLog::TYPE_FAILURE, - $this->invoice->client - ); - } } diff --git a/app/Jobs/Mail/PaymentFailureMailer.php b/app/Jobs/Mail/PaymentFailureMailer.php index 9e966f8524a6..291708a9a44a 100644 --- a/app/Jobs/Mail/PaymentFailureMailer.php +++ b/app/Jobs/Mail/PaymentFailureMailer.php @@ -93,7 +93,7 @@ class PaymentFailureMailer extends BaseMailerJob implements ShouldQueue //catch errors if (count(Mail::failures()) > 0) { - $this->logMailError(Mail::failures()); + return $this->logMailError(Mail::failures(), $this->client); } } @@ -102,16 +102,5 @@ class PaymentFailureMailer extends BaseMailerJob implements ShouldQueue } - private function logMailError($errors) - { - SystemLogger::dispatch( - $errors, - SystemLog::CATEGORY_MAIL, - SystemLog::EVENT_MAIL_SEND, - SystemLog::TYPE_FAILURE, - $this->client - ); - } - } diff --git a/app/Jobs/User/UserEmailChanged.php b/app/Jobs/User/UserEmailChanged.php index 4dd5a7f23808..5af84671c291 100644 --- a/app/Jobs/User/UserEmailChanged.php +++ b/app/Jobs/User/UserEmailChanged.php @@ -72,7 +72,7 @@ class UserEmailChanged extends BaseMailerJob implements ShouldQueue //Catch errors and report. if (count(Mail::failures()) > 0) { - $this->logMailError(Mail::failures()); + return $this->logMailError(Mail::failures(), $this->company); } } @@ -94,15 +94,4 @@ class UserEmailChanged extends BaseMailerJob implements ShouldQueue ]; } - private function logMailError($errors) - { - SystemLogger::dispatch( - $errors, - SystemLog::CATEGORY_MAIL, - SystemLog::EVENT_MAIL_SEND, - SystemLog::TYPE_FAILURE, - $this->company - ); - } - }