From e82d8e0d8d9eb9666ea4b95db27b718cd5d9af33 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 19 Nov 2020 22:33:14 +1100
Subject: [PATCH] Fail gracefully if cannot upload logo

---
 app/Jobs/Util/Import.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php
index 0b0b7270b3..8182653a30 100644
--- a/app/Jobs/Util/Import.php
+++ b/app/Jobs/Util/Import.php
@@ -263,10 +263,14 @@ class Import implements ShouldQueue
 
         if(isset($data['settings']->company_logo) && strlen($data['settings']->company_logo) > 0) {
 
-            $tempImage = tempnam(sys_get_temp_dir(), basename($data['settings']->company_logo));
-            copy($data['settings']->company_logo, $tempImage);
-            $this->uploadLogo($tempImage, $this->company, $this->company);
-            
+            try {
+                $tempImage = tempnam(sys_get_temp_dir(), basename($data['settings']->company_logo));
+                copy($data['settings']->company_logo, $tempImage);
+                $this->uploadLogo($tempImage, $this->company, $this->company);
+            }
+            catch(\Exception $e){
+
+            }
         }
 
         Company::reguard();
@@ -972,7 +976,7 @@ class Import implements ShouldQueue
 
             $modified['company_id'] = $this->company->id;
             $modified['client_id'] = $this->transformId('clients', $resource['client_id']);
-            $modified['user_id'] = $this->processUserId($resource);
+            //$modified['user_id'] = $this->processUserId($resource);
 
             $cgt = ClientGatewayToken::Create($modified);