diff --git a/app/Jobs/Company/CompanyExport.php b/app/Jobs/Company/CompanyExport.php index 64fcbeccd8b1..f79f4c2f7bd6 100644 --- a/app/Jobs/Company/CompanyExport.php +++ b/app/Jobs/Company/CompanyExport.php @@ -260,7 +260,11 @@ class CompanyExport implements ShouldQueue $invoice = $this->transformBasicEntities($invoice); $invoice = $this->transformArrayOfKeys($invoice, ['recurring_id','client_id', 'vendor_id', 'project_id', 'design_id', 'subscription_id']); - return $invoice->makeVisible(['id']); + return $invoice->makeVisible(['id', + 'private_notes', + 'user_id', + 'client_id', + 'company_id',]); })->all(); diff --git a/tests/Feature/Import/ImportCompanyTest.php b/tests/Feature/Import/ImportCompanyTest.php index dd1b6fb687d7..c87e90140f42 100644 --- a/tests/Feature/Import/ImportCompanyTest.php +++ b/tests/Feature/Import/ImportCompanyTest.php @@ -530,8 +530,7 @@ class ImportCompanyTest extends TestCase // Recurring Invoice Invitations $this->assertEquals(2, count($this->backup_json_object->recurring_invoice_invitations)); -nlog($this->backup_json_object->recurring_invoice_invitations); -nlog($this->ids); + $this->genericImport(RecurringInvoiceInvitation::class, ['user_id', 'client_contact_id', 'company_id', 'id', 'hashed_id', 'recurring_invoice_id'], [ @@ -546,6 +545,30 @@ nlog($this->ids); // Recurring Invoice Invitations + + $this->assertEquals(2, count($this->backup_json_object->invoices)); + + $this->genericImport(Invoice::class, + ['user_id', 'client_id', 'company_id', 'id', 'hashed_id', 'recurring_id','status'], + [ + ['users' => 'user_id'], + ['users' => 'assigned_user_id'], + ['recurring_invoices' => 'recurring_id'], + ['clients' => 'client_id'], + ['subscriptions' => 'subscription_id'], + ['projects' => 'project_id'], + ['vendors' => 'vendor_id'], + ], + 'invoices', + 'number'); + + $this->assertEquals(2, Invoice::count()); + +// Invoices + + + +// Invoices } private function genericNewClassImport($class, $unset, $transforms, $object_property) diff --git a/tests/Feature/Import/backup.zip b/tests/Feature/Import/backup.zip index 5260bd4b4f6d..ca7d1808bc20 100644 Binary files a/tests/Feature/Import/backup.zip and b/tests/Feature/Import/backup.zip differ