From fe2c410ef75d7a4379e53f034e3adc7b59ded3cc Mon Sep 17 00:00:00 2001 From: = Date: Fri, 4 Jun 2021 20:20:10 +1000 Subject: [PATCH] Company Import --- app/Jobs/Company/CompanyExport.php | 2 +- app/Jobs/Company/CompanyImport.php | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/Jobs/Company/CompanyExport.php b/app/Jobs/Company/CompanyExport.php index 256448b97dd9..2b7a942fd73d 100644 --- a/app/Jobs/Company/CompanyExport.php +++ b/app/Jobs/Company/CompanyExport.php @@ -168,7 +168,7 @@ class CompanyExport implements ShouldQueue $this->export_data['company'] = $this->company->toArray(); - $this->export_data['company_gateways'] = $this->company->company_gateways->map(function ($company_gateway){ + $this->export_data['company_gateways'] = $this->company->company_gateways->withTrashed()->cursor()->map(function ($company_gateway){ $company_gateway = $this->transformArrayOfKeys($company_gateway, ['company_id', 'user_id']); $company_gateway->config = decrypt($company_gateway->config); diff --git a/app/Jobs/Company/CompanyImport.php b/app/Jobs/Company/CompanyImport.php index 5453a7abc5a6..1efb528d8e2d 100644 --- a/app/Jobs/Company/CompanyImport.php +++ b/app/Jobs/Company/CompanyImport.php @@ -1115,10 +1115,14 @@ class CompanyImport implements ShouldQueue return null; if (! array_key_exists($resource, $this->ids)) { + nlog($this->ids); + nlog($this->backup_file->payments); throw new \Exception("Resource {$resource} not available."); } if (! array_key_exists("{$old}", $this->ids[$resource])) { + nlog($this->ids); + nlog($this->backup_file->payments); throw new \Exception("Missing {$resource} key: {$old}"); }