From 329d3595baaec0a5bc274e8c3289aed5e5f9b2e3 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 15 Feb 2023 23:09:27 +1100 Subject: [PATCH] Fixes for invoiceemailengine --- app/Jobs/Mail/NinjaMailerJob.php | 11 ++--------- app/Mail/Engine/InvoiceEmailEngine.php | 4 ++-- app/Providers/AppServiceProvider.php | 2 +- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/app/Jobs/Mail/NinjaMailerJob.php b/app/Jobs/Mail/NinjaMailerJob.php index 8511280b2cdd..ecaf942e9e37 100644 --- a/app/Jobs/Mail/NinjaMailerJob.php +++ b/app/Jobs/Mail/NinjaMailerJob.php @@ -138,8 +138,6 @@ class NinjaMailerJob implements ShouldQueue $mailer->mailgun_config($this->client_mailgun_secret, $this->client_mailgun_domain); } -nlog($this->nmo->to_user->email); - $mailer ->to($this->nmo->to_user->email) ->send($this->nmo->mailable); @@ -395,9 +393,8 @@ nlog($this->nmo->to_user->email); * as the Mailer */ private function setPostmarkMailer() - {nlog("configuring postmark"); + { if(strlen($this->nmo->settings->postmark_secret) > 2){ - nlog($this->nmo->settings->postmark_secret); $this->client_postmark_secret = $this->nmo->settings->postmark_secret; } else{ @@ -409,8 +406,7 @@ nlog($this->nmo->to_user->email); $sending_email = (isset($this->nmo->settings->custom_sending_email) && stripos($this->nmo->settings->custom_sending_email, "@")) ? $this->nmo->settings->custom_sending_email : $user->email; $sending_user = (isset($this->nmo->settings->email_from_name) && strlen($this->nmo->settings->email_from_name) > 2) ? $this->nmo->settings->email_from_name : $user->name(); -nlog($sending_email); -nlog($sending_user); + $this->nmo ->mailable ->from($sending_email, $sending_user); @@ -653,9 +649,6 @@ nlog($sending_user); public function failed($exception = null) { - if($exception) - nlog($exception->getMessage()); - config(['queue.failed.driver' => null]); } diff --git a/app/Mail/Engine/InvoiceEmailEngine.php b/app/Mail/Engine/InvoiceEmailEngine.php index a089c0696af6..598db7a00a3d 100644 --- a/app/Mail/Engine/InvoiceEmailEngine.php +++ b/app/Mail/Engine/InvoiceEmailEngine.php @@ -213,8 +213,8 @@ class InvoiceEmailEngine extends BaseEmailEngine } } - + } + return $this; } } -} \ No newline at end of file diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index f7a75620ecf9..a0c93ab683fb 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -94,7 +94,7 @@ class AppServiceProvider extends ServiceProvider }); Mailer::macro('postmark_config', function (string $postmark_key) { - nlog($postmark_key); + Mailer::setSymfonyTransport(app('mail.manager')->createSymfonyTransport([ 'transport' => 'postmark', 'token' => $postmark_key