From 4ad3e7fc8a97c1e4b09dd641d05137a60b729d37 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 14 Jan 2021 08:01:27 +1100 Subject: [PATCH] Fix for group_settings_id being dropped in certain edge cases --- app/Http/Requests/Client/StoreClientRequest.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Http/Requests/Client/StoreClientRequest.php b/app/Http/Requests/Client/StoreClientRequest.php index 6d70b3a29302..b9cb4f1a15d6 100644 --- a/app/Http/Requests/Client/StoreClientRequest.php +++ b/app/Http/Requests/Client/StoreClientRequest.php @@ -85,10 +85,12 @@ class StoreClientRequest extends Request $input = $this->decodePrimaryKeys($input); + if(isset($input['group_settings_id'])) + $input['group_settings_id'] = $this->decodePrimaryKey($input['group_settings_id']); //is no settings->currency_id is set then lets dive in and find either a group or company currency all the below may be redundant!! if (! property_exists($settings, 'currency_id') && isset($input['group_settings_id'])) { - $input['group_settings_id'] = $this->decodePrimaryKey($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)) {