From 646e8b2522234e44cc1f41a11580717fa4cfe55a Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 26 Jan 2026 22:59:09 +1100
Subject: [PATCH] Fixes for base64 encoding of PNG images

---
 app/Export/CSV/RecurringInvoiceItemExport.php |  2 +-
 .../Preview/PreviewInvoiceRequest.php         |  2 +-
 app/Utils/VendorHtmlEngine.php                | 22 ++++++++++++-------
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/app/Export/CSV/RecurringInvoiceItemExport.php b/app/Export/CSV/RecurringInvoiceItemExport.php
index a397a81cea..9030a57244 100644
--- a/app/Export/CSV/RecurringInvoiceItemExport.php
+++ b/app/Export/CSV/RecurringInvoiceItemExport.php
@@ -65,7 +65,7 @@ class RecurringInvoiceItemExport extends BaseExport
         if (count($this->input['report_keys']) == 0) {
             $this->force_keys = true;
             $this->input['report_keys'] = array_values($this->mergeItemsKeys('recurring_invoice_report_keys'));
-            nlog($this->input['report_keys']);
+            // nlog($this->input['report_keys']);
         }
 
         $this->input['report_keys'] = array_merge($this->input['report_keys'], array_diff($this->forced_client_fields, $this->input['report_keys']));
diff --git a/app/Http/Requests/Preview/PreviewInvoiceRequest.php b/app/Http/Requests/Preview/PreviewInvoiceRequest.php
index bd0b0e3f0f..b260cfa335 100644
--- a/app/Http/Requests/Preview/PreviewInvoiceRequest.php
+++ b/app/Http/Requests/Preview/PreviewInvoiceRequest.php
@@ -118,7 +118,7 @@ class PreviewInvoiceRequest extends Request
         };
 
         if ($invitation) {
-            nlog($invitation->toArray());
+            // nlog($invitation->toArray());
             return $invitation;
         }
 
diff --git a/app/Utils/VendorHtmlEngine.php b/app/Utils/VendorHtmlEngine.php
index c0868d5f4a..6c10132ce7 100644
--- a/app/Utils/VendorHtmlEngine.php
+++ b/app/Utils/VendorHtmlEngine.php
@@ -12,19 +12,20 @@
 
 namespace App\Utils;
 
+use Exception;
+use App\Utils\Ninja;
 use App\Models\Account;
 use App\Models\Country;
-use App\Models\CreditInvitation;
-use App\Models\InvoiceInvitation;
-use App\Models\PurchaseOrderInvitation;
-use App\Models\QuoteInvitation;
-use App\Models\RecurringInvoiceInvitation;
 use App\Utils\Traits\AppSetup;
-use App\Utils\Traits\DesignCalculator;
+use App\Models\QuoteInvitation;
+use App\Models\CreditInvitation;
 use App\Utils\Traits\MakesDates;
-use Exception;
+use App\Models\InvoiceInvitation;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Cache;
+use App\Utils\Traits\DesignCalculator;
+use App\Models\PurchaseOrderInvitation;
+use App\Models\RecurringInvoiceInvitation;
 
 /**
  * Note the premise used here is that any currencies will be formatted back to the company currency and not
@@ -350,8 +351,13 @@ class VendorHtmlEngine
         $data['$signature'] = ['value' => $this->settings->email_signature ?: '&nbsp;', 'label' => ''];
         $data['$emailSignature'] = &$data['$signature'];
 
-        $logo = $this->company->present()->logo_base64($this->settings);
+        if (Ninja::isHosted()) {
+            $logo = $this->company->present()->logo($this->settings);
+        } else {
+            $logo = $this->company->present()->logo_base64($this->settings);
+        }
 
+        
         $data['$company.logo'] = ['value' => $logo ?: '&nbsp;', 'label' => ctrans('texts.logo')];
         $data['$company_logo'] = &$data['$company.logo'];
         $data['$company1'] = ['value' => $this->helpers->formatCustomFieldValue($this->company->custom_fields, 'company1', $this->settings->custom_value1, $this->vendor) ?: '&nbsp;', 'label' => $this->helpers->makeCustomField($this->company->custom_fields, 'company1')];