Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Ensure clients have a contact post import

Browse Source
This commit is contained in:
David Bomba 2021-09-21 08:04:25 +10:00
parent b2baadc429
commit 2c7dcf0a4e
1 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,6 +13,7 @@ namespace App\Jobs\Company;
use App\Exceptions\ImportCompanyFailed; use App\Exceptions\ImportCompanyFailed;
use App\Exceptions\NonExistingMigrationFile; use App\Exceptions\NonExistingMigrationFile;
use App\Factory\ClientContactFactory;
use App\Jobs\Mail\NinjaMailerJob; use App\Jobs\Mail\NinjaMailerJob;
use App\Jobs\Mail\NinjaMailerObject; use App\Jobs\Mail\NinjaMailerObject;
use App\Jobs\Util\UnlinkFile; use App\Jobs\Util\UnlinkFile;
@ -65,14 +66,15 @@ use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels; use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Facades\App;
use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Str; use Illuminate\Support\Str;
use JsonMachine\JsonDecoder\ExtJsonDecoder;
use JsonMachine\JsonMachine;
use ZipArchive; use ZipArchive;
use ZipStream\Option\Archive; use ZipStream\Option\Archive;
use ZipStream\ZipStream; use ZipStream\ZipStream;
use JsonMachine\JsonMachine;
use JsonMachine\JsonDecoder\ExtJsonDecoder;
class CompanyImport implements ShouldQueue class CompanyImport implements ShouldQueue
{ {
@ -208,7 +210,8 @@ class CompanyImport implements ShouldQueue
$this->preFlightChecks() $this->preFlightChecks()
->purgeCompanyData() ->purgeCompanyData()
->importData(); ->importData()
->postImportCleanup();
$data = [ $data = [
'errors' => [] 'errors' => []
@ -234,12 +237,32 @@ class CompanyImport implements ShouldQueue
} }
//
private function postImportCleanup()
{
//ensure all clients have a contact
$this->company
->clients()
->whereDoesntHave('contacts')
->cursor()
->each(function ($client){
$new_contact = ClientContactFactory::create($client->company_id, $client->user_id);
$new_contact->client_id = $client->id;
$new_contact->contact_key = Str::random(40);
$new_contact->is_primary = true;
$new_contact->confirmed = true;
$new_contact->email = ' ';
$new_contact->save();
});
}
private function unzipFile() private function unzipFile()
{ {
// if(mime_content_type(Storage::path($this->file_location)) == 'text/plain')
// return Storage::path($this->file_location);
$path = TempFile::filePath(Storage::disk(config('filesystems.default'))->get($this->file_location), basename($this->file_location)); $path = TempFile::filePath(Storage::disk(config('filesystems.default'))->get($this->file_location), basename($this->file_location));
$zip = new ZipArchive(); $zip = new ZipArchive();
@ -1391,6 +1414,9 @@ class CompanyImport implements ShouldQueue
private function sendImportMail($message){ private function sendImportMail($message){
App::forgetInstance('translator');
$t = app('translator');
$t->replace(Ninja::transformTranslations($this->company->settings));
$nmo = new NinjaMailerObject; $nmo = new NinjaMailerObject;
$nmo->mailable = new CompanyImportFailure($this->company, $message); $nmo->mailable = new CompanyImportFailure($this->company, $message);