From 802490a7ee9116a4e77e2e505fd8ee020e9c6db9 Mon Sep 17 00:00:00 2001
From: = <turbo124@gmail.com>
Date: Mon, 25 Jul 2022 09:01:15 +1000
Subject: [PATCH] Refactor for logos in dockerfile

---
 app/Jobs/Util/UploadAvatar.php             |  3 ---
 app/Models/Presenters/CompanyPresenter.php | 20 +++++++++++++++++++-
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/app/Jobs/Util/UploadAvatar.php b/app/Jobs/Util/UploadAvatar.php
index 48d7bfe5a459..9d7b8c2464cc 100644
--- a/app/Jobs/Util/UploadAvatar.php
+++ b/app/Jobs/Util/UploadAvatar.php
@@ -44,9 +44,6 @@ class UploadAvatar implements ShouldQueue
 
         $path = Storage::putFile($this->directory, new File(sys_get_temp_dir().'/'.$tmp_file));
 
-        // info($path);
-        // info($tmp_file);
-
         $url = Storage::url($path);
 
         //return file path
diff --git a/app/Models/Presenters/CompanyPresenter.php b/app/Models/Presenters/CompanyPresenter.php
index 8106844991d0..9ed69a506926 100644
--- a/app/Models/Presenters/CompanyPresenter.php
+++ b/app/Models/Presenters/CompanyPresenter.php
@@ -46,6 +46,24 @@ class CompanyPresenter extends EntityPresenter
 
     }
 
+    public function logoDocker($settings = null)
+    {
+        
+        if (! $settings) {
+            $settings = $this->entity->settings;
+        }
+
+        $basename = basename($this->settings->company_logo);
+
+        $logo = Storage::get("{$this->company_key}/{$basename}");
+
+        if(!$logo)
+            return $this->logo($settings);
+
+        return "data:image/png;base64, ". base64_encode($logo);
+
+    }
+
     /**
      * Test for using base64 encoding
      */
@@ -56,7 +74,7 @@ class CompanyPresenter extends EntityPresenter
         }
 
         if(config('ninja.is_docker') || config('ninja.local_download'))
-            return $this->logo($settings);
+            return $this->logoDocker($settings);
 
         $context_options =array(
             "ssl"=>array(