Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

Minor changes - get settings

KrzysztofPajakf1b9c78f6603
diff --git a/src/Business/Grand.Business.Common/Services/Configuration/SettingService.cs b/src/Business/Grand.Business.Common/Services/Configuration/SettingService.cs
index 00155f544..2a0dbaf99 100644
--- a/src/Business/Grand.Business.Common/Services/Configuration/SettingService.cs
+++ b/src/Business/Grand.Business.Common/Services/Configuration/SettingService.cs
@@ -131,10 +131,10 @@ namespace Grand.Business.Common.Services.Configuration
/// <returns>Setting value</returns>
public virtual T GetSettingByKey<T>(string key, T defaultValue = default, string storeId = "")
{
- if (String.IsNullOrEmpty(key))
+ if (string.IsNullOrEmpty(key))
return defaultValue;
- string keyCache = string.Format(CacheKey.SETTINGS_BY_KEY, key, storeId);
+ var keyCache = string.Format(CacheKey.SETTINGS_BY_KEY, key, storeId);
return _cacheBase.Get<T>(keyCache, () =>
{
var settings = GetSettingsByName(key);
@@ -142,10 +142,9 @@ namespace Grand.Business.Common.Services.Configuration
if (settings.Any())
{
var setting = settings.FirstOrDefault(x => x.StoreId == storeId);
-
- //load shared value?
- if (setting == null && !String.IsNullOrEmpty(storeId))
- setting = settings.FirstOrDefault(x => x.StoreId == "");
+ //load default value?
+ if (setting == null)
+ setting = settings.FirstOrDefault(x => string.IsNullOrEmpty(x.StoreId));
if (setting != null)
return JsonSerializer.Deserialize<T>(setting.Metadata);