fixed default return

akaunting · Oct 26, 2023 · c60e250 · c60e250
1 parent 252ff28
commit c60e250
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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', '');
     }
 }