Minor fixes for currency_id logic

This commit is contained in:
David Bomba 2024-03-12 13:07:09 +11:00
parent b95ce4c2ec
commit 1de5bbfdc4

View File

@ -139,7 +139,7 @@ class StoreClientRequest extends Request
if (! array_key_exists('currency_id', $input['settings']) && isset($input['group_settings_id'])) { if (! array_key_exists('currency_id', $input['settings']) && isset($input['group_settings_id'])) {
$group_settings = GroupSetting::find($input['group_settings_id']); $group_settings = GroupSetting::find($input['group_settings_id']);
if ($group_settings && property_exists($group_settings->settings, 'currency_id') && isset($group_settings->settings->currency_id)) { if ($group_settings && property_exists($group_settings->settings, 'currency_id') && is_numeric($group_settings->settings->currency_id)) {
$input['settings']['currency_id'] = (string) $group_settings->settings->currency_id; $input['settings']['currency_id'] = (string) $group_settings->settings->currency_id;
} else { } else {
$input['settings']['currency_id'] = (string) $user->company()->settings->currency_id; $input['settings']['currency_id'] = (string) $user->company()->settings->currency_id;
@ -177,8 +177,6 @@ class StoreClientRequest extends Request
$input['name'] = strip_tags($input['name']); $input['name'] = strip_tags($input['name']);
} }
$input['id'] = null;
$this->replace($input); $this->replace($input);
} }