diff --git a/Directory.Packages.props b/Directory.Packages.props index 1e7e528b7..bfb6469e1 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -11,16 +11,16 @@ - - - + + + - - + + - - + + @@ -33,7 +33,7 @@ - + @@ -55,15 +55,15 @@ - + - - - - - + + + + + @@ -75,7 +75,7 @@ - - + + \ No newline at end of file diff --git a/src/Plugins/DiscountRules.Standard/Controllers/BaseDiscountRulePluginController.cs b/src/Plugins/DiscountRules.Standard/Controllers/BaseDiscountRulePluginController.cs new file mode 100644 index 000000000..806f0fc74 --- /dev/null +++ b/src/Plugins/DiscountRules.Standard/Controllers/BaseDiscountRulePluginController.cs @@ -0,0 +1,9 @@ +using Grand.Web.Common.Controllers; +using Grand.Web.Common.Filters; +using Microsoft.AspNetCore.Mvc; + +namespace DiscountRules.Standard.Controllers; + +[AuthorizeAdminOrStore] +[AutoValidateAntiforgeryToken] +public abstract class BaseDiscountRulePluginController : BaseController; diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/CustomerGroupsController.cs b/src/Plugins/DiscountRules.Standard/Controllers/DiscountRulesCustomerGroupsController.cs similarity index 94% rename from src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/CustomerGroupsController.cs rename to src/Plugins/DiscountRules.Standard/Controllers/DiscountRulesCustomerGroupsController.cs index 375e4362a..f4c836c94 100644 --- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/CustomerGroupsController.cs +++ b/src/Plugins/DiscountRules.Standard/Controllers/DiscountRulesCustomerGroupsController.cs @@ -1,22 +1,21 @@ -using DiscountRules.Standard.Models; +using DiscountRules.Standard.Models; using Grand.Business.Core.Interfaces.Catalog.Discounts; using Grand.Business.Core.Interfaces.Common.Directory; using Grand.Business.Core.Interfaces.Common.Security; using Grand.Domain.Permissions; using Grand.Domain.Discounts; -using Grand.Web.Common.Controllers; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Rendering; -namespace DiscountRules.Standard.Areas.Admin.Controllers; +namespace DiscountRules.Standard.Controllers; -public class CustomerGroupsController : BaseAdminPluginController +public class DiscountRulesCustomerGroupsController : BaseDiscountRulePluginController { private readonly IDiscountService _discountService; private readonly IGroupService _groupService; private readonly IPermissionService _permissionService; - public CustomerGroupsController( + public DiscountRulesCustomerGroupsController( IDiscountService discountService, IGroupService groupService, IPermissionService permissionService) diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HadSpentAmountController.cs b/src/Plugins/DiscountRules.Standard/Controllers/DiscountRulesHadSpentAmountController.cs similarity index 93% rename from src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HadSpentAmountController.cs rename to src/Plugins/DiscountRules.Standard/Controllers/DiscountRulesHadSpentAmountController.cs index 2a0372642..818f39afc 100644 --- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HadSpentAmountController.cs +++ b/src/Plugins/DiscountRules.Standard/Controllers/DiscountRulesHadSpentAmountController.cs @@ -1,20 +1,19 @@ -using DiscountRules.Standard.Models; +using DiscountRules.Standard.Models; using Grand.Business.Core.Interfaces.Catalog.Discounts; using Grand.Business.Core.Interfaces.Common.Security; using Grand.Domain.Permissions; using Grand.Domain.Discounts; -using Grand.Web.Common.Controllers; using Microsoft.AspNetCore.Mvc; using System.Globalization; -namespace DiscountRules.Standard.Areas.Admin.Controllers; +namespace DiscountRules.Standard.Controllers; -public class HadSpentAmountController : BaseAdminPluginController +public class DiscountRulesHadSpentAmountController : BaseDiscountRulePluginController { private readonly IDiscountService _discountService; private readonly IPermissionService _permissionService; - public HadSpentAmountController( + public DiscountRulesHadSpentAmountController( IDiscountService discountService, IPermissionService permissionService) { diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasAllProductsController.cs b/src/Plugins/DiscountRules.Standard/Controllers/DiscountRulesHasAllProductsController.cs similarity index 86% rename from src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasAllProductsController.cs rename to src/Plugins/DiscountRules.Standard/Controllers/DiscountRulesHasAllProductsController.cs index 0d7f5fc4f..16c754fec 100644 --- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasAllProductsController.cs +++ b/src/Plugins/DiscountRules.Standard/Controllers/DiscountRulesHasAllProductsController.cs @@ -1,4 +1,4 @@ -using DiscountRules.Standard.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.Localization; @@ -9,15 +9,14 @@ using Grand.Domain.Discounts; using Grand.Domain.Permissions; using Grand.Infrastructure; -using Grand.Web.Common.Controllers; using Grand.Web.Common.DataSource; using Grand.Web.Common.Localization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Rendering; -namespace DiscountRules.Standard.Areas.Admin.Controllers; +namespace DiscountRules.Standard.Controllers; -public class HasAllProductsController : BaseAdminPluginController +public class DiscountRulesHasAllProductsController : BaseDiscountRulePluginController { private readonly IDiscountService _discountService; private readonly IPermissionService _permissionService; @@ -28,8 +27,8 @@ public class HasAllProductsController : BaseAdminPluginController private readonly IContextAccessor _contextAccessor; private readonly IEnumTranslationService _enumTranslationService; - - public HasAllProductsController(IDiscountService discountService, + private string CurrentStoreId => _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId; + public DiscountRulesHasAllProductsController(IDiscountService discountService, IPermissionService permissionService, IContextAccessor contextAccessor, ITranslationService translationService, @@ -127,22 +126,30 @@ public async Task ProductAddPopup(string btnId, string productIds IsLoggedInAsVendor = _contextAccessor.WorkContext.CurrentVendor != null }; - //stores - model.AvailableStores.Add(new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = "" }); - foreach (var s in await _storeService.GetAllStores()) - model.AvailableStores.Add(new SelectListItem { Text = s.Shortcut, Value = s.Id }); - - //vendors - model.AvailableVendors.Add(new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = "" }); - foreach (var v in await _vendorService.GetAllVendors(showHidden: true)) - model.AvailableVendors.Add(new SelectListItem { Text = v.Name, Value = v.Id }); + //stores - when acting as a store manager, scope to their store + if (!string.IsNullOrEmpty(CurrentStoreId)) + { + var store = await _storeService.GetStoreById(CurrentStoreId); + if (store != null) + model.AvailableStores.Add(new SelectListItem { Text = store.Shortcut, Value = store.Id }); + } + else + { + model.AvailableStores.Add(new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = "" }); + foreach (var s in await _storeService.GetAllStores()) + model.AvailableStores.Add(new SelectListItem { Text = s.Shortcut, Value = s.Id }); + + //vendors (only shown to admins) + model.AvailableVendors.Add(new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = "" }); + foreach (var v in await _vendorService.GetAllVendors(showHidden: true)) + model.AvailableVendors.Add(new SelectListItem { Text = v.Name, Value = v.Id }); + } //product types model.AvailableProductTypes = _enumTranslationService.ToSelectList(ProductType.SimpleProduct, false).ToList(); model.AvailableProductTypes.Insert(0, new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = "" }); - ViewBag.productIdsInput = productIdsInput; ViewBag.btnId = btnId; @@ -159,6 +166,9 @@ public async Task ProductAddPopupList(DataSourceRequest command, //a vendor should have access only to his products if (_contextAccessor.WorkContext.CurrentVendor != null) model.SearchVendorId = _contextAccessor.WorkContext.CurrentVendor.Id; + //a store manager should only search within their store + if (!string.IsNullOrEmpty(CurrentStoreId)) model.SearchStoreId = CurrentStoreId; + var searchCategoryIds = new List(); if (!string.IsNullOrEmpty(model.SearchCategoryId)) searchCategoryIds.Add(model.SearchCategoryId); diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasOneProductController.cs b/src/Plugins/DiscountRules.Standard/Controllers/DiscountRulesHasOneProductController.cs similarity index 85% rename from src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasOneProductController.cs rename to src/Plugins/DiscountRules.Standard/Controllers/DiscountRulesHasOneProductController.cs index 2c4d74dd7..b214e08ad 100644 --- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasOneProductController.cs +++ b/src/Plugins/DiscountRules.Standard/Controllers/DiscountRulesHasOneProductController.cs @@ -1,4 +1,4 @@ -using DiscountRules.Standard.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.Localization; @@ -10,15 +10,14 @@ using Grand.Domain.Permissions; using Grand.Domain.Vendors; using Grand.Infrastructure; -using Grand.Web.Common.Controllers; using Grand.Web.Common.DataSource; using Grand.Web.Common.Localization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Rendering; -namespace DiscountRules.Standard.Areas.Admin.Controllers; +namespace DiscountRules.Standard.Controllers; -public class HasOneProductController : BaseAdminPluginController +public class DiscountRulesHasOneProductController : BaseDiscountRulePluginController { private readonly IDiscountService _discountService; private readonly IPermissionService _permissionService; @@ -30,8 +29,9 @@ public class HasOneProductController : BaseAdminPluginController private readonly IEnumTranslationService _enumTranslationService; private Vendor CurrentVendor => _contextAccessor.WorkContext.CurrentVendor; + private string CurrentStoreId => _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId; - public HasOneProductController(IDiscountService discountService, + public DiscountRulesHasOneProductController(IDiscountService discountService, IPermissionService permissionService, IContextAccessor contextAccessor, ITranslationService translationService, @@ -138,15 +138,24 @@ public async Task ProductAddPopup(string btnId, string productIds IsLoggedInAsVendor = CurrentVendor != null }; - //stores - model.AvailableStores.Add(new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = "" }); - foreach (var s in await _storeService.GetAllStores()) - model.AvailableStores.Add(new SelectListItem { Text = s.Shortcut, Value = s.Id }); - - //vendors - model.AvailableVendors.Add(new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = "" }); - foreach (var v in await _vendorService.GetAllVendors(showHidden: true)) - model.AvailableVendors.Add(new SelectListItem { Text = v.Name, Value = v.Id }); + //stores - when acting as a store manager, scope to their store + if (!string.IsNullOrEmpty(CurrentStoreId)) + { + var store = await _storeService.GetStoreById(CurrentStoreId); + if (store != null) + model.AvailableStores.Add(new SelectListItem { Text = store.Shortcut, Value = store.Id }); + } + else + { + model.AvailableStores.Add(new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = "" }); + foreach (var s in await _storeService.GetAllStores()) + model.AvailableStores.Add(new SelectListItem { Text = s.Shortcut, Value = s.Id }); + + //vendors (only shown to admins) + model.AvailableVendors.Add(new SelectListItem { Text = _translationService.GetResource("Admin.Common.All"), Value = "" }); + foreach (var v in await _vendorService.GetAllVendors(showHidden: true)) + model.AvailableVendors.Add(new SelectListItem { Text = v.Name, Value = v.Id }); + } //product types model.AvailableProductTypes = _enumTranslationService.ToSelectList(ProductType.SimpleProduct, false).ToList(); @@ -169,6 +178,8 @@ public async Task ProductAddPopupList(DataSourceRequest command, //a vendor should have access only to his products if (CurrentVendor != null) model.SearchVendorId = CurrentVendor.Id; + //a store manager should only search within their store + if (!string.IsNullOrEmpty(CurrentStoreId)) model.SearchStoreId = CurrentStoreId; var searchCategoryIds = new List(); if (!string.IsNullOrEmpty(model.SearchCategoryId)) diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/ShoppingCartAmountController.cs b/src/Plugins/DiscountRules.Standard/Controllers/DiscountRulesShoppingCartAmountController.cs similarity index 92% rename from src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/ShoppingCartAmountController.cs rename to src/Plugins/DiscountRules.Standard/Controllers/DiscountRulesShoppingCartAmountController.cs index 99d1b911f..c047ba4ef 100644 --- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/ShoppingCartAmountController.cs +++ b/src/Plugins/DiscountRules.Standard/Controllers/DiscountRulesShoppingCartAmountController.cs @@ -1,20 +1,19 @@ -using DiscountRules.Standard.Models; +using DiscountRules.Standard.Models; using Grand.Business.Core.Interfaces.Catalog.Discounts; using Grand.Business.Core.Interfaces.Common.Security; using Grand.Domain.Permissions; using Grand.Domain.Discounts; -using Grand.Web.Common.Controllers; using Microsoft.AspNetCore.Mvc; using System.Globalization; -namespace DiscountRules.Standard.Areas.Admin.Controllers; +namespace DiscountRules.Standard.Controllers; -public class ShoppingCartAmountController : BaseAdminPluginController +public class DiscountRulesShoppingCartAmountController : BaseDiscountRulePluginController { private readonly IDiscountService _discountService; private readonly IPermissionService _permissionService; - public ShoppingCartAmountController(IDiscountService discountService, + public DiscountRulesShoppingCartAmountController(IDiscountService discountService, IPermissionService permissionService) { _discountService = discountService; diff --git a/src/Plugins/DiscountRules.Standard/DiscountRules.Standard.csproj b/src/Plugins/DiscountRules.Standard/DiscountRules.Standard.csproj index c130e63e8..d99106c54 100644 --- a/src/Plugins/DiscountRules.Standard/DiscountRules.Standard.csproj +++ b/src/Plugins/DiscountRules.Standard/DiscountRules.Standard.csproj @@ -44,5 +44,5 @@ Always - + \ No newline at end of file diff --git a/src/Plugins/DiscountRules.Standard/EndpointProvider.cs b/src/Plugins/DiscountRules.Standard/EndpointProvider.cs index 47cbed67c..c218ded62 100644 --- a/src/Plugins/DiscountRules.Standard/EndpointProvider.cs +++ b/src/Plugins/DiscountRules.Standard/EndpointProvider.cs @@ -10,50 +10,56 @@ public void RegisterEndpoint(IEndpointRouteBuilder endpointRouteBuilder) { //CustomerGroups endpointRouteBuilder.MapControllerRoute("Plugin.DiscountRules.CustomerGroups.Configure", - "Admin/CustomerGroups/Configure", - new { controller = "CustomerGroups", action = "Configure" } + "DiscountRulesCustomerGroups/Configure", + new { controller = "DiscountRulesCustomerGroups", action = "Configure" } ); //HadSpentAmount endpointRouteBuilder.MapControllerRoute("Plugin.DiscountRules.HadSpentAmount.Configure", - "Admin/HadSpentAmount/Configure", - new { controller = "HadSpentAmount", action = "Configure" } + "DiscountRulesHadSpentAmount/Configure", + new { controller = "DiscountRulesHadSpentAmount", action = "Configure" } + ); + + //ShoppingCartAmount + endpointRouteBuilder.MapControllerRoute("Plugin.DiscountRules.ShoppingCartAmount.Configure", + "DiscountRulesShoppingCartAmount/Configure", + new { controller = "DiscountRulesShoppingCartAmount", action = "Configure" } ); //HasAllProducts endpointRouteBuilder.MapControllerRoute("Plugin.DiscountRules.HasAllProducts.Configure", - "Admin/HasAllProducts/Configure", - new { controller = "HasAllProducts", action = "Configure" } + "DiscountRulesHasAllProducts/Configure", + new { controller = "DiscountRulesHasAllProducts", action = "Configure" } ); endpointRouteBuilder.MapControllerRoute("Plugin.DiscountRules.HasAllProducts.ProductAddPopup", - "Admin/HasAllProducts/ProductAddPopup", - new { controller = "HasAllProducts", action = "ProductAddPopup" } + "DiscountRulesHasAllProducts/ProductAddPopup", + new { controller = "DiscountRulesHasAllProducts", action = "ProductAddPopup" } ); endpointRouteBuilder.MapControllerRoute("Plugin.DiscountRules.HasAllProducts.ProductAddPopupList", - "Admin/HasAllProducts/ProductAddPopupList", - new { controller = "HasAllProducts", action = "ProductAddPopupList" } + "DiscountRulesHasAllProducts/ProductAddPopupList", + new { controller = "DiscountRulesHasAllProducts", action = "ProductAddPopupList" } ); endpointRouteBuilder.MapControllerRoute("Plugin.DiscountRules.HasAllProducts.LoadProductFriendlyNames", - "Admin/HasAllProducts/LoadProductFriendlyNames", - new { controller = "HasAllProducts", action = "LoadProductFriendlyNames" } + "DiscountRulesHasAllProducts/LoadProductFriendlyNames", + new { controller = "DiscountRulesHasAllProducts", action = "LoadProductFriendlyNames" } ); //HasOneProduct endpointRouteBuilder.MapControllerRoute("Plugin.DiscountRules.HasOneProduct.Configure", - "Admin/HasOneProduct/Configure", - new { controller = "HasOneProduct", action = "Configure" } + "DiscountRulesHasOneProduct/Configure", + new { controller = "DiscountRulesHasOneProduct", action = "Configure" } ); endpointRouteBuilder.MapControllerRoute("Plugin.DiscountRules.HasOneProduct.ProductAddPopup", - "Admin/HasOneProduct/ProductAddPopup", - new { controller = "HasOneProduct", action = "ProductAddPopup" } + "DiscountRulesHasOneProduct/ProductAddPopup", + new { controller = "DiscountRulesHasOneProduct", action = "ProductAddPopup" } ); endpointRouteBuilder.MapControllerRoute("Plugin.DiscountRules.HasOneProduct.ProductAddPopupList", - "Admin/HasOneProduct/ProductAddPopupList", - new { controller = "HasOneProduct", action = "ProductAddPopupList" } + "DiscountRulesHasOneProduct/ProductAddPopupList", + new { controller = "DiscountRulesHasOneProduct", action = "ProductAddPopupList" } ); endpointRouteBuilder.MapControllerRoute("Plugin.DiscountRules.HasOneProduct.LoadProductFriendlyNames", - "Admin/HasOneProduct/LoadProductFriendlyNames", - new { controller = "HasOneProduct", action = "LoadProductFriendlyNames" } + "DiscountRulesHasOneProduct/LoadProductFriendlyNames", + new { controller = "DiscountRulesHasOneProduct", action = "LoadProductFriendlyNames" } ); } diff --git a/src/Plugins/DiscountRules.Standard/Providers/CustomerGroupDiscountRule.cs b/src/Plugins/DiscountRules.Standard/Providers/CustomerGroupDiscountRule.cs index ed6a6293c..d0a62c90c 100644 --- a/src/Plugins/DiscountRules.Standard/Providers/CustomerGroupDiscountRule.cs +++ b/src/Plugins/DiscountRules.Standard/Providers/CustomerGroupDiscountRule.cs @@ -41,7 +41,7 @@ public async Task CheckRequirement(DiscountRuleVal public string GetConfigurationUrl(string discountId, string discountRequirementId) { //configured - var result = "Admin/CustomerGroups/Configure/?discountId=" + discountId; + var result = $"/DiscountRulesCustomerGroups/Configure/?discountId=" + discountId; if (!string.IsNullOrEmpty(discountRequirementId)) result += $"&discountRequirementId={discountRequirementId}"; return result; diff --git a/src/Plugins/DiscountRules.Standard/Providers/HadSpentAmountDiscountRule.cs b/src/Plugins/DiscountRules.Standard/Providers/HadSpentAmountDiscountRule.cs index 0e70c5ba8..398948168 100644 --- a/src/Plugins/DiscountRules.Standard/Providers/HadSpentAmountDiscountRule.cs +++ b/src/Plugins/DiscountRules.Standard/Providers/HadSpentAmountDiscountRule.cs @@ -65,7 +65,7 @@ public async Task CheckRequirement(DiscountRuleVal public string GetConfigurationUrl(string discountId, string discountRequirementId) { //configured - var result = "Admin/HadSpentAmount/Configure/?discountId=" + discountId; + var result = $"/DiscountRulesHadSpentAmount/Configure/?discountId=" + discountId; if (!string.IsNullOrEmpty(discountRequirementId)) result += $"&discountRequirementId={discountRequirementId}"; return result; diff --git a/src/Plugins/DiscountRules.Standard/Providers/HasAllProductsDiscountRule.cs b/src/Plugins/DiscountRules.Standard/Providers/HasAllProductsDiscountRule.cs index d8942dadb..89edd276b 100644 --- a/src/Plugins/DiscountRules.Standard/Providers/HasAllProductsDiscountRule.cs +++ b/src/Plugins/DiscountRules.Standard/Providers/HasAllProductsDiscountRule.cs @@ -124,7 +124,7 @@ into g public string GetConfigurationUrl(string discountId, string discountRequirementId) { //configured - var result = "Admin/HasAllProducts/Configure/?discountId=" + discountId; + var result = $"/DiscountRulesHasAllProducts/Configure/?discountId=" + discountId; if (!string.IsNullOrEmpty(discountRequirementId)) result += $"&discountRequirementId={discountRequirementId}"; return result; diff --git a/src/Plugins/DiscountRules.Standard/Providers/HasOneProductDiscountRule.cs b/src/Plugins/DiscountRules.Standard/Providers/HasOneProductDiscountRule.cs index 0ed59bd6f..5ad908b29 100644 --- a/src/Plugins/DiscountRules.Standard/Providers/HasOneProductDiscountRule.cs +++ b/src/Plugins/DiscountRules.Standard/Providers/HasOneProductDiscountRule.cs @@ -123,7 +123,7 @@ into g public string GetConfigurationUrl(string discountId, string discountRequirementId) { //configured - var result = "Admin/HasOneProduct/Configure/?discountId=" + discountId; + var result = $"/DiscountRulesHasOneProduct/Configure/?discountId=" + discountId; if (!string.IsNullOrEmpty(discountRequirementId)) result += $"&discountRequirementId={discountRequirementId}"; return result; diff --git a/src/Plugins/DiscountRules.Standard/Providers/ShoppingCartDiscountRule.cs b/src/Plugins/DiscountRules.Standard/Providers/ShoppingCartDiscountRule.cs index b5c6c166b..9b584ee8a 100644 --- a/src/Plugins/DiscountRules.Standard/Providers/ShoppingCartDiscountRule.cs +++ b/src/Plugins/DiscountRules.Standard/Providers/ShoppingCartDiscountRule.cs @@ -86,7 +86,7 @@ public async Task CheckRequirement(DiscountRuleVal public string GetConfigurationUrl(string discountId, string discountRequirementId) { //configured - var result = "Admin/ShoppingCartAmount/Configure/?discountId=" + discountId; + var result = $"/DiscountRulesShoppingCartAmount/Configure/?discountId=" + discountId; if (!string.IsNullOrEmpty(discountRequirementId)) result += $"&discountRequirementId={discountRequirementId}"; return result; diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/CustomerGroups/Configure.cshtml b/src/Plugins/DiscountRules.Standard/Views/DiscountRulesCustomerGroups/Configure.cshtml similarity index 96% rename from src/Plugins/DiscountRules.Standard/Areas/Admin/Views/CustomerGroups/Configure.cshtml rename to src/Plugins/DiscountRules.Standard/Views/DiscountRulesCustomerGroups/Configure.cshtml index 6625a1b6f..af9bc57e5 100644 --- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/CustomerGroups/Configure.cshtml +++ b/src/Plugins/DiscountRules.Standard/Views/DiscountRulesCustomerGroups/Configure.cshtml @@ -23,7 +23,7 @@ $.ajax({ cache:false, type: "POST", - url: "@Url.Action("Configure", "CustomerGroups")", + url: "@Url.Action("Configure", "DiscountRulesCustomerGroups")", data: postData, success: function (data) { $('#pnl-save-requirement-result@(Model.RequirementId)').fadeIn("slow").delay(1000).fadeOut("slow"); diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HadSpentAmount/Configure.cshtml b/src/Plugins/DiscountRules.Standard/Views/DiscountRulesHadSpentAmount/Configure.cshtml similarity index 96% rename from src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HadSpentAmount/Configure.cshtml rename to src/Plugins/DiscountRules.Standard/Views/DiscountRulesHadSpentAmount/Configure.cshtml index 1ac04e3dc..4000e88a4 100644 --- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HadSpentAmount/Configure.cshtml +++ b/src/Plugins/DiscountRules.Standard/Views/DiscountRulesHadSpentAmount/Configure.cshtml @@ -21,7 +21,7 @@ $.ajax({ cache:false, type: "POST", - url: "@Url.Action("Configure", "HadSpentAmount")", + url: "@Url.Action("Configure", "DiscountRulesHadSpentAmount")", data: postData, success: function (data) { $('#pnl-save-requirement-result@(Model.RequirementId)').fadeIn("slow").delay(1000).fadeOut("slow"); diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasAllProducts/Configure.cshtml b/src/Plugins/DiscountRules.Standard/Views/DiscountRulesHasAllProducts/Configure.cshtml similarity index 98% rename from src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasAllProducts/Configure.cshtml rename to src/Plugins/DiscountRules.Standard/Views/DiscountRulesHasAllProducts/Configure.cshtml index 4dc95039a..905d21e80 100644 --- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasAllProducts/Configure.cshtml +++ b/src/Plugins/DiscountRules.Standard/Views/DiscountRulesHasAllProducts/Configure.cshtml @@ -21,7 +21,7 @@ $.ajax({ cache:false, type: "POST", - url: "@Url.Action("Configure", "HasAllProducts")", + url: "@Url.Action("Configure", "DiscountRulesHasAllProducts")", data: postData, success: function (data) { $('#pnl-save-requirement-result@(Model.RequirementId)').fadeIn("slow").delay(1000).fadeOut("slow"); diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasAllProducts/ProductAddPopup.cshtml b/src/Plugins/DiscountRules.Standard/Views/DiscountRulesHasAllProducts/ProductAddPopup.cshtml similarity index 100% rename from src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasAllProducts/ProductAddPopup.cshtml rename to src/Plugins/DiscountRules.Standard/Views/DiscountRulesHasAllProducts/ProductAddPopup.cshtml diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasOneProduct/Configure.cshtml b/src/Plugins/DiscountRules.Standard/Views/DiscountRulesHasOneProduct/Configure.cshtml similarity index 98% rename from src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasOneProduct/Configure.cshtml rename to src/Plugins/DiscountRules.Standard/Views/DiscountRulesHasOneProduct/Configure.cshtml index 55b30a880..659ea5b18 100644 --- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasOneProduct/Configure.cshtml +++ b/src/Plugins/DiscountRules.Standard/Views/DiscountRulesHasOneProduct/Configure.cshtml @@ -21,7 +21,7 @@ $.ajax({ cache:false, type: "POST", - url: "@Url.Action("Configure", "HasOneProduct")", + url: "@Url.Action("Configure", "DiscountRulesHasOneProduct")", data: postData, success: function (data) { $('#pnl-save-requirement-result@(Model.RequirementId)').fadeIn("slow").delay(1000).fadeOut("slow"); diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasOneProduct/ProductAddPopup.cshtml b/src/Plugins/DiscountRules.Standard/Views/DiscountRulesHasOneProduct/ProductAddPopup.cshtml similarity index 98% rename from src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasOneProduct/ProductAddPopup.cshtml rename to src/Plugins/DiscountRules.Standard/Views/DiscountRulesHasOneProduct/ProductAddPopup.cshtml index fc917a7ee..9c4fcbb07 100644 --- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/HasOneProduct/ProductAddPopup.cshtml +++ b/src/Plugins/DiscountRules.Standard/Views/DiscountRulesHasOneProduct/ProductAddPopup.cshtml @@ -8,7 +8,7 @@ //page title ViewBag.Title = Loc["Plugins.DiscountRules.HasOneProduct.Fields.Products.Choose"]; } -
+
diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/ShoppingCartAmount/Configure.cshtml b/src/Plugins/DiscountRules.Standard/Views/DiscountRulesShoppingCartAmount/Configure.cshtml similarity index 95% rename from src/Plugins/DiscountRules.Standard/Areas/Admin/Views/ShoppingCartAmount/Configure.cshtml rename to src/Plugins/DiscountRules.Standard/Views/DiscountRulesShoppingCartAmount/Configure.cshtml index 3b7e2f03e..d7adccaab 100644 --- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Views/ShoppingCartAmount/Configure.cshtml +++ b/src/Plugins/DiscountRules.Standard/Views/DiscountRulesShoppingCartAmount/Configure.cshtml @@ -12,7 +12,7 @@ $.ajax({ cache:false, type: "POST", - url: "@Url.Action("Configure", "ShoppingCartAmount")", + url: "@Url.Action("Configure", "DiscountRulesShoppingCartAmount")", data: { "discountId": discountId, "discountRequirementId": requirementId, "spentAmount": spentAmount }, success: function (data) { $('#pnl-save-requirement-result@(Model.RequirementId)').fadeIn("slow").delay(1000).fadeOut("slow"); diff --git a/src/Plugins/DiscountRules.Standard/Views/_ViewImports.cshtml b/src/Plugins/DiscountRules.Standard/Views/_ViewImports.cshtml new file mode 100644 index 000000000..44d7f0eae --- /dev/null +++ b/src/Plugins/DiscountRules.Standard/Views/_ViewImports.cshtml @@ -0,0 +1,11 @@ +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers +@addTagHelper *, Grand.Web.Common +@addTagHelper *, Grand.Web + +@using Microsoft.AspNetCore.Mvc.ViewFeatures +@using Grand.Infrastructure.Extensions +@using Grand.Web.Common +@using Grand.Web.Common.Localization +@using Grand.Web.Common.Page + +@inject LocService Loc \ No newline at end of file diff --git a/src/Web/Grand.Web.AdminShared/Services/DiscountViewModelService.cs b/src/Web/Grand.Web.AdminShared/Services/DiscountViewModelService.cs index 8873e089c..5075c9d92 100644 --- a/src/Web/Grand.Web.AdminShared/Services/DiscountViewModelService.cs +++ b/src/Web/Grand.Web.AdminShared/Services/DiscountViewModelService.cs @@ -250,10 +250,7 @@ public virtual string GetRequirementUrlInternal(IDiscountRule discountRequiremen ArgumentNullException.ThrowIfNull(discountRequirementRule); ArgumentNullException.ThrowIfNull(discount); - var storeLocation = _contextAccessor.StoreContext.CurrentHost.Url.TrimEnd('/'); - - var url = - $"{storeLocation}/{discountRequirementRule.GetConfigurationUrl(discount.Id, discountRequirementId)}"; + var url = discountRequirementRule.GetConfigurationUrl(discount.Id, discountRequirementId); return url; } diff --git a/src/Web/Grand.Web.Common/Filters/AuthorizeAdminOrStoreAttribute.cs b/src/Web/Grand.Web.Common/Filters/AuthorizeAdminOrStoreAttribute.cs new file mode 100644 index 000000000..0d95cb234 --- /dev/null +++ b/src/Web/Grand.Web.Common/Filters/AuthorizeAdminOrStoreAttribute.cs @@ -0,0 +1,96 @@ +using Grand.Business.Core.Interfaces.Common.Directory; +using Grand.Business.Core.Interfaces.Common.Security; +using Grand.Domain.Permissions; +using Grand.Data; +using Grand.Domain.Security; +using Grand.Infrastructure; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.Filters; +using Microsoft.AspNetCore.Routing; + +namespace Grand.Web.Common.Filters; + +/// +/// Represents a filter attribute that grants access to users who have access to either +/// the admin panel (Grand.Web.Admin) or the store manager panel (Grand.Web.Store). +/// +public class AuthorizeAdminOrStoreAttribute : TypeFilterAttribute +{ + /// + /// Create instance of the filter attribute + /// + /// Whether to ignore the execution of filter actions + public AuthorizeAdminOrStoreAttribute(bool ignore = false) : base(typeof(AuthorizeAdminOrStoreFilter)) + { + IgnoreFilter = ignore; + Arguments = [ignore]; + } + + public bool IgnoreFilter { get; } + + #region Filter + + private class AuthorizeAdminOrStoreFilter( + bool ignoreFilter, + IPermissionService permissionService, + SecuritySettings securitySettings, + IContextAccessor contextAccessor, + IGroupService groupService) : IAsyncAuthorizationFilter + { + #region Methods + + public async Task OnAuthorizationAsync(AuthorizationFilterContext filterContext) + { + ArgumentNullException.ThrowIfNull(filterContext); + + //check whether this filter has been overridden for the action + var actionFilter = filterContext.ActionDescriptor.FilterDescriptors + .Where(f => f.Scope == FilterScope.Action) + .Select(f => f.Filter).OfType().FirstOrDefault(); + + if (actionFilter?.IgnoreFilter ?? ignoreFilter) + return; + + if (!DataSettingsManager.DatabaseIsInstalled()) + return; + + var customer = contextAccessor.WorkContext.CurrentCustomer; + var isStoreManager = await groupService.IsStoreManager(customer); + var hasStaffStore = !string.IsNullOrEmpty(customer.StaffStoreId); + + // Store manager path: user belongs to the store manager group with an active store assignment + if (isStoreManager) + { + if (!hasStaffStore || !await permissionService.Authorize(StandardPermission.ManageAccessStoreManagerPanel)) + filterContext.Result = new RedirectToRouteResult("StoreLogin", new RouteValueDictionary()); + return; + } + + // Admin path: user is a regular admin (not a vendor) + if (!await permissionService.Authorize(StandardPermission.ManageAccessAdminPanel)) + { + filterContext.Result = new RedirectToRouteResult("AdminLogin", new RouteValueDictionary()); + return; + } + + if (await groupService.IsVendor(customer) || contextAccessor.WorkContext.CurrentVendor is not null) + { + filterContext.Result = new RedirectToRouteResult("AdminLogin", new RouteValueDictionary()); + return; + } + + // IP address restriction check (admin only) + var ipAddresses = securitySettings.AdminAreaAllowedIpAddresses; + if (ipAddresses == null || !ipAddresses.Any()) + return; + + var currentIp = filterContext.HttpContext.Connection.RemoteIpAddress?.ToString(); + if (!ipAddresses.Any(ip => ip.Equals(currentIp, StringComparison.OrdinalIgnoreCase))) + filterContext.Result = new RedirectToRouteResult("AdminLogin", new RouteValueDictionary()); + } + + #endregion + } + + #endregion +} diff --git a/src/Web/Grand.Web.Common/Filters/AuthorizeStoreAttribute.cs b/src/Web/Grand.Web.Common/Filters/AuthorizeStoreAttribute.cs index 0a1c98912..f6d0effab 100644 --- a/src/Web/Grand.Web.Common/Filters/AuthorizeStoreAttribute.cs +++ b/src/Web/Grand.Web.Common/Filters/AuthorizeStoreAttribute.cs @@ -50,9 +50,9 @@ public async Task OnAuthorizationAsync(AuthorizationFilterContext context) //check whether this filter has been overridden for the Action var actionFilter = context.ActionDescriptor.FilterDescriptors .Where(f => f.Scope == FilterScope.Action) - .Select(f => f.Filter).OfType().FirstOrDefault(); + .Select(f => f.Filter).OfType().FirstOrDefault(); - //ignore filter (the action is available even if the current customer isn't a vendor) + //ignore filter if (actionFilter?.IgnoreFilter ?? ignoreFilter) return; diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/BrandAddPopup.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/BrandAddPopup.cshtml new file mode 100644 index 000000000..0bd06081d --- /dev/null +++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/BrandAddPopup.cshtml @@ -0,0 +1,168 @@ +@model DiscountModel.AddBrandToDiscountModel +@inject AdminAreaSettings adminAreaSettings +@{ + Layout = ""; + ViewBag.Title = Loc["admin.marketing.Discounts.AppliedToBrands.AddNew"]; +} + + + +
+
+
+
+
+ + @Loc["admin.marketing.Discounts.AppliedToBrands.AddNew"] +
+
+
+
+
+
+
+
+
+ + +
+
+
+
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+ + + diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/CategoryAddPopup.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/CategoryAddPopup.cshtml new file mode 100644 index 000000000..bb6502f1f --- /dev/null +++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/CategoryAddPopup.cshtml @@ -0,0 +1,175 @@ +@model DiscountModel.AddCategoryToDiscountModel +@inject AdminAreaSettings adminAreaSettings +@{ + Layout = ""; + ViewBag.Title = Loc["admin.marketing.Discounts.AppliedToCategories.AddNew"]; +} + +
+ +
+
+
+
+
+ + @Loc["admin.marketing.Discounts.AppliedToCategories.AddNew"] +
+
+
+
+
+
+
+
+
+ + +
+
+
+
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+ + +
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/CollectionAddPopup.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/CollectionAddPopup.cshtml new file mode 100644 index 000000000..0dac9032c --- /dev/null +++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/CollectionAddPopup.cshtml @@ -0,0 +1,175 @@ +@model DiscountModel.AddCollectionToDiscountModel +@inject AdminAreaSettings adminAreaSettings +@{ + Layout = ""; + ViewBag.Title = Loc["admin.marketing.Discounts.AppliedToCollections.AddNew"]; +} + +
+ +
+
+
+
+
+ + @Loc["admin.marketing.Discounts.AppliedToCollections.AddNew"] +
+
+
+
+
+
+
+
+
+ + +
+
+
+
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+ + +
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Create.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Create.cshtml new file mode 100644 index 000000000..3ef7f976a --- /dev/null +++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Create.cshtml @@ -0,0 +1,35 @@ +@model DiscountModel +@{ + ViewBag.Title = Loc["admin.marketing.Discounts.AddNew"]; +} +
+ +
+
+
+
+
+ + @Loc["admin.marketing.Discounts.AddNew"] + + @Html.ActionLink(Loc["admin.marketing.Discounts.BackToList"], "List") + +
+
+
+ + +
+
+
+
+ +
+
+
+
+
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Edit.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Edit.cshtml new file mode 100644 index 000000000..3d440744f --- /dev/null +++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Edit.cshtml @@ -0,0 +1,39 @@ +@model DiscountModel +@{ + ViewBag.Title = Loc["admin.marketing.Discounts.EditDiscountDetails"]; +} +
+ +
+
+
+
+
+ + @Loc["admin.marketing.Discounts.EditDiscountDetails"] - @Model.Name + + @Html.ActionLink(Loc["admin.marketing.Discounts.BackToList"], "List") + +
+
+
+ + + + @Loc["Admin.Common.Delete"] + +
+
+
+
+ +
+
+
+
+
+ diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/List.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/List.cshtml new file mode 100644 index 000000000..3920812d7 --- /dev/null +++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/List.cshtml @@ -0,0 +1,169 @@ +@model DiscountListModel +@inject AdminAreaSettings adminAreaSettings +@{ + ViewBag.Title = Loc["admin.marketing.Discounts"]; +} + +
+
+
+
+
+ + @Loc["admin.marketing.Discounts"] +
+
+ + @Loc["Admin.Common.AddNew"] + +
+
+
+
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+ + + diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabAppliedToBrands.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabAppliedToBrands.cshtml new file mode 100644 index 000000000..e40b3c89f --- /dev/null +++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabAppliedToBrands.cshtml @@ -0,0 +1,107 @@ +@model DiscountModel +@{ + if (!string.IsNullOrEmpty(Model.Id)) + { +
+
+
+
+
+  @Loc["Admin.Marketing.Discounts.AppliedToBrands.AddNew"] + +
+
+ + + + } + else + { +
+ @Loc["admin.marketing.Discounts.AppliedToBrands.SaveBeforeEdit"] +
+ } +} diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabAppliedToCategories.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabAppliedToCategories.cshtml new file mode 100644 index 000000000..569fc171a --- /dev/null +++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabAppliedToCategories.cshtml @@ -0,0 +1,107 @@ +@model DiscountModel +@{ + if (!string.IsNullOrEmpty(Model.Id)) + { +
+
+
+
+
+  @Loc["admin.marketing.Discounts.AppliedToCategories.AddNew"] + +
+
+ + + + } + else + { +
+ @Loc["admin.marketing.Discounts.AppliedToCategories.SaveBeforeEdit"] +
+ } +} diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabAppliedToCollections.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabAppliedToCollections.cshtml new file mode 100644 index 000000000..c7b638d8f --- /dev/null +++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabAppliedToCollections.cshtml @@ -0,0 +1,106 @@ +@model DiscountModel +@{ + if (!string.IsNullOrEmpty(Model.Id)) + { +
+
+
+
+
+  @Loc["admin.marketing.Discounts.AppliedToCollections.AddNew"] + +
+
+ + + } + else + { +
+ @Loc["admin.marketing.Discounts.AppliedToCollections.SaveBeforeEdit"] +
+ } +} diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabAppliedToProducts.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabAppliedToProducts.cshtml new file mode 100644 index 000000000..ca5710b26 --- /dev/null +++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabAppliedToProducts.cshtml @@ -0,0 +1,109 @@ +@model DiscountModel +@inject AdminAreaSettings adminAreaSettings + +@{ + if (!string.IsNullOrEmpty(Model.Id)) + { +
+
+
+
+
+  @Loc["admin.marketing.Discounts.AppliedToProducts.AddNew"] + +
+
+ + + + + } + else + { +
+ @Loc["admin.marketing.Discounts.AppliedToProducts.SaveBeforeEdit"] +
+ } +} diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabCouponCodes.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabCouponCodes.cshtml new file mode 100644 index 000000000..cc95bdf4c --- /dev/null +++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabCouponCodes.cshtml @@ -0,0 +1,99 @@ +@model DiscountModel +@inject AdminAreaSettings adminAreaSettings + +@if (!string.IsNullOrEmpty(Model.Id)) +{ +
+
+
+
+
+ +} +else +{ +
+ @Loc["admin.marketing.Discounts.CouponCodes.SaveBeforeEdit"] +
+} diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabHistory.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabHistory.cshtml new file mode 100644 index 000000000..ad2b4659f --- /dev/null +++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabHistory.cshtml @@ -0,0 +1,75 @@ +@model DiscountModel +@inject AdminAreaSettings adminAreaSettings +@{ +
+ +} diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabInfo.cshtml new file mode 100644 index 000000000..14046cf5e --- /dev/null +++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabInfo.cshtml @@ -0,0 +1,260 @@ +@using Grand.Domain.Discounts +@model DiscountModel + + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + @Loc["admin.marketing.Discounts.Fields.LimitationTimes.Times"] +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabRequirements.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabRequirements.cshtml new file mode 100644 index 000000000..fe615efa4 --- /dev/null +++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabRequirements.cshtml @@ -0,0 +1,207 @@ +@model DiscountModel + +@{ + if (!string.IsNullOrEmpty(Model.Id)) + { + + + +
+
+ + + +
+
+
+ @Loc["admin.marketing.Discounts.Requirements.AddNew"] +
+
+ +
+ + +
+
+
+
+
+
+
+
+
+
+ } + else + { +
+ @Loc["admin.marketing.Discounts.Requirements.SaveBeforeEdit"] +
+ } +} diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.cshtml new file mode 100644 index 000000000..78e3f9b96 --- /dev/null +++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.cshtml @@ -0,0 +1,67 @@ +@model DiscountModel + +
+ + + + + +
+ +
+ + + + +
+ +
+ + + + +
+ +
+ + + + +
+ +
+ + + + +
+ +
+ + + + +
+ +
+ + + + +
+ +
+ + + @if (!string.IsNullOrEmpty(Model.Id)) + { + + +
+ +
+ + + } + + diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/ProductAddPopup.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/ProductAddPopup.cshtml new file mode 100644 index 000000000..174392a8d --- /dev/null +++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/ProductAddPopup.cshtml @@ -0,0 +1,174 @@ +@model DiscountModel.AddProductToDiscountModel +@inject AdminAreaSettings adminAreaSettings +@{ + Layout = ""; + ViewBag.Title = Loc["admin.marketing.Discounts.AppliedToProducts.AddNew"]; +} + +
+ +
+
+
+
+
+ + @Loc["admin.marketing.Discounts.AppliedToProducts.AddNew"] +
+
+
+
+
+
+
+
+
+ + +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+
+
+
+
+ + +
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/_ViewImports.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/_ViewImports.cshtml index 1420c6933..d330949c8 100644 --- a/src/Web/Grand.Web.Store/Areas/Store/Views/_ViewImports.cshtml +++ b/src/Web/Grand.Web.Store/Areas/Store/Views/_ViewImports.cshtml @@ -35,6 +35,7 @@ @using Grand.Web.AdminShared.Models.Pages @using Grand.Web.AdminShared.Models.Settings @using Grand.Web.AdminShared.Models.Shipping +@using Grand.Web.AdminShared.Models.Discounts @inject LocService Loc @inject IEnumTranslationService EnumTranslationService \ No newline at end of file diff --git a/src/Web/Grand.Web.Store/Controllers/DiscountController.cs b/src/Web/Grand.Web.Store/Controllers/DiscountController.cs new file mode 100644 index 000000000..06ae7fbec --- /dev/null +++ b/src/Web/Grand.Web.Store/Controllers/DiscountController.cs @@ -0,0 +1,782 @@ +using Grand.Business.Core.Interfaces.Catalog.Brands; +using Grand.Business.Core.Interfaces.Catalog.Categories; +using Grand.Business.Core.Interfaces.Catalog.Collections; +using Grand.Business.Core.Interfaces.Catalog.Discounts; +using Grand.Business.Core.Interfaces.Catalog.Products; +using Grand.Business.Core.Interfaces.Common.Directory; +using Grand.Business.Core.Interfaces.Common.Localization; +using Grand.Business.Core.Queries.Catalog; +using Grand.Domain.Discounts; +using Grand.Domain.Permissions; +using Grand.Infrastructure; +using Grand.Web.AdminShared.Extensions; +using Grand.Web.AdminShared.Extensions.Mapping; +using Grand.Web.AdminShared.Interfaces; +using Grand.Web.AdminShared.Models.Catalog; +using Grand.Web.AdminShared.Models.Discounts; +using Grand.Web.Common.DataSource; +using Grand.Web.Common.Filters; +using Grand.Web.Common.Security.Authorization; +using MediatR; +using Microsoft.AspNetCore.Mvc; + +namespace Grand.Web.Store.Controllers; + +[PermissionAuthorize(PermissionSystemName.Discounts)] +public class DiscountController : BaseStoreController +{ + #region Constructors + + public DiscountController( + IDiscountViewModelService discountViewModelService, + IDiscountService discountService, + ITranslationService translationService, + IContextAccessor contextAccessor, + IDateTimeService dateTimeService, + IMediator mediator) + { + _discountViewModelService = discountViewModelService; + _discountService = discountService; + _translationService = translationService; + _contextAccessor = contextAccessor; + _dateTimeService = dateTimeService; + _mediator = mediator; + } + + #endregion + + #region Fields + + private readonly IDiscountViewModelService _discountViewModelService; + private readonly IDiscountService _discountService; + private readonly ITranslationService _translationService; + private readonly IContextAccessor _contextAccessor; + private readonly IDateTimeService _dateTimeService; + private readonly IMediator _mediator; + + #endregion + + #region Utilities + + private string CurrentStoreId => + _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId; + + #endregion + + #region Discounts + + public IActionResult Index() + { + return RedirectToAction("List"); + } + + public IActionResult List() + { + var model = _discountViewModelService.PrepareDiscountListModel(); + return View(model); + } + + [HttpPost] + [PermissionAuthorizeAction(PermissionActionName.List)] + public async Task List(DiscountListModel model, DataSourceRequest command) + { + var (discountModel, totalCount) = + await _discountViewModelService.PrepareDiscountModel(model, command.Page, command.PageSize); + var gridModel = new DataSourceResult { + Data = discountModel.ToList(), + Total = totalCount + }; + return Json(gridModel); + } + + [PermissionAuthorizeAction(PermissionActionName.Create)] + public async Task Create() + { + var model = new DiscountModel(); + await _discountViewModelService.PrepareDiscountModel(model, null); + model.LimitationTimes = 1; + return View(model); + } + + [HttpPost] + [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")] + [PermissionAuthorizeAction(PermissionActionName.Create)] + public async Task Create(DiscountModel model, bool continueEditing) + { + if (ModelState.IsValid) + { + model.Stores = [CurrentStoreId]; + var discount = await _discountViewModelService.InsertDiscountModel(model); + Success(_translationService.GetResource("admin.marketing.discounts.Added")); + return continueEditing + ? RedirectToAction("Edit", new { id = discount.Id }) + : RedirectToAction("List"); + } + + await _discountViewModelService.PrepareDiscountModel(model, null); + return View(model); + } + + [PermissionAuthorizeAction(PermissionActionName.Preview)] + public async Task Edit(string id) + { + var discount = await _discountService.GetDiscountById(id); + if (discount == null) + return RedirectToAction("List"); + + if (!discount.AccessToEntityByStore(CurrentStoreId)) + return RedirectToAction("List"); + + var model = discount.ToModel(_dateTimeService); + await _discountViewModelService.PrepareDiscountModel(model, discount); + return View(model); + } + + [HttpPost] + [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")] + [PermissionAuthorizeAction(PermissionActionName.Edit)] + public async Task Edit(DiscountModel model, bool continueEditing) + { + var discount = await _discountService.GetDiscountById(model.Id); + if (discount == null) + return RedirectToAction("List"); + + if (!discount.AccessToEntityByStore(CurrentStoreId)) + return RedirectToAction("Edit", new { id = discount.Id }); + + if (ModelState.IsValid) + { + model.Stores = [CurrentStoreId]; + discount = await _discountViewModelService.UpdateDiscountModel(discount, model); + Success(_translationService.GetResource("admin.marketing.discounts.Updated")); + if (continueEditing) + { + await SaveSelectedTabIndex(); + return RedirectToAction("Edit", new { id = discount.Id }); + } + + return RedirectToAction("List"); + } + + await _discountViewModelService.PrepareDiscountModel(model, discount); + return View(model); + } + + [HttpPost] + [PermissionAuthorizeAction(PermissionActionName.Delete)] + public async Task Delete(string id) + { + var discount = await _discountService.GetDiscountById(id); + if (discount == null) + return RedirectToAction("List"); + + if (!discount.AccessToEntityByStore(CurrentStoreId)) + return RedirectToAction("Edit", new { id }); + + var usageHistory = await _mediator.Send(new GetDiscountUsageHistoryQuery { DiscountId = discount.Id }); + if (usageHistory.Count > 0) + { + Error(_translationService.GetResource("admin.marketing.discounts.Deleted.UsageHistory")); + return RedirectToAction("Edit", new { id = discount.Id }); + } + + if (ModelState.IsValid) + { + await _discountViewModelService.DeleteDiscount(discount); + Success(_translationService.GetResource("admin.marketing.discounts.Deleted")); + return RedirectToAction("List"); + } + + Error(ModelState); + return RedirectToAction("Edit", new { id = discount.Id }); + } + + #endregion + + #region Discount coupon codes + + [HttpPost] + [PermissionAuthorizeAction(PermissionActionName.Preview)] + public async Task CouponCodeList(DataSourceRequest command, string discountId) + { + var discount = await _discountService.GetDiscountById(discountId); + if (discount == null) + throw new Exception("No discount found with the specified id"); + + if (!discount.AccessToEntityByStore(CurrentStoreId)) + return new JsonResult(new DataSourceResult { Errors = "Access denied" }); + + var couponcodes = await _discountService.GetAllCouponCodesByDiscountId(discount.Id, + command.Page - 1, command.PageSize); + var gridModel = new DataSourceResult { + Data = couponcodes.Select(x => new { + x.Id, + x.CouponCode, + x.Used + }), + Total = couponcodes.TotalCount + }; + return Json(gridModel); + } + + [PermissionAuthorizeAction(PermissionActionName.Edit)] + public async Task CouponCodeDelete(string discountId, string Id) + { + var discount = await _discountService.GetDiscountById(discountId); + if (discount == null) + throw new Exception("No discount found with the specified id"); + + if (!discount.AccessToEntityByStore(CurrentStoreId)) + return new JsonResult(new DataSourceResult { Errors = "Access denied" }); + + var coupon = await _discountService.GetDiscountCodeById(Id); + if (coupon == null) + throw new Exception("No coupon code found with the specified id"); + if (ModelState.IsValid) + { + if (!coupon.Used) + await _discountService.DeleteDiscountCoupon(coupon); + else + return new JsonResult(new DataSourceResult + { Errors = "You can't delete coupon code, it was used" }); + + return new JsonResult(""); + } + + return ErrorForKendoGridJson(ModelState); + } + + [PermissionAuthorizeAction(PermissionActionName.Edit)] + public async Task CouponCodeInsert(string discountId, string couponCode) + { + if (string.IsNullOrEmpty(couponCode)) + throw new Exception("Coupon code can't be empty"); + + var discount = await _discountService.GetDiscountById(discountId); + if (discount == null) + throw new Exception("No discount found with the specified id"); + + if (!discount.AccessToEntityByStore(CurrentStoreId)) + return new JsonResult(new DataSourceResult { Errors = "Access denied" }); + + couponCode = couponCode.ToUpperInvariant(); + + if (await _discountService.GetDiscountByCouponCode(couponCode) != null) + return new JsonResult(new DataSourceResult { Errors = "Coupon code exists" }); + if (ModelState.IsValid) + { + await _discountViewModelService.InsertCouponCode(discountId, couponCode); + return new JsonResult(""); + } + + return ErrorForKendoGridJson(ModelState); + } + + #endregion + + #region Discount requirements + + [AcceptVerbs("GET")] + [PermissionAuthorizeAction(PermissionActionName.Preview)] + public async Task GetDiscountRequirementConfigurationUrl(string rulesystemName, + string discountId, string discountRequirementId, + [FromServices] IDiscountProviderLoader discountProviderLoader) + { + ArgumentNullException.ThrowIfNullOrEmpty(rulesystemName); + + var discountPlugin = discountProviderLoader.LoadDiscountProviderByRuleSystemName(rulesystemName); + + if (discountPlugin == null) + throw new ArgumentException("Discount requirement rule could not be loaded"); + + var discount = await _discountService.GetDiscountById(discountId); + if (discount == null) + throw new ArgumentException("Discount could not be loaded"); + + if (!discount.AccessToEntityByStore(CurrentStoreId)) + throw new ArgumentException("Access denied"); + + var singleRequirement = discountPlugin.GetRequirementRules().FirstOrDefault(x => + x.SystemName.Equals(rulesystemName, StringComparison.OrdinalIgnoreCase)); + var url = _discountViewModelService.GetRequirementUrlInternal(singleRequirement, discount, discountRequirementId); + return Json(new { url }); + } + + [PermissionAuthorizeAction(PermissionActionName.Preview)] + public async Task GetDiscountRequirementMetaInfo(string discountRequirementId, string discountId, + [FromServices] IDiscountProviderLoader discountProviderLoader) + { + var discount = await _discountService.GetDiscountById(discountId); + if (discount == null) + throw new ArgumentException("Discount could not be loaded"); + + if (!discount.AccessToEntityByStore(CurrentStoreId)) + throw new ArgumentException("Access denied"); + + var discountRequirement = discount.DiscountRules.FirstOrDefault(dr => dr.Id == discountRequirementId); + if (discountRequirement == null) + throw new ArgumentException("Discount requirement could not be loaded"); + + var discountPlugin = + discountProviderLoader.LoadDiscountProviderByRuleSystemName(discountRequirement + .DiscountRequirementRuleSystemName); + if (discountPlugin == null) + throw new ArgumentException("Discount requirement rule could not be loaded"); + + var discountRequirementRule = discountPlugin.GetRequirementRules() + .First(x => x.SystemName == discountRequirement.DiscountRequirementRuleSystemName); + var url = _discountViewModelService.GetRequirementUrlInternal(discountRequirementRule, discount, discountRequirementId); + var ruleName = discountRequirementRule.FriendlyName; + + return Json(new { url, ruleName }); + } + + [HttpPost] + [PermissionAuthorizeAction(PermissionActionName.Edit)] + public async Task DeleteDiscountRequirement(string discountRequirementId, string discountId) + { + var discount = await _discountService.GetDiscountById(discountId); + if (discount == null) + throw new ArgumentException("Discount could not be loaded"); + + if (!discount.AccessToEntityByStore(CurrentStoreId)) + return Json(new { Result = false, Error = "Access denied" }); + + var discountRequirement = discount.DiscountRules.FirstOrDefault(dr => dr.Id == discountRequirementId); + if (discountRequirement == null) + throw new ArgumentException("Discount requirement could not be loaded"); + + if (ModelState.IsValid) + { + await _discountViewModelService.DeleteDiscountRequirement(discountRequirement, discount); + return Json(new { Result = true }); + } + + return ErrorForKendoGridJson(ModelState); + } + + #endregion + + #region Applied to products + + [PermissionAuthorizeAction(PermissionActionName.Preview)] + [HttpPost] + public async Task ProductList(DataSourceRequest command, string discountId, + [FromServices] IProductService productService) + { + var discount = await _discountService.GetDiscountById(discountId); + if (discount == null) + throw new Exception("No discount found with the specified id"); + + if (!discount.AccessToEntityByStore(CurrentStoreId)) + return new JsonResult(new DataSourceResult { Errors = "Access denied" }); + + var products = await productService.GetProductsByDiscount(discount.Id, command.Page - 1, + command.PageSize); + var gridModel = new DataSourceResult { + Data = products.Select(x => new DiscountModel.AppliedToProductModel { + ProductId = x.Id, + ProductName = x.Name + }), + Total = products.TotalCount + }; + + return Json(gridModel); + } + + [PermissionAuthorizeAction(PermissionActionName.Edit)] + public async Task ProductDelete(string discountId, string productId, + [FromServices] IProductService productService) + { + var discount = await _discountService.GetDiscountById(discountId); + if (discount == null) + throw new Exception("No discount found with the specified id"); + + if (!discount.AccessToEntityByStore(CurrentStoreId)) + return new JsonResult(new DataSourceResult { Errors = "Access denied" }); + + var product = await productService.GetProductById(productId); + if (product == null) + throw new Exception("No product found with the specified id"); + + if (ModelState.IsValid) + { + await _discountViewModelService.DeleteProduct(discount, product); + return new JsonResult(""); + } + + return ErrorForKendoGridJson(ModelState); + } + + [PermissionAuthorizeAction(PermissionActionName.Edit)] + public async Task ProductAddPopup(string discountId) + { + var model = await _discountViewModelService.PrepareProductToDiscountModel(); + return View(model); + } + + [PermissionAuthorizeAction(PermissionActionName.Edit)] + [HttpPost] + public async Task ProductAddPopupList(DataSourceRequest command, + DiscountModel.AddProductToDiscountModel model) + { + model.SearchStoreId = CurrentStoreId; + var products = await _discountViewModelService.PrepareProductModel(model, command.Page, command.PageSize); + + var gridModel = new DataSourceResult { + Data = products.products.ToList(), + Total = products.totalCount + }; + + return Json(gridModel); + } + + [PermissionAuthorizeAction(PermissionActionName.Edit)] + [HttpPost] + public async Task ProductAddPopup(DiscountModel.AddProductToDiscountModel model) + { + var discount = await _discountService.GetDiscountById(model.DiscountId); + if (discount == null) + throw new Exception("No discount found with the specified id"); + + if (!discount.AccessToEntityByStore(CurrentStoreId)) + return Content("Access denied"); + + if (model.SelectedProductIds != null) await _discountViewModelService.InsertProductToDiscountModel(model); + + return Content(""); + } + + #endregion + + #region Applied to categories + + [PermissionAuthorizeAction(PermissionActionName.Preview)] + [HttpPost] + public async Task CategoryList(DataSourceRequest command, string discountId, + [FromServices] ICategoryService categoryService) + { + var discount = await _discountService.GetDiscountById(discountId); + if (discount == null) + throw new Exception("No discount found with the specified id"); + + if (!discount.AccessToEntityByStore(CurrentStoreId)) + return new JsonResult(new DataSourceResult { Errors = "Access denied" }); + + var categories = await categoryService.GetAllCategoriesByDiscount(discount.Id); + var items = new List(); + foreach (var item in categories) + items.Add(new DiscountModel.AppliedToCategoryModel { + CategoryId = item.Id, + CategoryName = await categoryService.GetFormattedBreadCrumb(item) + }); + + var gridModel = new DataSourceResult { + Data = items, + Total = categories.Count + }; + + return Json(gridModel); + } + + [PermissionAuthorizeAction(PermissionActionName.Edit)] + public async Task CategoryDelete(string discountId, string categoryId, + [FromServices] ICategoryService categoryService) + { + var discount = await _discountService.GetDiscountById(discountId); + if (discount == null) + throw new Exception("No discount found with the specified id"); + + if (!discount.AccessToEntityByStore(CurrentStoreId)) + return new JsonResult(new DataSourceResult { Errors = "Access denied" }); + + var category = await categoryService.GetCategoryById(categoryId); + if (category == null) + throw new Exception("No category found with the specified id"); + + if (ModelState.IsValid) + { + await _discountViewModelService.DeleteCategory(discount, category); + return new JsonResult(""); + } + + return ErrorForKendoGridJson(ModelState); + } + + [PermissionAuthorizeAction(PermissionActionName.Edit)] + public IActionResult CategoryAddPopup(string discountId) + { + var model = new DiscountModel.AddCategoryToDiscountModel(); + return View(model); + } + + [PermissionAuthorizeAction(PermissionActionName.Edit)] + [HttpPost] + public async Task CategoryAddPopupList(DataSourceRequest command, + DiscountModel.AddCategoryToDiscountModel model, [FromServices] ICategoryService categoryService) + { + var categories = await categoryService.GetAllCategories(categoryName: model.SearchCategoryName, + storeId: CurrentStoreId, pageIndex: command.Page - 1, pageSize: command.PageSize, showHidden: true); + var items = new List(); + foreach (var item in categories) + { + var categoryModel = item.ToModel(); + categoryModel.Breadcrumb = await categoryService.GetFormattedBreadCrumb(item); + items.Add(categoryModel); + } + + var gridModel = new DataSourceResult { + Data = items, + Total = categories.TotalCount + }; + + return Json(gridModel); + } + + [PermissionAuthorizeAction(PermissionActionName.Edit)] + [HttpPost] + public async Task CategoryAddPopup(DiscountModel.AddCategoryToDiscountModel model) + { + var discount = await _discountService.GetDiscountById(model.DiscountId); + if (discount == null) + throw new Exception("No discount found with the specified id"); + + if (!discount.AccessToEntityByStore(CurrentStoreId)) + return Content("Access denied"); + + if (model.SelectedCategoryIds != null) await _discountViewModelService.InsertCategoryToDiscountModel(model); + + return Content(""); + } + + #endregion + + #region Applied to brands + + [PermissionAuthorizeAction(PermissionActionName.Preview)] + [HttpPost] + public async Task BrandList(DataSourceRequest command, string discountId, + [FromServices] IBrandService brandService) + { + var discount = await _discountService.GetDiscountById(discountId); + if (discount == null) + throw new Exception("No discount found with the specified id"); + + if (!discount.AccessToEntityByStore(CurrentStoreId)) + return new JsonResult(new DataSourceResult { Errors = "Access denied" }); + + var brands = await brandService.GetAllBrandsByDiscount(discount.Id); + var gridModel = new DataSourceResult { + Data = brands.Select(x => new DiscountModel.AppliedToBrandModel { + BrandId = x.Id, + BrandName = x.Name + }), + Total = brands.Count + }; + + return Json(gridModel); + } + + [PermissionAuthorizeAction(PermissionActionName.Edit)] + public async Task BrandDelete(string discountId, string brandId, + [FromServices] IBrandService brandService) + { + var discount = await _discountService.GetDiscountById(discountId); + if (discount == null) + throw new Exception("No discount found with the specified id"); + + if (!discount.AccessToEntityByStore(CurrentStoreId)) + return new JsonResult(new DataSourceResult { Errors = "Access denied" }); + + var brand = await brandService.GetBrandById(brandId); + if (brand == null) + throw new Exception("No brand found with the specified id"); + + if (ModelState.IsValid) + { + await _discountViewModelService.DeleteBrand(discount, brand); + return new JsonResult(""); + } + + return ErrorForKendoGridJson(ModelState); + } + + [PermissionAuthorizeAction(PermissionActionName.Edit)] + public IActionResult BrandAddPopup(string discountId) + { + var model = new DiscountModel.AddBrandToDiscountModel(); + return View(model); + } + + [PermissionAuthorizeAction(PermissionActionName.Edit)] + [HttpPost] + public async Task BrandAddPopupList(DataSourceRequest command, + DiscountModel.AddBrandToDiscountModel model, [FromServices] IBrandService brandService) + { + var brands = await brandService.GetAllBrands(model.SearchBrandName, + CurrentStoreId, command.Page - 1, command.PageSize, true); + + var gridModel = new DataSourceResult { + Data = brands.Select(x => x.ToModel()), + Total = brands.TotalCount + }; + + return Json(gridModel); + } + + [PermissionAuthorizeAction(PermissionActionName.Edit)] + [HttpPost] + public async Task BrandAddPopup(DiscountModel.AddBrandToDiscountModel model) + { + var discount = await _discountService.GetDiscountById(model.DiscountId); + if (discount == null) + throw new Exception("No discount found with the specified id"); + + if (!discount.AccessToEntityByStore(CurrentStoreId)) + return Content("Access denied"); + + if (model.SelectedBrandIds != null) await _discountViewModelService.InsertBrandToDiscountModel(model); + + return Content(""); + } + + #endregion + + #region Applied to collections + + [PermissionAuthorizeAction(PermissionActionName.Preview)] + [HttpPost] + public async Task CollectionList(DataSourceRequest command, string discountId, + [FromServices] ICollectionService collectionService) + { + var discount = await _discountService.GetDiscountById(discountId); + if (discount == null) + throw new Exception("No discount found with the specified id"); + + if (!discount.AccessToEntityByStore(CurrentStoreId)) + return new JsonResult(new DataSourceResult { Errors = "Access denied" }); + + var collections = await collectionService.GetAllCollectionsByDiscount(discount.Id); + var gridModel = new DataSourceResult { + Data = collections.Select(x => new DiscountModel.AppliedToCollectionModel { + CollectionId = x.Id, + CollectionName = x.Name + }), + Total = collections.Count + }; + + return Json(gridModel); + } + + [PermissionAuthorizeAction(PermissionActionName.Edit)] + public async Task CollectionDelete(string discountId, string collectionId, + [FromServices] ICollectionService collectionService) + { + var discount = await _discountService.GetDiscountById(discountId); + if (discount == null) + throw new Exception("No discount found with the specified id"); + + if (!discount.AccessToEntityByStore(CurrentStoreId)) + return new JsonResult(new DataSourceResult { Errors = "Access denied" }); + + var collection = await collectionService.GetCollectionById(collectionId); + if (collection == null) + throw new Exception("No collection found with the specified id"); + + if (ModelState.IsValid) + { + await _discountViewModelService.DeleteCollection(discount, collection); + return new JsonResult(""); + } + + return ErrorForKendoGridJson(ModelState); + } + + [PermissionAuthorizeAction(PermissionActionName.Edit)] + public IActionResult CollectionAddPopup(string discountId) + { + var model = new DiscountModel.AddCollectionToDiscountModel(); + return View(model); + } + + [PermissionAuthorizeAction(PermissionActionName.Edit)] + [HttpPost] + public async Task CollectionAddPopupList(DataSourceRequest command, + DiscountModel.AddCollectionToDiscountModel model, [FromServices] ICollectionService collectionService) + { + var collections = await collectionService.GetAllCollections(model.SearchCollectionName, CurrentStoreId, + command.Page - 1, command.PageSize, true); + var gridModel = new DataSourceResult { + Data = collections.Select(x => x.ToModel()), + Total = collections.TotalCount + }; + + return Json(gridModel); + } + + [PermissionAuthorizeAction(PermissionActionName.Edit)] + [HttpPost] + public async Task CollectionAddPopup(DiscountModel.AddCollectionToDiscountModel model) + { + var discount = await _discountService.GetDiscountById(model.DiscountId); + if (discount == null) + throw new Exception("No discount found with the specified id"); + + if (!discount.AccessToEntityByStore(CurrentStoreId)) + return Content("Access denied"); + + if (model.SelectedCollectionIds != null) await _discountViewModelService.InsertCollectionToDiscountModel(model); + + return Content(""); + } + + #endregion + + #region Discount usage history + + [PermissionAuthorizeAction(PermissionActionName.Preview)] + [HttpPost] + public async Task UsageHistoryList(string discountId, DataSourceRequest command) + { + var discount = await _discountService.GetDiscountById(discountId); + if (discount == null) + throw new ArgumentException("No discount found with the specified id"); + + if (!discount.AccessToEntityByStore(CurrentStoreId)) + return new JsonResult(new DataSourceResult { Errors = "Access denied" }); + + var (usageHistoryModels, totalCount) = + await _discountViewModelService.PrepareDiscountUsageHistoryModel(discount, command.Page, + command.PageSize); + var gridModel = new DataSourceResult { + Data = usageHistoryModels.ToList(), + Total = totalCount + }; + return Json(gridModel); + } + + [PermissionAuthorizeAction(PermissionActionName.Edit)] + [HttpPost] + public async Task UsageHistoryDelete(string discountId, string id) + { + var discount = await _discountService.GetDiscountById(discountId); + if (discount == null) + throw new ArgumentException("No discount found with the specified id"); + + if (!discount.AccessToEntityByStore(CurrentStoreId)) + return new JsonResult(new DataSourceResult { Errors = "Access denied" }); + + var duh = await _discountService.GetDiscountUsageHistoryById(id); + if (duh != null) + { + if (ModelState.IsValid) + await _discountService.DeleteDiscountUsageHistory(duh); + else + return ErrorForKendoGridJson(ModelState); + } + + return new JsonResult(""); + } + + #endregion +} diff --git a/src/Web/Grand.Web.Store/Controllers/HomeController.cs b/src/Web/Grand.Web.Store/Controllers/HomeController.cs index dd733c6c8..6ba8b7bd5 100644 --- a/src/Web/Grand.Web.Store/Controllers/HomeController.cs +++ b/src/Web/Grand.Web.Store/Controllers/HomeController.cs @@ -1,5 +1,4 @@ -using Grand.Business.Common.Services.Localization; -using Grand.Business.Core.Interfaces.Authentication; +using Grand.Business.Core.Interfaces.Authentication; using Grand.Business.Core.Interfaces.Common.Directory; using Grand.Business.Core.Interfaces.Common.Localization; using Grand.Business.Core.Interfaces.Customers;