Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-04 01:07:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5957 from turbo124/v5-develop

Browse Source 
Fixes for pre flight checks:
This commit is contained in:
David Bomba 2021-06-08 15:06:11 +10:00 committed by GitHub
commit 9a0c779f07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Jobs/Company/CompanyImport.php
View File

@ -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;