From 6fecdbb62a532b8995a330ed50edef7c7e3ac9d8 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 14 Apr 2024 07:01:27 +1000 Subject: [PATCH] Fixes for premium template --- app/Console/Commands/EncryptNinja.php | 1 - app/Mail/TemplateEmail.php | 7 +++++-- app/Mail/VendorTemplateEmail.php | 7 +++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/app/Console/Commands/EncryptNinja.php b/app/Console/Commands/EncryptNinja.php index a32032934260..242d388a71d4 100644 --- a/app/Console/Commands/EncryptNinja.php +++ b/app/Console/Commands/EncryptNinja.php @@ -68,7 +68,6 @@ class EncryptNinja extends Command $contents = Storage::disk('base')->get($file); $encrypted = encrypt($contents); Storage::disk('base')->put($file.".enc", $encrypted); - // Storage::disk('base')->delete($file); } } diff --git a/app/Mail/TemplateEmail.php b/app/Mail/TemplateEmail.php index 9b841d4c4e97..e8db6271307e 100644 --- a/app/Mail/TemplateEmail.php +++ b/app/Mail/TemplateEmail.php @@ -74,11 +74,14 @@ class TemplateEmail extends Mailable { $template_name = 'email.template.'.$this->build_email->getTemplate(); - if ($this->build_email->getTemplate() == 'light' || $this->build_email->getTemplate() == 'dark') { - // $template_name = $this->company->account->isPremium() ? 'email.template.client_premium' : 'email.template.client'; + if (in_array($this->build_email->getTemplate(), ['light', 'dark'])) { $template_name = 'email.template.client'; } + if($this->build_email->getTemplate() == 'premium') { + $template_name = 'email.template.client_premium'; + } + if ($this->build_email->getTemplate() == 'custom') { $this->build_email->setBody(str_replace('$body', $this->build_email->getBody().$this->buildLinksForCustomDesign(), $this->client->getSetting('email_style_custom'))); } diff --git a/app/Mail/VendorTemplateEmail.php b/app/Mail/VendorTemplateEmail.php index 752f32c80cbe..ff54cf4e1048 100644 --- a/app/Mail/VendorTemplateEmail.php +++ b/app/Mail/VendorTemplateEmail.php @@ -71,10 +71,13 @@ class VendorTemplateEmail extends Mailable { $template_name = 'email.template.'.$this->build_email->getTemplate(); - if ($this->build_email->getTemplate() == 'light' || $this->build_email->getTemplate() == 'dark') { - // $template_name = $this->company->account->isPremium() ? 'email.template.client_premium' : 'email.template.client'; + if (in_array($this->build_email->getTemplate(), ['light', 'dark'])) { $template_name = 'email.template.client'; } + + if($this->build_email->getTemplate() == 'premium') { + $template_name = 'email.template.client_premium'; + } if ($this->build_email->getTemplate() == 'custom') { $this->build_email->setBody(str_replace('$body', $this->build_email->getBody().$this->buildLinksForCustomDesign(), $this->company->getSetting('email_style_custom')));