Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

v5.3.85

Browse Source
This commit is contained in:
David Bomba 2022-05-04 09:29:43 +10:00
parent 0ae42195b2
commit 9c9d721866
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.3.84 5.3.85

2
app/Jobs/Company/CompanyExport.php
View File

@ -192,7 +192,7 @@ class CompanyExport implements ShouldQueue
})->all(); })->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']); $company_user = $this->transformArrayOfKeys($company_user, ['company_id', 'account_id', 'user_id']);

12
app/Jobs/Company/CompanyImport.php
View File

@ -1120,11 +1120,17 @@ class CompanyImport implements ShouldQueue
unset($cu_array['id']); unset($cu_array['id']);
unset($cu_array['company_id']); unset($cu_array['company_id']);
unset($cu_array['user_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( $new_cu = CompanyUser::withTrashed()->firstOrNew(
['user_id' => $user_id, 'company_id' => $this->company->id], ['user_id' => $user_id, 'company_id' => $this->company->id],
$cu_array, $cu_array,
); );
$new_cu->account_id = $this->account->id; $new_cu->account_id = $this->account->id;
$new_cu->save(['timestamps' => false]); $new_cu->save(['timestamps' => false]);

4
config/ninja.php
View File

@ -14,8 +14,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true), 'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => '5.3.84', 'app_version' => '5.3.85',
'app_tag' => '5.3.84', 'app_tag' => '5.3.85',
'minimum_client_version' => '5.0.16', 'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1', 'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', ''), 'api_secret' => env('API_SECRET', ''),