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

Fixes for company import

Browse Source
This commit is contained in:
David Bomba 2021-12-20 15:25:40 +11:00
parent 0a065aefc1
commit 14efe94903
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -866,6 +866,7 @@ class CompanyImport implements ShouldQueue
'company_id', 'company_id',
'backup', 'backup',
'invitation_id', 'invitation_id',
'payment_id',
], ],
[ [
['users' => 'user_id'], ['users' => 'user_id'],
@ -873,7 +874,7 @@ class CompanyImport implements ShouldQueue
['client_contacts' => 'client_contact_id'], ['client_contacts' => 'client_contact_id'],
['projects' => 'project_id'], ['projects' => 'project_id'],
['vendors' => 'vendor_id'], ['vendors' => 'vendor_id'],
['payments' => 'payment_id'], // ['payments' => 'payment_id'],
['invoices' => 'invoice_id'], ['invoices' => 'invoice_id'],
['credits' => 'credit_id'], ['credits' => 'credit_id'],
['tasks' => 'task_id'], ['tasks' => 'task_id'],
@ -1418,10 +1419,9 @@ class CompanyImport implements ShouldQueue
if (! array_key_exists($resource, $this->ids)) { if (! array_key_exists($resource, $this->ids)) {
nlog($resource); nlog($resource);
nlog($this->ids);
$this->sendImportMail("The Import failed due to missing data in the import file. Resource {$resource} not available."); $this->sendImportMail("The Import failed due to missing data in the import file. Resource {$resource} not available.");
nlog($this->ids);
throw new \Exception("Resource {$resource} not available."); throw new \Exception("Resource {$resource} not available.");
} }
@ -1435,6 +1435,8 @@ class CompanyImport implements ShouldQueue
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."); $this->sendImportMail("The Import failed due to missing data in the import file. Resource {$resource} not available.");
nlog($this->ids[$resource]);
throw new \Exception("Missing {$resource} key: {$old}"); throw new \Exception("Missing {$resource} key: {$old}");
} }