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

Remove invitation_id from activities import table

Browse Source
This commit is contained in:
David Bomba 2021-12-14 08:37:30 +11:00
parent 74789366dd
commit a6678197eb
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -874,20 +874,13 @@ class CompanyImport implements ShouldQueue
$activities = []; $activities = [];
// foreach($this->backup_file->activities as $activity)
// foreach((object)$this->getObject("activities") as $obj)
// {
// $activity->account_id = $this->account->id;
// $activities[] = $activity;
// }
// $this->backup_file->activities = $activities;
$this->genericNewClassImport(Activity::class, $this->genericNewClassImport(Activity::class,
[ [
'hashed_id', 'hashed_id',
'company_id', 'company_id',
'backup', 'backup',
'invitation_id',
], ],
[ [
['users' => 'user_id'], ['users' => 'user_id'],
@ -903,7 +896,7 @@ class CompanyImport implements ShouldQueue
['quotes' => 'quote_id'], ['quotes' => 'quote_id'],
['subscriptions' => 'subscription_id'], ['subscriptions' => 'subscription_id'],
['recurring_invoices' => 'recurring_invoice_id'], ['recurring_invoices' => 'recurring_invoice_id'],
['invitations' => 'invitation_id'], // ['invitations' => 'invitation_id'],
], ],
'activities'); 'activities');
@ -1438,7 +1431,9 @@ class CompanyImport implements ShouldQueue
} }
if (! array_key_exists($resource, $this->ids)) { if (! array_key_exists($resource, $this->ids)) {
// nlog($this->ids); 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.");
throw new \Exception("Resource {$resource} not available."); throw new \Exception("Resource {$resource} not available.");