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
Further improvements with discount requirements rule
support39e359981ba9
diff --git a/src/Business/Grand.Business.Catalog/Services/Discounts/DiscountService.cs b/src/Business/Grand.Business.Catalog/Services/Discounts/DiscountService.csindex 40e6deec5..09642da03 100644--- a/src/Business/Grand.Business.Catalog/Services/Discounts/DiscountService.cs+++ b/src/Business/Grand.Business.Catalog/Services/Discounts/DiscountService.cs@@ -519,11 +519,11 @@ namespace Grand.Business.Catalog.Services.Discounts}//discount requirements- var requirements = discount.DiscountRules.ToList();- foreach (var req in requirements)+ var discountRules = discount.DiscountRules.ToList();+ foreach (var rule in discountRules){//load a plugin- var discountRequirementPlugin = LoadDiscountProviderBySystemName(req.DiscountRequirementRuleSystemName);+ var discountRequirementPlugin = LoadDiscountProviderBySystemName(rule.DiscountRequirementRuleSystemName);if (discountRequirementPlugin == null)continue;@@ -533,14 +533,13 @@ namespace Grand.Business.Catalog.Services.Discountsvar ruleRequest = new DiscountRuleValidationRequest{- DiscountRequirementId = req.Id,- MetaData = req.Metadata,- DiscountId = discount.Id,+ DiscountRule = rule,+ Discount = discount,Customer = customer,Store = _workContext.CurrentStore};- var singleRequirementRule = discountRequirementPlugin.GetRequirementRules().Single(x => x.SystemName == req.DiscountRequirementRuleSystemName);+ var singleRequirementRule = discountRequirementPlugin.GetRequirementRules().Single(x => x.SystemName == rule.DiscountRequirementRuleSystemName);var ruleResult = await singleRequirementRule.CheckRequirement(ruleRequest);if (!ruleResult.IsValid){diff --git a/src/Business/Grand.Business.Core/Utilities/Catalog/DiscountRuleValidationRequest.cs b/src/Business/Grand.Business.Core/Utilities/Catalog/DiscountRuleValidationRequest.csindex 5e68007a0..43c8f4afb 100644--- a/src/Business/Grand.Business.Core/Utilities/Catalog/DiscountRuleValidationRequest.cs+++ b/src/Business/Grand.Business.Core/Utilities/Catalog/DiscountRuleValidationRequest.cs@@ -1,4 +1,5 @@using Grand.Domain.Customers;+using Grand.Domain.Discounts;using Grand.Domain.Stores;namespace Grand.Business.Core.Utilities.Catalog@@ -9,19 +10,14 @@ namespace Grand.Business.Core.Utilities.Catalogpublic partial class DiscountRuleValidationRequest{/// <summary>- /// Gets or sets the appropriate discount requirement ID (identifier)+ /// Gets or sets the discount/// </summary>- public string DiscountRequirementId { get; set; }+ public Discount Discount { get; set; }/// <summary>- /// Gets or sets the metadata+ /// Gets or sets the discount rule/// </summary>- public string MetaData { get; set; }-- /// <summary>- /// Gets or sets the discount ID (identifier)- /// </summary>- public string DiscountId { get; set; }+ public DiscountRule DiscountRule { get; set; }/// <summary>/// Gets or sets the customerdiff --git a/src/Plugins/DiscountRules.Standard/Manifest.cs b/src/Plugins/DiscountRules.Standard/Manifest.csindex efc5c0e20..340cc1916 100644--- a/src/Plugins/DiscountRules.Standard/Manifest.cs+++ b/src/Plugins/DiscountRules.Standard/Manifest.cs@@ -7,5 +7,5 @@ using Grand.Infrastructure.Plugins;SystemName = "DiscountRules.Standard",SupportedVersion = GrandVersion.SupportedPluginVersion,Author = "grandnode team",- Version = "1.01"+ Version = "1.02")]diff --git a/src/Plugins/DiscountRules.Standard/Providers/CustomerGroupDiscountRule.cs b/src/Plugins/DiscountRules.Standard/Providers/CustomerGroupDiscountRule.csindex bdc5bdfd6..1cccbaf12 100644--- a/src/Plugins/DiscountRules.Standard/Providers/CustomerGroupDiscountRule.cs+++ b/src/Plugins/DiscountRules.Standard/Providers/CustomerGroupDiscountRule.cs@@ -25,11 +25,11 @@ namespace DiscountRules.Providerif (request.Customer == null)return result;- if (string.IsNullOrEmpty(request.MetaData))+ if (string.IsNullOrEmpty(request.DiscountRule.Metadata))return result;foreach (var customerGroup in request.Customer.Groups.ToList())- if (request.MetaData == customerGroup)+ if (request.DiscountRule.Metadata == customerGroup){//validresult.IsValid = true;diff --git a/src/Plugins/DiscountRules.Standard/Providers/HadSpentAmountDiscountRule.cs b/src/Plugins/DiscountRules.Standard/Providers/HadSpentAmountDiscountRule.csindex 2fe1f0062..84a701292 100644--- a/src/Plugins/DiscountRules.Standard/Providers/HadSpentAmountDiscountRule.cs+++ b/src/Plugins/DiscountRules.Standard/Providers/HadSpentAmountDiscountRule.cs@@ -30,7 +30,7 @@ namespace DiscountRules.Provider//invalid by defaultvar result = new DiscountRuleValidationResult();- if (double.TryParse(request.MetaData, out var spentAmountRequirement))+ if (double.TryParse(request.DiscountRule.Metadata, out var spentAmountRequirement)){if (spentAmountRequirement == 0){diff --git a/src/Plugins/DiscountRules.Standard/Providers/HasAllProductsDiscountRule.cs b/src/Plugins/DiscountRules.Standard/Providers/HasAllProductsDiscountRule.csindex c9d7d46a2..e023015a3 100644--- a/src/Plugins/DiscountRules.Standard/Providers/HasAllProductsDiscountRule.cs+++ b/src/Plugins/DiscountRules.Standard/Providers/HasAllProductsDiscountRule.cs@@ -27,7 +27,7 @@ namespace DiscountRules.Provider//invalid by defaultvar result = new DiscountRuleValidationResult();- var restrictedProductIds = string.IsNullOrEmpty(request.MetaData) ? new List<string>() : request.MetaData.Split(',').ToList();+ var restrictedProductIds = string.IsNullOrEmpty(request.DiscountRule.Metadata) ? new List<string>() : request.DiscountRule.Metadata.Split(',').ToList();if (!restrictedProductIds.Any()){diff --git a/src/Plugins/DiscountRules.Standard/Providers/HasOneProductDiscountRule.cs b/src/Plugins/DiscountRules.Standard/Providers/HasOneProductDiscountRule.csindex 5ec436064..e7a89ddf2 100644--- a/src/Plugins/DiscountRules.Standard/Providers/HasOneProductDiscountRule.cs+++ b/src/Plugins/DiscountRules.Standard/Providers/HasOneProductDiscountRule.cs@@ -27,7 +27,7 @@ namespace DiscountRules.Provider//invalid by defaultvar result = new DiscountRuleValidationResult();- var restrictedProductIds = string.IsNullOrEmpty(request.MetaData) ? new List<string>() : request.MetaData.Split(',').ToList();+ var restrictedProductIds = string.IsNullOrEmpty(request.DiscountRule.Metadata) ? new List<string>() : request.DiscountRule.Metadata.Split(',').ToList();if (!restrictedProductIds.Any()){diff --git a/src/Plugins/DiscountRules.Standard/Providers/ShoppingCartDiscountRule.cs b/src/Plugins/DiscountRules.Standard/Providers/ShoppingCartDiscountRule.csindex 1c4216b1f..8ad24f144 100644--- a/src/Plugins/DiscountRules.Standard/Providers/ShoppingCartDiscountRule.cs+++ b/src/Plugins/DiscountRules.Standard/Providers/ShoppingCartDiscountRule.cs@@ -40,7 +40,7 @@ namespace DiscountRules.Providervar result = new DiscountRuleValidationResult();- if (double.TryParse(request.MetaData, out var spentAmountRequirement))+ if (double.TryParse(request.DiscountRule.Metadata, out var spentAmountRequirement)){if (spentAmountRequirement == 0){