From c60e2504b9cde89a900f0a164b09d35be2e8f371 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20Duli=C3=A7i?= <denisdulici@gmail.com>
Date: Thu, 26 Oct 2023 23:59:06 +0300
Subject: [PATCH] fixed default return

---
 app/Traits/Settings.php | 8 +++++---
 app/Utilities/Info.php  | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/Traits/Settings.php b/app/Traits/Settings.php
index 6032bfabd82..04b1d9e35f4 100644
--- a/app/Traits/Settings.php
+++ b/app/Traits/Settings.php
@@ -9,12 +9,12 @@ trait Settings
 {
     use Companies;
 
-    public function getSettingValue(string $key, mixed $default = ''): mixed
+    public function getSettingValue(string $key, mixed $default = null): mixed
     {
         $settings = setting()->all();
 
         if (! empty($settings)) {
-            return setting($key);
+            return setting($key, $default);
         }
 
         $company_id = $this->getCompanyId();
@@ -23,6 +23,8 @@ public function getSettingValue(string $key, mixed $default = ''): mixed
             return $default;
         }
 
-        return Setting::companyId($company_id)->where('key', $key)->pluck('value')->first();
+        $value = Setting::companyId($company_id)->where('key', $key)->pluck('value')->first();
+
+        return $value ?: $default;
     }
 }
diff --git a/app/Utilities/Info.php b/app/Utilities/Info.php
index 32ccb46adaf..28118e0a48b 100644
--- a/app/Utilities/Info.php
+++ b/app/Utilities/Info.php
@@ -93,6 +93,6 @@ public static function getApiKey(): string
     {
         $setting = new class() { use Settings; };
 
-        return $setting->getSettingValue('apps.api_key');
+        return $setting->getSettingValue('apps.api_key', '');
     }
 }