From 9c9d721866f91821d16893daa2b93559984bb9e8 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 4 May 2022 09:29:43 +1000 Subject: [PATCH] v5.3.85 --- VERSION.txt | 2 +- app/Jobs/Company/CompanyExport.php | 2 +- app/Jobs/Company/CompanyImport.php | 12 +++++++++--- config/ninja.php | 4 ++-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index 9baf8dbc7227..9e5a077653d6 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.3.84 \ No newline at end of file +5.3.85 \ No newline at end of file diff --git a/app/Jobs/Company/CompanyExport.php b/app/Jobs/Company/CompanyExport.php index 0ca4cc8dfd9e..3d11955eadb0 100644 --- a/app/Jobs/Company/CompanyExport.php +++ b/app/Jobs/Company/CompanyExport.php @@ -192,7 +192,7 @@ class CompanyExport implements ShouldQueue })->all(); - $this->export_data['company_users'] = $this->company->company_users->map(function ($company_user){ + $this->export_data['company_users'] = $this->company->company_users()->without(['user','account'])->cursor()->map(function ($company_user){ $company_user = $this->transformArrayOfKeys($company_user, ['company_id', 'account_id', 'user_id']); diff --git a/app/Jobs/Company/CompanyImport.php b/app/Jobs/Company/CompanyImport.php index 396ff88d34ae..da8f22a28c7b 100644 --- a/app/Jobs/Company/CompanyImport.php +++ b/app/Jobs/Company/CompanyImport.php @@ -1120,11 +1120,17 @@ class CompanyImport implements ShouldQueue unset($cu_array['id']); unset($cu_array['company_id']); unset($cu_array['user_id']); + unset($cu_array['user']); + unset($cu_array['account']); + + // $cu_array['settings'] = json_encode($cu_array['settings']); + // $cu_array['notifications'] = json_encode($cu_array['notifications']); + // $cu_array['permissions'] = json_encode($cu_array['permissions']); $new_cu = CompanyUser::withTrashed()->firstOrNew( - ['user_id' => $user_id, 'company_id' => $this->company->id], - $cu_array, - ); + ['user_id' => $user_id, 'company_id' => $this->company->id], + $cu_array, + ); $new_cu->account_id = $this->account->id; $new_cu->save(['timestamps' => false]); diff --git a/config/ninja.php b/config/ninja.php index 2b09aa28889e..869268aadea3 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -14,8 +14,8 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'), - 'app_version' => '5.3.84', - 'app_tag' => '5.3.84', + 'app_version' => '5.3.85', + 'app_tag' => '5.3.85', 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', ''),