From eb7cee706d86dc400a38699fa3f8d9dde2f4b2d9 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 13 Jan 2021 12:22:23 +1100
Subject: [PATCH] Fixes for displaying company logo in email templates

---
 app/Utils/TemplateEngine.php                          | 3 ---
 resources/views/email/partials/company_logo.blade.php | 2 +-
 resources/views/email/template/light.blade.php        | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/Utils/TemplateEngine.php b/app/Utils/TemplateEngine.php
index f464de2b32e3..898a3044650c 100644
--- a/app/Utils/TemplateEngine.php
+++ b/app/Utils/TemplateEngine.php
@@ -150,11 +150,8 @@ class TemplateEngine
 
     private function entityValues($contact)
     {
-        //$data = $this->entity_obj->buildLabelsAndValues($contact);
 
         $data = (new HtmlEngine($this->entity_obj->invitations->first()))->generateLabelsAndValues();
-        // $arrKeysLength = array_map('strlen', array_keys($data));
-        // array_multisort($arrKeysLength, SORT_DESC, $data);
 
         $this->body = strtr($this->body, $data['labels']);
         $this->body = strtr($this->body, $data['values']);
diff --git a/resources/views/email/partials/company_logo.blade.php b/resources/views/email/partials/company_logo.blade.php
index d0bf15cde2dc..e842646897e2 100644
--- a/resources/views/email/partials/company_logo.blade.php
+++ b/resources/views/email/partials/company_logo.blade.php
@@ -3,7 +3,7 @@
         <a href="{{ $settings->website }}" style="color: #19BB40; text-decoration: underline;">
     @endif
 
-    <img src="{{ $company->present()->logo() }}" height="50" style="height:50px; max-width:140px; margin-left: 33px; padding-top: 2px" alt=""/>
+    <img src="{{ $company->present()->logo($settings) }}" height="50" style="height:50px; max-width:140px; margin-left: 33px; padding-top: 2px" alt=""/>
 
     @if ($settings->website)
         </a>
diff --git a/resources/views/email/template/light.blade.php b/resources/views/email/template/light.blade.php
index 963b2b4a57a0..3fcfa139405c 100644
--- a/resources/views/email/template/light.blade.php
+++ b/resources/views/email/template/light.blade.php
@@ -1,7 +1,7 @@
 @component('email.template.master', ['design' => 'light', 'settings' => $settings, 'whitelabel' => $whitelabel])
 
 @slot('header')
-    @component('email.components.header', ['p' => $body, (strlen($settings->company_logo) > 1) ? url('') . $settings->company_logo : 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png'])
+    @component('email.components.header', ['p' => $body, 'logo' => (strlen($settings->company_logo) > 1) ? url('') . $settings->company_logo : 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png'])
         
         @if(isset($title))
             {{$title}}