Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-05 00:14:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6151 from turbo124/v5-develop

Browse Source 
Send mails after company import
This commit is contained in:
David Bomba 2021-06-29 10:04:29 +10:00 committed by GitHub
commit c369fc8c5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,7 @@ use App\Libraries\MultiDB;
use App\Mail\DownloadBackup; use App\Mail\DownloadBackup;
use App\Mail\DownloadInvoices; use App\Mail\DownloadInvoices;
use App\Mail\Import\CompanyImportFailure; use App\Mail\Import\CompanyImportFailure;
use App\Mail\Import\ImportCompleted;
use App\Models\Activity; use App\Models\Activity;
use App\Models\Backup; use App\Models\Backup;
use App\Models\Client; use App\Models\Client;
@ -193,6 +194,17 @@ class CompanyImport implements ShouldQueue
->purgeCompanyData() ->purgeCompanyData()
->importData(); ->importData();
$data = [
'errors' => []
];
$nmo = new NinjaMailerObject;
$nmo->mailable = new ImportCompleted($this->company, $data);
$nmo->company = $this->company;
$nmo->settings = $this->company->settings;
$nmo->to_user = $this->company->owner();
NinjaMailerJob::dispatchNow($nmo);
} }
catch(\Exception $e){ catch(\Exception $e){
@ -324,14 +336,9 @@ class CompanyImport implements ShouldQueue
if($this->pre_flight_checks_pass === false) if($this->pre_flight_checks_pass === false)
{ {
$nmo = new NinjaMailerObject;
$nmo->mailable = new CompanyImportFailure($this->company, $this->message);
$nmo->company = $this->company;
$nmo->settings = $this->company->settings;
$nmo->to_user = $this->company->owner();
NinjaMailerJob::dispatchNow($nmo);
nlog($this->message); $this->sendImportMail($this->message);
throw new \Exception($this->message); throw new \Exception($this->message);
} }
@ -393,7 +400,7 @@ class CompanyImport implements ShouldQueue
} }
nlog("finished importing company data"); nlog("finished importing company data");
return $this; return $this;
@ -1150,7 +1157,7 @@ class CompanyImport implements ShouldQueue
if(is_null($obj)) if(is_null($obj))
continue; continue;
/* Remove unwanted keys*/ /* Remove unwanted keys*/
$obj_array = (array)$obj; $obj_array = (array)$obj;
foreach($unset as $un){ foreach($unset as $un){
@ -1271,6 +1278,8 @@ class CompanyImport implements ShouldQueue
if (! array_key_exists($resource, $this->ids)) { if (! array_key_exists($resource, $this->ids)) {
// nlog($this->ids); // nlog($this->ids);
$this->sendImportMail("The Import failed due to missing data in the import file. Resource {$resource} not available.");
throw new \Exception("Resource {$resource} not available."); throw new \Exception("Resource {$resource} not available.");
} }
@ -1283,6 +1292,8 @@ class CompanyImport implements ShouldQueue
if($resource == 'users') if($resource == 'users')
return $this->company_owner->id; return $this->company_owner->id;
$this->sendImportMail("The Import failed due to missing data in the import file. Resource {$resource} not available.");
throw new \Exception("Missing {$resource} key: {$old}"); throw new \Exception("Missing {$resource} key: {$old}");
} }
@ -1290,4 +1301,15 @@ class CompanyImport implements ShouldQueue
} }
private function sendImportMail($message){
$nmo = new NinjaMailerObject;
$nmo->mailable = new CompanyImportFailure($this->company, $message);
$nmo->company = $this->company;
$nmo->settings = $this->company->settings;
$nmo->to_user = $this->company->owner();
NinjaMailerJob::dispatchNow($nmo);
}
} }