From 9585974b665b14576a6e3fa62cb9a9cb4e536abd Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 8 Jun 2021 22:58:46 +1000
Subject: [PATCH] Fixes for import json

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

diff --git a/app/Jobs/Company/CompanyImport.php b/app/Jobs/Company/CompanyImport.php
index 2699b34551cb..1c4b4eb08f4d 100644
--- a/app/Jobs/Company/CompanyImport.php
+++ b/app/Jobs/Company/CompanyImport.php
@@ -164,17 +164,18 @@ class CompanyImport implements ShouldQueue
         $this->backup_file = json_decode(base64_decode($this->backup_file));
 
         // nlog($this->backup_file);
+        $this->checkUserCount();
 
         if(array_key_exists('import_settings', $this->request_array) && $this->request_array['import_settings'] == 'true') {
-            $this->checkUserCount()->preFlightChecks()->importSettings();
+            
+            $this->preFlightChecks()->importSettings();
         }
 
         if(array_key_exists('import_data', $this->request_array) && $this->request_array['import_data'] == 'true') {
 
             try{
 
-                $this->checkUserCount()
-                     ->preFlightChecks()
+                $this->preFlightChecks()
                      ->purgeCompanyData()
                      ->importData();