diff --git a/app/Jobs/Company/CompanyExport.php b/app/Jobs/Company/CompanyExport.php index 8fa94893d591..4404ed18a500 100644 --- a/app/Jobs/Company/CompanyExport.php +++ b/app/Jobs/Company/CompanyExport.php @@ -330,7 +330,7 @@ class CompanyExport implements ShouldQueue $quote = $this->transformArrayOfKeys($quote, ['company_id', 'user_id', 'client_contact_id', 'recurring_invoice_id']); - return $quote; + return $quote->makeVisible(['id']); })->all(); diff --git a/tests/Feature/Import/ImportCompanyTest.php b/tests/Feature/Import/ImportCompanyTest.php index ce60bcb08c6e..dd1b6fb687d7 100644 --- a/tests/Feature/Import/ImportCompanyTest.php +++ b/tests/Feature/Import/ImportCompanyTest.php @@ -531,8 +531,9 @@ class ImportCompanyTest extends TestCase $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'], + ['user_id', 'client_contact_id', 'company_id', 'id', 'hashed_id', 'recurring_invoice_id'], [ ['users' => 'user_id'], ['recurring_invoices' => 'recurring_invoice_id'], diff --git a/tests/Feature/Import/backup.zip b/tests/Feature/Import/backup.zip index fec0e85ceba8..636003960c9a 100644 Binary files a/tests/Feature/Import/backup.zip and b/tests/Feature/Import/backup.zip differ diff --git a/tests/Unit/SystemHealthTest.php b/tests/Unit/SystemHealthTest.php index 648962b4449c..9df0bcefba0d 100644 --- a/tests/Unit/SystemHealthTest.php +++ b/tests/Unit/SystemHealthTest.php @@ -34,9 +34,9 @@ class SystemHealthTest extends TestCase $this->assertTrue((bool) $results['system_health']); - $this->assertTrue($results['extensions'][0]['mysqli']); - $this->assertTrue($results['extensions'][1]['gd']); - $this->assertTrue($results['extensions'][2]['curl']); - $this->assertTrue($results['extensions'][3]['zip']); + // $this->assertTrue($results['extensions'][0]['mysqli']); + $this->assertTrue($results['extensions'][0]['gd']); + $this->assertTrue($results['extensions'][1]['curl']); + $this->assertTrue($results['extensions'][2]['zip']); } }