From b8db1d5d2201e1a93e92f2c831a3c4759ef0975a Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 8 Jun 2021 15:05:51 +1000
Subject: [PATCH] Fixes for pre flight checks:

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

diff --git a/app/Jobs/Company/CompanyImport.php b/app/Jobs/Company/CompanyImport.php
index 1239f3eaf390..b1ed1e9c6bfb 100644
--- a/app/Jobs/Company/CompanyImport.php
+++ b/app/Jobs/Company/CompanyImport.php
@@ -165,14 +165,15 @@ class CompanyImport implements ShouldQueue
         // nlog($this->backup_file);
 
         if(array_key_exists('import_settings', $this->request_array) && $this->request_array['import_settings'] == 'true') {
-            $this->preFlightChecks()->importSettings();
+            $this->checkUserCount()->preFlightChecks()->importSettings();
         }
 
         if(array_key_exists('import_data', $this->request_array) && $this->request_array['import_data'] == 'true') {
 
             try{
 
-                $this->preFlightChecks()
+                $this->checkUserCount()
+                     ->preFlightChecks()
                      ->purgeCompanyData()
                      ->importData();
 
@@ -277,8 +278,6 @@ class CompanyImport implements ShouldQueue
             //perform some magic here
         }
         
-        $this->checkUserCount();
-
         if(!$this->pre_flight_checks_pass)
         {
             $nmo = new NinjaMailerObject;