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.

Upgrade plugin Discount rules

support3c20721a1fd1
diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/CustomerGroupsController.cs b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/CustomerGroupsController.cs
index 3c0a16a61..c28aeb860 100644
--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/CustomerGroupsController.cs
+++ b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/CustomerGroupsController.cs
@@ -1,7 +1,5 @@
using DiscountRules.CustomerGroups.Models;
-using DiscountRules.Standard.Models;
using Grand.Business.Core.Interfaces.Catalog.Discounts;
-using Grand.Business.Core.Interfaces.Common.Configuration;
using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Business.Core.Utilities.Common.Security;
@@ -19,18 +17,15 @@ namespace DiscountRules.CustomerGroups.Controllers
{
private readonly IDiscountService _discountService;
private readonly IGroupService _groupService;
- private readonly ISettingService _settingService;
private readonly IPermissionService _permissionService;
public CustomerGroupsController(
IDiscountService discountService,
IGroupService groupService,
- ISettingService settingService,
IPermissionService permissionService)
{
_discountService = discountService;
_groupService = groupService;
- _settingService = settingService;
_permissionService = permissionService;
}
@@ -44,23 +39,23 @@ namespace DiscountRules.CustomerGroups.Controllers
throw new ArgumentException("Discount could not be loaded");
DiscountRule discountRequirement = null;
- if (!String.IsNullOrEmpty(discountRequirementId))
+ if (!string.IsNullOrEmpty(discountRequirementId))
{
discountRequirement = discount.DiscountRules.FirstOrDefault(dr => dr.Id == discountRequirementId);
if (discountRequirement == null)
return Content("Failed to load requirement.");
}
- var restrictedToCustomerGroupId = _settingService.GetSettingByKey<RequirementCustomerGroup>(string.Format("DiscountRules.Standard.MustBeAssignedToCustomerGroup-{0}-{1}", discount.Id, !String.IsNullOrEmpty(discountRequirementId) ? discountRequirementId : ""));
+ var model = new RequirementModel {
+ RequirementId = !string.IsNullOrEmpty(discountRequirementId) ? discountRequirementId : "",
+ DiscountId = discountId,
+ CustomerGroupId = discountRequirement?.Metadata
+ };
- var model = new RequirementModel();
- model.RequirementId = !String.IsNullOrEmpty(discountRequirementId) ? discountRequirementId : "";
- model.DiscountId = discountId;
- model.CustomerGroupId = restrictedToCustomerGroupId?.CustomerGroupId;
//customer groups
model.AvailableCustomerGroups.Add(new SelectListItem { Text = "Select customer group", Value = "" });
foreach (var cr in await _groupService.GetAllCustomerGroups(showHidden: true))
- model.AvailableCustomerGroups.Add(new SelectListItem { Text = cr.Name, Value = cr.Id.ToString(), Selected = discountRequirement != null && cr.Id == restrictedToCustomerGroupId?.CustomerGroupId });
+ model.AvailableCustomerGroups.Add(new SelectListItem { Text = cr.Name, Value = cr.Id.ToString(), Selected = discountRequirement != null && cr.Id == discountRequirement?.Metadata });
//add a prefix
ViewData.TemplateInfo.HtmlFieldPrefix = string.Format("DiscountRulesCustomerGroups{0}", !String.IsNullOrEmpty(discountRequirementId) ? discountRequirementId : "");
@@ -80,24 +75,25 @@ namespace DiscountRules.CustomerGroups.Controllers
throw new ArgumentException("Discount could not be loaded");
DiscountRule discountRequirement = null;
- if (!String.IsNullOrEmpty(discountRequirementId))
+ if (!string.IsNullOrEmpty(discountRequirementId))
discountRequirement = discount.DiscountRules.FirstOrDefault(dr => dr.Id == discountRequirementId);
if (discountRequirement != null)
{
//update existing rule
- await _settingService.SetSetting(string.Format("DiscountRules.Standard.MustBeAssignedToCustomerGroup-{0}-{1}", discount.Id, discountRequirement.Id), new RequirementCustomerGroup() { CustomerGroupId = customerGroupId });
+ discountRequirement.Metadata = customerGroupId;
+ await _discountService.UpdateDiscount(discount);
}
else
{
//save new rule
discountRequirement = new DiscountRule {
- DiscountRequirementRuleSystemName = "DiscountRules.Standard.MustBeAssignedToCustomerGroup"
+ DiscountRequirementRuleSystemName = "DiscountRules.Standard.MustBeAssignedToCustomerGroup",
+ Metadata = customerGroupId
};
discount.DiscountRules.Add(discountRequirement);
await _discountService.UpdateDiscount(discount);
- await _settingService.SetSetting(string.Format("DiscountRules.Standard.MustBeAssignedToCustomerGroup-{0}-{1}", discount.Id, discountRequirement.Id), new RequirementCustomerGroup() { CustomerGroupId = customerGroupId });
}
return Json(new { Result = true, NewRequirementId = discountRequirement.Id });
}
diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HadSpentAmountController.cs b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HadSpentAmountController.cs
index 3e7c21643..699407b52 100644
--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HadSpentAmountController.cs
+++ b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HadSpentAmountController.cs
@@ -1,5 +1,4 @@
using Grand.Business.Core.Interfaces.Catalog.Discounts;
-using Grand.Business.Core.Interfaces.Common.Configuration;
using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Common.Controllers;
@@ -7,7 +6,6 @@ using Grand.Web.Common.Filters;
using Grand.Domain.Discounts;
using Microsoft.AspNetCore.Mvc;
using DiscountRules.Standard.HadSpentAmount.Models;
-using DiscountRules.Standard.Models;
namespace DiscountRules.Standard.HadSpentAmount.Controllers
{
@@ -16,15 +14,13 @@ namespace DiscountRules.Standard.HadSpentAmount.Controllers
public class HadSpentAmountController : BasePluginController
{
private readonly IDiscountService _discountService;
- private readonly ISettingService _settingService;
private readonly IPermissionService _permissionService;
- public HadSpentAmountController(IDiscountService discountService,
- ISettingService settingService,
+ public HadSpentAmountController(
+ IDiscountService discountService,
IPermissionService permissionService)
{
_discountService = discountService;
- _settingService = settingService;
_permissionService = permissionService;
}
@@ -37,19 +33,21 @@ namespace DiscountRules.Standard.HadSpentAmount.Controllers
if (discount == null)
throw new ArgumentException("Discount could not be loaded");
- if (!String.IsNullOrEmpty(discountRequirementId))
+ double spentAmountRequirement = 0;
+ if (!string.IsNullOrEmpty(discountRequirementId))
{
var discountRequirement = discount.DiscountRules.FirstOrDefault(dr => dr.Id == discountRequirementId);
if (discountRequirement == null)
return Content("Failed to load requirement.");
- }
- var spentAmountRequirement = _settingService.GetSettingByKey<RequirementHadSpentAmount>(string.Format("DiscountRules.Standard.HadSpentAmount-{0}-{1}", discount.Id, !String.IsNullOrEmpty(discountRequirementId) ? discountRequirementId : ""))?.SpentAmount;
+ spentAmountRequirement = Convert.ToDouble(discountRequirement.Metadata);
+ }
- var model = new RequirementModel();
- model.RequirementId = !String.IsNullOrEmpty(discountRequirementId) ? discountRequirementId : "";
- model.DiscountId = discountId;
- model.SpentAmount = spentAmountRequirement ?? 0;
+ var model = new RequirementModel {
+ RequirementId = !string.IsNullOrEmpty(discountRequirementId) ? discountRequirementId : "",
+ DiscountId = discountId,
+ SpentAmount = spentAmountRequirement
+ };
//add a prefix
ViewData.TemplateInfo.HtmlFieldPrefix = string.Format("DiscountRulesHadSpentAmount{0}-{1}", discount.Id, !String.IsNullOrEmpty(discountRequirementId) ? discountRequirementId : "");
@@ -69,25 +67,24 @@ namespace DiscountRules.Standard.HadSpentAmount.Controllers
throw new ArgumentException("Discount could not be loaded");
DiscountRule discountRequirement = null;
- if (!String.IsNullOrEmpty(discountRequirementId))
+ if (!string.IsNullOrEmpty(discountRequirementId))
discountRequirement = discount.DiscountRules.FirstOrDefault(dr => dr.Id == discountRequirementId);
if (discountRequirement != null)
{
//update existing rule
- await _settingService.SetSetting(string.Format("DiscountRules.Standard.HadSpentAmount-{0}-{1}", discount.Id, discountRequirement.Id), new RequirementHadSpentAmount() { SpentAmount = spentAmount });
+ discountRequirement.Metadata = spentAmount.ToString();
+ await _discountService.UpdateDiscount(discount);
}
else
{
//save new rule
- discountRequirement = new DiscountRule
- {
- DiscountRequirementRuleSystemName = "DiscountRules.Standard.HadSpentAmount"
+ discountRequirement = new DiscountRule {
+ DiscountRequirementRuleSystemName = "DiscountRules.Standard.HadSpentAmount",
+ Metadata = spentAmount.ToString()
};
discount.DiscountRules.Add(discountRequirement);
await _discountService.UpdateDiscount(discount);
-
- await _settingService.SetSetting(string.Format("DiscountRules.Standard.HadSpentAmount-{0}-{1}", discount.Id, discountRequirement.Id), new RequirementHadSpentAmount() { SpentAmount = spentAmount });
}
return new JsonResult(new { Result = true, NewRequirementId = discountRequirement.Id });
}
diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasAllProductsController.cs b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasAllProductsController.cs
index ee4fe9815..e1ebd0b77 100644
--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasAllProductsController.cs
+++ b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasAllProductsController.cs
@@ -1,8 +1,6 @@
using DiscountRules.HasAllProducts.Models;
-using DiscountRules.Standard.Models;
using Grand.Business.Core.Interfaces.Catalog.Discounts;
using Grand.Business.Core.Interfaces.Catalog.Products;
-using Grand.Business.Core.Interfaces.Common.Configuration;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Business.Core.Interfaces.Common.Stores;
@@ -25,7 +23,6 @@ namespace DiscountRules.HasAllProducts.Controllers
public class HasAllProductsController : BasePluginController
{
private readonly IDiscountService _discountService;
- private readonly ISettingService _settingService;
private readonly IPermissionService _permissionService;
private readonly IWorkContext _workContext;
private readonly ITranslationService _translationService;
@@ -34,7 +31,6 @@ namespace DiscountRules.HasAllProducts.Controllers
private readonly IProductService _productService;
public HasAllProductsController(IDiscountService discountService,
- ISettingService settingService,
IPermissionService permissionService,
IWorkContext workContext,
ITranslationService translationService,
@@ -43,7 +39,6 @@ namespace DiscountRules.HasAllProducts.Controllers
IProductService productService)
{
_discountService = discountService;
- _settingService = settingService;
_permissionService = permissionService;
_workContext = workContext;
_translationService = translationService;
@@ -61,22 +56,25 @@ namespace DiscountRules.HasAllProducts.Controllers
if (discount == null)
throw new ArgumentException("Discount could not be loaded");
- if (!String.IsNullOrEmpty(discountRequirementId))
+ var restrictedProductIds = string.Empty;
+
+ if (!string.IsNullOrEmpty(discountRequirementId))
{
var discountRequirement = discount.DiscountRules.FirstOrDefault(dr => dr.Id == discountRequirementId);
if (discountRequirement == null)
return Content("Failed to load requirement.");
- }
- var restrictedProductIds = _settingService.GetSettingByKey<RequirementProducts>(string.Format("DiscountRules.Standard.RestrictedProductIds-{0}-{1}", discount.Id, !String.IsNullOrEmpty(discountRequirementId) ? discountRequirementId : ""))?.Products;
+ restrictedProductIds = discountRequirement.Metadata;
+ }
- var model = new RequirementModel();
- model.RequirementId = !String.IsNullOrEmpty(discountRequirementId) ? discountRequirementId : "";
- model.DiscountId = discountId;
- model.Products = restrictedProductIds == null ? "" : string.Join(",", restrictedProductIds);
+ var model = new RequirementModel {
+ RequirementId = !string.IsNullOrEmpty(discountRequirementId) ? discountRequirementId : "",
+ DiscountId = discountId,
+ Products = restrictedProductIds
+ };
//add a prefix
- ViewData.TemplateInfo.HtmlFieldPrefix = string.Format("DiscountRulesHasAllProducts{0}-{1}", discount.Id, !String.IsNullOrEmpty(discountRequirementId) ? discountRequirementId : "");
+ ViewData.TemplateInfo.HtmlFieldPrefix = string.Format("DiscountRulesHasAllProducts{0}-{1}", discount.Id, !string.IsNullOrEmpty(discountRequirementId) ? discountRequirementId : "");
return View(model);
}
@@ -93,25 +91,25 @@ namespace DiscountRules.HasAllProducts.Controllers
throw new ArgumentException("Discount could not be loaded");
DiscountRule discountRequirement = null;
- if (!String.IsNullOrEmpty(discountRequirementId))
+
+ if (!string.IsNullOrEmpty(discountRequirementId))
discountRequirement = discount.DiscountRules.FirstOrDefault(dr => dr.Id == discountRequirementId);
if (discountRequirement != null)
{
//update existing rule
- await _settingService.SetSetting(string.Format("DiscountRules.Standard.RestrictedProductIds-{0}-{1}", discount.Id, discountRequirement.Id), new RequirementProducts() { Products = productIds.Split(",") });
+ discountRequirement.Metadata = productIds;
+ await _discountService.UpdateDiscount(discount);
}
else
{
//save new rule
- discountRequirement = new DiscountRule
- {
- DiscountRequirementRuleSystemName = "DiscountRules.HasAllProducts"
+ discountRequirement = new DiscountRule {
+ DiscountRequirementRuleSystemName = "DiscountRules.HasAllProducts",
+ Metadata = productIds
};
discount.DiscountRules.Add(discountRequirement);
await _discountService.UpdateDiscount(discount);
-
- await _settingService.SetSetting(string.Format("DiscountRules.Standard.RestrictedProductIds-{0}-{1}", discount.Id, discountRequirement.Id), new RequirementProducts() { Products = productIds.Split(",") });
}
return new JsonResult(new { Result = true, NewRequirementId = discountRequirement.Id });
}
@@ -121,9 +119,10 @@ namespace DiscountRules.HasAllProducts.Controllers
if (!await _permissionService.Authorize(StandardPermission.ManageProducts))
return Content("Access denied");
- var model = new RequirementModel.AddProductModel();
- //a vendor should have access only to his products
- model.IsLoggedInAsVendor = _workContext.CurrentVendor != null;
+ var model = new RequirementModel.AddProductModel {
+ //a vendor should have access only to his products
+ IsLoggedInAsVendor = _workContext.CurrentVendor != null
+ };
//stores
model.AvailableStores.Add(new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = "" });
@@ -159,7 +158,7 @@ namespace DiscountRules.HasAllProducts.Controllers
model.SearchVendorId = _workContext.CurrentVendor.Id;
}
var searchCategoryIds = new List<string>();
- if (!String.IsNullOrEmpty(model.SearchCategoryId))
+ if (!string.IsNullOrEmpty(model.SearchCategoryId))
searchCategoryIds.Add(model.SearchCategoryId);
var products = (await _productService.SearchProducts(
@@ -174,8 +173,7 @@ namespace DiscountRules.HasAllProducts.Controllers
showHidden: true
)).products;
var gridModel = new DataSourceResult();
- gridModel.Data = products.Select(x => new RequirementModel.ProductModel
- {
+ gridModel.Data = products.Select(x => new RequirementModel.ProductModel {
Id = x.Id,
Name = x.Name,
Published = x.Published
diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasOneProductController.cs b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasOneProductController.cs
index b3d56c92c..7dd67b4ed 100644
--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasOneProductController.cs
+++ b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasOneProductController.cs
@@ -1,8 +1,6 @@
using DiscountRules.HasOneProduct.Models;
-using DiscountRules.Standard.Models;
using Grand.Business.Core.Interfaces.Catalog.Discounts;
using Grand.Business.Core.Interfaces.Catalog.Products;
-using Grand.Business.Core.Interfaces.Common.Configuration;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Business.Core.Interfaces.Common.Stores;
@@ -25,7 +23,6 @@ namespace DiscountRules.HasOneProduct.Controllers
public class HasOneProductController : BasePluginController
{
private readonly IDiscountService _discountService;
- private readonly ISettingService _settingService;
private readonly IPermissionService _permissionService;
private readonly IWorkContext _workContext;
private readonly ITranslationService _translationService;
@@ -34,7 +31,6 @@ namespace DiscountRules.HasOneProduct.Controllers
private readonly IProductService _productService;
public HasOneProductController(IDiscountService discountService,
- ISettingService settingService,
IPermissionService permissionService,
IWorkContext workContext,
ITranslationService translationService,
@@ -43,7 +39,6 @@ namespace DiscountRules.HasOneProduct.Controllers
IProductService productService)
{
_discountService = discountService;
- _settingService = settingService;
_permissionService = permissionService;
_workContext = workContext;
_translationService = translationService;
@@ -61,19 +56,21 @@ namespace DiscountRules.HasOneProduct.Controllers
if (discount == null)
throw new ArgumentException("Discount could not be loaded");
- if (!String.IsNullOrEmpty(discountRequirementId))
+ var restrictedProductIds = string.Empty;
+ if (!string.IsNullOrEmpty(discountRequirementId))
{
var discountRequirement = discount.DiscountRules.FirstOrDefault(dr => dr.Id == discountRequirementId);
if (discountRequirement == null)
return Content("Failed to load requirement.");
- }
- var restrictedProductIds = _settingService.GetSettingByKey<RequirementProducts>(string.Format("DiscountRules.Standard.RestrictedProductIds-{0}-{1}", discount.Id, !String.IsNullOrEmpty(discountRequirementId) ? discountRequirementId : ""))?.Products;
+ restrictedProductIds = discountRequirement.Metadata;
+ }
- var model = new RequirementModel();
- model.RequirementId = !String.IsNullOrEmpty(discountRequirementId) ? discountRequirementId : "";
- model.DiscountId = discountId;
- model.Products = restrictedProductIds == null ? "" : string.Join(",", restrictedProductIds);
+ var model = new RequirementModel {
+ RequirementId = !string.IsNullOrEmpty(discountRequirementId) ? discountRequirementId : "",
+ DiscountId = discountId,
+ Products = restrictedProductIds
+ };
//add a prefix
ViewData.TemplateInfo.HtmlFieldPrefix = string.Format("DiscountRulesHasOneProduct{0}-{1}", discount.Id, !String.IsNullOrEmpty(discountRequirementId) ? discountRequirementId : "");
@@ -93,26 +90,26 @@ namespace DiscountRules.HasOneProduct.Controllers
throw new ArgumentException("Discount could not be loaded");
DiscountRule discountRequirement = null;
- if (!String.IsNullOrEmpty(discountRequirementId))
+ if (!string.IsNullOrEmpty(discountRequirementId))
discountRequirement = discount.DiscountRules.FirstOrDefault(dr => dr.Id == discountRequirementId);
if (discountRequirement != null)
{
//update existing rule
- await _settingService.SetSetting(string.Format("DiscountRules.Standard.RestrictedProductIds-{0}-{1}", discount.Id, discountRequirement.Id), new RequirementProducts() { Products = productIds.Split(',') });
+ discountRequirement.Metadata = productIds;
+ await _discountService.UpdateDiscount(discount);
}
else
{
//save new rule
- discountRequirement = new DiscountRule
- {
- DiscountRequirementRuleSystemName = "DiscountRules.HasOneProduct"
+ discountRequirement = new DiscountRule {
+ DiscountRequirementRuleSystemName = "DiscountRules.HasOneProduct",
+ Metadata = productIds
};
discount.DiscountRules.Add(discountRequirement);
await _discountService.UpdateDiscount(discount);
-
- await _settingService.SetSetting(string.Format("DiscountRules.Standard.RestrictedProductIds-{0}-{1}", discount.Id, discountRequirement.Id), new RequirementProducts() { Products = productIds.Split(',') });
}
+
return new JsonResult(new { Result = true, NewRequirementId = discountRequirement.Id });
}
@@ -121,9 +118,10 @@ namespace DiscountRules.HasOneProduct.Controllers
if (!await _permissionService.Authorize(StandardPermission.ManageProducts))
return Content("Access denied");
- var model = new RequirementModel.AddProductModel();
- //a vendor should have access only to his products
- model.IsLoggedInAsVendor = _workContext.CurrentVendor != null;
+ var model = new RequirementModel.AddProductModel {
+ //a vendor should have access only to his products
+ IsLoggedInAsVendor = _workContext.CurrentVendor != null
+ };
//stores
model.AvailableStores.Add(new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = "" });
@@ -160,7 +158,7 @@ namespace DiscountRules.HasOneProduct.Controllers
}
var searchCategoryIds = new List<string>();
- if (!String.IsNullOrEmpty(model.SearchCategoryId))
+ if (!string.IsNullOrEmpty(model.SearchCategoryId))
searchCategoryIds.Add(model.SearchCategoryId);
var products = (await _productService.SearchProducts(
@@ -175,8 +173,7 @@ namespace DiscountRules.HasOneProduct.Controllers
showHidden: true
)).products;
var gridModel = new DataSourceResult();
- gridModel.Data = products.Select(x => new RequirementModel.ProductModel
- {
+ gridModel.Data = products.Select(x => new RequirementModel.ProductModel {
Id = x.Id,
Name = x.Name,
Published = x.Published
diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/ShoppingCartAmountController.cs b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/ShoppingCartAmountController.cs
index 777fbc095..d79c5bb62 100644
--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/ShoppingCartAmountController.cs
+++ b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/ShoppingCartAmountController.cs
@@ -16,15 +16,12 @@ namespace DiscountRules.Standard.Controllers
public class ShoppingCartAmountController : BasePluginController
{
private readonly IDiscountService _discountService;
- private readonly ISettingService _settingService;
private readonly IPermissionService _permissionService;
public ShoppingCartAmountController(IDiscountService discountService,
- ISettingService settingService,
IPermissionService permissionService)
{
_discountService = discountService;
- _settingService = settingService;
_permissionService = permissionService;
}
@@ -37,19 +34,21 @@ namespace DiscountRules.Standard.Controllers
if (discount == null)
throw new ArgumentException("Discount could not be loaded");
- if (!String.IsNullOrEmpty(discountRequirementId))
+ double spentAmountRequirement = 0;
+ if (!string.IsNullOrEmpty(discountRequirementId))
{
var discountRequirement = discount.DiscountRules.FirstOrDefault(dr => dr.Id == discountRequirementId);
if (discountRequirement == null)
return Content("Failed to load requirement.");
- }
- var spentAmountRequirement = _settingService.GetSettingByKey<RequirementSpentAmount>(string.Format("DiscountRequirement.ShoppingCart-{0}", !String.IsNullOrEmpty(discountRequirementId) ? discountRequirementId : ""))?.SpentAmount;
+ spentAmountRequirement = Convert.ToDouble(discountRequirement.Metadata);
+ }
- var model = new RequirementModel();
- model.RequirementId = !String.IsNullOrEmpty(discountRequirementId) ? discountRequirementId : "";
- model.DiscountId = discountId;
- model.SpentAmount = spentAmountRequirement ?? 0;
+ var model = new RequirementModel {
+ RequirementId = !string.IsNullOrEmpty(discountRequirementId) ? discountRequirementId : "",
+ DiscountId = discountId,
+ SpentAmount = spentAmountRequirement
+ };
//add a prefix
ViewData.TemplateInfo.HtmlFieldPrefix = string.Format("DiscountRulesShoppingCart{0}", !String.IsNullOrEmpty(discountRequirementId) ? discountRequirementId : "");
@@ -69,25 +68,25 @@ namespace DiscountRules.Standard.Controllers
throw new ArgumentException("Discount could not be loaded");
DiscountRule discountRequirement = null;
- if (!String.IsNullOrEmpty(discountRequirementId))
+ if (!string.IsNullOrEmpty(discountRequirementId))
discountRequirement = discount.DiscountRules.FirstOrDefault(dr => dr.Id == discountRequirementId);
if (discountRequirement != null)
{
//update existing rule
- await _settingService.SetSetting(string.Format("DiscountRequirement.ShoppingCart-{0}", discountRequirement.Id), new RequirementSpentAmount() { SpentAmount = spentAmount });
+ discountRequirement.Metadata = spentAmount.ToString();
+ await _discountService.UpdateDiscount(discount);
}
else
{
//save new rule
discountRequirement = new DiscountRule
{
- DiscountRequirementRuleSystemName = "DiscountRequirement.ShoppingCart"
+ DiscountRequirementRuleSystemName = "DiscountRequirement.ShoppingCart",
+ Metadata = spentAmount.ToString()
};
discount.DiscountRules.Add(discountRequirement);
await _discountService.UpdateDiscount(discount);
-
- await _settingService.SetSetting(string.Format("DiscountRequirement.ShoppingCart-{0}", discountRequirement.Id), new RequirementSpentAmount() { SpentAmount = spentAmount });
}
return Json(new { Result = true, NewRequirementId = discountRequirement.Id });
}
diff --git a/src/Plugins/DiscountRules.Standard/Manifest.cs b/src/Plugins/DiscountRules.Standard/Manifest.cs
index 6497df805..efc5c0e20 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.00"
+ Version = "1.01"
)]
diff --git a/src/Plugins/DiscountRules.Standard/Providers/CustomerGroupDiscountRule.cs b/src/Plugins/DiscountRules.Standard/Providers/CustomerGroupDiscountRule.cs
index 747cc22fd..bdc5bdfd6 100644
--- a/src/Plugins/DiscountRules.Standard/Providers/CustomerGroupDiscountRule.cs
+++ b/src/Plugins/DiscountRules.Standard/Providers/CustomerGroupDiscountRule.cs
@@ -1,17 +1,12 @@
-using DiscountRules.Standard.Models;
using Grand.Business.Core.Interfaces.Catalog.Discounts;
using Grand.Business.Core.Utilities.Catalog;
-using Grand.Business.Core.Interfaces.Common.Configuration;
namespace DiscountRules.Provider
{
public partial class CustomerGroupDiscountRule : IDiscountRule
{
- private readonly ISettingService _settingService;
-
- public CustomerGroupDiscountRule(ISettingService settingService)
+ public CustomerGroupDiscountRule()
{
- _settingService = settingService;
}
/// <summary>
@@ -30,13 +25,11 @@ namespace DiscountRules.Provider
if (request.Customer == null)
return result;
- var restrictedToCustomerGroupId = _settingService.GetSettingByKey<RequirementCustomerGroup>(string.Format("DiscountRules.Standard.MustBeAssignedToCustomerGroup-{0}-{1}", request.DiscountId, request.DiscountRequirementId));
-
- if (restrictedToCustomerGroupId == null || String.IsNullOrEmpty(restrictedToCustomerGroupId?.CustomerGroupId))
+ if (string.IsNullOrEmpty(request.MetaData))
return result;
foreach (var customerGroup in request.Customer.Groups.ToList())
- if (restrictedToCustomerGroupId.CustomerGroupId == customerGroup)
+ if (request.MetaData == customerGroup)
{
//valid
result.IsValid = true;
@@ -56,7 +49,7 @@ namespace DiscountRules.Provider
{
//configured
string result = "Admin/CustomerGroups/Configure/?discountId=" + discountId;
- if (!String.IsNullOrEmpty(discountRequirementId))
+ if (!string.IsNullOrEmpty(discountRequirementId))
result += string.Format("&discountRequirementId={0}", discountRequirementId);
return result;
}
diff --git a/src/Plugins/DiscountRules.Standard/Providers/HadSpentAmountDiscountRule.cs b/src/Plugins/DiscountRules.Standard/Providers/HadSpentAmountDiscountRule.cs
index f85d9cbf1..2fe1f0062 100644
--- a/src/Plugins/DiscountRules.Standard/Providers/HadSpentAmountDiscountRule.cs
+++ b/src/Plugins/DiscountRules.Standard/Providers/HadSpentAmountDiscountRule.cs
@@ -1,8 +1,6 @@
-using DiscountRules.Standard.Models;
using Grand.Business.Core.Interfaces.Catalog.Discounts;
using Grand.Business.Core.Utilities.Catalog;
using Grand.Business.Core.Interfaces.Checkout.Orders;
-using Grand.Business.Core.Interfaces.Common.Configuration;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Domain.Orders;
@@ -10,13 +8,11 @@ namespace DiscountRules.Provider
{
public partial class HadSpentAmountDiscountRule : IDiscountRule
{
- private readonly ISettingService _settingService;
private readonly IOrderService _orderService;
private readonly ITranslationService _translationService;
- public HadSpentAmountDiscountRule(ISettingService settingService, IOrderService orderService, ITranslationService translationService)
+ public HadSpentAmountDiscountRule(IOrderService orderService, ITranslationService translationService)
{
- _settingService = settingService;
_orderService = orderService;
_translationService = translationService;
}
@@ -34,29 +30,30 @@ namespace DiscountRules.Provider
//invalid by default
var result = new DiscountRuleValidationResult();
- var spentAmountRequirement = _settingService.GetSettingByKey<RequirementHadSpentAmount>(string.Format("DiscountRules.Standard.HadSpentAmount-{0}-{1}", request.DiscountId, request.DiscountRequirementId));
-
- if (spentAmountRequirement == null || spentAmountRequirement.SpentAmount == 0)
+ if (double.TryParse(request.MetaData, out var spentAmountRequirement))
{
- //valid
- result.IsValid = true;
- return result;
- }
+ if (spentAmountRequirement == 0)
+ {
+ //valid
+ result.IsValid = true;
+ return result;
+ }
- if (request.Customer == null)
- return result;
+ if (request.Customer == null)
+ return result;
- var orders = await _orderService.SearchOrders(storeId: request.Store.Id,
- customerId: request.Customer.Id,
- os: (int)OrderStatusSystem.Complete);
- double spentAmount = orders.Sum(o => o.OrderTotal);
- if (spentAmount > spentAmountRequirement.SpentAmount)
- {
- result.IsValid = true;
- }
- else
- {
- result.UserError = _translationService.GetResource("Plugins.DiscountRules.Standard.HadSpentAmount.NotEnough");
+ var orders = await _orderService.SearchOrders(storeId: request.Store.Id,
+ customerId: request.Customer.Id,
+ os: (int)OrderStatusSystem.Complete);
+ double spentAmount = orders.Sum(o => o.OrderTotal);
+ if (spentAmount > spentAmountRequirement)
+ {
+ result.IsValid = true;
+ }
+ else
+ {
+ result.UserError = _translationService.GetResource("Plugins.DiscountRules.Standard.HadSpentAmount.NotEnough");
+ }
}
return result;
}
@@ -71,7 +68,7 @@ namespace DiscountRules.Provider
{
//configured
string result = "Admin/HadSpentAmount/Configure/?discountId=" + discountId;
- if (!String.IsNullOrEmpty(discountRequirementId))
+ if (!string.IsNullOrEmpty(discountRequirementId))
result += string.Format("&discountRequirementId={0}", discountRequirementId);
return result;
}
diff --git a/src/Plugins/DiscountRules.Standard/Providers/HasAllProductsDiscountRule.cs b/src/Plugins/DiscountRules.Standard/Providers/HasAllProductsDiscountRule.cs
index 04ec233ec..c9d7d46a2 100644
--- a/src/Plugins/DiscountRules.Standard/Providers/HasAllProductsDiscountRule.cs
+++ b/src/Plugins/DiscountRules.Standard/Providers/HasAllProductsDiscountRule.cs
@@ -1,20 +1,16 @@
-using DiscountRules.Standard.Models;
using Grand.Business.Core.Interfaces.Catalog.Discounts;
using Grand.Business.Core.Utilities.Catalog;
using Grand.Business.Core.Extensions;
-using Grand.Business.Core.Interfaces.Common.Configuration;
using Grand.Domain.Orders;
namespace DiscountRules.Provider
{
public partial class HasAllProductsDiscountRule : IDiscountRule
{
- private readonly ISettingService _settingService;
private readonly ShoppingCartSettings _shoppingCartSettings;
- public HasAllProductsDiscountRule(ISettingService settingService, ShoppingCartSettings shoppingCartSettings)
+ public HasAllProductsDiscountRule(ShoppingCartSettings shoppingCartSettings)
{
- _settingService = settingService;
_shoppingCartSettings = shoppingCartSettings;
}
@@ -31,9 +27,9 @@ namespace DiscountRules.Provider
//invalid by default
var result = new DiscountRuleValidationResult();
- var restrictedProductIds = _settingService.GetSettingByKey<RequirementProducts>(string.Format("DiscountRules.Standard.RestrictedProductIds-{0}-{1}", request.DiscountId, request.DiscountRequirementId));
+ var restrictedProductIds = string.IsNullOrEmpty(request.MetaData) ? new List<string>() : request.MetaData.Split(',').ToList();
- if (restrictedProductIds == null || !restrictedProductIds.Products.Any())
+ if (!restrictedProductIds.Any())
{
//valid
result.IsValid = true;
@@ -54,7 +50,7 @@ namespace DiscountRules.Provider
var cart = cartQuery.ToList();
bool allFound = true;
- foreach (var restrictedProduct in restrictedProductIds.Products.Select(x => x.Trim()))
+ foreach (var restrictedProduct in restrictedProductIds.Select(x => x.Trim()))
{
if (String.IsNullOrWhiteSpace(restrictedProduct))
continue;
@@ -139,7 +135,7 @@ namespace DiscountRules.Provider
{
//configured
string result = "Admin/HasAllProducts/Configure/?discountId=" + discountId;
- if (!String.IsNullOrEmpty(discountRequirementId))
+ if (!string.IsNullOrEmpty(discountRequirementId))
result += string.Format("&discountRequirementId={0}", discountRequirementId);
return result;
}
diff --git a/src/Plugins/DiscountRules.Standard/Providers/HasOneProductDiscountRule.cs b/src/Plugins/DiscountRules.Standard/Providers/HasOneProductDiscountRule.cs
index 928e91a35..5ec436064 100644
--- a/src/Plugins/DiscountRules.Standard/Providers/HasOneProductDiscountRule.cs
+++ b/src/Plugins/DiscountRules.Standard/Providers/HasOneProductDiscountRule.cs
@@ -1,20 +1,16 @@
-using DiscountRules.Standard.Models;
using Grand.Business.Core.Interfaces.Catalog.Discounts;
using Grand.Business.Core.Utilities.Catalog;
using Grand.Business.Core.Extensions;
-using Grand.Business.Core.Interfaces.Common.Configuration;
using Grand.Domain.Orders;
namespace DiscountRules.Provider
{
public partial class HasOneProductDiscountRule : IDiscountRule
{
- private readonly ISettingService _settingService;
private readonly ShoppingCartSettings _shoppingCartSettings;
- public HasOneProductDiscountRule(ISettingService settingService, ShoppingCartSettings shoppingCartSettings)
+ public HasOneProductDiscountRule(ShoppingCartSettings shoppingCartSettings)
{
- _settingService = settingService;
_shoppingCartSettings = shoppingCartSettings;
}
@@ -31,9 +27,9 @@ namespace DiscountRules.Provider
//invalid by default
var result = new DiscountRuleValidationResult();
- var restrictedProductIds = _settingService.GetSettingByKey<RequirementProducts>(string.Format("DiscountRules.Standard.RestrictedProductIds-{0}-{1}", request.DiscountId, request.DiscountRequirementId));
+ var restrictedProductIds = string.IsNullOrEmpty(request.MetaData) ? new List<string>() : request.MetaData.Split(',').ToList();
- if (restrictedProductIds == null || !restrictedProductIds.Products.Any())
+ if (!restrictedProductIds.Any())
{
//valid
result.IsValid = true;
@@ -54,16 +50,16 @@ namespace DiscountRules.Provider
//process
bool found = false;
- foreach (var restrictedProduct in restrictedProductIds.Products)
+ foreach (var restrictedProduct in restrictedProductIds)
{
- if (String.IsNullOrWhiteSpace(restrictedProduct))
+ if (string.IsNullOrWhiteSpace(restrictedProduct))
continue;
foreach (var sci in cart)
{
- if (restrictedProduct.Contains(":"))
+ if (restrictedProduct.Contains(':'))
{
- if (restrictedProduct.Contains("-"))
+ if (restrictedProduct.Contains('-'))
{
//the third way (the quantity rage specified)
//{Product ID}:{Min quantity}-{Max quantity}. For example, 77:1-3, 123:2-5, 156:3-8
@@ -139,7 +135,7 @@ namespace DiscountRules.Provider
{
//configured
string result = "Admin/HasOneProduct/Configure/?discountId=" + discountId;
- if (!String.IsNullOrEmpty(discountRequirementId))
+ if (!string.IsNullOrEmpty(discountRequirementId))
result += string.Format("&discountRequirementId={0}", discountRequirementId);
return result;
}
diff --git a/src/Plugins/DiscountRules.Standard/Providers/ShoppingCartDiscountRule.cs b/src/Plugins/DiscountRules.Standard/Providers/ShoppingCartDiscountRule.cs
index 1794eb029..1c4216b1f 100644
--- a/src/Plugins/DiscountRules.Standard/Providers/ShoppingCartDiscountRule.cs
+++ b/src/Plugins/DiscountRules.Standard/Providers/ShoppingCartDiscountRule.cs
@@ -1,10 +1,8 @@
-using DiscountRules.Standard.Models;
-using Grand.Business.Core.Interfaces.Catalog.Discounts;
+using Grand.Business.Core.Interfaces.Catalog.Discounts;
using Grand.Business.Core.Interfaces.Catalog.Prices;
using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Business.Core.Utilities.Catalog;
using Grand.Business.Core.Extensions;
-using Grand.Business.Core.Interfaces.Common.Configuration;
using Grand.Domain.Orders;
using Grand.Infrastructure;
using Microsoft.Extensions.DependencyInjection;
@@ -15,20 +13,17 @@ namespace DiscountRules.Provider
{
private readonly IWorkContext _workContext;
private readonly IProductService _productService;
- private readonly ISettingService _settingService;
private readonly IServiceProvider _serviceProvider;
private readonly ShoppingCartSettings _shoppingCartSettings;
public ShoppingCartDiscountRule(
- IWorkContext workContext,
+ IWorkContext workContext,
IProductService productService,
IServiceProvider serviceProvider,
- ISettingService settingService,
ShoppingCartSettings shoppingCartSettings)
{
_workContext = workContext;
_productService = productService;
- _settingService = settingService;
_serviceProvider = serviceProvider;
_shoppingCartSettings = shoppingCartSettings;
}
@@ -45,36 +40,38 @@ namespace DiscountRules.Provider
var result = new DiscountRuleValidationResult();
- var spentAmountRequirement = _settingService.GetSettingByKey<RequirementSpentAmount>(string.Format("DiscountRequirement.ShoppingCart-{0}", request.DiscountRequirementId));
-
- if (spentAmountRequirement == null || spentAmountRequirement.SpentAmount == 0)
+ if (double.TryParse(request.MetaData, out var spentAmountRequirement))
{
- result.IsValid = true;
- return result;
- }
- var cart = _workContext.CurrentCustomer.ShoppingCartItems
- .Where(sci => sci.ShoppingCartTypeId == ShoppingCartType.ShoppingCart)
- .LimitPerStore(_shoppingCartSettings.SharedCartBetweenStores, request.Store.Id)
- .ToList();
+ if (spentAmountRequirement == 0)
+ {
+ result.IsValid = true;
+ return result;
+ }
- if (cart.Count == 0)
- {
- result.IsValid = false;
- return result;
- }
- double spentAmount = 0;
+ var cart = _workContext.CurrentCustomer.ShoppingCartItems
+ .Where(sci => sci.ShoppingCartTypeId == ShoppingCartType.ShoppingCart)
+ .LimitPerStore(_shoppingCartSettings.SharedCartBetweenStores, request.Store.Id)
+ .ToList();
- var priceCalculationService = _serviceProvider.GetRequiredService<IPricingService>();
+ if (cart.Count == 0)
+ {
+ result.IsValid = false;
+ return result;
+ }
+ double spentAmount = 0;
- foreach (var ca in cart)
- {
- bool calculateWithDiscount = false;
- var product = await _productService.GetProductById(ca.ProductId);
- if (product != null)
- spentAmount += (await priceCalculationService.GetSubTotal(ca, product, calculateWithDiscount)).subTotal;
- }
+ var priceCalculationService = _serviceProvider.GetRequiredService<IPricingService>();
- result.IsValid = spentAmount > spentAmountRequirement.SpentAmount;
+ foreach (var ca in cart)
+ {
+ bool calculateWithDiscount = false;
+ var product = await _productService.GetProductById(ca.ProductId);
+ if (product != null)
+ spentAmount += (await priceCalculationService.GetSubTotal(ca, product, calculateWithDiscount)).subTotal;
+ }
+
+ result.IsValid = spentAmount > spentAmountRequirement;
+ }
return result;
}
@@ -88,7 +85,7 @@ namespace DiscountRules.Provider
{
//configured
string result = "Admin/ShoppingCartAmount/Configure/?discountId=" + discountId;
- if (!String.IsNullOrEmpty(discountRequirementId))
+ if (!string.IsNullOrEmpty(discountRequirementId))
result += string.Format("&discountRequirementId={0}", discountRequirementId);
return result;
}