From a6678197eb7281473df41502d0976cf7ae5c0936 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 14 Dec 2021 08:37:30 +1100 Subject: [PATCH] Remove invitation_id from activities import table --- app/Jobs/Company/CompanyImport.php | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/app/Jobs/Company/CompanyImport.php b/app/Jobs/Company/CompanyImport.php index 408148ef26d4..5f8f1d913b39 100644 --- a/app/Jobs/Company/CompanyImport.php +++ b/app/Jobs/Company/CompanyImport.php @@ -874,20 +874,13 @@ class CompanyImport implements ShouldQueue $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, [ 'hashed_id', 'company_id', 'backup', + 'invitation_id', ], [ ['users' => 'user_id'], @@ -903,7 +896,7 @@ class CompanyImport implements ShouldQueue ['quotes' => 'quote_id'], ['subscriptions' => 'subscription_id'], ['recurring_invoices' => 'recurring_invoice_id'], - ['invitations' => 'invitation_id'], + // ['invitations' => 'invitation_id'], ], 'activities'); @@ -1438,7 +1431,9 @@ class CompanyImport implements ShouldQueue } 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."); throw new \Exception("Resource {$resource} not available.");