From 0d2cf667769cf05508bcf2897e9271718666ed0e Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 17 Jun 2021 21:55:56 +1000 Subject: [PATCH] Fixes for BCC list --- app/DataMapper/CompanySettings.php | 4 ++-- app/Jobs/Mail/NinjaMailerJob.php | 9 ++++++++- app/Mail/TemplateEmail.php | 3 --- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/DataMapper/CompanySettings.php b/app/DataMapper/CompanySettings.php index bbe3f67a0abd..cbb75ee2291f 100644 --- a/app/DataMapper/CompanySettings.php +++ b/app/DataMapper/CompanySettings.php @@ -152,8 +152,8 @@ class CompanySettings extends BaseSettings public $email_sending_method = 'default'; //enum 'default','gmail' //@implemented public $gmail_sending_user_id = '0'; //@implemented - public $reply_to_email = ''; //@TODO - public $reply_to_name = ''; //@TODO + public $reply_to_email = ''; //@implemented + public $reply_to_name = ''; //@implemented public $bcc_email = ''; //@TODO public $pdf_email_attachment = false; //@implemented public $ubl_email_attachment = false; //@implemented diff --git a/app/Jobs/Mail/NinjaMailerJob.php b/app/Jobs/Mail/NinjaMailerJob.php index f4d0a85deb8d..411f5c0682b6 100644 --- a/app/Jobs/Mail/NinjaMailerJob.php +++ b/app/Jobs/Mail/NinjaMailerJob.php @@ -98,11 +98,17 @@ class NinjaMailerJob implements ShouldQueue $this->nmo->mailable->replyTo($this->company->owner()->email, $this->company->owner()->present()->name()); } + $this->nmo->mailable->bcc('poop@gmail.com', 'hi'); + + $bcc_list = []; if (strlen($this->nmo->settings->bcc_email) > 1) { - $this->nmo->mailable->bcc(explode(",", $this->nmo->settings->bcc_email)); + foreach(explode(",", $this->nmo->settings->bcc_email) as $bcc){ + $bcc_list[] = [$bcc, 'Blind Copy']; + } + // $this->nmo->mailable->bcc($bcc_list); } @@ -112,6 +118,7 @@ class NinjaMailerJob implements ShouldQueue Mail::mailer($this->mailer) ->to($this->nmo->to_user->email) + ->bcc($bcc_list) ->send($this->nmo->mailable); LightLogs::create(new EmailSuccess($this->nmo->company->company_key)) diff --git a/app/Mail/TemplateEmail.php b/app/Mail/TemplateEmail.php index e941024b85b2..5d7f2ccc454e 100644 --- a/app/Mail/TemplateEmail.php +++ b/app/Mail/TemplateEmail.php @@ -80,9 +80,6 @@ class TemplateEmail extends Mailable $this->from(config('mail.from.address'), $this->company->present()->name()); - // if (strlen($settings->bcc_email) > 1) - // $this->bcc(explode(",",$settings->bcc_email), 'BCC'); - $this->subject($this->build_email->getSubject()) ->text('email.template.plain', [ 'body' => $this->build_email->getBody(),