Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-05 03:44:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

FIxes for CompanyImport

Browse Source
This commit is contained in:
David Bomba 2021-08-25 16:58:23 +10:00
parent 4774f22591
commit 611110c35a
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.3.0 5.3.1

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

@ -984,6 +984,8 @@ class CompanyImport implements ShouldQueue
$cu_array = (array)$cu; $cu_array = (array)$cu;
unset($cu_array['id']); unset($cu_array['id']);
unset($cu_array['company_id']);
unset($cu_array['user_id']);
$new_cu = CompanyUser::firstOrNew( $new_cu = CompanyUser::firstOrNew(
['user_id' => $user_id, 'company_id' => $this->company->id], ['user_id' => $user_id, 'company_id' => $this->company->id],
@ -1102,6 +1104,18 @@ class CompanyImport implements ShouldQueue
unset($obj_array[$un]); unset($obj_array[$un]);
} }
if($class instanceof CompanyGateway){
if(Ninja::isHosted() && $obj_array['gateway_key'] == 'd14dd26a37cecc30fdd65700bfb55b23'){
$obj_array['gateway_key'] = 'd14dd26a47cecc30fdd65700bfb67b34';
}
if(Ninja::isSelfHost() && $obj_array['gateway_key'] == 'd14dd26a47cecc30fdd65700bfb67b34'){
$obj_array['gateway_key'] = 'd14dd26a37cecc30fdd65700bfb55b23';
}
}
$activity_invitation_key = false; $activity_invitation_key = false;
if($class == 'App\Models\Activity'){ if($class == 'App\Models\Activity'){

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.0', 'app_version' => '5.3.1',
'app_tag' => '5.3.0', 'app_tag' => '5.3.1',
'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', ''),