waqas
/
Akaunting
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed default return

This commit is contained in:
Denis Duliçi 2023-10-26 23:59:06 +03:00
parent 252ff287de
commit c60e2504b9
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Traits/Settings.php
View File

@ -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 @@ trait Settings
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;
}
}

2
app/Utilities/Info.php
View File

@ -93,6 +93,6 @@ class Info
{
$setting = new class() { use Settings; };
return $setting->getSettingValue('apps.api_key');
return $setting->getSettingValue('apps.api_key', '');
}
}