diff --git a/app/Mail/TemplateEmail.php b/app/Mail/TemplateEmail.php index 1568c290e96a..d5d95dafec8d 100644 --- a/app/Mail/TemplateEmail.php +++ b/app/Mail/TemplateEmail.php @@ -49,7 +49,8 @@ class TemplateEmail extends Mailable public function build() { - $template_name = 'email.template.'.$this->build_email->getTemplate(); + // $template_name = 'email.template.'.$this->build_email->getTemplate(); + $template_name = 'email.template.client'; if($this->build_email->getTemplate() == 'custom') { $this->build_email->setBody(str_replace('$body', $this->build_email->getBody(), $this->client->getSetting('email_style_custom'))); @@ -100,6 +101,7 @@ class TemplateEmail extends Mailable 'settings' => $settings, 'company' => $company, 'whitelabel' => $this->client->user->account->isPaid() ? true : false, + 'logo' => $this->company->present()->logo(), ]) ->withSwiftMessage(function ($message) use($company){ $message->getHeaders()->addTextHeader('Tag', $company->company_key); diff --git a/app/Utils/TemplateEngine.php b/app/Utils/TemplateEngine.php index 1632c93e17ef..b602a77e130d 100644 --- a/app/Utils/TemplateEngine.php +++ b/app/Utils/TemplateEngine.php @@ -194,6 +194,7 @@ class TemplateEngine $data['title'] = ''; $data['body'] = '$body'; $data['footer'] = ''; + $data['logo'] = auth()->user()->company()->present()->logo(); $data = array_merge($data, Helpers::sharedEmailVariables($this->entity_obj->client)); @@ -211,11 +212,17 @@ class TemplateEngine } else { $wrapper = ''; } - } else { + } + elseif ($email_style == 'plain') { $wrapper = view($this->getTemplatePath($email_style), $data)->render(); $injection = ''; $wrapper = str_replace('', $injection, $wrapper); } + else { + $wrapper = view($this->getTemplatePath('client'), $data)->render(); + $injection = ''; + $wrapper = str_replace('', $injection, $wrapper); + } $data = [ 'subject' => $this->subject, diff --git a/resources/views/email/template/client.blade.php b/resources/views/email/template/client.blade.php index 20e1bfd12a43..1701ae3c53cd 100644 --- a/resources/views/email/template/client.blade.php +++ b/resources/views/email/template/client.blade.php @@ -119,7 +119,8 @@
- {{ $slot}} + {{ $slot ?? '' }} + {!! $body ?? '' !!}