From d33707335577086b1bbfce9887d2d59caa98a78f Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 29 Jun 2021 09:35:58 +1000
Subject: [PATCH] Fixes for company import

---
 app/Jobs/Company/CompanyImport.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/Jobs/Company/CompanyImport.php b/app/Jobs/Company/CompanyImport.php
index 2d9cdbed8d79..8666cec05171 100644
--- a/app/Jobs/Company/CompanyImport.php
+++ b/app/Jobs/Company/CompanyImport.php
@@ -385,7 +385,7 @@ class CompanyImport implements ShouldQueue
 
         foreach($this->importables as $import){
 
-            $method = "import_{$import} ";
+            $method = "import_{$import}";
 
             nlog($method);
 
@@ -1147,6 +1147,10 @@ class CompanyImport implements ShouldQueue
 
         foreach($this->backup_file->{$object_property} as $obj)
         {
+
+            if(is_null($obj))
+                continue;
+            
             /* Remove unwanted keys*/
             $obj_array = (array)$obj;
             foreach($unset as $un){
@@ -1274,7 +1278,8 @@ class CompanyImport implements ShouldQueue
             // nlog($this->ids[$resource]);
             nlog("searching for {$old} in {$resource}");
 
-            nlog("If we are missing a user - default to the company owner")
+            nlog("If we are missing a user - default to the company owner");
+            
             if($resource == 'users')
                 return $this->company_owner->id;