diff --git a/app/Http/Controllers/BankIntegrationController.php b/app/Http/Controllers/BankIntegrationController.php index a67bfbd7df..a8fad163c3 100644 --- a/app/Http/Controllers/BankIntegrationController.php +++ b/app/Http/Controllers/BankIntegrationController.php @@ -280,7 +280,7 @@ class BankIntegrationController extends BaseController $account = $nordigen->getAccount($bank_integration->nordigen_account_id); - if(is_array($account) && !in_array($account['account_status'], ['READY', 'PROCESSING','DISCOVERED'])) { + if(is_array($account) && isset($account['account_status']) &&!in_array($account['account_status'], ['READY', 'PROCESSING','DISCOVERED'])) { $bank_integration->disabled_upstream = true; $bank_integration->save(); diff --git a/app/Http/Requests/Client/UpdateClientRequest.php b/app/Http/Requests/Client/UpdateClientRequest.php index bb94bd661d..a3497ac7ad 100644 --- a/app/Http/Requests/Client/UpdateClientRequest.php +++ b/app/Http/Requests/Client/UpdateClientRequest.php @@ -106,9 +106,11 @@ class UpdateClientRequest extends Request $user = auth()->user(); /* If the user removes the currency we must always set the default */ - if (array_key_exists('settings', $input) && ! array_key_exists('currency_id', $input['settings'])) { - $input['settings']['currency_id'] = (string) $user->company()->settings->currency_id; - } elseif (empty($input['settings']['currency_id']) ?? true) { + // if (array_key_exists('settings', $input) && ! array_key_exists('currency_id', $input['settings'])) { + // $input['settings']['currency_id'] = (string) $user->company()->settings->currency_id; + // } else //2025-03-11 fixes for currency_id not being set + + if (empty($input['settings']['currency_id'])) { $input['settings']['currency_id'] = (string) $user->company()->settings->currency_id; }