diff --git a/src/Libraries/Nop.Services/Localization/LocalizationExtensions.cs b/src/Libraries/Nop.Services/Localization/LocalizationExtensions.cs
index aa80fcf3d87..4f175c5e91b 100644
--- a/src/Libraries/Nop.Services/Localization/LocalizationExtensions.cs
+++ b/src/Libraries/Nop.Services/Localization/LocalizationExtensions.cs
@@ -126,11 +126,12 @@ public static class LocalizationExtensions
/// Settings
/// Key selector
/// Language identifier
+ /// Store identifier
/// A value indicating whether to return default value (if localized is not found)
/// A value indicating whether to ensure that we have at least two published languages; otherwise, load only default value
/// Localized property
public static string GetLocalizedSetting(this T settings,
- Expression> keySelector, int languageId,
+ Expression> keySelector, int languageId, int storeId,
bool returnDefaultValue = true, bool ensureTwoPublishedLanguages = true)
where T : ISettings, new()
{
@@ -139,7 +140,7 @@ public static class LocalizationExtensions
string key = settings.GetSettingKey(keySelector);
//we do not support localized settings per store (overridden store settings)
- var setting = settingService.GetSetting(key, storeId: 0, loadSharedValueIfNotFound: false);
+ var setting = settingService.GetSetting(key, storeId: storeId, loadSharedValueIfNotFound: true);
if (setting == null)
return null;
diff --git a/src/Plugins/Nop.Plugin.Payments.CheckMoneyOrder/Controllers/PaymentCheckMoneyOrderController.cs b/src/Plugins/Nop.Plugin.Payments.CheckMoneyOrder/Controllers/PaymentCheckMoneyOrderController.cs
index 517e65aaa58..88726c1ef5d 100644
--- a/src/Plugins/Nop.Plugin.Payments.CheckMoneyOrder/Controllers/PaymentCheckMoneyOrderController.cs
+++ b/src/Plugins/Nop.Plugin.Payments.CheckMoneyOrder/Controllers/PaymentCheckMoneyOrderController.cs
@@ -47,7 +47,7 @@ public ActionResult Configure()
//locales
AddLocales(_languageService, model.Locales, (locale, languageId) =>
{
- locale.DescriptionText = checkMoneyOrderPaymentSettings.GetLocalizedSetting(x => x.DescriptionText, languageId, false, false);
+ locale.DescriptionText = checkMoneyOrderPaymentSettings.GetLocalizedSetting(x => x.DescriptionText, languageId, 0, false, false);
});
model.AdditionalFee = checkMoneyOrderPaymentSettings.AdditionalFee;
model.AdditionalFeePercentage = checkMoneyOrderPaymentSettings.AdditionalFeePercentage;
@@ -114,7 +114,7 @@ public ActionResult PaymentInfo()
var model = new PaymentInfoModel
{
- DescriptionText = checkMoneyOrderPaymentSettings.GetLocalizedSetting(x => x.DescriptionText, _workContext.WorkingLanguage.Id)
+ DescriptionText = checkMoneyOrderPaymentSettings.GetLocalizedSetting(x => x.DescriptionText, _workContext.WorkingLanguage.Id, _storeContext.CurrentStore.Id)
};
return View("~/Plugins/Payments.CheckMoneyOrder/Views/PaymentCheckMoneyOrder/PaymentInfo.cshtml", model);