Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-30 21:54:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

company_user.settings default to null (#3416)

Browse Source
This commit is contained in:
David Bomba 2020-03-04 09:46:19 +11:00 committed by GitHub
parent 40af77d324
commit b8c26bb534
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Console/Commands/CreateTestData.php
View File

@ -201,7 +201,7 @@ class CreateTestData extends Command
'is_admin' => 1,
'is_locked' => 0,
'permissions' => '',
'settings' => new \stdClass,
'settings' => null,
]);
@ -300,7 +300,7 @@ class CreateTestData extends Command
'is_admin' => 1,
'is_locked' => 0,
'permissions' => '',
'settings' => new \stdClass,
'settings' => null,
]);

1
app/Http/Controllers/CompanyController.php
View File

@ -214,6 +214,7 @@ class CompanyController extends BaseController
'is_admin' => 1,
'is_locked' => 0,
'permissions' => '',
'settings' => null,
//'settings' => DefaultSettings::userSettings(),
]);

30
app/Http/Requests/Client/StoreClientRequest.php
View File

@ -81,22 +81,22 @@ class StoreClientRequest extends Request
$input['group_settings_id'] = $this->decodePrimaryKey($input['group_settings_id']);
}
if(empty($input['settings']) || empty($input['settings']->currency_id))
{
if(empty($input['group_settings_id']))
{
$input['settings']->currency_id = auth()->user()->company()->settings->currency_id;
}
else
{
$group_settings = GroupSetting::find($input['group_settings_id']);
// if(empty($input['settings']) || empty($input['settings']->currency_id))
// {
// if(empty($input['group_settings_id']))
// {
// $input['settings']->currency_id = auth()->user()->company()->settings->currency_id;
// }
// else
// {
// $group_settings = GroupSetting::find($input['group_settings_id']);
if($group_settings && property_exists($group_settings, 'currency_id') && is_int($group_settings->currency_id))
$input['settings']->currency_id = $group_settings->currency_id;
else
$input['settings']->currency_id = auth()->user()->company()->settings->currency_id;
}
}
// if($group_settings && property_exists($group_settings, 'currency_id') && is_int($group_settings->currency_id))
// $input['settings']->currency_id = $group_settings->currency_id;
// else
// $input['settings']->currency_id = auth()->user()->company()->settings->currency_id;
// }
// }
if(isset($input['contacts']))
{