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.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Discount service - rename method
supporta7eff48e0fa5
diff --git a/src/Business/Grand.Business.Catalog/Services/Discounts/DiscountService.cs b/src/Business/Grand.Business.Catalog/Services/Discounts/DiscountService.csindex 09642da03..8e9862e67 100644--- a/src/Business/Grand.Business.Catalog/Services/Discounts/DiscountService.cs+++ b/src/Business/Grand.Business.Catalog/Services/Discounts/DiscountService.cs@@ -185,20 +185,20 @@ namespace Grand.Business.Catalog.Services.Discounts//event notificationawait _mediator.EntityDeleted(discount);}-+/// <summary>- /// Load discount by system name+ /// Load discount provider by rule system name/// </summary>- /// <param name="systemName">System name</param>+ /// <param name="rulesystemName">Rule system name</param>/// <returns>Found discount</returns>- public virtual IDiscountProvider LoadDiscountProviderBySystemName(string systemName)+ public virtual IDiscountProvider LoadDiscountProviderByRuleSystemName(string rulesystemName){var discountPlugins = LoadAllDiscountProviders();foreach (var discountPlugin in discountPlugins){var rules = discountPlugin.GetRequirementRules();- if (!rules.Any(x => x.SystemName == systemName))+ if (!rules.Any(x => x.SystemName.Equals(rulesystemName, StringComparison.OrdinalIgnoreCase)))continue;return discountPlugin;}@@ -523,7 +523,7 @@ namespace Grand.Business.Catalog.Services.Discountsforeach (var rule in discountRules){//load a plugin- var discountRequirementPlugin = LoadDiscountProviderBySystemName(rule.DiscountRequirementRuleSystemName);+ var discountRequirementPlugin = LoadDiscountProviderByRuleSystemName(rule.DiscountRequirementRuleSystemName);if (discountRequirementPlugin == null)continue;@@ -538,8 +538,7 @@ namespace Grand.Business.Catalog.Services.DiscountsCustomer = customer,Store = _workContext.CurrentStore};-- var singleRequirementRule = discountRequirementPlugin.GetRequirementRules().Single(x => x.SystemName == rule.DiscountRequirementRuleSystemName);+ var singleRequirementRule = discountRequirementPlugin.GetRequirementRules().FirstOrDefault(x => x.SystemName.Equals(rule.DiscountRequirementRuleSystemName, StringComparison.OrdinalIgnoreCase));var ruleResult = await singleRequirementRule.CheckRequirement(ruleRequest);if (!ruleResult.IsValid){diff --git a/src/Business/Grand.Business.Core/Interfaces/Catalog/Discounts/IDiscountService.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Discounts/IDiscountService.csindex cf1ce1aca..df51cd09e 100644--- a/src/Business/Grand.Business.Core/Interfaces/Catalog/Discounts/IDiscountService.cs+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Discounts/IDiscountService.cs@@ -46,11 +46,11 @@ namespace Grand.Business.Core.Interfaces.Catalog.DiscountsTask DeleteDiscount(Discount discount);/// <summary>- /// Loads existing discount provider by system name+ /// Loads existing discount provider by rule system name/// </summary>- /// <param name="systemName">System name</param>+ /// <param name="rulesystemName">Rule system name</param>/// <returns>Discount provider</returns>- IDiscountProvider LoadDiscountProviderBySystemName(string systemName);+ IDiscountProvider LoadDiscountProviderByRuleSystemName(string rulesystemName);/// <summary>/// Loads all available discount providersdiff --git a/src/Web/Grand.Web.Admin/Controllers/DiscountController.cs b/src/Web/Grand.Web.Admin/Controllers/DiscountController.csindex 080893c42..25548a369 100644--- a/src/Web/Grand.Web.Admin/Controllers/DiscountController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/DiscountController.cs@@ -289,7 +289,7 @@ namespace Grand.Web.Admin.Controllersif (String.IsNullOrEmpty(systemName))throw new ArgumentNullException("systemName");- var discountPlugin = _discountService.LoadDiscountProviderBySystemName(systemName);+ var discountPlugin = _discountService.LoadDiscountProviderByRuleSystemName(systemName);if (discountPlugin == null)throw new ArgumentException("Discount requirement rule could not be loaded");@@ -298,7 +298,7 @@ namespace Grand.Web.Admin.Controllersif (discount == null)throw new ArgumentException("Discount could not be loaded");- var singleRequirement = discountPlugin.GetRequirementRules().Single(x => x.SystemName == systemName);+ var singleRequirement = discountPlugin.GetRequirementRules().FirstOrDefault(x => x.SystemName.Equals(systemName, StringComparison.OrdinalIgnoreCase));string url = _discountViewModelService.GetRequirementUrlInternal(singleRequirement, discount, discountRequirementId);return Json(new { url = url });}@@ -314,7 +314,7 @@ namespace Grand.Web.Admin.Controllersif (discountRequirement == null)throw new ArgumentException("Discount requirement could not be loaded");- var discountPlugin = _discountService.LoadDiscountProviderBySystemName(discountRequirement.DiscountRequirementRuleSystemName);+ var discountPlugin = _discountService.LoadDiscountProviderByRuleSystemName(discountRequirement.DiscountRequirementRuleSystemName);if (discountPlugin == null)throw new ArgumentException("Discount requirement rule could not be loaded");diff --git a/src/Web/Grand.Web.Admin/Services/DiscountViewModelService.cs b/src/Web/Grand.Web.Admin/Services/DiscountViewModelService.csindex a905cea6f..a0024ed00 100644--- a/src/Web/Grand.Web.Admin/Services/DiscountViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/DiscountViewModelService.cs@@ -139,7 +139,7 @@ namespace Grand.Web.Admin.Services//requirementsforeach (var dr in discount.DiscountRules.OrderBy(dr => dr.Id)){- var discountPlugin = _discountService.LoadDiscountProviderBySystemName(dr.DiscountRequirementRuleSystemName);+ var discountPlugin = _discountService.LoadDiscountProviderByRuleSystemName(dr.DiscountRequirementRuleSystemName);var discountRequirement = discountPlugin.GetRequirementRules().Single(x => x.SystemName == dr.DiscountRequirementRuleSystemName);{if (discountPlugin != null)