mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-06-05 22:24:35 -04:00
Merge pull request #5958 from turbo124/v5-develop
Fixes for pre flight checks:
This commit is contained in:
commit
3fd6564af1
@ -258,7 +258,6 @@ class CompanyImport implements ShouldQueue
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->pre_flight_checks_pass = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
@ -278,7 +277,7 @@ class CompanyImport implements ShouldQueue
|
|||||||
//perform some magic here
|
//perform some magic here
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!$this->pre_flight_checks_pass)
|
if($this->pre_flight_checks_pass === false)
|
||||||
{
|
{
|
||||||
$nmo = new NinjaMailerObject;
|
$nmo = new NinjaMailerObject;
|
||||||
$nmo->mailable = new CompanyImportFailure($this->company, $this->message);
|
$nmo->mailable = new CompanyImportFailure($this->company, $this->message);
|
||||||
@ -349,6 +348,8 @@ class CompanyImport implements ShouldQueue
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
nlog("finished importing company data");
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user