From 568c0aa028119324ff9323799a08083957a7e173 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 2 Feb 2023 12:23:07 +1100 Subject: [PATCH] Update postmark sending email address for Statement mailer --- app/Services/Email/EmailMailer.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/Services/Email/EmailMailer.php b/app/Services/Email/EmailMailer.php index 6d885db2db28..55fac55979ad 100644 --- a/app/Services/Email/EmailMailer.php +++ b/app/Services/Email/EmailMailer.php @@ -322,8 +322,11 @@ class EmailMailer implements ShouldQueue $user = $this->resolveSendingUser(); + $sending_email = (isset($this->email_service->email_object->settings->custom_sending_email) && stripos($this->email_service->email_object->settings->custom_sending_email, "@")) ? $this->email_service->email_object->settings->custom_sending_email : $user->email; + $sending_user = (isset($this->email_service->email_object->settings->email_from_name) && strlen($this->email_service->email_object->settings->email_from_name) > 2) ? $this->email_service->email_object->settings->email_from_name : $user->name(); + $this->email_mailable - ->from($user->email, $user->name()); + ->from($sending_email, $sending_user); } /** @@ -342,8 +345,11 @@ class EmailMailer implements ShouldQueue $user = $this->resolveSendingUser(); + $sending_email = (isset($this->email_service->email_object->settings->custom_sending_email) && stripos($this->email_service->email_object->settings->custom_sending_email, "@")) ? $this->email_service->email_object->settings->custom_sending_email : $user->email; + $sending_user = (isset($this->email_service->email_object->settings->email_from_name) && strlen($this->email_service->email_object->settings->email_from_name) > 2) ? $this->email_service->email_object->settings->email_from_name : $user->name(); + $this->email_mailable - ->from($user->email, $user->name()); + ->from($sending_email, $sending_user); } /**