Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
ARCH-001 Phase 12: Discount controller/service consolidation (Admin/Store) (#805)
Krzysztof Pajakb3f825e8d8e6
diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/AdminDiscountDataScopeTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/AdminDiscountDataScopeTests.csnew file mode 100644index 000000000..41af5c61e--- /dev/null+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/AdminDiscountDataScopeTests.cs@@ -0,0 +1,91 @@+#nullable enable++using Grand.Business.Core.Interfaces.Common.Directory;+using Grand.Domain.Customers;+using Grand.Domain.Discounts;+using Grand.Infrastructure;+using Grand.Web.AdminShared.Services;+using Microsoft.VisualStudio.TestTools.UnitTesting;+using Moq;++namespace Grand.Web.Admin.Tests.Controllers;++[TestClass]+public class AdminDiscountDataScopeTests+{+ private static AdminDiscountDataScope BuildScope(bool isStoreManager, string staffStoreId = "store-a")+ {+ var customer = new Customer { StaffStoreId = staffStoreId };+ var workContext = new Mock<IWorkContext>();+ workContext.Setup(x => x.CurrentCustomer).Returns(customer);+ var contextAccessor = new Mock<IContextAccessor>();+ contextAccessor.Setup(x => x.WorkContext).Returns(workContext.Object);+ var groupService = new Mock<IGroupService>();+ groupService.Setup(x => x.IsStoreManager(customer)).ReturnsAsync(isStoreManager);+ return new AdminDiscountDataScope(contextAccessor.Object, groupService.Object);+ }++ [TestMethod]+ public async Task HasAccess_NotStoreManager_AlwaysTrue()+ {+ var scope = BuildScope(isStoreManager: false);+ var discount = new Discount { LimitedToStores = true, Stores = ["store-b"] };+ Assert.IsTrue(await scope.HasAccess(discount));+ }++ [TestMethod]+ public async Task HasAccess_StoreManager_DeniesOtherStoreDiscount()+ {+ var scope = BuildScope(isStoreManager: true, staffStoreId: "store-a");+ var discount = new Discount { LimitedToStores = true, Stores = ["store-b"] };+ Assert.IsFalse(await scope.HasAccess(discount));+ }++ [TestMethod]+ public async Task HasAccess_StoreManager_AllowsOwnStoreDiscount()+ {+ var scope = BuildScope(isStoreManager: true, staffStoreId: "store-a");+ var discount = new Discount { LimitedToStores = true, Stores = ["store-a"] };+ Assert.IsTrue(await scope.HasAccess(discount));+ }++ [TestMethod]+ public async Task CanView_StoreManager_GlobalDiscount_AllowedDespiteNotOwning()+ {+ var scope = BuildScope(isStoreManager: true, staffStoreId: "store-a");+ var discount = new Discount { LimitedToStores = false, Stores = [] };+ Assert.IsTrue(await scope.CanView(discount));+ }++ [TestMethod]+ public async Task CanView_StoreManager_ExclusivelyOtherStoreDiscount_Denied()+ {+ var scope = BuildScope(isStoreManager: true, staffStoreId: "store-a");+ var discount = new Discount { LimitedToStores = true, Stores = ["store-b"] };+ Assert.IsFalse(await scope.CanView(discount));+ }++ [TestMethod]+ public async Task GetDefaultStoreIdAsync_NotStoreManager_ReturnsNull()+ {+ var scope = BuildScope(isStoreManager: false);+ Assert.IsNull(await scope.GetDefaultStoreIdAsync());+ }++ [TestMethod]+ public async Task GetDefaultStoreIdAsync_StoreManager_ReturnsStaffStoreId()+ {+ var scope = BuildScope(isStoreManager: true, staffStoreId: "store-a");+ Assert.AreEqual("store-a", await scope.GetDefaultStoreIdAsync());+ }++ [TestMethod]+ public void DefaultStoreId_SyncAccess_ThrowsNotSupported()+ {+ // DefaultStoreId requires the async IsStoreManager check and deliberately has no+ // sync-safe implementation - see AdminDiscountDataScope's own doc comment. Every call+ // site is async and must use GetDefaultStoreIdAsync instead.+ var scope = BuildScope(isStoreManager: false);+ Assert.ThrowsExactly<NotSupportedException>(() => _ = scope.DefaultStoreId);+ }+}diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseDiscountControllerTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseDiscountControllerTests.csnew file mode 100644index 000000000..a8709fa61--- /dev/null+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseDiscountControllerTests.cs@@ -0,0 +1,1088 @@+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;+using Grand.Domain.Catalog;+using Grand.Domain.Discounts;+using Grand.Domain.Permissions;+using Grand.Infrastructure.Mapper;+using Grand.Mapping;+using Grand.Mediator;+using Grand.Web.AdminShared.Controllers;+using Grand.Web.AdminShared.Interfaces;+using Grand.Web.AdminShared.Mapper;+using Grand.Web.AdminShared.Models.Catalog;+using Grand.Web.AdminShared.Models.Discounts;+using Grand.Web.Common.DataSource;+using Grand.Web.Common.Security.Authorization;+using Microsoft.AspNetCore.Http;+using Microsoft.AspNetCore.Mvc;+using Microsoft.AspNetCore.Mvc.Routing;+using Microsoft.AspNetCore.Mvc.ViewFeatures;+using Microsoft.Extensions.Logging;+using Microsoft.VisualStudio.TestTools.UnitTesting;+using Moq;++namespace Grand.Web.Admin.Tests.Controllers;++[TestClass]+public class BaseDiscountControllerTests+{+ // BaseDiscountController is abstract; minimal subclass so actions can be invoked directly.+ private class TestDiscountController(+ IDiscountViewModelService discountViewModelService,+ IDiscountService discountService,+ ITranslationService translationService,+ IDateTimeService dateTimeService,+ IMediator mediator,+ IDiscountProviderLoader discountProviderLoader,+ IAdminDataScope<Discount> scope)+ : BaseDiscountController(discountViewModelService, discountService, translationService, dateTimeService,+ mediator, discountProviderLoader, scope);++ private Mock<IDiscountViewModelService> _vmService = null!;+ private Mock<IDiscountService> _service = null!;+ private Mock<IAdminDataScope<Discount>> _scope = null!;+ private Mock<IMediator> _mediator = null!;+ private Mock<IDiscountProviderLoader> _loader = null!;+ private TestDiscountController _sut = null!;++ [TestInitialize]+ public void Setup()+ {+ var mapperConfig = new MapperConfiguration(cfg => cfg.AddProfile<DiscountProfile>());+ AutoMapperConfig.Init(mapperConfig);++ _vmService = new Mock<IDiscountViewModelService>();+ _service = new Mock<IDiscountService>();+ _scope = new Mock<IAdminDataScope<Discount>>();+ _mediator = new Mock<IMediator>();+ _loader = new Mock<IDiscountProviderLoader>();++ var translationServiceMock = new Mock<ITranslationService>();+ translationServiceMock.Setup(t => t.GetResource(It.IsAny<string>())).Returns("resource");++ _sut = new TestDiscountController(_vmService.Object, _service.Object,+ translationServiceMock.Object, Mock.Of<IDateTimeService>(), _mediator.Object, _loader.Object,+ _scope.Object);++ var httpContext = new DefaultHttpContext();+ var loggerFactoryMock = new Mock<ILoggerFactory>();+ loggerFactoryMock.Setup(l => l.CreateLogger(It.IsAny<string>())).Returns(new Mock<ILogger>().Object);+ var urlHelperFactoryMock = new Mock<IUrlHelperFactory>();+ urlHelperFactoryMock.Setup(f => f.GetUrlHelper(It.IsAny<ActionContext>())).Returns(new Mock<IUrlHelper>().Object);+ var requestServicesMock = new Mock<IServiceProvider>();+ requestServicesMock.Setup(s => s.GetService(typeof(ILoggerFactory))).Returns(loggerFactoryMock.Object);+ requestServicesMock.Setup(s => s.GetService(typeof(IUrlHelperFactory))).Returns(urlHelperFactoryMock.Object);+ httpContext.RequestServices = requestServicesMock.Object;+ _sut.ControllerContext = new ControllerContext { HttpContext = httpContext };+ _sut.TempData = new TempDataDictionary(httpContext, new Mock<ITempDataProvider>().Object);+ }++ [TestMethod]+ public async Task Edit_Get_ScopeDeniesView_RedirectsToList()+ {+ var discount = new Discount { Id = "1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _scope.Setup(x => x.CanView(discount)).ReturnsAsync(false);++ var result = await _sut.Edit("1") as RedirectToActionResult;++ Assert.AreEqual("List", result!.ActionName);+ }++ [TestMethod]+ public async Task Edit_Get_ScopeAllowsView_ReturnsView()+ {+ var discount = new Discount { Id = "1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _scope.Setup(x => x.CanView(discount)).ReturnsAsync(true);++ var result = await _sut.Edit("1") as ViewResult;++ Assert.IsNotNull(result);+ Assert.IsInstanceOfType(result!.Model, typeof(DiscountModel));+ _vmService.Verify(x => x.PrepareDiscountModel(It.IsAny<DiscountModel>(), discount), Times.Once);+ }++ [TestMethod]+ public async Task Edit_Post_ScopeDeniesAccess_RedirectsToEditSelf()+ {+ var discount = new Discount { Id = "1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _scope.Setup(x => x.HasAccess(discount)).ReturnsAsync(false);+ var model = new DiscountModel { Id = "1" };++ var result = await _sut.Edit(model, false) as RedirectToActionResult;++ Assert.AreEqual("Edit", result!.ActionName);+ }++ [TestMethod]+ public async Task Delete_ScopeDeniesAccess_RedirectsToEditSelf()+ {+ var discount = new Discount { Id = "1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _scope.Setup(x => x.HasAccess(discount)).ReturnsAsync(false);+ _mediator.Setup(x => x.Send(It.IsAny<GetDiscountUsageHistoryQuery>(), default))+ .ReturnsAsync(new PagedList<DiscountUsageHistory>());++ var result = await _sut.Delete("1") as RedirectToActionResult;++ Assert.AreEqual("Edit", result!.ActionName);+ }++ [TestMethod]+ public async Task Delete_HasUsageHistory_BlocksDeletionEvenWithAccess()+ {+ var discount = new Discount { Id = "1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _scope.Setup(x => x.HasAccess(discount)).ReturnsAsync(true);+ _mediator.Setup(x => x.Send(It.IsAny<GetDiscountUsageHistoryQuery>(), default))+ .ReturnsAsync(new PagedList<DiscountUsageHistory>(new List<DiscountUsageHistory> { new() }, 0, int.MaxValue));++ var result = await _sut.Delete("1") as RedirectToActionResult;++ Assert.AreEqual("Edit", result!.ActionName);+ _vmService.Verify(x => x.DeleteDiscount(It.IsAny<Discount>()), Times.Never);+ }++ [TestMethod]+ public async Task Delete_HasAccessAndNoUsageHistory_DeletesAndRedirectsToList()+ {+ var discount = new Discount { Id = "1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _scope.Setup(x => x.HasAccess(discount)).ReturnsAsync(true);+ _mediator.Setup(x => x.Send(It.IsAny<GetDiscountUsageHistoryQuery>(), default))+ .ReturnsAsync(new PagedList<DiscountUsageHistory>());++ var result = await _sut.Delete("1") as RedirectToActionResult;++ Assert.AreEqual("List", result!.ActionName);+ _vmService.Verify(x => x.DeleteDiscount(discount), Times.Once);+ }++ [TestMethod]+ public void Index_RedirectsToList()+ {+ var result = _sut.Index() as RedirectToActionResult;+ Assert.AreEqual("List", result!.ActionName);+ }++ [TestMethod]+ public async Task Create_Post_DefaultStoreIdSet_ForcesModelStores()+ {+ _scope.Setup(x => x.GetDefaultStoreIdAsync()).ReturnsAsync("store-A");+ var model = new DiscountModel { Name = "Test" };+ _vmService.Setup(x => x.InsertDiscountModel(model)).ReturnsAsync(new Discount { Id = "1" });++ await _sut.Create(model, false);++ CollectionAssert.AreEqual(new[] { "store-A" }, model.Stores);+ }++ [TestMethod]+ public async Task CouponCodeDelete_ScopeDeniesAccess_ReturnsAccessDeniedJson()+ {+ var discount = new Discount { Id = "1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _scope.Setup(x => x.HasAccess(discount)).ReturnsAsync(false);++ var result = await _sut.CouponCodeDelete("1", "coupon-1") as JsonResult;++ var data = (DataSourceResult)result!.Value!;+ Assert.AreEqual("Access denied", data.Errors);+ }++ [TestMethod]+ public async Task CouponCodeInsert_ScopeAllowsAccess_InsertsCoupon()+ {+ var discount = new Discount { Id = "1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _scope.Setup(x => x.HasAccess(discount)).ReturnsAsync(true);+ _service.Setup(x => x.GetDiscountByCouponCode("SAVE10")).ReturnsAsync((Discount?)null);++ await _sut.CouponCodeInsert("1", "save10");++ _vmService.Verify(x => x.InsertCouponCode("1", "SAVE10"), Times.Once);+ }++ [TestMethod]+ public async Task GetDiscountRequirementConfigurationUrl_ScopeDeniesAccess_ReturnsGracefulJsonError()+ {+ var discount = new Discount { Id = "1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _scope.Setup(x => x.HasAccess(discount)).ReturnsAsync(false);+ var provider = Mock.Of<IDiscountProvider>();+ _loader.Setup(x => x.LoadDiscountProviderByRuleSystemName("rule1")).Returns(provider);++ var result = await _sut.GetDiscountRequirementConfigurationUrl("rule1", "1", "req1") as JsonResult;++ Assert.IsFalse((bool)result!.Value!.GetType().GetProperty("Result")!.GetValue(result.Value)!);+ }++ [TestMethod]+ public async Task GetDiscountRequirementMetaInfo_ScopeDeniesAccess_ReturnsGracefulJsonError()+ {+ var discount = new Discount { Id = "1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _scope.Setup(x => x.HasAccess(discount)).ReturnsAsync(false);++ var result = await _sut.GetDiscountRequirementMetaInfo("req1", "1") as JsonResult;++ Assert.IsFalse((bool)result!.Value!.GetType().GetProperty("Result")!.GetValue(result.Value)!);+ }++ [TestMethod]+ public async Task DeleteDiscountRequirement_ScopeDeniesAccess_ReturnsGracefulJsonError()+ {+ var discount = new Discount { Id = "1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _scope.Setup(x => x.HasAccess(discount)).ReturnsAsync(false);++ var result = await _sut.DeleteDiscountRequirement("req1", "1") as JsonResult;++ Assert.IsFalse((bool)result!.Value!.GetType().GetProperty("Result")!.GetValue(result.Value)!);+ }++ [TestMethod]+ public async Task ProductList_ScopeDeniesView_ReturnsAccessDeniedJson()+ {+ var discount = new Discount { Id = "1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _scope.Setup(x => x.CanView(discount)).ReturnsAsync(false);+ var productService = new Mock<IProductService>();++ var result = await _sut.ProductList(new DataSourceRequest(), "1", productService.Object) as JsonResult;++ var data = (DataSourceResult)result!.Value!;+ Assert.AreEqual("Access denied", data.Errors);+ }++ [TestMethod]+ public async Task ProductList_ScopeAllowsView_ReturnsProducts()+ {+ var discount = new Discount { Id = "1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _scope.Setup(x => x.CanView(discount)).ReturnsAsync(true);+ var productService = new Mock<IProductService>();+ var products = new PagedList<Product>(new List<Product> { new() { Id = "p1", Name = "Product 1" } }, 0, int.MaxValue);+ productService.Setup(x => x.GetProductsByDiscount("1", 0, 10)).ReturnsAsync(products);++ var result = await _sut.ProductList(new DataSourceRequest { Page = 1, PageSize = 10 }, "1", productService.Object) as JsonResult;++ var data = (DataSourceResult)result!.Value!;+ Assert.AreEqual(1, data.Total);+ }++ [TestMethod]+ public async Task ProductDelete_ScopeDeniesAccess_ReturnsAccessDeniedJson()+ {+ var discount = new Discount { Id = "1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _scope.Setup(x => x.HasAccess(discount)).ReturnsAsync(false);+ var productService = new Mock<IProductService>();++ var result = await _sut.ProductDelete("1", "p1", productService.Object) as JsonResult;++ var data = (DataSourceResult)result!.Value!;+ Assert.AreEqual("Access denied", data.Errors);+ }++ [TestMethod]+ public async Task ProductDelete_ScopeAllowsAccess_DeletesProduct()+ {+ var discount = new Discount { Id = "1" };+ var product = new Product { Id = "p1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _scope.Setup(x => x.HasAccess(discount)).ReturnsAsync(true);+ var productService = new Mock<IProductService>();+ productService.Setup(x => x.GetProductById("p1", false)).ReturnsAsync(product);++ await _sut.ProductDelete("1", "p1", productService.Object);++ _vmService.Verify(x => x.DeleteProduct(discount, product), Times.Once);+ }++ [TestMethod]+ public async Task ProductAddPopup_Get_ScopeDeniesAccess_ReturnsAccessDeniedJson()+ {+ var discount = new Discount { Id = "1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _scope.Setup(x => x.HasAccess(discount)).ReturnsAsync(false);++ var result = await _sut.ProductAddPopup("1") as JsonResult;++ var data = (DataSourceResult)result!.Value!;+ Assert.AreEqual("Access denied", data.Errors);+ }++ [TestMethod]+ public async Task ProductAddPopup_Get_ScopeAllowsAccess_ReturnsView()+ {+ var discount = new Discount { Id = "1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _scope.Setup(x => x.HasAccess(discount)).ReturnsAsync(true);+ var model = new DiscountModel.AddProductToDiscountModel();+ _vmService.Setup(x => x.PrepareProductToDiscountModel()).ReturnsAsync(model);++ var result = await _sut.ProductAddPopup("1") as ViewResult;++ Assert.AreSame(model, result!.Model);+ }++ [TestMethod]+ public async Task ProductAddPopupList_GlobalScope_LeavesSearchStoreIdUntouched()+ {+ _scope.Setup(x => x.GetDefaultStoreIdAsync()).ReturnsAsync((string?)null);+ var model = new DiscountModel.AddProductToDiscountModel { SearchStoreId = "client-supplied" };+ _vmService.Setup(x => x.PrepareProductModel(model, 1, 10))+ .ReturnsAsync((new List<ProductModel>(), 0));++ await _sut.ProductAddPopupList(new DataSourceRequest { Page = 1, PageSize = 10 }, model);++ Assert.AreEqual("client-supplied", model.SearchStoreId);+ }++ [TestMethod]+ public async Task ProductAddPopupList_StoreScope_ForcesSearchStoreId()+ {+ _scope.Setup(x => x.GetDefaultStoreIdAsync()).ReturnsAsync("store-a");+ var model = new DiscountModel.AddProductToDiscountModel { SearchStoreId = "client-supplied" };+ _vmService.Setup(x => x.PrepareProductModel(model, 1, 10))+ .ReturnsAsync((new List<ProductModel>(), 0));++ await _sut.ProductAddPopupList(new DataSourceRequest { Page = 1, PageSize = 10 }, model);++ Assert.AreEqual("store-a", model.SearchStoreId);+ }++ [TestMethod]+ public async Task ProductAddPopup_Post_ScopeDeniesAccess_ReturnsAccessDeniedContent()+ {+ var discount = new Discount { Id = "1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _scope.Setup(x => x.HasAccess(discount)).ReturnsAsync(false);+ var model = new DiscountModel.AddProductToDiscountModel { DiscountId = "1" };++ var result = await _sut.ProductAddPopup(model) as ContentResult;++ Assert.AreEqual("Access denied", result!.Content);+ }++ [TestMethod]+ public async Task ProductAddPopup_Post_ScopeAllowsAccess_InsertsProduct()+ {+ var discount = new Discount { Id = "1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _scope.Setup(x => x.HasAccess(discount)).ReturnsAsync(true);+ var model = new DiscountModel.AddProductToDiscountModel { DiscountId = "1", SelectedProductIds = ["p1"] };++ await _sut.ProductAddPopup(model);++ _vmService.Verify(x => x.InsertProductToDiscountModel(model), Times.Once);+ }++ [TestMethod]+ public async Task CategoryList_ScopeDeniesView_ReturnsAccessDeniedJson()+ {+ var discount = new Discount { Id = "1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _scope.Setup(x => x.CanView(discount)).ReturnsAsync(false);+ var categoryService = new Mock<ICategoryService>();++ var result = await _sut.CategoryList(new DataSourceRequest(), "1", categoryService.Object) as JsonResult;++ var data = (DataSourceResult)result!.Value!;+ Assert.AreEqual("Access denied", data.Errors);+ }++ [TestMethod]+ public async Task CategoryDelete_ScopeDeniesAccess_ReturnsAccessDeniedJson()+ {+ var discount = new Discount { Id = "1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _scope.Setup(x => x.HasAccess(discount)).ReturnsAsync(false);+ var categoryService = new Mock<ICategoryService>();++ var result = await _sut.CategoryDelete("1", "c1", categoryService.Object) as JsonResult;++ var data = (DataSourceResult)result!.Value!;+ Assert.AreEqual("Access denied", data.Errors);+ }++ [TestMethod]+ public async Task CategoryAddPopup_Get_ScopeDeniesAccess_ReturnsAccessDeniedJson()+ {+ var discount = new Discount { Id = "1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _scope.Setup(x => x.HasAccess(discount)).ReturnsAsync(false);++ var result = await _sut.CategoryAddPopup("1") as JsonResult;++ var data = (DataSourceResult)result!.Value!;+ Assert.AreEqual("Access denied", data.Errors);+ }++ [TestMethod]+ public async Task CategoryAddPopup_Post_ScopeDeniesAccess_ReturnsAccessDeniedContent()+ {+ var discount = new Discount { Id = "1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _scope.Setup(x => x.HasAccess(discount)).ReturnsAsync(false);+ var model = new DiscountModel.AddCategoryToDiscountModel { DiscountId = "1" };++ var result = await _sut.CategoryAddPopup(model) as ContentResult;++ Assert.AreEqual("Access denied", result!.Content);+ }++ [TestMethod]+ public async Task CategoryAddPopupList_GlobalScope_PassesEmptyStoreId()+ {+ _scope.Setup(x => x.GetDefaultStoreIdAsync()).ReturnsAsync((string?)null);+ var categoryService = new Mock<ICategoryService>();+ categoryService.Setup(x => x.GetAllCategories(null, null, "", 0, 10, true))+ .ReturnsAsync(new PagedList<Category>(new List<Category>(), 0, 10, 0));++ await _sut.CategoryAddPopupList(new DataSourceRequest { Page = 1, PageSize = 10 },+ new DiscountModel.AddCategoryToDiscountModel(), categoryService.Object);++ categoryService.Verify(x => x.GetAllCategories(null, null, "", 0, 10, true), Times.Once);+ }++ [TestMethod]+ public async Task CategoryAddPopupList_StoreScope_PassesScopedStoreId()+ {+ _scope.Setup(x => x.GetDefaultStoreIdAsync()).ReturnsAsync("store-a");+ var categoryService = new Mock<ICategoryService>();+ categoryService.Setup(x => x.GetAllCategories(null, null, "store-a", 0, 10, true))+ .ReturnsAsync(new PagedList<Category>(new List<Category>(), 0, 10, 0));++ await _sut.CategoryAddPopupList(new DataSourceRequest { Page = 1, PageSize = 10 },+ new DiscountModel.AddCategoryToDiscountModel(), categoryService.Object);++ categoryService.Verify(x => x.GetAllCategories(null, null, "store-a", 0, 10, true), Times.Once);+ }++ [TestMethod]+ public async Task BrandList_ScopeDeniesView_ReturnsAccessDeniedJson()+ {+ var discount = new Discount { Id = "1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _scope.Setup(x => x.CanView(discount)).ReturnsAsync(false);+ var brandService = new Mock<IBrandService>();++ var result = await _sut.BrandList(new DataSourceRequest(), "1", brandService.Object) as JsonResult;++ var data = (DataSourceResult)result!.Value!;+ Assert.AreEqual("Access denied", data.Errors);+ }++ [TestMethod]+ public async Task BrandDelete_ScopeDeniesAccess_ReturnsAccessDeniedJson()+ {+ var discount = new Discount { Id = "1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _scope.Setup(x => x.HasAccess(discount)).ReturnsAsync(false);+ var brandService = new Mock<IBrandService>();++ var result = await _sut.BrandDelete("1", "b1", brandService.Object) as JsonResult;++ var data = (DataSourceResult)result!.Value!;+ Assert.AreEqual("Access denied", data.Errors);+ }++ [TestMethod]+ public async Task BrandAddPopup_Get_ScopeDeniesAccess_ReturnsAccessDeniedJson()+ {+ var discount = new Discount { Id = "1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _scope.Setup(x => x.HasAccess(discount)).ReturnsAsync(false);++ var result = await _sut.BrandAddPopup("1") as JsonResult;++ var data = (DataSourceResult)result!.Value!;+ Assert.AreEqual("Access denied", data.Errors);+ }++ [TestMethod]+ public async Task BrandAddPopup_Post_ScopeDeniesAccess_ReturnsAccessDeniedContent()+ {+ var discount = new Discount { Id = "1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _scope.Setup(x => x.HasAccess(discount)).ReturnsAsync(false);+ var model = new DiscountModel.AddBrandToDiscountModel { DiscountId = "1" };++ var result = await _sut.BrandAddPopup(model) as ContentResult;++ Assert.AreEqual("Access denied", result!.Content);+ }++ [TestMethod]+ public async Task BrandAddPopupList_GlobalScope_PassesEmptyStoreId()+ {+ _scope.Setup(x => x.GetDefaultStoreIdAsync()).ReturnsAsync((string?)null);+ var brandService = new Mock<IBrandService>();+ brandService.Setup(x => x.GetAllBrands(null, "", 0, 10, true))+ .ReturnsAsync(new PagedList<Brand>(new List<Brand>(), 0, 10, 0));++ await _sut.BrandAddPopupList(new DataSourceRequest { Page = 1, PageSize = 10 },+ new DiscountModel.AddBrandToDiscountModel(), brandService.Object);++ brandService.Verify(x => x.GetAllBrands(null, "", 0, 10, true), Times.Once);+ }++ [TestMethod]+ public async Task BrandAddPopupList_StoreScope_PassesScopedStoreId()+ {+ _scope.Setup(x => x.GetDefaultStoreIdAsync()).ReturnsAsync("store-a");+ var brandService = new Mock<IBrandService>();+ brandService.Setup(x => x.GetAllBrands(null, "store-a", 0, 10, true))+ .ReturnsAsync(new PagedList<Brand>(new List<Brand>(), 0, 10, 0));++ await _sut.BrandAddPopupList(new DataSourceRequest { Page = 1, PageSize = 10 },+ new DiscountModel.AddBrandToDiscountModel(), brandService.Object);++ brandService.Verify(x => x.GetAllBrands(null, "store-a", 0, 10, true), Times.Once);+ }++ [TestMethod]+ public async Task CollectionList_ScopeDeniesView_ReturnsAccessDeniedJson()+ {+ var discount = new Discount { Id = "1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _scope.Setup(x => x.CanView(discount)).ReturnsAsync(false);+ var collectionService = new Mock<ICollectionService>();++ var result = await _sut.CollectionList(new DataSourceRequest(), "1", collectionService.Object) as JsonResult;++ var data = (DataSourceResult)result!.Value!;+ Assert.AreEqual("Access denied", data.Errors);+ }++ [TestMethod]+ public async Task CollectionDelete_ScopeDeniesAccess_ReturnsAccessDeniedJson()+ {+ var discount = new Discount { Id = "1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _scope.Setup(x => x.HasAccess(discount)).ReturnsAsync(false);+ var collectionService = new Mock<ICollectionService>();++ var result = await _sut.CollectionDelete("1", "c1", collectionService.Object) as JsonResult;++ var data = (DataSourceResult)result!.Value!;+ Assert.AreEqual("Access denied", data.Errors);+ }++ [TestMethod]+ public async Task CollectionAddPopup_Get_ScopeDeniesAccess_ReturnsAccessDeniedJson()+ {+ var discount = new Discount { Id = "1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _scope.Setup(x => x.HasAccess(discount)).ReturnsAsync(false);++ var result = await _sut.CollectionAddPopup("1") as JsonResult;++ var data = (DataSourceResult)result!.Value!;+ Assert.AreEqual("Access denied", data.Errors);+ }++ [TestMethod]+ public async Task CollectionAddPopup_Post_ScopeDeniesAccess_ReturnsAccessDeniedContent()+ {+ var discount = new Discount { Id = "1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _scope.Setup(x => x.HasAccess(discount)).ReturnsAsync(false);+ var model = new DiscountModel.AddCollectionToDiscountModel { DiscountId = "1" };++ var result = await _sut.CollectionAddPopup(model) as ContentResult;++ Assert.AreEqual("Access denied", result!.Content);+ }++ [TestMethod]+ public async Task CollectionAddPopupList_GlobalScope_PassesEmptyStoreId()+ {+ _scope.Setup(x => x.GetDefaultStoreIdAsync()).ReturnsAsync((string?)null);+ var collectionService = new Mock<ICollectionService>();+ collectionService.Setup(x => x.GetAllCollections(null, "", 0, 10, true))+ .ReturnsAsync(new PagedList<Collection>(new List<Collection>(), 0, 10, 0));++ await _sut.CollectionAddPopupList(new DataSourceRequest { Page = 1, PageSize = 10 },+ new DiscountModel.AddCollectionToDiscountModel(), collectionService.Object);++ collectionService.Verify(x => x.GetAllCollections(null, "", 0, 10, true), Times.Once);+ }++ [TestMethod]+ public async Task CollectionAddPopupList_StoreScope_PassesScopedStoreId()+ {+ _scope.Setup(x => x.GetDefaultStoreIdAsync()).ReturnsAsync("store-a");+ var collectionService = new Mock<ICollectionService>();+ collectionService.Setup(x => x.GetAllCollections(null, "store-a", 0, 10, true))+ .ReturnsAsync(new PagedList<Collection>(new List<Collection>(), 0, 10, 0));++ await _sut.CollectionAddPopupList(new DataSourceRequest { Page = 1, PageSize = 10 },+ new DiscountModel.AddCollectionToDiscountModel(), collectionService.Object);++ collectionService.Verify(x => x.GetAllCollections(null, "store-a", 0, 10, true), Times.Once);+ }++ [TestMethod]+ public async Task UsageHistoryList_ScopeDeniesAccess_ReturnsAccessDeniedJson()+ {+ var discount = new Discount { Id = "1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _scope.Setup(x => x.HasAccess(discount)).ReturnsAsync(false);++ var result = await _sut.UsageHistoryList("1", new DataSourceRequest()) as JsonResult;++ var data = (DataSourceResult)result!.Value!;+ Assert.AreEqual("Access denied", data.Errors);+ }++ [TestMethod]+ public async Task UsageHistoryList_ScopeAllowsAccess_ReturnsUsageHistory()+ {+ var discount = new Discount { Id = "1" };+ var usageHistoryModel = new DiscountModel.DiscountUsageHistoryModel { Id = "h1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _scope.Setup(x => x.HasAccess(discount)).ReturnsAsync(true);+ _vmService.Setup(x => x.PrepareDiscountUsageHistoryModel(discount, 1, 10))+ .ReturnsAsync((new[] { usageHistoryModel }, 1));++ var result = await _sut.UsageHistoryList("1", new DataSourceRequest { Page = 1, PageSize = 10 }) as JsonResult;++ var data = (DataSourceResult)result!.Value!;+ Assert.AreEqual(1, data.Total);+ Assert.AreEqual(1, ((List<DiscountModel.DiscountUsageHistoryModel>)data.Data).Count);+ }++ [TestMethod]+ public async Task UsageHistoryDelete_ScopeDeniesAccess_ReturnsAccessDeniedJson()+ {+ var discount = new Discount { Id = "1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _scope.Setup(x => x.HasAccess(discount)).ReturnsAsync(false);++ var result = await _sut.UsageHistoryDelete("1", "h1") as JsonResult;++ var data = (DataSourceResult)result!.Value!;+ Assert.AreEqual("Access denied", data.Errors);+ }++ [TestMethod]+ public async Task UsageHistoryDelete_ScopeAllowsAccess_DeletesHistory()+ {+ var discount = new Discount { Id = "1" };+ var history = new DiscountUsageHistory { Id = "h1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _scope.Setup(x => x.HasAccess(discount)).ReturnsAsync(true);+ _service.Setup(x => x.GetDiscountUsageHistoryById("h1")).ReturnsAsync(history);++ await _sut.UsageHistoryDelete("1", "h1");++ _service.Verify(x => x.DeleteDiscountUsageHistory(history), Times.Once);+ }+}++/// <summary>+/// Regression test for ARCH-001 authorization attributes on Discount applied-to-collections region+/// methods. Ensures CollectionList, CollectionDelete, both CollectionAddPopup overloads, and+/// CollectionAddPopupList carry the required [PermissionAuthorizeAction] attributes.+/// </summary>+[TestClass]+public class BaseDiscountControllerCollectionsAttributeTests+{+ [TestMethod]+ public void CollectionList_HasPermissionAuthorizeActionPreview()+ {+ var method = typeof(BaseDiscountController).GetMethod("CollectionList");+ Assert.IsNotNull(method, "CollectionList method not found");+ var attr = method!.GetCustomAttributes(typeof(PermissionAuthorizeActionAttribute), false)+ .Cast<PermissionAuthorizeActionAttribute>()+ .SingleOrDefault();+ Assert.IsNotNull(attr, "CollectionList missing [PermissionAuthorizeAction]");+ Assert.AreEqual(PermissionActionName.Preview, attr!.PermissionAction, "CollectionList should require Preview permission");+ }++ [TestMethod]+ public void CollectionDelete_HasPermissionAuthorizeActionEdit()+ {+ var method = typeof(BaseDiscountController).GetMethod("CollectionDelete");+ Assert.IsNotNull(method, "CollectionDelete method not found");+ var attr = method!.GetCustomAttributes(typeof(PermissionAuthorizeActionAttribute), false)+ .Cast<PermissionAuthorizeActionAttribute>()+ .SingleOrDefault();+ Assert.IsNotNull(attr, "CollectionDelete missing [PermissionAuthorizeAction]");+ Assert.AreEqual(PermissionActionName.Edit, attr!.PermissionAction, "CollectionDelete should require Edit permission");+ }++ [TestMethod]+ public void CollectionAddPopup_Get_HasPermissionAuthorizeActionEdit()+ {+ var method = typeof(BaseDiscountController).GetMethod("CollectionAddPopup", [typeof(string)]);+ Assert.IsNotNull(method, "CollectionAddPopup(string) method not found");+ var attr = method!.GetCustomAttributes(typeof(PermissionAuthorizeActionAttribute), false)+ .Cast<PermissionAuthorizeActionAttribute>()+ .SingleOrDefault();+ Assert.IsNotNull(attr, "CollectionAddPopup(string) missing [PermissionAuthorizeAction]");+ Assert.AreEqual(PermissionActionName.Edit, attr!.PermissionAction, "CollectionAddPopup(string) should require Edit permission");+ }++ [TestMethod]+ public void CollectionAddPopupList_HasPermissionAuthorizeActionEdit()+ {+ var method = typeof(BaseDiscountController).GetMethod("CollectionAddPopupList");+ Assert.IsNotNull(method, "CollectionAddPopupList method not found");+ var attr = method!.GetCustomAttributes(typeof(PermissionAuthorizeActionAttribute), false)+ .Cast<PermissionAuthorizeActionAttribute>()+ .SingleOrDefault();+ Assert.IsNotNull(attr, "CollectionAddPopupList missing [PermissionAuthorizeAction]");+ Assert.AreEqual(PermissionActionName.Edit, attr!.PermissionAction, "CollectionAddPopupList should require Edit permission");+ }++ [TestMethod]+ public void CollectionAddPopup_Post_HasPermissionAuthorizeActionEdit()+ {+ var method = typeof(BaseDiscountController).GetMethod("CollectionAddPopup", [typeof(DiscountModel.AddCollectionToDiscountModel)]);+ Assert.IsNotNull(method, "CollectionAddPopup(AddCollectionToDiscountModel) method not found");+ var attr = method!.GetCustomAttributes(typeof(PermissionAuthorizeActionAttribute), false)+ .Cast<PermissionAuthorizeActionAttribute>()+ .SingleOrDefault();+ Assert.IsNotNull(attr, "CollectionAddPopup(AddCollectionToDiscountModel) missing [PermissionAuthorizeAction]");+ Assert.AreEqual(PermissionActionName.Edit, attr!.PermissionAction, "CollectionAddPopup(AddCollectionToDiscountModel) should require Edit permission");+ }+}++/// <summary>+/// Regression test for ARCH-001 authorization attributes on Discount applied-to-products region methods.+/// Ensures that ProductList, ProductDelete, and both ProductAddPopup overloads carry the required+/// [PermissionAuthorizeAction] attributes.+/// </summary>+[TestClass]+public class BaseDiscountControllerProductsAttributeTests+{+ [TestMethod]+ public void ProductList_HasPermissionAuthorizeActionPreview()+ {+ var method = typeof(BaseDiscountController).GetMethod("ProductList");+ Assert.IsNotNull(method, "ProductList method not found");+ var attr = method!.GetCustomAttributes(typeof(PermissionAuthorizeActionAttribute), false)+ .Cast<PermissionAuthorizeActionAttribute>()+ .SingleOrDefault();+ Assert.IsNotNull(attr, "ProductList missing [PermissionAuthorizeAction]");+ Assert.AreEqual(PermissionActionName.Preview, attr!.PermissionAction, "ProductList should require Preview permission");+ }++ [TestMethod]+ public void ProductDelete_HasPermissionAuthorizeActionEdit()+ {+ var method = typeof(BaseDiscountController).GetMethod("ProductDelete");+ Assert.IsNotNull(method, "ProductDelete method not found");+ var attr = method!.GetCustomAttributes(typeof(PermissionAuthorizeActionAttribute), false)+ .Cast<PermissionAuthorizeActionAttribute>()+ .SingleOrDefault();+ Assert.IsNotNull(attr, "ProductDelete missing [PermissionAuthorizeAction]");+ Assert.AreEqual(PermissionActionName.Edit, attr!.PermissionAction, "ProductDelete should require Edit permission");+ }++ [TestMethod]+ public void ProductAddPopup_Get_HasPermissionAuthorizeActionEdit()+ {+ var method = typeof(BaseDiscountController).GetMethod("ProductAddPopup", [typeof(string)]);+ Assert.IsNotNull(method, "ProductAddPopup(string) method not found");+ var attr = method!.GetCustomAttributes(typeof(PermissionAuthorizeActionAttribute), false)+ .Cast<PermissionAuthorizeActionAttribute>()+ .SingleOrDefault();+ Assert.IsNotNull(attr, "ProductAddPopup(string) missing [PermissionAuthorizeAction]");+ Assert.AreEqual(PermissionActionName.Edit, attr!.PermissionAction, "ProductAddPopup(string) should require Edit permission");+ }++ [TestMethod]+ public void ProductAddPopupList_HasPermissionAuthorizeActionEdit()+ {+ var method = typeof(BaseDiscountController).GetMethod("ProductAddPopupList");+ Assert.IsNotNull(method, "ProductAddPopupList method not found");+ var attr = method!.GetCustomAttributes(typeof(PermissionAuthorizeActionAttribute), false)+ .Cast<PermissionAuthorizeActionAttribute>()+ .SingleOrDefault();+ Assert.IsNotNull(attr, "ProductAddPopupList missing [PermissionAuthorizeAction]");+ Assert.AreEqual(PermissionActionName.Edit, attr!.PermissionAction, "ProductAddPopupList should require Edit permission");+ }++ [TestMethod]+ public void ProductAddPopup_Post_HasPermissionAuthorizeActionEdit()+ {+ var method = typeof(BaseDiscountController).GetMethod("ProductAddPopup", [typeof(DiscountModel.AddProductToDiscountModel)]);+ Assert.IsNotNull(method, "ProductAddPopup(AddProductToDiscountModel) method not found");+ var attr = method!.GetCustomAttributes(typeof(PermissionAuthorizeActionAttribute), false)+ .Cast<PermissionAuthorizeActionAttribute>()+ .SingleOrDefault();+ Assert.IsNotNull(attr, "ProductAddPopup(AddProductToDiscountModel) missing [PermissionAuthorizeAction]");+ Assert.AreEqual(PermissionActionName.Edit, attr!.PermissionAction, "ProductAddPopup(AddProductToDiscountModel) should require Edit permission");+ }+}++/// <summary>+/// Regression test for ARCH-001 authorization attributes on Discount requirements region methods.+/// Ensures that GetDiscountRequirementConfigurationUrl, GetDiscountRequirementMetaInfo, and+/// DeleteDiscountRequirement carry the required [PermissionAuthorizeAction] attributes.+/// </summary>+[TestClass]+public class BaseDiscountControllerRequirementsAttributeTests+{+ [TestMethod]+ public void GetDiscountRequirementConfigurationUrl_HasPermissionAuthorizeActionPreview()+ {+ var method = typeof(BaseDiscountController).GetMethod("GetDiscountRequirementConfigurationUrl");+ Assert.IsNotNull(method, "GetDiscountRequirementConfigurationUrl method not found");+ var attr = method!.GetCustomAttributes(typeof(PermissionAuthorizeActionAttribute), false)+ .Cast<PermissionAuthorizeActionAttribute>()+ .SingleOrDefault();+ Assert.IsNotNull(attr, "GetDiscountRequirementConfigurationUrl missing [PermissionAuthorizeAction]");+ Assert.AreEqual(PermissionActionName.Preview, attr!.PermissionAction,+ "GetDiscountRequirementConfigurationUrl should require Preview permission");+ }++ [TestMethod]+ public void GetDiscountRequirementMetaInfo_HasPermissionAuthorizeActionPreview()+ {+ var method = typeof(BaseDiscountController).GetMethod("GetDiscountRequirementMetaInfo");+ Assert.IsNotNull(method, "GetDiscountRequirementMetaInfo method not found");+ var attr = method!.GetCustomAttributes(typeof(PermissionAuthorizeActionAttribute), false)+ .Cast<PermissionAuthorizeActionAttribute>()+ .SingleOrDefault();+ Assert.IsNotNull(attr, "GetDiscountRequirementMetaInfo missing [PermissionAuthorizeAction]");+ Assert.AreEqual(PermissionActionName.Preview, attr!.PermissionAction,+ "GetDiscountRequirementMetaInfo should require Preview permission");+ }++ [TestMethod]+ public void DeleteDiscountRequirement_HasPermissionAuthorizeActionEdit()+ {+ var method = typeof(BaseDiscountController).GetMethod("DeleteDiscountRequirement");+ Assert.IsNotNull(method, "DeleteDiscountRequirement method not found");+ var attr = method!.GetCustomAttributes(typeof(PermissionAuthorizeActionAttribute), false)+ .Cast<PermissionAuthorizeActionAttribute>()+ .SingleOrDefault();+ Assert.IsNotNull(attr, "DeleteDiscountRequirement missing [PermissionAuthorizeAction]");+ Assert.AreEqual(PermissionActionName.Edit, attr!.PermissionAction,+ "DeleteDiscountRequirement should require Edit permission");+ }+}++/// <summary>+/// Regression test for ARCH-001 authorization attributes on Discount coupon-code region methods.+/// Ensures that CouponCodeList, CouponCodeDelete, and CouponCodeInsert carry the required+/// [PermissionAuthorizeAction] attributes to prevent authorization bypass (users without Edit+/// permission should not be able to modify or delete coupon codes).+/// </summary>+[TestClass]+public class BaseDiscountControllerCouponCodeAttributeTests+{+ [TestMethod]+ public void CouponCodeList_HasPermissionAuthorizeActionPreview()+ {+ var method = typeof(BaseDiscountController).GetMethod("CouponCodeList");+ Assert.IsNotNull(method, "CouponCodeList method not found");+ var attr = method!.GetCustomAttributes(typeof(PermissionAuthorizeActionAttribute), false)+ .Cast<PermissionAuthorizeActionAttribute>()+ .SingleOrDefault();+ Assert.IsNotNull(attr, "CouponCodeList missing [PermissionAuthorizeAction]");+ Assert.AreEqual(PermissionActionName.Preview, attr!.PermissionAction, "CouponCodeList should require Preview permission");+ }++ [TestMethod]+ public void CouponCodeDelete_HasPermissionAuthorizeActionEdit()+ {+ var method = typeof(BaseDiscountController).GetMethod("CouponCodeDelete");+ Assert.IsNotNull(method, "CouponCodeDelete method not found");+ var attr = method!.GetCustomAttributes(typeof(PermissionAuthorizeActionAttribute), false)+ .Cast<PermissionAuthorizeActionAttribute>()+ .SingleOrDefault();+ Assert.IsNotNull(attr, "CouponCodeDelete missing [PermissionAuthorizeAction]");+ Assert.AreEqual(PermissionActionName.Edit, attr!.PermissionAction, "CouponCodeDelete should require Edit permission");+ }++ [TestMethod]+ public void CouponCodeInsert_HasPermissionAuthorizeActionEdit()+ {+ var method = typeof(BaseDiscountController).GetMethod("CouponCodeInsert");+ Assert.IsNotNull(method, "CouponCodeInsert method not found");+ var attr = method!.GetCustomAttributes(typeof(PermissionAuthorizeActionAttribute), false)+ .Cast<PermissionAuthorizeActionAttribute>()+ .SingleOrDefault();+ Assert.IsNotNull(attr, "CouponCodeInsert missing [PermissionAuthorizeAction]");+ Assert.AreEqual(PermissionActionName.Edit, attr!.PermissionAction, "CouponCodeInsert should require Edit permission");+ }+}++/// <summary>+/// Regression test for ARCH-001 authorization attributes on Discount usage-history region methods.+/// Ensures that UsageHistoryList and UsageHistoryDelete carry the required [PermissionAuthorizeAction]+/// attributes to prevent authorization bypass.+/// </summary>+[TestClass]+public class BaseDiscountControllerUsageHistoryAttributeTests+{+ [TestMethod]+ public void UsageHistoryList_HasPermissionAuthorizeActionPreview()+ {+ var method = typeof(BaseDiscountController).GetMethod("UsageHistoryList");+ Assert.IsNotNull(method, "UsageHistoryList method not found");+ var attr = method!.GetCustomAttributes(typeof(PermissionAuthorizeActionAttribute), false)+ .Cast<PermissionAuthorizeActionAttribute>()+ .SingleOrDefault();+ Assert.IsNotNull(attr, "UsageHistoryList missing [PermissionAuthorizeAction]");+ Assert.AreEqual(PermissionActionName.Preview, attr!.PermissionAction, "UsageHistoryList should require Preview permission");+ }++ [TestMethod]+ public void UsageHistoryDelete_HasPermissionAuthorizeActionEdit()+ {+ var method = typeof(BaseDiscountController).GetMethod("UsageHistoryDelete");+ Assert.IsNotNull(method, "UsageHistoryDelete method not found");+ var attr = method!.GetCustomAttributes(typeof(PermissionAuthorizeActionAttribute), false)+ .Cast<PermissionAuthorizeActionAttribute>()+ .SingleOrDefault();+ Assert.IsNotNull(attr, "UsageHistoryDelete missing [PermissionAuthorizeAction]");+ Assert.AreEqual(PermissionActionName.Edit, attr!.PermissionAction, "UsageHistoryDelete should require Edit permission");+ }+}++/// <summary>+/// Regression test for ARCH-001 authorization attributes on Discount applied-to-categories and+/// applied-to-brands region methods. Ensures CategoryList, CategoryDelete, both CategoryAddPopup+/// overloads, CategoryAddPopupList, BrandList, BrandDelete, both BrandAddPopup overloads, and+/// BrandAddPopupList carry the required [PermissionAuthorizeAction] attributes.+/// </summary>+[TestClass]+public class BaseDiscountControllerCategoriesAndBrandsAttributeTests+{+ [TestMethod]+ public void CategoryList_HasPermissionAuthorizeActionPreview()+ {+ var method = typeof(BaseDiscountController).GetMethod("CategoryList");+ Assert.IsNotNull(method, "CategoryList method not found");+ var attr = method!.GetCustomAttributes(typeof(PermissionAuthorizeActionAttribute), false)+ .Cast<PermissionAuthorizeActionAttribute>()+ .SingleOrDefault();+ Assert.IsNotNull(attr, "CategoryList missing [PermissionAuthorizeAction]");+ Assert.AreEqual(PermissionActionName.Preview, attr!.PermissionAction, "CategoryList should require Preview permission");+ }++ [TestMethod]+ public void CategoryDelete_HasPermissionAuthorizeActionEdit()+ {+ var method = typeof(BaseDiscountController).GetMethod("CategoryDelete");+ Assert.IsNotNull(method, "CategoryDelete method not found");+ var attr = method!.GetCustomAttributes(typeof(PermissionAuthorizeActionAttribute), false)+ .Cast<PermissionAuthorizeActionAttribute>()+ .SingleOrDefault();+ Assert.IsNotNull(attr, "CategoryDelete missing [PermissionAuthorizeAction]");+ Assert.AreEqual(PermissionActionName.Edit, attr!.PermissionAction, "CategoryDelete should require Edit permission");+ }++ [TestMethod]+ public void CategoryAddPopup_Get_HasPermissionAuthorizeActionEdit()+ {+ var method = typeof(BaseDiscountController).GetMethod("CategoryAddPopup", [typeof(string)]);+ Assert.IsNotNull(method, "CategoryAddPopup(string) method not found");+ var attr = method!.GetCustomAttributes(typeof(PermissionAuthorizeActionAttribute), false)+ .Cast<PermissionAuthorizeActionAttribute>()+ .SingleOrDefault();+ Assert.IsNotNull(attr, "CategoryAddPopup(string) missing [PermissionAuthorizeAction]");+ Assert.AreEqual(PermissionActionName.Edit, attr!.PermissionAction, "CategoryAddPopup(string) should require Edit permission");+ }++ [TestMethod]+ public void CategoryAddPopupList_HasPermissionAuthorizeActionEdit()+ {+ var method = typeof(BaseDiscountController).GetMethod("CategoryAddPopupList");+ Assert.IsNotNull(method, "CategoryAddPopupList method not found");+ var attr = method!.GetCustomAttributes(typeof(PermissionAuthorizeActionAttribute), false)+ .Cast<PermissionAuthorizeActionAttribute>()+ .SingleOrDefault();+ Assert.IsNotNull(attr, "CategoryAddPopupList missing [PermissionAuthorizeAction]");+ Assert.AreEqual(PermissionActionName.Edit, attr!.PermissionAction, "CategoryAddPopupList should require Edit permission");+ }++ [TestMethod]+ public void CategoryAddPopup_Post_HasPermissionAuthorizeActionEdit()+ {+ var method = typeof(BaseDiscountController).GetMethod("CategoryAddPopup", [typeof(DiscountModel.AddCategoryToDiscountModel)]);+ Assert.IsNotNull(method, "CategoryAddPopup(AddCategoryToDiscountModel) method not found");+ var attr = method!.GetCustomAttributes(typeof(PermissionAuthorizeActionAttribute), false)+ .Cast<PermissionAuthorizeActionAttribute>()+ .SingleOrDefault();+ Assert.IsNotNull(attr, "CategoryAddPopup(AddCategoryToDiscountModel) missing [PermissionAuthorizeAction]");+ Assert.AreEqual(PermissionActionName.Edit, attr!.PermissionAction, "CategoryAddPopup(AddCategoryToDiscountModel) should require Edit permission");+ }++ [TestMethod]+ public void BrandList_HasPermissionAuthorizeActionPreview()+ {+ var method = typeof(BaseDiscountController).GetMethod("BrandList");+ Assert.IsNotNull(method, "BrandList method not found");+ var attr = method!.GetCustomAttributes(typeof(PermissionAuthorizeActionAttribute), false)+ .Cast<PermissionAuthorizeActionAttribute>()+ .SingleOrDefault();+ Assert.IsNotNull(attr, "BrandList missing [PermissionAuthorizeAction]");+ Assert.AreEqual(PermissionActionName.Preview, attr!.PermissionAction, "BrandList should require Preview permission");+ }++ [TestMethod]+ public void BrandDelete_HasPermissionAuthorizeActionEdit()+ {+ var method = typeof(BaseDiscountController).GetMethod("BrandDelete");+ Assert.IsNotNull(method, "BrandDelete method not found");+ var attr = method!.GetCustomAttributes(typeof(PermissionAuthorizeActionAttribute), false)+ .Cast<PermissionAuthorizeActionAttribute>()+ .SingleOrDefault();+ Assert.IsNotNull(attr, "BrandDelete missing [PermissionAuthorizeAction]");+ Assert.AreEqual(PermissionActionName.Edit, attr!.PermissionAction, "BrandDelete should require Edit permission");+ }++ [TestMethod]+ public void BrandAddPopup_Get_HasPermissionAuthorizeActionEdit()+ {+ var method = typeof(BaseDiscountController).GetMethod("BrandAddPopup", [typeof(string)]);+ Assert.IsNotNull(method, "BrandAddPopup(string) method not found");+ var attr = method!.GetCustomAttributes(typeof(PermissionAuthorizeActionAttribute), false)+ .Cast<PermissionAuthorizeActionAttribute>()+ .SingleOrDefault();+ Assert.IsNotNull(attr, "BrandAddPopup(string) missing [PermissionAuthorizeAction]");+ Assert.AreEqual(PermissionActionName.Edit, attr!.PermissionAction, "BrandAddPopup(string) should require Edit permission");+ }++ [TestMethod]+ public void BrandAddPopupList_HasPermissionAuthorizeActionEdit()+ {+ var method = typeof(BaseDiscountController).GetMethod("BrandAddPopupList");+ Assert.IsNotNull(method, "BrandAddPopupList method not found");+ var attr = method!.GetCustomAttributes(typeof(PermissionAuthorizeActionAttribute), false)+ .Cast<PermissionAuthorizeActionAttribute>()+ .SingleOrDefault();+ Assert.IsNotNull(attr, "BrandAddPopupList missing [PermissionAuthorizeAction]");+ Assert.AreEqual(PermissionActionName.Edit, attr!.PermissionAction, "BrandAddPopupList should require Edit permission");+ }++ [TestMethod]+ public void BrandAddPopup_Post_HasPermissionAuthorizeActionEdit()+ {+ var method = typeof(BaseDiscountController).GetMethod("BrandAddPopup", [typeof(DiscountModel.AddBrandToDiscountModel)]);+ Assert.IsNotNull(method, "BrandAddPopup(AddBrandToDiscountModel) method not found");+ var attr = method!.GetCustomAttributes(typeof(PermissionAuthorizeActionAttribute), false)+ .Cast<PermissionAuthorizeActionAttribute>()+ .SingleOrDefault();+ Assert.IsNotNull(attr, "BrandAddPopup(AddBrandToDiscountModel) missing [PermissionAuthorizeAction]");+ Assert.AreEqual(PermissionActionName.Edit, attr!.PermissionAction, "BrandAddPopup(AddBrandToDiscountModel) should require Edit permission");+ }+}diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/DiscountControllerAttributeTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/DiscountControllerAttributeTests.csnew file mode 100644index 000000000..bdc7c61ab--- /dev/null+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/DiscountControllerAttributeTests.cs@@ -0,0 +1,205 @@+extern alias StoreHost;++using System.Reflection;+using Grand.Domain.Permissions;+using Grand.Web.Common.Filters;+using Grand.Web.Common.Security.Authorization;+using Microsoft.AspNetCore.Mvc;+using Microsoft.VisualStudio.TestTools.UnitTesting;++namespace Grand.Web.Admin.Tests.Controllers;++/// <summary>+/// ARCH-001 / Task 12: mandatory method-level [PermissionAuthorizeAction] regression test for+/// Discount. This is the first instance in this initiative closing the Phase 11 final-review+/// follow-up — prior phases' attribute regression tests only asserted class-level attributes+/// ([Area]/[Authorize*]/[AuthorizeMenu]/[PermissionAuthorize]); this test additionally asserts,+/// for every distinct action method name on BaseDiscountController plus Admin's Vendor region+/// (the full set of discount actions, including both GET and POST overloads of the XAddPopup+/// methods), that the correct [PermissionAuthorizeAction] is present, whether declared directly+/// on the concrete controller or inherited from BaseDiscountController.+///+/// Vendor actions (VendorList/VendorDelete/VendorAddPopup/VendorAddPopupList) exist only on+/// Grand.Web.Admin.Controllers.DiscountController (see Task 7b/9) — Store's DiscountController has+/// no equivalent methods at all, so they are asserted separately as Admin-only.+/// </summary>+[TestClass]+public class DiscountControllerAttributeTests+{+ private static readonly (string Method, string Expected)[] SharedActionAttributes = [+ ("List", PermissionActionName.List), // the POST overload specifically — List() GET has no attribute+ ("Create", PermissionActionName.Create),+ ("Edit", PermissionActionName.Preview), // GET overload; the POST overload carries Edit+ ("Delete", PermissionActionName.Delete),+ ("CouponCodeList", PermissionActionName.Preview),+ ("CouponCodeDelete", PermissionActionName.Edit),+ ("CouponCodeInsert", PermissionActionName.Edit),+ ("GetDiscountRequirementConfigurationUrl", PermissionActionName.Preview),+ ("GetDiscountRequirementMetaInfo", PermissionActionName.Preview),+ ("DeleteDiscountRequirement", PermissionActionName.Edit),+ ("ProductList", PermissionActionName.Preview),+ ("ProductDelete", PermissionActionName.Edit),+ ("ProductAddPopup", PermissionActionName.Edit),+ ("ProductAddPopupList", PermissionActionName.Edit),+ ("CategoryList", PermissionActionName.Preview),+ ("CategoryDelete", PermissionActionName.Edit),+ ("CategoryAddPopup", PermissionActionName.Edit),+ ("CategoryAddPopupList", PermissionActionName.Edit),+ ("BrandList", PermissionActionName.Preview),+ ("BrandDelete", PermissionActionName.Edit),+ ("BrandAddPopup", PermissionActionName.Edit),+ ("BrandAddPopupList", PermissionActionName.Edit),+ ("CollectionList", PermissionActionName.Preview),+ ("CollectionDelete", PermissionActionName.Edit),+ ("CollectionAddPopup", PermissionActionName.Edit),+ ("CollectionAddPopupList", PermissionActionName.Edit),+ ("UsageHistoryList", PermissionActionName.Preview),+ ("UsageHistoryDelete", PermissionActionName.Edit)+ ];++ private static readonly (string Method, string Expected)[] AdminOnlyActionAttributes = [+ ("VendorList", PermissionActionName.Preview),+ ("VendorDelete", PermissionActionName.Edit),+ ("VendorAddPopup", PermissionActionName.Edit),+ ("VendorAddPopupList", PermissionActionName.Edit)+ ];++ [TestMethod]+ public void AdminDiscountController_EveryActionMethod_HasCorrectPermissionActionName()+ {+ AssertAllActionsHaveAttribute(typeof(Grand.Web.Admin.Controllers.DiscountController), SharedActionAttributes);+ AssertAllActionsHaveAttribute(typeof(Grand.Web.Admin.Controllers.DiscountController), AdminOnlyActionAttributes);+ }++ [TestMethod]+ public void StoreDiscountController_EveryActionMethod_HasCorrectPermissionActionName()+ {+ AssertAllActionsHaveAttribute(typeof(StoreHost::Grand.Web.Store.Controllers.DiscountController), SharedActionAttributes);+ }++ [TestMethod]+ public void StoreDiscountController_HasNoVendorActions()+ {+ var storeType = typeof(StoreHost::Grand.Web.Store.Controllers.DiscountController);+ foreach (var (methodName, _) in AdminOnlyActionAttributes)+ {+ var exists = storeType.GetMethods(BindingFlags.Public | BindingFlags.Instance)+ .Any(m => m.Name == methodName);+ Assert.IsFalse(exists,+ $"Store's DiscountController unexpectedly has a {methodName} method — Vendor actions must remain Admin-only.");+ }+ }++ // Class-level attribute regression guard (mirrors MerchandiseReturnControllerAttributeTests /+ // AttributeFamilyControllerRoutingTests): BaseDiscountController can't carry a host's+ // [Area]/[Authorize*] attributes itself (they differ per host), so each concrete subclass must+ // restate its own - a missing one here would 404 or deauthorize the whole controller silently.+ // Admin's set was verified to match OrderController.cs:27-30 exactly; Store's set was verified+ // to match OrderController.cs:20-23 exactly (see Task 9 ledger).+ [TestMethod]+ public void AdminDiscountController_HasAreaAttributeWithAdminArea()+ {+ var areaAttr = (AreaAttribute)Attribute.GetCustomAttribute(+ typeof(Grand.Web.Admin.Controllers.DiscountController), typeof(AreaAttribute), false);+ Assert.IsNotNull(areaAttr, "Missing [Area].");+ Assert.AreEqual(Grand.Web.Admin.Extensions.Constants.AreaAdmin, areaAttr.RouteValue);+ }++ [TestMethod]+ public void AdminDiscountController_HasAuthorizeAdminAttribute() =>+ Assert.IsTrue(typeof(Grand.Web.Admin.Controllers.DiscountController).IsDefined(typeof(AuthorizeAdminAttribute), false),+ "Missing [AuthorizeAdmin].");++ [TestMethod]+ public void AdminDiscountController_HasAutoValidateAntiforgeryTokenAttribute() =>+ Assert.IsTrue(typeof(Grand.Web.Admin.Controllers.DiscountController).IsDefined(typeof(AutoValidateAntiforgeryTokenAttribute), false),+ "Missing [AutoValidateAntiforgeryToken].");++ [TestMethod]+ public void AdminDiscountController_HasAuthorizeMenuAttribute() =>+ Assert.IsTrue(typeof(Grand.Web.Admin.Controllers.DiscountController).IsDefined(typeof(AuthorizeMenuAttribute), false),+ "Missing [AuthorizeMenu].");++ [TestMethod]+ public void StoreDiscountController_HasAreaAttributeWithStoreArea()+ {+ var areaAttr = (AreaAttribute)Attribute.GetCustomAttribute(+ typeof(StoreHost::Grand.Web.Store.Controllers.DiscountController), typeof(AreaAttribute), false);+ Assert.IsNotNull(areaAttr, "Missing [Area].");+ Assert.AreEqual(StoreHost::Grand.Web.Store.Extensions.Constants.AreaStore, areaAttr.RouteValue);+ }++ [TestMethod]+ public void StoreDiscountController_HasAuthorizeStoreAttribute() =>+ Assert.IsTrue(typeof(StoreHost::Grand.Web.Store.Controllers.DiscountController).IsDefined(typeof(AuthorizeStoreAttribute), false),+ "Missing [AuthorizeStore].");++ [TestMethod]+ public void StoreDiscountController_HasAutoValidateAntiforgeryTokenAttribute() =>+ Assert.IsTrue(typeof(StoreHost::Grand.Web.Store.Controllers.DiscountController).IsDefined(typeof(AutoValidateAntiforgeryTokenAttribute), false),+ "Missing [AutoValidateAntiforgeryToken].");++ [TestMethod]+ public void StoreDiscountController_HasAuthorizeMenuAttribute() =>+ Assert.IsTrue(typeof(StoreHost::Grand.Web.Store.Controllers.DiscountController).IsDefined(typeof(AuthorizeMenuAttribute), false),+ "Missing [AuthorizeMenu].");++ // [PermissionAuthorize(PermissionSystemName.Discounts)] is inherited from BaseDiscountController+ // and deliberately NOT re-declared on either concrete subclass (Task 9 ledger) - assert it via+ // inherited-attribute lookup at the type level, same idiom as AssertAllActionsHaveAttribute's+ // method-level inherited lookup below.+ [TestMethod]+ public void AdminDiscountController_HasPermissionAuthorizeForDiscounts_Inherited()+ {+ var attr = typeof(Grand.Web.Admin.Controllers.DiscountController)+ .GetCustomAttributes(typeof(PermissionAuthorizeAttribute), inherit: true)+ .Cast<PermissionAuthorizeAttribute>()+ .SingleOrDefault();+ Assert.IsNotNull(attr, "Missing [PermissionAuthorize] (checked with inherit: true).");+ Assert.AreEqual(PermissionSystemName.Discounts, attr.Permission);++ // Confirm it is genuinely inherited, not re-declared on the concrete class.+ Assert.IsFalse(+ typeof(Grand.Web.Admin.Controllers.DiscountController).IsDefined(typeof(PermissionAuthorizeAttribute), inherit: false),+ "PermissionAuthorize should not be re-declared on the concrete Admin controller.");+ }++ [TestMethod]+ public void StoreDiscountController_HasPermissionAuthorizeForDiscounts_Inherited()+ {+ var attr = typeof(StoreHost::Grand.Web.Store.Controllers.DiscountController)+ .GetCustomAttributes(typeof(PermissionAuthorizeAttribute), inherit: true)+ .Cast<PermissionAuthorizeAttribute>()+ .SingleOrDefault();+ Assert.IsNotNull(attr, "Missing [PermissionAuthorize] (checked with inherit: true).");+ Assert.AreEqual(PermissionSystemName.Discounts, attr.Permission);++ // Confirm it is genuinely inherited, not re-declared on the concrete class.+ Assert.IsFalse(+ typeof(StoreHost::Grand.Web.Store.Controllers.DiscountController).IsDefined(typeof(PermissionAuthorizeAttribute), inherit: false),+ "PermissionAuthorize should not be re-declared on the concrete Store controller.");+ }++ private static void AssertAllActionsHaveAttribute(Type controllerType,+ (string Method, string Expected)[] expectedAttributes)+ {+ foreach (var (methodName, expected) in expectedAttributes)+ {+ var methods = controllerType.GetMethods(BindingFlags.Public | BindingFlags.Instance)+ .Where(m => m.Name == methodName && m.DeclaringType != typeof(object))+ .ToList();+ Assert.IsTrue(methods.Count > 0, $"{controllerType.Name}.{methodName} not found");++ //at least one overload of this method name must carry the expected attribute —+ //methods with multiple overloads (e.g. List GET/POST) are declared once on the base+ //with the attribute on only the decorated overload; find via inherited-attribute+ //lookup (inherit: true) so base-class hoisting is honored+ var hasExpected = methods.Any(m =>+ m.GetCustomAttributes(typeof(PermissionAuthorizeActionAttribute), true)+ .Cast<PermissionAuthorizeActionAttribute>()+ .Any(a => a.PermissionAction == expected));+ Assert.IsTrue(hasExpected,+ $"{controllerType.Name}.{methodName} is missing [PermissionAuthorizeAction({expected})]");+ }+ }+}diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/DiscountControllerVendorTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/DiscountControllerVendorTests.csnew file mode 100644index 000000000..217ab8228--- /dev/null+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/DiscountControllerVendorTests.cs@@ -0,0 +1,310 @@+using Grand.Business.Core.Interfaces.Catalog.Discounts;+using Grand.Business.Core.Interfaces.Common.Directory;+using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Business.Core.Interfaces.Customers;+using Grand.Domain;+using Grand.Domain.Discounts;+using Grand.Domain.Permissions;+using Grand.Domain.Vendors;+using Grand.Infrastructure.Mapper;+using Grand.Mapping;+using Grand.Mediator;+using Grand.Web.Admin.Controllers;+using Grand.Web.AdminShared.Interfaces;+using Grand.Web.AdminShared.Mapper;+using Grand.Web.AdminShared.Models.Discounts;+using Grand.Web.Common.DataSource;+using Grand.Web.Common.Security.Authorization;+using Microsoft.AspNetCore.Mvc;+using Microsoft.VisualStudio.TestTools.UnitTesting;+using Moq;++namespace Grand.Web.Admin.Tests.Controllers;++/// <summary>+/// ARCH-001 / Task 9: regression coverage for the Admin-only "Applied to vendors" region on+/// Grand.Web.Admin.Controllers.DiscountController. This region has no Store counterpart (Store's+/// original DiscountController never had a Vendor tab) so it lives directly on the concrete Admin+/// controller rather than BaseDiscountController. Task 7b's version had no discount-scope access+/// check at all; Task 9 folded these actions onto the injected IAdminDataScope<Discount> scope+/// (VendorList -> CanView, the other four -> HasAccess), matching every other region in+/// BaseDiscountController. These tests exercise that scope-gated behavior.+/// </summary>+[TestClass]+public class DiscountControllerVendorTests+{+ private Mock<IDiscountViewModelService> _vmService = null!;+ private Mock<IDiscountService> _service = null!;+ private Mock<IVendorService> _vendorService = null!;+ private Mock<IAdminDataScope<Discount>> _scope = null!;+ private DiscountController _sut = null!;++ [TestInitialize]+ public void Setup()+ {+ var mapperConfig = new MapperConfiguration(cfg =>+ {+ cfg.AddProfile<Grand.Web.AdminShared.Mapper.VendorProfile>();+ });+ AutoMapperConfig.Init(mapperConfig);++ _vmService = new Mock<IDiscountViewModelService>();+ _service = new Mock<IDiscountService>();+ _vendorService = new Mock<IVendorService>();+ _scope = new Mock<IAdminDataScope<Discount>>();+ _scope.Setup(x => x.HasAccess(It.IsAny<Discount>())).ReturnsAsync(true);+ _scope.Setup(x => x.CanView(It.IsAny<Discount>())).ReturnsAsync(true);++ var translationServiceMock = new Mock<ITranslationService>();+ translationServiceMock.Setup(t => t.GetResource(It.IsAny<string>())).Returns("resource");++ _sut = new DiscountController(+ _vmService.Object,+ _service.Object,+ translationServiceMock.Object,+ Mock.Of<IDateTimeService>(),+ Mock.Of<IMediator>(),+ Mock.Of<IDiscountProviderLoader>(),+ _scope.Object);+ }++ [TestMethod]+ public async Task VendorAddPopupList_NeverPassesAStoreIdArgument()+ {+ // IVendorService.GetAllVendors(name, pageIndex, pageSize, showHidden) has no storeId+ // parameter at all — vendors aren't store-scoped. This test guards against a future edit+ // accidentally introducing store-scoping to this call.+ var model = new DiscountModel.AddVendorToDiscountModel { DiscountId = "1" };+ _vendorService.Setup(x => x.GetAllVendors(It.IsAny<string>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<bool>()))+ .ReturnsAsync(new PagedList<Vendor>(new List<Vendor>(), 0, 10, 0));++ await _sut.VendorAddPopupList(new DataSourceRequest { Page = 1, PageSize = 10 }, model, _vendorService.Object);++ _vendorService.Verify(x => x.GetAllVendors(model.SearchVendorName, 0, 10, true), Times.Once);+ // Confirm the overload actually invoked is the 4-arg (no storeId) signature by checking+ // the interface only exposes this one GetAllVendors method.+ var method = typeof(IVendorService).GetMethod(nameof(IVendorService.GetAllVendors));+ Assert.IsNotNull(method);+ Assert.IsFalse(method!.GetParameters().Any(p => p.Name != null && p.Name.Contains("store", StringComparison.OrdinalIgnoreCase)),+ "IVendorService.GetAllVendors should not have gained a storeId parameter");+ }++ [TestMethod]+ public async Task VendorDelete_MissingVendor_ThrowsException()+ {+ var discount = new Discount { Id = "1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _vendorService.Setup(x => x.GetVendorById("missing-vendor")).ReturnsAsync((Vendor)null);++ await Assert.ThrowsAsync<Exception>(() =>+ _sut.VendorDelete("1", "missing-vendor", _vendorService.Object));+ }++ [TestMethod]+ public async Task VendorList_MissingDiscount_ThrowsException()+ {+ _service.Setup(x => x.GetDiscountById("missing")).ReturnsAsync((Discount)null);++ await Assert.ThrowsAsync<Exception>(() =>+ _sut.VendorList(new DataSourceRequest(), "missing", _vendorService.Object));+ }++ [TestMethod]+ public async Task VendorList_ReturnsVendorsMappedFromDiscount()+ {+ var discount = new Discount { Id = "1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ var vendors = new List<Vendor> { new() { Id = "v1", Name = "Vendor 1" } };+ _vendorService.Setup(x => x.GetAllVendorsByDiscount("1")).ReturnsAsync(vendors);++ var result = await _sut.VendorList(new DataSourceRequest(), "1", _vendorService.Object) as JsonResult;++ var data = (DataSourceResult)result!.Value!;+ Assert.AreEqual(1, data.Total);+ }++ [TestMethod]+ public async Task VendorDelete_ExistingVendor_DeletesAndReturnsEmptyJson()+ {+ var discount = new Discount { Id = "1" };+ var vendor = new Vendor { Id = "v1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _vendorService.Setup(x => x.GetVendorById("v1")).ReturnsAsync(vendor);++ await _sut.VendorDelete("1", "v1", _vendorService.Object);++ _vmService.Verify(x => x.DeleteVendor(discount, vendor), Times.Once);+ }++ [TestMethod]+ public async Task VendorAddPopup_Get_ReturnsViewWithEmptyModel()+ {+ var discount = new Discount { Id = "1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);++ var result = await _sut.VendorAddPopup("1") as ViewResult;++ Assert.IsNotNull(result);+ Assert.IsInstanceOfType(result!.Model, typeof(DiscountModel.AddVendorToDiscountModel));+ }++ [TestMethod]+ public async Task VendorAddPopup_Post_MissingDiscount_ThrowsException()+ {+ var model = new DiscountModel.AddVendorToDiscountModel { DiscountId = "missing" };+ _service.Setup(x => x.GetDiscountById("missing")).ReturnsAsync((Discount)null);++ await Assert.ThrowsAsync<Exception>(() => _sut.VendorAddPopup(model));+ }++ [TestMethod]+ public async Task VendorAddPopup_Post_WithSelectedVendors_InsertsVendors()+ {+ var discount = new Discount { Id = "1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ var model = new DiscountModel.AddVendorToDiscountModel { DiscountId = "1", SelectedVendorIds = ["v1"] };++ await _sut.VendorAddPopup(model);++ _vmService.Verify(x => x.InsertVendorToDiscountModel(model), Times.Once);+ }++ [TestMethod]+ public async Task VendorList_ScopeDeniesCanView_ReturnsAccessDeniedJson()+ {+ var discount = new Discount { Id = "1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _scope.Setup(x => x.CanView(discount)).ReturnsAsync(false);++ var result = await _sut.VendorList(new DataSourceRequest(), "1", _vendorService.Object) as JsonResult;++ var data = (DataSourceResult)result!.Value!;+ Assert.AreEqual("Access denied", data.Errors);+ }++ [TestMethod]+ public async Task VendorDelete_ScopeDeniesHasAccess_ReturnsAccessDeniedJson()+ {+ var discount = new Discount { Id = "1" };+ var vendor = new Vendor { Id = "v1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _vendorService.Setup(x => x.GetVendorById("v1")).ReturnsAsync(vendor);+ _scope.Setup(x => x.HasAccess(discount)).ReturnsAsync(false);++ await _sut.VendorDelete("1", "v1", _vendorService.Object);++ _vmService.Verify(x => x.DeleteVendor(discount, vendor), Times.Never);+ }++ [TestMethod]+ public async Task VendorAddPopup_Get_ScopeDeniesHasAccess_ReturnsAccessDeniedJson()+ {+ var discount = new Discount { Id = "1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _scope.Setup(x => x.HasAccess(discount)).ReturnsAsync(false);++ var result = await _sut.VendorAddPopup("1") as JsonResult;++ Assert.IsNotNull(result);+ }++ [TestMethod]+ public async Task VendorAddPopup_Post_ScopeDeniesHasAccess_ReturnsAccessDeniedContent()+ {+ var discount = new Discount { Id = "1" };+ _service.Setup(x => x.GetDiscountById("1")).ReturnsAsync(discount);+ _scope.Setup(x => x.HasAccess(discount)).ReturnsAsync(false);+ var model = new DiscountModel.AddVendorToDiscountModel { DiscountId = "1", SelectedVendorIds = ["v1"] };++ var result = await _sut.VendorAddPopup(model) as ContentResult;++ Assert.IsNotNull(result);+ Assert.AreEqual("Access denied", result!.Content);+ _vmService.Verify(x => x.InsertVendorToDiscountModel(model), Times.Never);+ }+}++/// <summary>+/// Regression test for ARCH-001 authorization attributes on Discount's Admin-only applied-to-vendors+/// region methods. Ensures VendorList, VendorDelete, both VendorAddPopup overloads, and+/// VendorAddPopupList carry the required [PermissionAuthorizeAction] attributes. These methods live+/// only on the Admin concrete DiscountController — Grand.Web.Store.Controllers.DiscountController+/// must never gain equivalents.+/// </summary>+[TestClass]+public class DiscountControllerVendorAttributeTests+{+ [TestMethod]+ public void VendorList_HasPermissionAuthorizeActionPreview()+ {+ var method = typeof(DiscountController).GetMethod("VendorList");+ Assert.IsNotNull(method, "VendorList method not found");+ var attr = method!.GetCustomAttributes(typeof(PermissionAuthorizeActionAttribute), false)+ .Cast<PermissionAuthorizeActionAttribute>()+ .SingleOrDefault();+ Assert.IsNotNull(attr, "VendorList missing [PermissionAuthorizeAction]");+ Assert.AreEqual(PermissionActionName.Preview, attr!.PermissionAction, "VendorList should require Preview permission");+ }++ [TestMethod]+ public void VendorDelete_HasPermissionAuthorizeActionEdit()+ {+ var method = typeof(DiscountController).GetMethod("VendorDelete");+ Assert.IsNotNull(method, "VendorDelete method not found");+ var attr = method!.GetCustomAttributes(typeof(PermissionAuthorizeActionAttribute), false)+ .Cast<PermissionAuthorizeActionAttribute>()+ .SingleOrDefault();+ Assert.IsNotNull(attr, "VendorDelete missing [PermissionAuthorizeAction]");+ Assert.AreEqual(PermissionActionName.Edit, attr!.PermissionAction, "VendorDelete should require Edit permission");+ }++ [TestMethod]+ public void VendorAddPopup_Get_HasPermissionAuthorizeActionEdit()+ {+ var method = typeof(DiscountController).GetMethod("VendorAddPopup", [typeof(string)]);+ Assert.IsNotNull(method, "VendorAddPopup(string) method not found");+ var attr = method!.GetCustomAttributes(typeof(PermissionAuthorizeActionAttribute), false)+ .Cast<PermissionAuthorizeActionAttribute>()+ .SingleOrDefault();+ Assert.IsNotNull(attr, "VendorAddPopup(string) missing [PermissionAuthorizeAction]");+ Assert.AreEqual(PermissionActionName.Edit, attr!.PermissionAction, "VendorAddPopup(string) should require Edit permission");+ }++ [TestMethod]+ public void VendorAddPopupList_HasPermissionAuthorizeActionEdit()+ {+ var method = typeof(DiscountController).GetMethod("VendorAddPopupList");+ Assert.IsNotNull(method, "VendorAddPopupList method not found");+ var attr = method!.GetCustomAttributes(typeof(PermissionAuthorizeActionAttribute), false)+ .Cast<PermissionAuthorizeActionAttribute>()+ .SingleOrDefault();+ Assert.IsNotNull(attr, "VendorAddPopupList missing [PermissionAuthorizeAction]");+ Assert.AreEqual(PermissionActionName.Edit, attr!.PermissionAction, "VendorAddPopupList should require Edit permission");+ }++ [TestMethod]+ public void VendorAddPopup_Post_HasPermissionAuthorizeActionEdit()+ {+ var method = typeof(DiscountController).GetMethod("VendorAddPopup", [typeof(DiscountModel.AddVendorToDiscountModel)]);+ Assert.IsNotNull(method, "VendorAddPopup(AddVendorToDiscountModel) method not found");+ var attr = method!.GetCustomAttributes(typeof(PermissionAuthorizeActionAttribute), false)+ .Cast<PermissionAuthorizeActionAttribute>()+ .SingleOrDefault();+ Assert.IsNotNull(attr, "VendorAddPopup(AddVendorToDiscountModel) missing [PermissionAuthorizeAction]");+ Assert.AreEqual(PermissionActionName.Edit, attr!.PermissionAction, "VendorAddPopup(AddVendorToDiscountModel) should require Edit permission");+ }++ [TestMethod]+ public void StoreDiscountController_HasNoVendorActions()+ {+ // Guards Task 12's expectation: Grand.Web.Store's DiscountController must never gain+ // Vendor actions, since Store never had an "Applied to vendors" tab.+ var storeControllerType = Type.GetType(+ "Grand.Web.Store.Controllers.DiscountController, Grand.Web.Store");+ Assert.IsNotNull(storeControllerType, "Grand.Web.Store.Controllers.DiscountController type not found");+ Assert.IsNull(storeControllerType!.GetMethod("VendorList"), "Store DiscountController should not have VendorList");+ Assert.IsNull(storeControllerType.GetMethod("VendorDelete"), "Store DiscountController should not have VendorDelete");+ Assert.IsNull(storeControllerType.GetMethod("VendorAddPopup"), "Store DiscountController should not have VendorAddPopup");+ Assert.IsNull(storeControllerType.GetMethod("VendorAddPopupList"), "Store DiscountController should not have VendorAddPopupList");+ }+}diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/RoutedDiscountDataScopeTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/RoutedDiscountDataScopeTests.csnew file mode 100644index 000000000..9daf20c2c--- /dev/null+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/RoutedDiscountDataScopeTests.cs@@ -0,0 +1,92 @@+#nullable enable++using Grand.Business.Core.Interfaces.Common.Directory;+using Grand.Domain.Customers;+using Grand.Domain.Discounts;+using Grand.Infrastructure;+using Grand.Web.AdminShared.Services;+using Microsoft.AspNetCore.Http;+using Microsoft.VisualStudio.TestTools.UnitTesting;+using Moq;++namespace Grand.Web.Admin.Tests.Controllers;++/// <summary>+/// Covers the routing decision itself - which concrete IAdminDataScope<Discount> the+/// resolver delegates to for each area, and that an unrecognized or missing area fails closed+/// rather than falling back to any concrete scope. Mirrors RoutedOrderDataScopeTests: real+/// concrete scopes built with mocked IContextAccessor/IGroupService dependencies, since+/// AdminDiscountDataScope/StoreAdminDataScope<Discount> have no virtual members for Moq to+/// intercept.+/// </summary>+[TestClass]+public class RoutedDiscountDataScopeTests+{+ private const string StaffStoreId = "store-1";++ private AdminDiscountDataScope _adminScope = null!;+ private StoreAdminDataScope<Discount> _storeScope = null!;++ [TestInitialize]+ public void Setup()+ {+ var workContext = new Mock<IWorkContext>();+ workContext.Setup(x => x.CurrentCustomer).Returns(new Customer { StaffStoreId = StaffStoreId });+ var contextAccessor = new Mock<IContextAccessor>();+ contextAccessor.Setup(x => x.WorkContext).Returns(workContext.Object);++ var groupService = new Mock<IGroupService>();+ groupService.Setup(g => g.IsStoreManager(It.IsAny<Customer>())).ReturnsAsync(false);++ _adminScope = new AdminDiscountDataScope(contextAccessor.Object, groupService.Object);+ _storeScope = new StoreAdminDataScope<Discount>(contextAccessor.Object);+ }++ private RoutedDiscountDataScope ResolverForArea(string? area)+ {+ var httpContext = new DefaultHttpContext();+ if (area is not null) httpContext.Request.RouteValues["area"] = area;+ var httpContextAccessor = new Mock<IHttpContextAccessor>();+ httpContextAccessor.Setup(x => x.HttpContext).Returns(httpContext);+ return new RoutedDiscountDataScope(httpContextAccessor.Object, _adminScope, _storeScope);+ }++ [TestMethod]+ public async Task AdminArea_ResolvesToAdminScope()+ {+ var resolver = ResolverForArea("Admin");+ Assert.AreEqual("Admin", resolver.ResourceKeyPrefix);+ Assert.IsNull(await resolver.GetDefaultStoreIdAsync());+ }++ [TestMethod]+ public async Task StoreArea_ResolvesToStoreScope()+ {+ var resolver = ResolverForArea("Store");+ Assert.AreEqual(StaffStoreId, await resolver.GetDefaultStoreIdAsync());+ }++ [TestMethod]+ public void DefaultStoreId_SyncAccess_ThrowsNotSupported_RegardlessOfArea()+ {+ // RoutedDiscountDataScope.DefaultStoreId throws unconditionally (not just when Resolved+ // is AdminDiscountDataScope) - see its own doc comment. Every call site must use+ // GetDefaultStoreIdAsync instead.+ var resolver = ResolverForArea("Store");+ Assert.ThrowsExactly<NotSupportedException>(() => _ = resolver.DefaultStoreId);+ }++ [TestMethod]+ public void UnrecognizedArea_Throws()+ {+ var resolver = ResolverForArea("Vendor");+ Assert.ThrowsExactly<InvalidOperationException>(() => _ = resolver.ResourceKeyPrefix);+ }++ [TestMethod]+ public void MissingArea_Throws()+ {+ var resolver = ResolverForArea(null);+ Assert.ThrowsExactly<InvalidOperationException>(() => _ = resolver.ResourceKeyPrefix);+ }+}diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Create.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Create.cshtmldeleted file mode 100644index 438eeb95c..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Create.cshtml+++ /dev/null@@ -1,37 +0,0 @@-@model DiscountModel-@{- //page title- ViewBag.Title = Loc["admin.marketing.Discounts.AddNew"];-}-<form asp-area="@Constants.AreaAdmin" asp-controller="Discount" asp-action="Create" method="post" id="discount-form">-- <div class="row">- <div class="col-md-12">- <div class="x_panel light form-fit">- <div class="x_title">- <div class="caption">- <i class="fa fa-tags"></i>- @Loc["admin.marketing.Discounts.AddNew"]- <small>- <i class="fa fa-arrow-circle-left"></i>@Html.ActionLink(Loc["admin.marketing.Discounts.BackToList"], "List")- </small>- </div>- <div class="actions">- <div class="btn-group btn-group-devided">- <button class="btn btn-success" type="submit" name="save">- <i class="fa fa-check"></i> @Loc["Admin.Common.Save"]- </button>- <button class="btn btn-success" type="submit" name="save-continue">- <i class="fa fa-check-circle"></i> @Loc["Admin.Common.SaveContinue"]- </button>- <vc:admin-widget widget-zone="discount_details_buttons" additional-data="null"/>- </div>- </div>- </div>- <div class="x_content form">- <partial name="Partials/CreateOrUpdate" model="Model"/>- </div>- </div>- </div>- </div>-</form>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Edit.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Edit.cshtmldeleted file mode 100644index 40c41ce8a..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Edit.cshtml+++ /dev/null@@ -1,42 +0,0 @@-@model DiscountModel-@{- //page title- ViewBag.Title = Loc["admin.marketing.Discounts.EditDiscountDetails"];-}-<form asp-area="@Constants.AreaAdmin" asp-controller="Discount" asp-action="Edit" method="post" id="discount-form">--- <div class="row">- <div class="col-md-12">- <div class="x_panel light form-fit">- <div class="x_title">- <div class="caption">- <i class="fa fa-tags"></i>- @Loc["admin.marketing.Discounts.EditDiscountDetails"] - @Model.Name- <small>- <i class="fa fa-arrow-circle-left"></i>@Html.ActionLink(Loc["admin.marketing.Discounts.BackToList"], "List")- </small>- </div>- <div class="actions">- <div class="btn-group btn-group-devided">- <button class="btn btn-success" type="submit" name="save">- <i class="fa fa-check"></i> @Loc["Admin.Common.Save"]- </button>- <button class="btn btn-success" type="submit" name="save-continue">- <i class="fa fa-check-circle"></i> @Loc["Admin.Common.SaveContinue"]- </button>- <span id="discount-delete" class="btn red">- <i class="fa fa-trash-o"></i> @Loc["Admin.Common.Delete"]- </span>- <vc:admin-widget widget-zone="discount_details_buttons" additional-data="Model"/>- </div>- </div>- </div>- <div class="x_content form">- <partial name="Partials/CreateOrUpdate" model="Model"/>- </div>- </div>- </div>- </div>-</form>-<admin-delete-confirmation button-id="discount-delete"/>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/CreateOrUpdate.TabRequirements.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/CreateOrUpdate.TabRequirements.cshtmldeleted file mode 100644index 975ddf4dd..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/CreateOrUpdate.TabRequirements.cshtml+++ /dev/null@@ -1,211 +0,0 @@-@using System.Text.Encodings.Web-@model DiscountModel--@{- <vc:admin-widget widget-zone="discount_details_requirements_top" additional-data="Model"/>- if (!string.IsNullOrEmpty(Model.Id))- {- <script>-- $(document).ready(function () {-- $("#@Html.IdFor(model => model.AddDiscountRequirement)").change(loadNewRequirementBox);-- //load add requirement box- loadNewRequirementBox();-- //load existing requirements- loadExistingRequirements();-- //adding requirement event- $("#discountRequirementContainer").bind('grandnewdiscountruleadded', function(event, newRequirementId) {-- var discountId = '@Model.Id';-- var postData = {- discountRequirementId: newRequirementId,- discountId: discountId- };- addAntiForgeryToken(postData);-- $.ajax({- cache:false,- type: "POST",- url: "@(Url.Action("GetDiscountRequirementMetaInfo", "Discount", new { area = Constants.AreaAdmin }))",- data: postData,- success: function (result) {- discountRequirements.push(- {- discountRequirementId: newRequirementId,- ruleName : result.ruleName,- url : result.url- }- );- loadExistingRequirements();- },- error:function (xhr, ajaxOptions, thrownError) {- alert('Failed to load new discount requirement info. Please refresh the page');- }- });-- });- });--- //load requirement HTML- function loadRequirement(configureRuleUrl, placeholderName) {- $.ajax({- cache:false,- url: configureRuleUrl,- dataType: "html",- success: function (result) {- $(placeholderName).html(result);- StopPageLoading();- },- error:function (xhr, ajaxOptions, thrownError) {- $(placeholderName).html('Failed to load requirement content.');- StopPageLoading();- }- });- }-- //load HTML for adding requirement- function loadNewRequirementBox() {- StartPageLoading();- //load URL- var ruleSystemName = $("#@Html.IdFor(model => model.AddDiscountRequirement)").val();- var discountId = '@Model.Id';- if (ruleSystemName != '') {- $.ajax({- cache:false,- url: "@(Url.Action("GetDiscountRequirementConfigurationUrl", "Discount", new { area = Constants.AreaAdmin }))",- data: { "rulesystemName": ruleSystemName, "discountId": discountId },- success: function (result) {- var configureRuleUrl = result.url;- //now load the content- loadRequirement(configureRuleUrl, '#addrequirementplaceholder');- },- error:function (xhr, ajaxOptions, thrownError){- $('#addrequirementplaceholder').html('Failed to load requirement URL');- }- });- }- else {- $('#addrequirementplaceholder').html('');- StopPageLoading();- }- }-- //array of exisiting discount requirements- var discountRequirements = [- @for (var i = 0; i < Model.DiscountRequirementMetaInfos.Count; i++)- {- var drmi = Model.DiscountRequirementMetaInfos[i];- <text>{ discountRequirementId: "@(drmi.DiscountRequirementId)", ruleName: "@(drmi.RuleName)", url: "@(Html.Raw(JavaScriptEncoder.Default.Encode(drmi.ConfigurationUrl)))" } </text>- if (i != Model.DiscountRequirementMetaInfos.Count - 1)- {- <text>, </text>- }- }- ];-- //load HTML for exisiting requirements- function loadExistingRequirements() {- StartPageLoading();- $("#discountRequirementContainer").html('');- $("#discountRequirementTemplate").tmpl(discountRequirements).appendTo("#discountRequirementContainer");-- var discountRequirementsLen = discountRequirements.length;- for (var i=0; i<discountRequirementsLen; i++) {- var url = discountRequirements[i].url;- var discountRequirementId = discountRequirements[i].discountRequirementId;- var placeholderName = '#editrequirementplaceholder' + discountRequirementId;- $(placeholderName).html('loading...');- loadRequirement(url, placeholderName);- }- StopPageLoading();- }-- //delete requirement rule- function deleteRequirement(discountRequirementId) {- var discountId = '@Model.Id';-- var postData = {- discountRequirementId: discountRequirementId,- discountId: discountId- };- addAntiForgeryToken(postData);-- $.ajax({- cache: false,- type: "POST",- url: "@(Url.Action("DeleteDiscountRequirement", "Discount", new { area = Constants.AreaAdmin }))",- data: postData,- success: function (data) {- removeRequirementByElement(discountRequirements, discountRequirementId);- loadExistingRequirements();- },- error:function (xhr, ajaxOptions, thrownError){- alert('Failed to delete requirement.');- }- });--- function removeRequirementByElement(arrayName,discountRequirementId) {- for(var i=0; i<arrayName.length; i++) {- if(arrayName[i].discountRequirementId==discountRequirementId) {- arrayName.splice(i,1);- }- }- }-- }-- </script>-- <!-- Template container -->- <div class="form-horizontal" id="discountRequirementContainer">- </div>- <!-- Discount requirement template -->- <script id="discountRequirementTemplate" type="text/html">- <div class="form-body" id="editrequirement{{= discountRequirementId }}">- <div class="note note-info">- @Loc["admin.marketing.Discounts.Requirements.DiscountRequirementType"] <strong>{{= ruleName }}</strong>- </div>- <div class="form-group" id="editrequirementplaceholder{{= discountRequirementId }}"></div>- <div class="offset-md-3 offset-sm-3 pb-3">- <input type="button" id="deleterequirement{{= discountRequirementId }}" onclick="deleteRequirement('{{= discountRequirementId }}')" class="k-button" value="@Loc["admin.marketing.Discounts.Requirements.Remove"]"/>- </div>- </div>- </script>-- <div class="form-horizontal">- <div class="form-body">- <div class="note note-info">- <strong>@Loc["admin.marketing.Discounts.Requirements.AddNew"]</strong>- </div>- <div class="form-group">- <admin-label asp-for="AddDiscountRequirement"/>- <div class="col-md-9 col-sm-9">- <admin-select asp-for="AddDiscountRequirement" asp-items="Model.AvailableDiscountRequirementRules"/>- <span asp-validation-for="AddDiscountRequirement"></span>- </div>- </div>- </div>- </div>- <div class="form-horizontal">- <div class="form-body">- <div id="addrequirementplaceholder">- </div>- </div>- </div>- }- else- {- <div class="note note-info">- @Loc["admin.marketing.Discounts.Requirements.SaveBeforeEdit"]- </div>- }-- <vc:admin-widget widget-zone="discount_details_requirements_bottom" additional-data="Model"/>-}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.AppliedToBrands.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.AppliedToBrands.Bottom.cshtmlnew file mode 100644index 000000000..789b6f87f--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.AppliedToBrands.Bottom.cshtml@@ -0,0 +1,2 @@+@model DiscountModel+<vc:admin-widget widget-zone="discount_details_applied_to_brands_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.AppliedToBrands.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.AppliedToBrands.Top.cshtmlnew file mode 100644index 000000000..ff3dc046b--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.AppliedToBrands.Top.cshtml@@ -0,0 +1,2 @@+@model DiscountModel+<vc:admin-widget widget-zone="discount_details_applied_to_brands_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.AppliedToCategories.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.AppliedToCategories.Bottom.cshtmlnew file mode 100644index 000000000..6beb613b6--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.AppliedToCategories.Bottom.cshtml@@ -0,0 +1,2 @@+@model DiscountModel+<vc:admin-widget widget-zone="discount_details_applied_to_categories_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.AppliedToCategories.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.AppliedToCategories.Top.cshtmlnew file mode 100644index 000000000..6f2801f19--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.AppliedToCategories.Top.cshtml@@ -0,0 +1,2 @@+@model DiscountModel+<vc:admin-widget widget-zone="discount_details_applied_to_categories_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.AppliedToCollections.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.AppliedToCollections.Bottom.cshtmlnew file mode 100644index 000000000..d1c3f65f2--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.AppliedToCollections.Bottom.cshtml@@ -0,0 +1,2 @@+@model DiscountModel+<vc:admin-widget widget-zone="discount_details_applied_to_collections_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.AppliedToCollections.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.AppliedToCollections.Top.cshtmlnew file mode 100644index 000000000..a64d57fd0--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.AppliedToCollections.Top.cshtml@@ -0,0 +1,2 @@+@model DiscountModel+<vc:admin-widget widget-zone="discount_details_applied_to_collections_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.AppliedToProducts.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.AppliedToProducts.Bottom.cshtmlnew file mode 100644index 000000000..d3b3987bc--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.AppliedToProducts.Bottom.cshtml@@ -0,0 +1,2 @@+@model DiscountModel+<vc:admin-widget widget-zone="discount_details_applied_to_products_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.AppliedToProducts.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.AppliedToProducts.Top.cshtmlnew file mode 100644index 000000000..2abf5d67a--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.AppliedToProducts.Top.cshtml@@ -0,0 +1,2 @@+@model DiscountModel+<vc:admin-widget widget-zone="discount_details_applied_to_products_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.CouponCodes.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.CouponCodes.Bottom.cshtmlnew file mode 100644index 000000000..e790537ec--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.CouponCodes.Bottom.cshtml@@ -0,0 +1,2 @@+@model DiscountModel+<vc:admin-widget widget-zone="discount_details_coupon_codes_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.CouponCodes.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.CouponCodes.Top.cshtmlnew file mode 100644index 000000000..d07b3caf7--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.CouponCodes.Top.cshtml@@ -0,0 +1,2 @@+@model DiscountModel+<vc:admin-widget widget-zone="discount_details_coupon_codes_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.DetailsButtons.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.DetailsButtons.cshtmlnew file mode 100644index 000000000..0f2bc191f--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.DetailsButtons.cshtml@@ -0,0 +1,2 @@+@model DiscountModel+<vc:admin-widget widget-zone="discount_details_buttons" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.History.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.History.Bottom.cshtmlnew file mode 100644index 000000000..348647209--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.History.Bottom.cshtml@@ -0,0 +1,2 @@+@model DiscountModel+<vc:admin-widget widget-zone="discount_details_history_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.History.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.History.Top.cshtmlnew file mode 100644index 000000000..ea9f9d127--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.History.Top.cshtml@@ -0,0 +1,2 @@+@model DiscountModel+<vc:admin-widget widget-zone="discount_details_history_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.ListButtons.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.ListButtons.cshtmlnew file mode 100644index 000000000..b25e025f9--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.ListButtons.cshtml@@ -0,0 +1 @@+<vc:admin-widget widget-zone="discount_list_buttons" additional-data="null"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.Requirements.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.Requirements.Bottom.cshtmlnew file mode 100644index 000000000..234cffa7c--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.Requirements.Bottom.cshtml@@ -0,0 +1,2 @@+@model DiscountModel+<vc:admin-widget widget-zone="discount_details_requirements_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.Requirements.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.Requirements.Top.cshtmlnew file mode 100644index 000000000..e1c1a4eda--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/WidgetZone.Requirements.Top.cshtml@@ -0,0 +1,2 @@+@model DiscountModel+<vc:admin-widget widget-zone="discount_details_requirements_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Controllers/DiscountController.cs b/src/Web/Grand.Web.Admin/Controllers/DiscountController.csindex 2dc670d7d..67163fb9a 100644--- a/src/Web/Grand.Web.Admin/Controllers/DiscountController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/DiscountController.cs@@ -1,729 +1,105 @@-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.Interfaces.Customers;-using Grand.Business.Core.Queries.Catalog;-using Grand.Domain.Permissions;using Grand.Domain;+using Grand.Domain.Discounts;+using Grand.Domain.Permissions;using Grand.Domain.Vendors;-using Grand.Infrastructure;+using Grand.Mediator;+using Grand.Web.Admin.Extensions;+using Grand.Web.AdminShared.Controllers;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 Grand.Mediator;using Microsoft.AspNetCore.Mvc;-using Grand.Web.AdminShared.Models.Discounts;-using Grand.Web.AdminShared.Extensions;namespace Grand.Web.Admin.Controllers;-[PermissionAuthorize(PermissionSystemName.Discounts)]-public class DiscountController : BaseAdminController+// Concrete host subclass of BaseDiscountController (ARCH-001 Discount consolidation). This class+// supplies Admin's DI wiring plus the attributes that used to arrive transitively via+// BaseAdminController - BaseDiscountController can't inherit any single host's base controller+// (it's shared across Admin/Store, each with a different [Area]/[Authorize*] pair), so each+// subclass restates its own host's attribute set explicitly, same pattern as OrderController and+// MerchandiseReturnController.+//+// Unlike Store, Admin also carries the "Applied to vendors" region below: Store's original+// DiscountController never had vendor actions/views, so they stay on this concrete subclass+// rather than moving into BaseDiscountController. Task 7b added these 5 actions to Admin's+// then-still-full controller with no discount-scope access check at all (unlike every other+// region's guard). This task (ARCH-001 Task 9) folds them onto the injected IAdminDataScope<Discount>+// scope, matching the HasAccess/CanView split used by every other region in BaseDiscountController+// (VendorList -> CanView, the four mutating actions -> HasAccess) - this is new access control being+// added here, not a preserved behavior.+[AuthorizeAdmin]+[AutoValidateAntiforgeryToken]+[Area(Constants.AreaAdmin)]+[AuthorizeMenu]+public class DiscountController(+ IDiscountViewModelService discountViewModelService,+ IDiscountService discountService,+ ITranslationService translationService,+ IDateTimeService dateTimeService,+ IMediator mediator,+ IDiscountProviderLoader discountProviderLoader,+ IAdminDataScope<Discount> scope)+ : BaseDiscountController(discountViewModelService, discountService, translationService, dateTimeService,+ mediator, discountProviderLoader, scope){- #region Constructors-- public DiscountController(- IDiscountViewModelService discountViewModelService,- IDiscountService discountService,- ITranslationService translationService,- IContextAccessor contextAccessor,- IDateTimeService dateTimeService,- IDiscountProviderLoader discountProviderLoader,- IMediator mediator)- {- _discountViewModelService = discountViewModelService;- _discountService = discountService;- _translationService = translationService;- _contextAccessor = contextAccessor;- _dateTimeService = dateTimeService;- _discountProviderLoader = discountProviderLoader;- _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 IDiscountProviderLoader _discountProviderLoader;- private readonly IMediator _mediator;-- #endregion-- #region Discounts-- //list- public IActionResult Index()- {- return RedirectToAction("List");- }-- public IActionResult List()- {- var model = _discountViewModelService.PrepareDiscountListModel();- return View(model);- }-- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.List)]- public async Task<IActionResult> 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);- }-- //create- [PermissionAuthorizeAction(PermissionActionName.Create)]- public async Task<IActionResult> Create()- {- var model = new DiscountModel();- await _discountViewModelService.PrepareDiscountModel(model, null);-- //default values- model.LimitationTimes = 1;- return View(model);- }-- [HttpPost]- [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]- [PermissionAuthorizeAction(PermissionActionName.Create)]- public async Task<IActionResult> Create(DiscountModel model, bool continueEditing)- {- if (ModelState.IsValid)- {- var discount = await _discountViewModelService.InsertDiscountModel(model);- Success(_translationService.GetResource("admin.marketing.discounts.Added"));- return continueEditing ? RedirectToAction("Edit", new { id = discount.Id }) : RedirectToAction("List");- }-- //If we got this far, something failed, redisplay form- await _discountViewModelService.PrepareDiscountModel(model, null);-- return View(model);- }-- //edit- [PermissionAuthorizeAction(PermissionActionName.Preview)]- public async Task<IActionResult> Edit(string id)- {- var discount = await _discountService.GetDiscountById(id);- if (discount == null)- //No discount found with the specified id- 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<IActionResult> Edit(DiscountModel model, bool continueEditing)- {- var discount = await _discountService.GetDiscountById(model.Id);- if (discount == null)- //No discount found with the specified id- return RedirectToAction("List");-- if (ModelState.IsValid)- {- discount = await _discountViewModelService.UpdateDiscountModel(discount, model);- Success(_translationService.GetResource("admin.marketing.discounts.Updated"));- if (continueEditing)- {- //selected tab- await SaveSelectedTabIndex();- return RedirectToAction("Edit", new { id = discount.Id });- }-- return RedirectToAction("List");- }-- //If we got this far, something failed, redisplay form- await _discountViewModelService.PrepareDiscountModel(model, discount);-- return View(model);- }-- //delete- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Delete)]- public async Task<IActionResult> Delete(string id)- {- var discount = await _discountService.GetDiscountById(id);- if (discount == null)- //No discount found with the specified id- return RedirectToAction("List");-- 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<IActionResult> CouponCodeList(DataSourceRequest command, string discountId)- {- var discount = await _discountService.GetDiscountById(discountId);- if (discount == null)- throw new Exception("No discount found with the specified id");-- 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<IActionResult> CouponCodeDelete(string discountId, string Id)- {- var discount = await _discountService.GetDiscountById(discountId);- if (discount == null)- throw new Exception("No discount found with the specified id");-- 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<IActionResult> 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");-- couponCode = couponCode.ToUpper();-- 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<IActionResult> GetDiscountRequirementConfigurationUrl(string rulesystemName,- string discountId, string discountRequirementId)- {- 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");-- 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<IActionResult> GetDiscountRequirementMetaInfo(string discountRequirementId, string discountId)- {- var discount = await _discountService.GetDiscountById(discountId);- if (discount == null)- throw new ArgumentException("Discount could not be loaded");-- 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<IActionResult> DeleteDiscountRequirement(string discountRequirementId, string discountId)- {- var discount = await _discountService.GetDiscountById(discountId);- if (discount == null)- throw new ArgumentException("Discount could not be loaded");-- 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<IActionResult> 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");-- 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<IActionResult> 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");-- 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<IActionResult> ProductAddPopup(string discountId)- {- var model = await _discountViewModelService.PrepareProductToDiscountModel();- return View(model);- }-- [PermissionAuthorizeAction(PermissionActionName.Edit)]- [HttpPost]- public async Task<IActionResult> ProductAddPopupList(DataSourceRequest command,- DiscountModel.AddProductToDiscountModel model)- {- 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<IActionResult> 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 (model.SelectedProductIds != null) await _discountViewModelService.InsertProductToDiscountModel(model);-- return Content("");- }-- #endregion-- #region Applied to categories-- [PermissionAuthorizeAction(PermissionActionName.Preview)]- [HttpPost]- public async Task<IActionResult> 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");-- var categories = await categoryService.GetAllCategoriesByDiscount(discount.Id);- var items = new List<DiscountModel.AppliedToCategoryModel>();- 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<IActionResult> 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");-- 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<IActionResult> CategoryAddPopupList(DataSourceRequest command,- DiscountModel.AddCategoryToDiscountModel model, [FromServices] ICategoryService categoryService)- {- var categories = await categoryService.GetAllCategories(parentId: null, categoryName: model.SearchCategoryName, storeId: "",- pageIndex: command.Page - 1, pageSize: command.PageSize, showHidden: true);- var items = new List<CategoryModel>();- 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<IActionResult> 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 (model.SelectedCategoryIds != null) await _discountViewModelService.InsertCategoryToDiscountModel(model);-- return Content("");- }-- #endregion-- #region Applied to brands-- [PermissionAuthorizeAction(PermissionActionName.Preview)]- [HttpPost]- public async Task<IActionResult> 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");-- 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<IActionResult> 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");-- 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<IActionResult> BrandAddPopupList(DataSourceRequest command,- DiscountModel.AddBrandToDiscountModel model, [FromServices] IBrandService brandService)- {- var brands = await brandService.GetAllBrands(model.SearchBrandName,- _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId, 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<IActionResult> 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 (model.SelectedBrandIds != null) await _discountViewModelService.InsertBrandToDiscountModel(model);-- return Content("");- }-- #endregion-- #region Applied to collections-- [PermissionAuthorizeAction(PermissionActionName.Preview)]- [HttpPost]- public async Task<IActionResult> 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");-- 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<IActionResult> 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");-- 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<IActionResult> CollectionAddPopupList(DataSourceRequest command,- DiscountModel.AddCollectionToDiscountModel model, [FromServices] ICollectionService collectionService)- {- var collections = await collectionService.GetAllCollections(model.SearchCollectionName, "",- 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<IActionResult> 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 (model.SelectedCollectionIds != null) await _discountViewModelService.InsertCollectionToDiscountModel(model);-- return Content("");- }-- #endregion-- #region Applied to vendors+ #region Applied to vendors (Admin-only — no Store equivalent, see Task 7b)[PermissionAuthorizeAction(PermissionActionName.Preview)][HttpPost]public async Task<IActionResult> VendorList(DataSourceRequest command, string discountId,[FromServices] IVendorService vendorService){- var discount = await _discountService.GetDiscountById(discountId);+ var discount = await discountService.GetDiscountById(discountId);if (discount == null)throw new Exception("No discount found with the specified id");+ if (!await scope.CanView(discount))+ return new JsonResult(new DataSourceResult { Errors = "Access denied" });var vendors = await vendorService.GetAllVendorsByDiscount(discount.Id);- var gridModel = new DataSourceResult {- Data = vendors.Select(x => new DiscountModel.AppliedToVendorModel {- VendorId = x.Id,- VendorName = x.Name- }),+ return Json(new DataSourceResult {+ Data = vendors.Select(x => new DiscountModel.AppliedToVendorModel { VendorId = x.Id, VendorName = x.Name }),Total = vendors.Count- };-- return Json(gridModel);+ });}[PermissionAuthorizeAction(PermissionActionName.Edit)]public async Task<IActionResult> VendorDelete(string discountId, string vendorId,[FromServices] IVendorService vendorService){- var discount = await _discountService.GetDiscountById(discountId);+ var discount = await discountService.GetDiscountById(discountId);if (discount == null)throw new Exception("No discount found with the specified id");+ if (!await scope.HasAccess(discount))+ return new JsonResult(new DataSourceResult { Errors = "Access denied" });var vendor = await vendorService.GetVendorById(vendorId);if (vendor == null)throw new Exception("No vendor found with the specified id");if (ModelState.IsValid){- await _discountViewModelService.DeleteVendor(discount, vendor);+ await discountViewModelService.DeleteVendor(discount, vendor);return new JsonResult("");}-return ErrorForKendoGridJson(ModelState);}[PermissionAuthorizeAction(PermissionActionName.Edit)]- public IActionResult VendorAddPopup(string discountId)+ public async Task<IActionResult> VendorAddPopup(string discountId){- var model = new DiscountModel.AddVendorToDiscountModel();- return View(model);+ var discount = await discountService.GetDiscountById(discountId);+ if (discount == null)+ throw new Exception("No discount found with the specified id");+ if (!await scope.HasAccess(discount))+ return new JsonResult(new DataSourceResult { Errors = "Access denied" });++ return View(new DiscountModel.AddVendorToDiscountModel());}[PermissionAuthorizeAction(PermissionActionName.Edit)]@@ -731,79 +107,30 @@ public class DiscountController : BaseAdminControllerpublic async Task<IActionResult> VendorAddPopupList(DataSourceRequest command,DiscountModel.AddVendorToDiscountModel model, [FromServices] IVendorService vendorService){- var vendors =- await vendorService.GetAllVendors(model.SearchVendorName, command.Page - 1, command.PageSize, true);+ var vendors = await vendorService.GetAllVendors(model.SearchVendorName, command.Page - 1, command.PageSize, true);- //search for emailsif (!string.IsNullOrEmpty(model.SearchVendorEmail)){- var tempVendors =- vendors.Where(x => x.Email.ToLowerInvariant().Contains(model.SearchVendorEmail.Trim()));+ var tempVendors = vendors.Where(x => x.Email.ToLowerInvariant().Contains(model.SearchVendorEmail.Trim()));vendors = new PagedList<Vendor>(tempVendors, command.Page - 1, command.PageSize);}- var gridModel = new DataSourceResult {- Data = vendors.Select(x => x.ToModel()),- Total = vendors.TotalCount- };-- return Json(gridModel);+ return Json(new DataSourceResult { Data = vendors.Select(x => x.ToModel()), Total = vendors.TotalCount });}[PermissionAuthorizeAction(PermissionActionName.Edit)][HttpPost]public async Task<IActionResult> VendorAddPopup(DiscountModel.AddVendorToDiscountModel model){- var discount = await _discountService.GetDiscountById(model.DiscountId);+ var discount = await discountService.GetDiscountById(model.DiscountId);if (discount == null)throw new Exception("No discount found with the specified id");+ if (!await scope.HasAccess(discount))+ return Content("Access denied");- if (model.SelectedVendorIds != null) await _discountViewModelService.InsertVendorToDiscountModel(model);-+ if (model.SelectedVendorIds != null) await discountViewModelService.InsertVendorToDiscountModel(model);return Content("");}#endregion-- #region Discount usage history-- [PermissionAuthorizeAction(PermissionActionName.Preview)]- [HttpPost]- public async Task<IActionResult> UsageHistoryList(string discountId, DataSourceRequest command)- {- var discount = await _discountService.GetDiscountById(discountId);- if (discount == null)- throw new ArgumentException("No discount found with the specified id");-- 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<IActionResult> UsageHistoryDelete(string discountId, string id)- {- var discount = await _discountService.GetDiscountById(discountId);- if (discount == null)- throw new ArgumentException("No discount found with the specified id");-- var duh = await _discountService.GetDiscountUsageHistoryById(id);- if (duh != null)- {- if (ModelState.IsValid)- await _discountService.DeleteDiscountUsageHistory(duh);- else- return ErrorForKendoGridJson(ModelState);- }-- return new JsonResult("");- }-- #endregion-}\ No newline at end of file+}diff --git a/src/Web/Grand.Web.AdminShared/Controllers/BaseDiscountController.cs b/src/Web/Grand.Web.AdminShared/Controllers/BaseDiscountController.csnew file mode 100644index 000000000..f0c7ce20f--- /dev/null+++ b/src/Web/Grand.Web.AdminShared/Controllers/BaseDiscountController.cs@@ -0,0 +1,692 @@+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.Mediator;+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.Controllers;+using Grand.Web.Common.DataSource;+using Grand.Web.Common.Filters;+using Grand.Web.Common.Security.Authorization;+using Microsoft.AspNetCore.Mvc;++namespace Grand.Web.AdminShared.Controllers;++[PermissionAuthorize(PermissionSystemName.Discounts)]+[AutoValidateAntiforgeryToken]+public abstract class BaseDiscountController(+ IDiscountViewModelService discountViewModelService,+ IDiscountService discountService,+ ITranslationService translationService,+ IDateTimeService dateTimeService,+ IMediator mediator,+ IDiscountProviderLoader discountProviderLoader,+ IAdminDataScope<Discount> scope)+ : BaseController+{+ #region Discounts++ public IActionResult Index() => RedirectToAction("List");++ public IActionResult List()+ {+ var model = discountViewModelService.PrepareDiscountListModel();+ return View(model);+ }++ [HttpPost]+ [PermissionAuthorizeAction(PermissionActionName.List)]+ public async Task<IActionResult> List(DiscountListModel model, DataSourceRequest command)+ {+ var (discountModel, totalCount) =+ await discountViewModelService.PrepareDiscountModel(model, command.Page, command.PageSize);+ return Json(new DataSourceResult { Data = discountModel.ToList(), Total = totalCount });+ }++ [PermissionAuthorizeAction(PermissionActionName.Create)]+ public async Task<IActionResult> 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<IActionResult> Create(DiscountModel model, bool continueEditing)+ {+ if (ModelState.IsValid)+ {+ var defaultStoreId = await scope.GetDefaultStoreIdAsync();+ if (defaultStoreId is not null) model.Stores = [defaultStoreId];+ 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<IActionResult> Edit(string id)+ {+ var discount = await discountService.GetDiscountById(id);+ if (discount == null || !await scope.CanView(discount))+ 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<IActionResult> Edit(DiscountModel model, bool continueEditing)+ {+ var discount = await discountService.GetDiscountById(model.Id);+ if (discount == null)+ return RedirectToAction("List");++ if (!await scope.HasAccess(discount))+ return RedirectToAction("Edit", new { id = discount.Id });++ if (ModelState.IsValid)+ {+ var defaultStoreId = await scope.GetDefaultStoreIdAsync();+ if (defaultStoreId is not null) model.Stores = [defaultStoreId];+ 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<IActionResult> Delete(string id)+ {+ var discount = await discountService.GetDiscountById(id);+ if (discount == null)+ return RedirectToAction("List");++ if (!await scope.HasAccess(discount))+ return RedirectToAction("Edit", new { id = discount.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 requirements++ [AcceptVerbs("GET")]+ [PermissionAuthorizeAction(PermissionActionName.Preview)]+ public async Task<IActionResult> GetDiscountRequirementConfigurationUrl(string rulesystemName,+ string discountId, string discountRequirementId = null)+ {+ 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 (!await scope.HasAccess(discount))+ return Json(new { Result = false, Error = "Access denied" });++ var singleRequirement = discountPlugin.GetRequirementRules().FirstOrDefault(x =>+ x.SystemName.Equals(rulesystemName, StringComparison.OrdinalIgnoreCase));+ var url = discountViewModelService.GetRequirementUrlInternal(singleRequirement, discount,+ discountRequirementId ?? string.Empty);+ return Json(new { url });+ }++ [PermissionAuthorizeAction(PermissionActionName.Preview)]+ public async Task<IActionResult> GetDiscountRequirementMetaInfo(string discountRequirementId, string discountId)+ {+ var discount = await discountService.GetDiscountById(discountId);+ if (discount == null)+ throw new ArgumentException("Discount could not be loaded");+ if (!await scope.HasAccess(discount))+ 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");++ 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);+ return Json(new { url, ruleName = discountRequirementRule.FriendlyName });+ }++ [HttpPost]+ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public async Task<IActionResult> DeleteDiscountRequirement(string discountRequirementId, string discountId)+ {+ var discount = await discountService.GetDiscountById(discountId);+ if (discount == null)+ throw new ArgumentException("Discount could not be loaded");+ if (!await scope.HasAccess(discount))+ 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 Discount coupon codes++ [HttpPost]+ [PermissionAuthorizeAction(PermissionActionName.Preview)]+ public async Task<IActionResult> 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 (!await scope.HasAccess(discount))+ return new JsonResult(new DataSourceResult { Errors = "Access denied" });++ var couponcodes = await discountService.GetAllCouponCodesByDiscountId(discount.Id,+ command.Page - 1, command.PageSize);+ return Json(new DataSourceResult {+ Data = couponcodes.Select(x => new { x.Id, x.CouponCode, x.Used }),+ Total = couponcodes.TotalCount+ });+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public async Task<IActionResult> 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 (!await scope.HasAccess(discount))+ 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<IActionResult> 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 (!await scope.HasAccess(discount))+ 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 Applied to products++ [PermissionAuthorizeAction(PermissionActionName.Preview)]+ [HttpPost]+ public async Task<IActionResult> 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 (!await scope.CanView(discount))+ return new JsonResult(new DataSourceResult { Errors = "Access denied" });++ var products = await productService.GetProductsByDiscount(discount.Id, command.Page - 1, command.PageSize);+ return Json(new DataSourceResult {+ Data = products.Select(x => new DiscountModel.AppliedToProductModel { ProductId = x.Id, ProductName = x.Name }),+ Total = products.TotalCount+ });+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public async Task<IActionResult> 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 (!await scope.HasAccess(discount))+ 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<IActionResult> ProductAddPopup(string discountId)+ {+ var discount = await discountService.GetDiscountById(discountId);+ if (discount == null)+ throw new Exception("No discount found with the specified id");+ if (!await scope.HasAccess(discount))+ return new JsonResult(new DataSourceResult { Errors = "Access denied" });++ var model = await discountViewModelService.PrepareProductToDiscountModel();+ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ public async Task<IActionResult> ProductAddPopupList(DataSourceRequest command,+ DiscountModel.AddProductToDiscountModel model)+ {+ var defaultStoreId = await scope.GetDefaultStoreIdAsync();+ if (defaultStoreId is not null) model.SearchStoreId = defaultStoreId;+ var products = await discountViewModelService.PrepareProductModel(model, command.Page, command.PageSize);+ return Json(new DataSourceResult { Data = products.products.ToList(), Total = products.totalCount });+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ public async Task<IActionResult> 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 (!await scope.HasAccess(discount))+ return Content("Access denied");++ if (model.SelectedProductIds != null) await discountViewModelService.InsertProductToDiscountModel(model);+ return Content("");+ }++ #endregion++ #region Applied to categories++ // CategoryList/CategoryDelete/CategoryAddPopup(POST) below preserve Store's original strict+ // AccessToEntityByStore check (widened here to scope.CanView/HasAccess) and widen Admin's+ // original, which had no check at all, to match Store. CategoryAddPopup(GET)/CategoryAddPopupList+ // are the genuine both-hosts gap: neither original guarded them, so applying scope.HasAccess+ // here is real disclosed security hardening, not behavior preservation.++ [PermissionAuthorizeAction(PermissionActionName.Preview)]+ [HttpPost]+ public async Task<IActionResult> 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 (!await scope.CanView(discount))+ return new JsonResult(new DataSourceResult { Errors = "Access denied" });++ var categories = await categoryService.GetAllCategoriesByDiscount(discount.Id);+ var items = new List<DiscountModel.AppliedToCategoryModel>();+ foreach (var item in categories)+ items.Add(new DiscountModel.AppliedToCategoryModel {+ CategoryId = item.Id, CategoryName = await categoryService.GetFormattedBreadCrumb(item)+ });+ return Json(new DataSourceResult { Data = items, Total = categories.Count });+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public async Task<IActionResult> 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 (!await scope.HasAccess(discount))+ 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 async Task<IActionResult> CategoryAddPopup(string discountId)+ {+ var discount = await discountService.GetDiscountById(discountId);+ if (discount == null)+ throw new Exception("No discount found with the specified id");+ if (!await scope.HasAccess(discount))+ return new JsonResult(new DataSourceResult { Errors = "Access denied" });++ return View(new DiscountModel.AddCategoryToDiscountModel());+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ public async Task<IActionResult> CategoryAddPopupList(DataSourceRequest command,+ DiscountModel.AddCategoryToDiscountModel model, [FromServices] ICategoryService categoryService)+ {+ var categories = await categoryService.GetAllCategories(parentId: null, categoryName: model.SearchCategoryName,+ storeId: await scope.GetDefaultStoreIdAsync() ?? "", pageIndex: command.Page - 1, pageSize: command.PageSize, showHidden: true);+ var items = new List<CategoryModel>();+ foreach (var item in categories)+ {+ var categoryModel = item.ToModel();+ categoryModel.Breadcrumb = await categoryService.GetFormattedBreadCrumb(item);+ items.Add(categoryModel);+ }+ return Json(new DataSourceResult { Data = items, Total = categories.TotalCount });+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ public async Task<IActionResult> 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 (!await scope.HasAccess(discount))+ return Content("Access denied");++ if (model.SelectedCategoryIds != null) await discountViewModelService.InsertCategoryToDiscountModel(model);+ return Content("");+ }++ #endregion++ #region Applied to brands++ // BrandList/BrandDelete/BrandAddPopup(POST) below preserve Store's original strict+ // AccessToEntityByStore check (widened here to scope.CanView/HasAccess) and widen Admin's+ // original, which had no check at all, to match Store. BrandAddPopup(GET)/BrandAddPopupList+ // are the genuine both-hosts gap: neither original guarded them, so applying scope.HasAccess+ // here is real disclosed security hardening, not behavior preservation.++ [PermissionAuthorizeAction(PermissionActionName.Preview)]+ [HttpPost]+ public async Task<IActionResult> 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 (!await scope.CanView(discount))+ return new JsonResult(new DataSourceResult { Errors = "Access denied" });++ var brands = await brandService.GetAllBrandsByDiscount(discount.Id);+ return Json(new DataSourceResult {+ Data = brands.Select(x => new DiscountModel.AppliedToBrandModel { BrandId = x.Id, BrandName = x.Name }),+ Total = brands.Count+ });+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public async Task<IActionResult> 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 (!await scope.HasAccess(discount))+ 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 async Task<IActionResult> BrandAddPopup(string discountId)+ {+ var discount = await discountService.GetDiscountById(discountId);+ if (discount == null)+ throw new Exception("No discount found with the specified id");+ if (!await scope.HasAccess(discount))+ return new JsonResult(new DataSourceResult { Errors = "Access denied" });++ return View(new DiscountModel.AddBrandToDiscountModel());+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ public async Task<IActionResult> BrandAddPopupList(DataSourceRequest command,+ DiscountModel.AddBrandToDiscountModel model, [FromServices] IBrandService brandService)+ {+ var brands = await brandService.GetAllBrands(model.SearchBrandName,+ await scope.GetDefaultStoreIdAsync() ?? "", command.Page - 1, command.PageSize, true);+ return Json(new DataSourceResult { Data = brands.Select(x => x.ToModel()), Total = brands.TotalCount });+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ public async Task<IActionResult> 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 (!await scope.HasAccess(discount))+ return Content("Access denied");++ if (model.SelectedBrandIds != null) await discountViewModelService.InsertBrandToDiscountModel(model);+ return Content("");+ }++ #endregion++ #region Applied to collections++ // CollectionList/CollectionDelete/CollectionAddPopup(POST) below preserve Store's original strict+ // AccessToEntityByStore check (widened here to scope.CanView/HasAccess) and widen Admin's+ // original, which had no check at all, to match Store. CollectionAddPopup(GET)/CollectionAddPopupList+ // are the genuine both-hosts gap: neither original guarded them, so applying scope.HasAccess+ // here is real disclosed security hardening, not behavior preservation.++ [PermissionAuthorizeAction(PermissionActionName.Preview)]+ [HttpPost]+ public async Task<IActionResult> 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 (!await scope.CanView(discount))+ return new JsonResult(new DataSourceResult { Errors = "Access denied" });++ var collections = await collectionService.GetAllCollectionsByDiscount(discount.Id);+ return Json(new DataSourceResult {+ Data = collections.Select(x => new DiscountModel.AppliedToCollectionModel { CollectionId = x.Id, CollectionName = x.Name }),+ Total = collections.Count+ });+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public async Task<IActionResult> 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 (!await scope.HasAccess(discount))+ 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 async Task<IActionResult> CollectionAddPopup(string discountId)+ {+ var discount = await discountService.GetDiscountById(discountId);+ if (discount == null)+ throw new Exception("No discount found with the specified id");+ if (!await scope.HasAccess(discount))+ return new JsonResult(new DataSourceResult { Errors = "Access denied" });++ return View(new DiscountModel.AddCollectionToDiscountModel());+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ public async Task<IActionResult> CollectionAddPopupList(DataSourceRequest command,+ DiscountModel.AddCollectionToDiscountModel model, [FromServices] ICollectionService collectionService)+ {+ var collections = await collectionService.GetAllCollections(model.SearchCollectionName,+ await scope.GetDefaultStoreIdAsync() ?? "", command.Page - 1, command.PageSize, true);+ return Json(new DataSourceResult { Data = collections.Select(x => x.ToModel()), Total = collections.TotalCount });+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ public async Task<IActionResult> 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 (!await scope.HasAccess(discount))+ return Content("Access denied");++ if (model.SelectedCollectionIds != null) await discountViewModelService.InsertCollectionToDiscountModel(model);+ return Content("");+ }++ #endregion++ #region Discount usage history++ [HttpPost]+ [PermissionAuthorizeAction(PermissionActionName.Preview)]+ public async Task<IActionResult> 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 (!await scope.HasAccess(discount))+ 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);+ }++ [HttpPost]+ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public async Task<IActionResult> 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 (!await scope.HasAccess(discount))+ 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.AdminShared/Interfaces/IAdminDataScope.cs b/src/Web/Grand.Web.AdminShared/Interfaces/IAdminDataScope.csindex 32fcbaf95..bb799a0cd 100644--- a/src/Web/Grand.Web.AdminShared/Interfaces/IAdminDataScope.cs+++ b/src/Web/Grand.Web.AdminShared/Interfaces/IAdminDataScope.cs@@ -17,14 +17,27 @@ public interface IAdminDataScope<TEntity>/// <summary>Whether the current user may view/reference this entity (open its edit form, copy it) —/// looser than <see cref="HasAccess"/> for hosts where viewing a shared/global entity is allowed but/// mutating it isn't. Defaults to <see cref="HasAccess"/> for hosts with no such split (Admin: always- /// true either way; Vendor: the two are identical, verified against the existing, unsplit- /// `CheckAccessToProduct`). Only Store overrides this.</summary>+ /// true either way for most entities; Vendor: the two are identical, verified against the existing,+ /// unsplit `CheckAccessToProduct`). Overridden by Store, and by+ /// <see cref="Grand.Web.AdminShared.Services.AdminDiscountDataScope"/> for its Store-Manager-gated+ /// Admin case.</summary>Task<bool> CanView(TEntity entity) => HasAccess(entity);/// <summary>Store id to default onto new/edited entities. Null when the host has no store concept/// (Admin: global, no default; Vendor: not store-scoped at all).</summary>string? DefaultStoreId { get; }+ /// <summary>Async counterpart to <see cref="DefaultStoreId"/>. Every controller/service call site+ /// in this project is already async, so callers should always prefer this member. It exists+ /// because <see cref="Grand.Web.AdminShared.Services.AdminDiscountDataScope"/> computes its+ /// default store id from an async customer-group check (<c>IGroupService.IsStoreManager</c>) with+ /// no sync-safe path — exposing only the synchronous <see cref="DefaultStoreId"/> would force it+ /// to block on that Task (`.GetAwaiter().GetResult()`), which is a hard constraint violation+ /// (see `.ai/constraints.md` "Never block on a Task") and a thread-pool starvation risk under+ /// load. Every other scope's default store id needs no I/O, so the default implementation here+ /// just wraps <see cref="DefaultStoreId"/> and costs those implementations nothing.</summary>+ Task<string?> GetDefaultStoreIdAsync() => Task.FromResult(DefaultStoreId);+/// <summary>Prefix used to build host-specific localization keys, e.g. "Admin", "Vendor". Store/// currently has no distinct resource set and uses "Admin" (see Task 6).</summary>string ResourceKeyPrefix { get; }diff --git a/src/Web/Grand.Web.AdminShared/Services/AdminDiscountDataScope.cs b/src/Web/Grand.Web.AdminShared/Services/AdminDiscountDataScope.csnew file mode 100644index 000000000..b34770304--- /dev/null+++ b/src/Web/Grand.Web.AdminShared/Services/AdminDiscountDataScope.cs@@ -0,0 +1,72 @@+#nullable enable++using Grand.Business.Core.Interfaces.Common.Directory;+using Grand.Domain.Discounts;+using Grand.Infrastructure;+using Grand.Web.AdminShared.Extensions;+using Grand.Web.AdminShared.Interfaces;++namespace Grand.Web.AdminShared.Services;++/// <summary>+/// Admin's <see cref="IAdminDataScope{Discount}" />. Deliberately NOT the generic+/// <see cref="GlobalAdminDataScope{TEntity}" /> — Admin's original DiscountController gates+/// Create/Edit/Delete on <c>groupService.IsStoreManager(CurrentCustomer)</c>, a customer-group+/// flag independent of area/host, that Store's original controller never checked (Store always+/// applies the strict store check unconditionally). Reusing the always-true generic scope here+/// would silently drop this restriction for the rare case of an Admin-area user who is also a+/// store manager. Same class of Admin-side scope logic as+/// <see cref="Grand.Web.AdminShared.Services.AdminOrderDataScope"/> (there: IsSalesManager/SeId;+/// here: IsStoreManager/StaffStoreId). See ARCH-001 Discount consolidation spec §2.+/// </summary>+public class AdminDiscountDataScope(IContextAccessor contextAccessor, IGroupService groupService)+ : IAdminDataScope<Discount>+{+ public async Task<bool> HasAccess(Discount entity)+ {+ if (entity is null) return false;+ var isStoreManager = await groupService.IsStoreManager(contextAccessor.WorkContext.CurrentCustomer);+ return !isStoreManager ||+ entity.AccessToEntityByStore(contextAccessor.WorkContext.CurrentCustomer.StaffStoreId);+ }++ public async Task<bool> CanView(Discount entity)+ {+ if (entity is null) return false;+ var isStoreManager = await groupService.IsStoreManager(contextAccessor.WorkContext.CurrentCustomer);+ if (!isStoreManager) return true;++ //looser than HasAccess: viewing a global or multi-store discount is allowed (with a+ //warning, applied by the caller) for a store manager; only mutating one they don't+ //exclusively own is denied+ if (!entity.LimitedToStores ||+ (entity.Stores.Contains(contextAccessor.WorkContext.CurrentCustomer.StaffStoreId) &&+ entity.Stores.Count > 1))+ return true;++ return entity.AccessToEntityByStore(contextAccessor.WorkContext.CurrentCustomer.StaffStoreId);+ }++ // The synchronous DefaultStoreId required by IAdminDataScope<TEntity> has no sync-safe+ // implementation here: it depends on IsStoreManager, which is async, and this codebase forbids+ // blocking on a Task (`.GetAwaiter().GetResult()`) in request/service code - see+ // `.ai/constraints.md` "Never block on a Task". Unlike AdminOrderDataScope's DefaultStoreId+ // (hardcoded null, no I/O needed), this scope genuinely cannot answer synchronously. Every call+ // site (BaseDiscountController) is already async, so it uses GetDefaultStoreIdAsync below+ // instead; this member throws rather than silently blocking or returning a wrong answer.+ public string? DefaultStoreId =>+ throw new NotSupportedException(+ $"{nameof(AdminDiscountDataScope)}.{nameof(DefaultStoreId)} requires an async customer-group " ++ $"check and has no sync-safe implementation. Use {nameof(GetDefaultStoreIdAsync)} instead.");++ public async Task<string?> GetDefaultStoreIdAsync()+ {+ var isStoreManager = await groupService.IsStoreManager(contextAccessor.WorkContext.CurrentCustomer);+ return isStoreManager ? contextAccessor.WorkContext.CurrentCustomer.StaffStoreId : null;+ }++ public string ResourceKeyPrefix => "Admin";+ public bool ShowStoreSelector => true;+ public string? DefaultVendorId => null;+ public bool CanFeatureOnHomepage => true; // unused for Discount; required interface member+}diff --git a/src/Web/Grand.Web.AdminShared/Services/RoutedDiscountDataScope.cs b/src/Web/Grand.Web.AdminShared/Services/RoutedDiscountDataScope.csnew file mode 100644index 000000000..6e40adf58--- /dev/null+++ b/src/Web/Grand.Web.AdminShared/Services/RoutedDiscountDataScope.cs@@ -0,0 +1,57 @@+#nullable enable++using Grand.Domain.Discounts;+using Grand.Web.AdminShared.Interfaces;+using Microsoft.AspNetCore.Http;++namespace Grand.Web.AdminShared.Services;++/// <summary>+/// Resolves the correct per-host <see cref="IAdminDataScope{Discount}" /> implementation at+/// request time, based on the current request's "area" route value — same fix and same reason+/// as every other Routed*DataScope in this initiative: Grand.Web (the combined host) loads+/// Admin and Store together in one DI container, so a plain per-host registration would+/// silently let whichever host's StartupApplication ran last win for every area in that+/// process.+///+/// Unlike most Routed*DataScope siblings, the Admin branch resolves to the bespoke+/// <see cref="AdminDiscountDataScope"/>, not the generic <see cref="GlobalAdminDataScope{TEntity}"/>+/// — see AdminDiscountDataScope's own doc comment for why. No Vendor branch: Discount has no+/// Vendor screen at all, so any "Vendor" (or other unrecognized/missing) area value fails closed.+/// </summary>+public class RoutedDiscountDataScope(+ IHttpContextAccessor httpContextAccessor,+ AdminDiscountDataScope adminScope,+ StoreAdminDataScope<Discount> storeScope) : IAdminDataScope<Discount>+{+ private IAdminDataScope<Discount> Resolved+ {+ get+ {+ var area = httpContextAccessor.HttpContext?.Request.RouteValues["area"] as string;+ return area switch {+ "Admin" => adminScope,+ "Store" => storeScope,+ _ => throw new InvalidOperationException(+ $"RoutedDiscountDataScope: unrecognized or missing area '{area}'.")+ };+ }+ }++ public Task<bool> HasAccess(Discount entity) => Resolved.HasAccess(entity);+ public Task<bool> CanView(Discount entity) => Resolved.CanView(entity);++ // Not Resolved.DefaultStoreId: when Resolved is AdminDiscountDataScope that throws+ // (see its own doc comment) - forwarding here would just relocate the same trap. Every call+ // site uses GetDefaultStoreIdAsync below, which both branches answer without blocking.+ public string? DefaultStoreId =>+ throw new NotSupportedException(+ $"{nameof(RoutedDiscountDataScope)}.{nameof(DefaultStoreId)} may resolve to a scope with " ++ $"no sync-safe implementation. Use {nameof(GetDefaultStoreIdAsync)} instead.");++ public Task<string?> GetDefaultStoreIdAsync() => Resolved.GetDefaultStoreIdAsync();+ public string ResourceKeyPrefix => Resolved.ResourceKeyPrefix;+ public bool ShowStoreSelector => Resolved.ShowStoreSelector;+ public string? DefaultVendorId => Resolved.DefaultVendorId;+ public bool CanFeatureOnHomepage => Resolved.CanFeatureOnHomepage;+}diff --git a/src/Web/Grand.Web.AdminShared/Startup/StartupApplication.cs b/src/Web/Grand.Web.AdminShared/Startup/StartupApplication.csindex 8278e1108..7c6d91cbf 100644--- a/src/Web/Grand.Web.AdminShared/Startup/StartupApplication.cs+++ b/src/Web/Grand.Web.AdminShared/Startup/StartupApplication.cs@@ -3,6 +3,7 @@ using elFinder.Net.Drivers.FileSystem.Extensions;using Grand.Domain.Catalog;using Grand.Domain.Common;using Grand.Domain.Customers;+using Grand.Domain.Discounts;using Grand.Domain.Messages;using Grand.Domain.Orders;using Grand.Domain.Payments;@@ -103,6 +104,13 @@ public class StartupApplication : IStartupApplicationservices.AddScoped<VendorOrderDataScope>();services.AddScoped<IAdminDataScope<Order>, RoutedOrderDataScope>();+ // IAdminDataScope<Discount>: bespoke Admin scope (Store Manager gating), reuses the generic+ // StoreAdminDataScope<T> for Store — see AdminDiscountDataScope/RoutedDiscountDataScope doc+ // comments. No Vendor scope: Discount has no Vendor screen.+ services.AddScoped<AdminDiscountDataScope>();+ services.AddScoped<StoreAdminDataScope<Discount>>();+ services.AddScoped<IAdminDataScope<Discount>, RoutedDiscountDataScope>();+// IAdminDataScope<Shipment>: registered once here for the same reason as Order above — see// RoutedShipmentDataScope's doc comment. Admin reuses the generic GlobalAdminDataScope<T>// unmodified (no Sales-Manager restriction on Shipment); Store/Vendor are bespoke becausediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/BrandAddPopup.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Discount/BrandAddPopup.cshtmlsimilarity index 95%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/BrandAddPopup.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/Discount/BrandAddPopup.cshtmlindex 3c2114ba2..101baf8be 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/BrandAddPopup.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Discount/BrandAddPopup.cshtml@@ -1,12 +1,13 @@-@model DiscountModel.AddBrandToDiscountModel+@model DiscountModel.AddBrandToDiscountModel@inject AdminAreaSettings adminAreaSettings@{Layout = "";//page titleViewBag.Title = Loc["admin.marketing.Discounts.AppliedToBrands.AddNew"];+ var area = ViewContext.RouteData.Values["area"]?.ToString();}-<form id="BrandAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Discount" asp-action="BrandAddPopup" method="post"+<form id="BrandAddPopup" asp-area="@area" asp-controller="Discount" asp-action="BrandAddPopup" method="post"asp-route-DiscountId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["DiscountId"])"asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">@@ -88,7 +89,7 @@dataSource: {transport: {read: {- url: "@Html.Raw(Url.Action("BrandAddPopupList", "Discount", new { area = Constants.AreaAdmin }))",+ url: "@Html.Raw(Url.Action("BrandAddPopupList", "Discount", new { area = area }))",type: "POST",dataType: "json",data: additionalData@@ -143,7 +144,7 @@$("#@Html.IdFor(model => model.SearchBrandName)").keydown(function(event) {if (event.keyCode == 13) {- $("#search-vendors").click();+ $("#search-brands").click();return false;}});@@ -173,4 +174,4 @@</script>-</form>\ No newline at end of file+</form>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/CategoryAddPopup.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Discount/CategoryAddPopup.cshtmlsimilarity index 96%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/CategoryAddPopup.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/Discount/CategoryAddPopup.cshtmlindex aa49a9c32..51b32fde1 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/CategoryAddPopup.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Discount/CategoryAddPopup.cshtml@@ -1,12 +1,13 @@-@model DiscountModel.AddCategoryToDiscountModel+@model DiscountModel.AddCategoryToDiscountModel@inject AdminAreaSettings adminAreaSettings@{Layout = "";//page titleViewBag.Title = Loc["admin.marketing.Discounts.AppliedToCategories.AddNew"];+ var area = ViewContext.RouteData.Values["area"]?.ToString();}-<form id="CategoryAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Discount" asp-action="CategoryAddPopup" method="post"+<form id="CategoryAddPopup" asp-area="@area" asp-controller="Discount" asp-action="CategoryAddPopup" method="post"asp-route-DiscountId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["DiscountId"])"asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">@@ -87,7 +88,7 @@dataSource: {transport: {read: {- url: "@Html.Raw(Url.Action("CategoryAddPopupList", "Discount", new { area = Constants.AreaAdmin }))",+ url: "@Html.Raw(Url.Action("CategoryAddPopupList", "Discount", new { area = area }))",type: "POST",dataType: "json",data: additionalData@@ -177,4 +178,4 @@}</script>-</form>\ No newline at end of file+</form>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/CollectionAddPopup.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Discount/CollectionAddPopup.cshtmlsimilarity index 96%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/CollectionAddPopup.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/Discount/CollectionAddPopup.cshtmlindex f42c3583f..7f90b0da0 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/CollectionAddPopup.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Discount/CollectionAddPopup.cshtml@@ -1,4 +1,4 @@-@model DiscountModel.AddCollectionToDiscountModel+@model DiscountModel.AddCollectionToDiscountModel@inject AdminAreaSettings adminAreaSettings@{@@ -6,9 +6,10 @@//page titleViewBag.Title = Loc["admin.marketing.Discounts.AppliedToCollections.AddNew"];+ var area = ViewContext.RouteData.Values["area"]?.ToString();}-<form id="CollectionAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Discount" asp-action="CollectionAddPopup" method="post"+<form id="CollectionAddPopup" asp-area="@area" asp-controller="Discount" asp-action="CollectionAddPopup" method="post"asp-route-DiscountId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["DiscountId"])"asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">@@ -89,7 +90,7 @@dataSource: {transport: {read: {- url: "@Html.Raw(Url.Action("CollectionAddPopupList", "Discount", new { area = Constants.AreaAdmin }))",+ url: "@Html.Raw(Url.Action("CollectionAddPopupList", "Discount", new { area = area }))",type: "POST",dataType: "json",data: additionalData@@ -177,4 +178,4 @@</script>-</form>\ No newline at end of file+</form>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Create.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Discount/Create.cshtmlsimilarity index 84%rename from src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Create.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/Discount/Create.cshtmlindex 3ef7f976a..7f0f21e1f 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Create.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Discount/Create.cshtml@@ -1,8 +1,10 @@@model DiscountModel@{+ //page titleViewBag.Title = Loc["admin.marketing.Discounts.AddNew"];+ var area = ViewContext.RouteData.Values["area"]?.ToString();}-<form asp-area="@Constants.AreaStore" asp-controller="Discount" asp-action="Create" method="post" id="discount-form">+<form asp-area="@area" asp-controller="Discount" asp-action="Create" method="post" id="discount-form"><div class="row"><div class="col-md-12">@@ -23,6 +25,7 @@<button class="btn btn-success" type="submit" name="save-continue"><i class="fa fa-check-circle"></i> @Loc["Admin.Common.SaveContinue"]</button>+ <partial name="Partials/WidgetZone.DetailsButtons"/></div></div></div>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Edit.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Discount/Edit.cshtmlsimilarity index 86%rename from src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Edit.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/Discount/Edit.cshtmlindex 3d440744f..8a7f7e444 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Edit.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Discount/Edit.cshtml@@ -1,8 +1,10 @@@model DiscountModel@{+ //page titleViewBag.Title = Loc["admin.marketing.Discounts.EditDiscountDetails"];+ var area = ViewContext.RouteData.Values["area"]?.ToString();}-<form asp-area="@Constants.AreaStore" asp-controller="Discount" asp-action="Edit" method="post" id="discount-form">+<form asp-area="@area" asp-controller="Discount" asp-action="Edit" method="post" id="discount-form"><div class="row"><div class="col-md-12">@@ -26,6 +28,7 @@<span id="discount-delete" class="btn red"><i class="fa fa-trash-o"></i> @Loc["Admin.Common.Delete"]</span>+ <partial name="Partials/WidgetZone.DetailsButtons" model="Model"/></div></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/List.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Discount/List.cshtmlsimilarity index 97%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/List.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/Discount/List.cshtmlindex af147d177..97e2ae4fd 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/List.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Discount/List.cshtml@@ -1,8 +1,9 @@-@model DiscountListModel+@model DiscountListModel@inject AdminAreaSettings adminAreaSettings@{//page titleViewBag.Title = Loc["admin.marketing.Discounts"];+ var area = ViewContext.RouteData.Values["area"]?.ToString();}<div class="row">@@ -14,10 +15,10 @@@Loc["admin.marketing.Discounts"]</div><div class="actions btn-group btn-group-devided">- <a href="@Url.Action("Create", new { area = Constants.AreaAdmin })" class="btn green">+ <a href="@Url.Action("Create", new { area = area })" class="btn green"><i class="fa fa-plus"></i><span class="d-none d-sm-inline"> @Loc["Admin.Common.AddNew"] </span></a>- <vc:admin-widget widget-zone="discount_list_buttons" additional-data="null"/>+ <partial name="Partials/WidgetZone.ListButtons"/></div></div><div class="x_content form">@@ -66,7 +67,7 @@dataSource: {transport: {read: {- url: "@Html.Raw(Url.Action("List", "Discount", new { area = Constants.AreaAdmin }))",+ url: "@Html.Raw(Url.Action("List", "Discount", new { area = area }))",type: "POST",dataType: "json",data: additionalData@@ -173,4 +174,4 @@return data;}-</script>\ No newline at end of file+</script>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/CreateOrUpdate.TabAppliedToBrands.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Discount/Partials/CreateOrUpdate.TabAppliedToBrands.cshtmlsimilarity index 84%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/CreateOrUpdate.TabAppliedToBrands.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/Discount/Partials/CreateOrUpdate.TabAppliedToBrands.cshtmlindex 25f3ff05c..ff05662f9 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/CreateOrUpdate.TabAppliedToBrands.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Discount/Partials/CreateOrUpdate.TabAppliedToBrands.cshtml@@ -1,17 +1,18 @@-@model DiscountModel+@model DiscountModel@{+ var area = ViewContext.RouteData.Values["area"]?.ToString();if (!string.IsNullOrEmpty(Model.Id)){<div class="panel panel-default">- <vc:admin-widget widget-zone="discount_details_applied_to_brands_top" additional-data="Model"/>+ <partial name="Partials/WidgetZone.AppliedToBrands.Top" model="Model"/><div class="panel-body"><div id="brands-grid"></div></div><div class="panel-footer">- <a id="btnAddNewBrand" href="@(Url.Action("BrandAddPopup", "Discount", new { discountId = Model.Id, btnId = "btnRefreshBrands", formId = "discount-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Marketing.Discounts.AppliedToBrands.AddNew"]</a>- <input type="button" id="btnRefreshBrands" style="display: none"/>+ <a id="btnAddNewBrand" href="@(Url.Action("BrandAddPopup", "Discount", new { discountId = Model.Id, btnId = "btnRefreshBrands", formId = "discount-form", area = area }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Marketing.Discounts.AppliedToBrands.AddNew"]</a>+ <input type="submit" id="btnRefreshBrands" style="display: none"/></div>- <vc:admin-widget widget-zone="discount_details_applied_to_brands_bottom" additional-data="Model"/>+ <partial name="Partials/WidgetZone.AppliedToBrands.Bottom" model="Model"/></div><script>@@ -33,13 +34,13 @@dataSource: {transport: {read: {- url: "@Html.Raw(Url.Action("BrandList", "Discount", new { discountId = Model.Id, area = Constants.AreaAdmin }))",+ url: "@Html.Raw(Url.Action("BrandList", "Discount", new { discountId = Model.Id, area = area }))",type: "POST",dataType: "json",data: addAntiForgeryToken},destroy: {- url: "@Html.Raw(Url.Action("BrandDelete", "Discount", new { discountId = Model.Id, area = Constants.AreaAdmin }))",+ url: "@Html.Raw(Url.Action("BrandDelete", "Discount", new { discountId = Model.Id, area = area }))",type: "POST",dataType: "json",data: addAntiForgeryToken@@ -80,7 +81,7 @@columns: [{field: "BrandName",title: "@Loc["admin.marketing.Discounts.AppliedToBrands.Brand"]",- template: '<a class="k-link" href="@Url.Action("Edit", "Brand", new { area = Constants.AreaAdmin })/#=BrandId#">#=kendo.htmlEncode(BrandName)#</a>',+ template: '<a class="k-link" href="@Url.Action("Edit", "Brand", new { area = area })/#=BrandId#">#=kendo.htmlEncode(BrandName)#</a>',}, {command: [{name: "destroy",@@ -110,4 +111,4 @@@Loc["admin.marketing.Discounts.AppliedToBrands.SaveBeforeEdit"]</div>}-}\ No newline at end of file+}diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/CreateOrUpdate.TabAppliedToCategories.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Discount/Partials/CreateOrUpdate.TabAppliedToCategories.cshtmlsimilarity index 85%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/CreateOrUpdate.TabAppliedToCategories.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/Discount/Partials/CreateOrUpdate.TabAppliedToCategories.cshtmlindex ba6292a00..cb03d02a5 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/CreateOrUpdate.TabAppliedToCategories.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Discount/Partials/CreateOrUpdate.TabAppliedToCategories.cshtml@@ -1,17 +1,18 @@-@model DiscountModel+@model DiscountModel@{+ var area = ViewContext.RouteData.Values["area"]?.ToString();if (!string.IsNullOrEmpty(Model.Id)){<div class="panel panel-default">- <vc:admin-widget widget-zone="discount_details_applied_to_categories_top" additional-data="Model"/>+ <partial name="Partials/WidgetZone.AppliedToCategories.Top" model="Model"/><div class="panel-body"><div id="categories-grid"></div></div><div class="panel-footer">- <a id="btnAddNewCategory" href="@(Url.Action("CategoryAddPopup", "Discount", new { discountId = Model.Id, btnId = "btnRefreshCategories", formId = "discount-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i> @Loc["admin.marketing.Discounts.AppliedToCategories.AddNew"]</a>+ <a id="btnAddNewCategory" href="@(Url.Action("CategoryAddPopup", "Discount", new { discountId = Model.Id, btnId = "btnRefreshCategories", formId = "discount-form", area = area }))" class="k-button"><i class="fa fa-plus"></i> @Loc["admin.marketing.Discounts.AppliedToCategories.AddNew"]</a><input type="submit" id="btnRefreshCategories" style="display: none"/></div>- <vc:admin-widget widget-zone="discount_details_applied_to_categories_bottom" additional-data="Model"/>+ <partial name="Partials/WidgetZone.AppliedToCategories.Bottom" model="Model"/></div><script>$(document).ready(function () {@@ -32,13 +33,13 @@dataSource: {transport: {read: {- url: "@Html.Raw(Url.Action("CategoryList", "Discount", new { discountId = Model.Id, area = Constants.AreaAdmin }))",+ url: "@Html.Raw(Url.Action("CategoryList", "Discount", new { discountId = Model.Id, area = area }))",type: "POST",dataType: "json",data: addAntiForgeryToken},destroy: {- url: "@Html.Raw(Url.Action("CategoryDelete", "Discount", new { discountId = Model.Id, area = Constants.AreaAdmin }))",+ url: "@Html.Raw(Url.Action("CategoryDelete", "Discount", new { discountId = Model.Id, area = area }))",type: "POST",dataType: "json",data: addAntiForgeryToken@@ -79,7 +80,7 @@columns: [{field: "CategoryName",title: "@Loc["admin.marketing.Discounts.AppliedToCategories.Category"]",- template: '<a class="k-link" href="@Url.Action("Edit", "Category", new { area = Constants.AreaAdmin })/#=CategoryId#">#=kendo.htmlEncode(CategoryName)#</a>',+ template: '<a class="k-link" href="@Url.Action("Edit", "Category", new { area = area })/#=CategoryId#">#=kendo.htmlEncode(CategoryName)#</a>',}, {command: [{name: "destroy",diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/CreateOrUpdate.TabAppliedToCollections.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Discount/Partials/CreateOrUpdate.TabAppliedToCollections.cshtmlsimilarity index 86%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/CreateOrUpdate.TabAppliedToCollections.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/Discount/Partials/CreateOrUpdate.TabAppliedToCollections.cshtmlindex a74fe2caa..184555000 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/CreateOrUpdate.TabAppliedToCollections.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Discount/Partials/CreateOrUpdate.TabAppliedToCollections.cshtml@@ -1,17 +1,18 @@-@model DiscountModel+@model DiscountModel@{+ var area = ViewContext.RouteData.Values["area"]?.ToString();if (!string.IsNullOrEmpty(Model.Id)){<div class="panel panel-default">- <vc:admin-widget widget-zone="discount_details_applied_to_collections_top" additional-data="Model"/>+ <partial name="Partials/WidgetZone.AppliedToCollections.Top" model="Model"/><div class="panel-body"><div id="collections-grid"></div></div><div class="panel-footer">- <a id="btnAddNewCollection" href="@(Url.Action("CollectionAddPopup", "Discount", new { discountId = Model.Id, btnId = "btnRefreshCollections", formId = "discount-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i> @Loc["admin.marketing.Discounts.AppliedToCollections.AddNew"]</a>+ <a id="btnAddNewCollection" href="@(Url.Action("CollectionAddPopup", "Discount", new { discountId = Model.Id, btnId = "btnRefreshCollections", formId = "discount-form", area = area }))" class="k-button"><i class="fa fa-plus"></i> @Loc["admin.marketing.Discounts.AppliedToCollections.AddNew"]</a><input type="submit" id="btnRefreshCollections" style="display: none"/></div>- <vc:admin-widget widget-zone="discount_details_applied_to_collections_bottom" additional-data="Model"/>+ <partial name="Partials/WidgetZone.AppliedToCollections.Bottom" model="Model"/></div><script>$(document).ready(function () {@@ -32,13 +33,13 @@dataSource: {transport: {read: {- url: "@Html.Raw(Url.Action("CollectionList", "Discount", new { discountId = Model.Id, area = Constants.AreaAdmin }))",+ url: "@Html.Raw(Url.Action("CollectionList", "Discount", new { discountId = Model.Id, area = area }))",type: "POST",dataType: "json",data: addAntiForgeryToken},destroy: {- url: "@Html.Raw(Url.Action("CollectionDelete", "Discount", new { discountId = Model.Id, area = Constants.AreaAdmin }))",+ url: "@Html.Raw(Url.Action("CollectionDelete", "Discount", new { discountId = Model.Id, area = area }))",type: "POST",dataType: "json",data: addAntiForgeryToken@@ -79,7 +80,7 @@columns: [{field: "CollectionName",title: "@Loc["admin.marketing.Discounts.AppliedToCollections.Collection"]",- template: '<a class="k-link" href="@Url.Action("Edit", "Collection", new { area = Constants.AreaAdmin })/#=CollectionId#">#=kendo.htmlEncode(CollectionName)#</a>',+ template: '<a class="k-link" href="@Url.Action("Edit", "Collection", new { area = area })/#=CollectionId#">#=kendo.htmlEncode(CollectionName)#</a>',}, {command: [{name: "destroy",diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/CreateOrUpdate.TabAppliedToProducts.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Discount/Partials/CreateOrUpdate.TabAppliedToProducts.cshtmlsimilarity index 85%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/CreateOrUpdate.TabAppliedToProducts.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/Discount/Partials/CreateOrUpdate.TabAppliedToProducts.cshtmlindex 85a5cb6f8..b98b76d26 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/CreateOrUpdate.TabAppliedToProducts.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Discount/Partials/CreateOrUpdate.TabAppliedToProducts.cshtml@@ -1,19 +1,20 @@-@model DiscountModel+@model DiscountModel@inject AdminAreaSettings adminAreaSettings@{+ var area = ViewContext.RouteData.Values["area"]?.ToString();if (!string.IsNullOrEmpty(Model.Id)){<div class="panel panel-default">- <vc:admin-widget widget-zone="discount_details_applied_to_products_top" additional-data="Model"/>+ <partial name="Partials/WidgetZone.AppliedToProducts.Top" model="Model"/><div class="panel-body"><div id="products-grid"></div></div><div class="panel-footer">- <a id="btnAddNewProduct" href="@(Url.Action("ProductAddPopup", "Discount", new { discountId = Model.Id, btnId = "btnRefreshProducts", formId = "discount-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i> @Loc["admin.marketing.Discounts.AppliedToProducts.AddNew"]</a>+ <a id="btnAddNewProduct" href="@(Url.Action("ProductAddPopup", "Discount", new { discountId = Model.Id, btnId = "btnRefreshProducts", formId = "discount-form", area = area }))" class="k-button"><i class="fa fa-plus"></i> @Loc["admin.marketing.Discounts.AppliedToProducts.AddNew"]</a><input type="submit" id="btnRefreshProducts" style="display: none"/></div>- <vc:admin-widget widget-zone="discount_details_applied_to_products_bottom" additional-data="Model"/>+ <partial name="Partials/WidgetZone.AppliedToProducts.Bottom" model="Model"/></div><script>@@ -35,13 +36,13 @@dataSource: {transport: {read: {- url: "@Html.Raw(Url.Action("ProductList", "Discount", new { discountId = Model.Id, area = Constants.AreaAdmin }))",+ url: "@Html.Raw(Url.Action("ProductList", "Discount", new { discountId = Model.Id, area = area }))",type: "POST",dataType: "json",data: addAntiForgeryToken},destroy: {- url: "@Html.Raw(Url.Action("ProductDelete", "Discount", new { discountId = Model.Id, area = Constants.AreaAdmin }))",+ url: "@Html.Raw(Url.Action("ProductDelete", "Discount", new { discountId = Model.Id, area = area }))",type: "POST",dataType: "json",data: addAntiForgeryToken@@ -81,7 +82,7 @@columns: [{field: "ProductName",title: "@Loc["admin.marketing.Discounts.AppliedToProducts.Product"]",- template: '<a class="k-link" href="@Url.Action("Edit", "Product", new { area = Constants.AreaAdmin })/#=ProductId#">#=kendo.htmlEncode(ProductName)#</a>',+ template: '<a class="k-link" href="@Url.Action("Edit", "Product", new { area = area })/#=ProductId#">#=kendo.htmlEncode(ProductName)#</a>',}, {command: [{name: "destroy",diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/CreateOrUpdate.TabCouponCodes.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Discount/Partials/CreateOrUpdate.TabCouponCodes.cshtmlsimilarity index 89%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/CreateOrUpdate.TabCouponCodes.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/Discount/Partials/CreateOrUpdate.TabCouponCodes.cshtmlindex e56729053..c823dce89 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/CreateOrUpdate.TabCouponCodes.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Discount/Partials/CreateOrUpdate.TabCouponCodes.cshtml@@ -1,14 +1,15 @@-@model DiscountModel+@model DiscountModel@inject AdminAreaSettings adminAreaSettings+@{ var area = ViewContext.RouteData.Values["area"]?.ToString(); }@if (!string.IsNullOrEmpty(Model.Id)){<div class="panel panel-default">- <vc:admin-widget widget-zone="discount_details_coupon_codes_top" additional-data="Model"/>+ <partial name="Partials/WidgetZone.CouponCodes.Top" model="Model"/><div class="panel-body"><div id="couponcode-grid"></div></div>- <vc:admin-widget widget-zone="discount_details_coupon_codes_bottom" additional-data="Model"/>+ <partial name="Partials/WidgetZone.CouponCodes.Bottom" model="Model"/></div><script>$(document).ready(function () {@@ -16,19 +17,19 @@dataSource: {transport: {read: {- url: "@Html.Raw(Url.Action("CouponCodeList", "Discount", new { discountId = Model.Id, area = Constants.AreaAdmin }))",+ url: "@Html.Raw(Url.Action("CouponCodeList", "Discount", new { discountId = Model.Id, area = area }))",type: "POST",dataType: "json",data: addAntiForgeryToken},create: {- url: "@Html.Raw(Url.Action("CouponCodeInsert", "Discount", new { discountId = Model.Id, area = Constants.AreaAdmin }))",+ url: "@Html.Raw(Url.Action("CouponCodeInsert", "Discount", new { discountId = Model.Id, area = area }))",type: "POST",dataType: "json",data: addAntiForgeryToken},destroy: {- url: "@Html.Raw(Url.Action("CouponCodeDelete", "Discount", new { discountId = Model.Id, area = Constants.AreaAdmin }))",+ url: "@Html.Raw(Url.Action("CouponCodeDelete", "Discount", new { discountId = Model.Id, area = area }))",type: "POST",dataType: "json",data: addAntiForgeryTokendiff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/CreateOrUpdate.TabHistory.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Discount/Partials/CreateOrUpdate.TabHistory.cshtmlsimilarity index 85%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/CreateOrUpdate.TabHistory.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/Discount/Partials/CreateOrUpdate.TabHistory.cshtmlindex 3b07cd04a..02203deb5 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Discount/Partials/CreateOrUpdate.TabHistory.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Discount/Partials/CreateOrUpdate.TabHistory.cshtml@@ -1,22 +1,23 @@-@model DiscountModel+@model DiscountModel@inject AdminAreaSettings adminAreaSettings@{- <vc:admin-widget widget-zone="discount_details_history_top" additional-data="Model"/>+ var area = ViewContext.RouteData.Values["area"]?.ToString();+ <partial name="Partials/WidgetZone.History.Top" model="Model"/><div id="usagehistory-grid"></div>- <vc:admin-widget widget-zone="discount_details_history_bottom" additional-data="Model"/>+ <partial name="Partials/WidgetZone.History.Bottom" model="Model"/><script>$(document).ready(function () {$("#usagehistory-grid").kendoGrid({dataSource: {transport: {read: {- url: "@Html.Raw(Url.Action("UsageHistoryList", "Discount", new { discountId = Model.Id, area = Constants.AreaAdmin }))",+ url: "@Html.Raw(Url.Action("UsageHistoryList", "Discount", new { discountId = Model.Id, area = area }))",type: "POST",dataType: "json",data: addAntiForgeryToken},destroy: {- url: "@Html.Raw(Url.Action("UsageHistoryDelete", "Discount", new { area = Constants.AreaAdmin }))",+ url: "@Html.Raw(Url.Action("UsageHistoryDelete", "Discount", new { area = area }))",type: "POST",dataType: "json",data: addAntiForgeryToken@@ -65,7 +66,7 @@field: "OrderId",title: "@Loc["admin.marketing.Discounts.History.Order"]",width: 200,- template: '<a class="btn btn-sm btn-default" href="@Url.Action("Edit", "Order", new { area = Constants.AreaAdmin })/#=OrderId#"><i class="fa fa-search"></i> #=OrderNumber# - @Loc["Admin.Common.View"]</a>'+ template: '<a class="btn btn-sm btn-default" href="@Url.Action("Edit", "Order", new { area = area })/#=OrderId#"><i class="fa fa-search"></i> #=OrderNumber# - @Loc["Admin.Common.View"]</a>'}, {field: "OrderTotal",title: "@Loc["admin.marketing.Discounts.History.OrderTotal"]",diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabRequirements.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Discount/Partials/CreateOrUpdate.TabRequirements.cshtmlsimilarity index 95%rename from src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabRequirements.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/Discount/Partials/CreateOrUpdate.TabRequirements.cshtmlindex 4b0588aef..6edbbb31d 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabRequirements.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Discount/Partials/CreateOrUpdate.TabRequirements.cshtml@@ -1,7 +1,9 @@-@using System.Text.Encodings.Web+@using System.Text.Encodings.Web@model DiscountModel@{+ var area = ViewContext.RouteData.Values["area"]?.ToString();+ <partial name="Partials/WidgetZone.Requirements.Top" model="Model"/>if (!string.IsNullOrEmpty(Model.Id)){<script>@@ -30,7 +32,7 @@$.ajax({cache:false,type: "POST",- url: "@(Url.Action("GetDiscountRequirementMetaInfo", "Discount", new { area = Constants.AreaStore }))",+ url: "@(Url.Action("GetDiscountRequirementMetaInfo", "Discount", new { area = area }))",data: postData,success: function (result) {discountRequirements.push(@@ -77,7 +79,7 @@if (ruleSystemName != '') {$.ajax({cache:false,- url: "@(Url.Action("GetDiscountRequirementConfigurationUrl", "Discount", new { area = Constants.AreaStore }))",+ url: "@(Url.Action("GetDiscountRequirementConfigurationUrl", "Discount", new { area = area }))",data: { "rulesystemName": ruleSystemName, "discountId": discountId },success: function (result) {var configureRuleUrl = result.url;@@ -138,7 +140,7 @@$.ajax({cache: false,type: "POST",- url: "@(Url.Action("DeleteDiscountRequirement", "Discount", new { area = Constants.AreaStore }))",+ url: "@(Url.Action("DeleteDiscountRequirement", "Discount", new { area = area }))",data: postData,success: function (data) {removeRequirementByElement(discountRequirements, discountRequirementId);@@ -205,4 +207,6 @@@Loc["admin.marketing.Discounts.Requirements.SaveBeforeEdit"]</div>}-}++ <partial name="Partials/WidgetZone.Requirements.Bottom" model="Model"/>+}\ No newline at end of filediff --git a/src/Web/Grand.Web.AdminShared/Views/AdminShared/_ViewImports.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/_ViewImports.cshtmlindex 7480ac5e6..70a550d2f 100644--- a/src/Web/Grand.Web.AdminShared/Views/AdminShared/_ViewImports.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/_ViewImports.cshtml@@ -16,6 +16,7 @@@using Grand.Web.AdminShared.Models.Catalog@using Grand.Web.AdminShared.Models.Orders@using Grand.Web.AdminShared.Models.Customers+@using Grand.Web.AdminShared.Models.Discounts@using Grand.Web.AdminShared.Interfaces@inject LocService Locdiff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/BrandAddPopup.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/BrandAddPopup.cshtmldeleted file mode 100644index 0bd06081d..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/BrandAddPopup.cshtml+++ /dev/null@@ -1,168 +0,0 @@-@model DiscountModel.AddBrandToDiscountModel-@inject AdminAreaSettings adminAreaSettings-@{- Layout = "";- ViewBag.Title = Loc["admin.marketing.Discounts.AppliedToBrands.AddNew"];-}--<form id="BrandAddPopup" asp-area="@Constants.AreaStore" asp-controller="Discount" asp-action="BrandAddPopup" method="post"- asp-route-DiscountId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["DiscountId"])"- asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"- asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">-- <div class="row">- <div class="col-md-12">- <div class="x_panel light form-fit">- <div class="x_title">- <div class="caption">- <i class="fa fa-cubes"></i>- @Loc["admin.marketing.Discounts.AppliedToBrands.AddNew"]- </div>- </div>- <div class="x_content form">- <div class="form-horizontal">- <div class="form-body">- <div class="main-header col-12 px-0 mb-3">- <div class="row align-items-end">- <div class="col-md-8 col-sm-12 col-12">- <div class="form-group mb-0">- <admin-label asp-for="SearchBrandName" class="control-label"/>- <admin-input asp-for="SearchBrandName"/>- </div>- </div>- <div class="col-md-4 col-sm-12 col-12">- <div class="form-actions">- <div class="btn-group btn-group-devided">- <button class="btn btn-success filter-submit" id="search-brands">- <i class="fa fa-search"></i> @Loc["Admin.Common.Search"]- </button>- <button class="btn btn-success" type="submit" name="save">- <i class="fa fa-check"></i> @Loc["Admin.Common.Save"]- </button>- </div>- </div>- </div>- </div>- </div>- <div id="brands-grid"></div>- </div>- </div>- </div>- </div>- </div>- </div>-- <script>- var mfp = $.magnificPopup.instance;- $("#BrandAddPopup").submit(function (e) {- e.preventDefault();- var form = $(this);- var url = form.attr('action');- $.ajax({- type: "POST",- url: url,- data: form.serialize(),- success: function (data) {- if (data == "") {- mfp.close();- $('#btnRefreshBrands').click();- } else {- $.magnificPopup.open({- items: {- src: data,- type: 'inline'- },- callbacks: {- open: function () {- $('.mfp-wrap').removeAttr('tabindex');- }- }- });- }- }- });- });- $("#brands-grid").kendoGrid({- dataSource: {- transport: {- read: {- url: "@Html.Raw(Url.Action("BrandAddPopupList", "Discount", new { area = Constants.AreaStore }))",- type: "POST",- dataType: "json",- data: additionalData- }- },- schema: {- data: "Data",- total: "Total",- errors: "Errors"- },- error: function(e) {- display_kendoui_grid_error(e);- this.cancelChanges();- },- pageSize: @(adminAreaSettings.DefaultGridPageSize),- serverPaging: true,- serverFiltering: true,- serverSorting: true- },- pageable: {- refresh: true,- pageSizes: [@(adminAreaSettings.GridPageSizes)]- },- editable: {- confirmation: false,- mode: "inline"- },- scrollable: false,- columns: [{- field: "Id",- headerTemplate: "<input id='mastercheckbox' type='checkbox'/>",- headerAttributes: { style: "text-align:center" },- template: "<input type='checkbox' name='SelectedBrandIds' value='#=Id#' class='checkboxGroups' />",- attributes: { style: "text-align:center" },- width: 50- }, {- field: "Name",- title: "@Loc["Admin.Catalog.Brands.Fields.Name"]"- }]- });-- $('#search-brands').click(function() {- var grid = $('#brands-grid').data('kendoGrid');- grid.dataSource.page(1);- $('.checkboxGroups').prop('checked', false).change();- return false;- });-- $("#@Html.IdFor(model => model.SearchBrandName)").keydown(function(event) {- if (event.keyCode == 13) {- $("#search-brands").click();- return false;- }- });-- //wire up checkboxes- $('#mastercheckbox').click(function() {- $('.checkboxGroups').prop('checked', $(this).is(':checked')).change();- });-- $('#brands-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {- updateMasterCheckbox();- });-- function additionalData() {- var data = {- SearchBrandName: $('#@Html.IdFor(model => model.SearchBrandName)').val(),- };- addAntiForgeryToken(data);- return data;- }-- function updateMasterCheckbox() {- var numChkBoxes = $('#brands-grid input[type=checkbox][id!=mastercheckbox]').length;- var numChkBoxesChecked = $('#brands-grid input[type=checkbox][id!=mastercheckbox]:checked').length;- $('#mastercheckbox').prop('checked', numChkBoxes == numChkBoxesChecked && numChkBoxes > 0);- }- </script>-</form>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.cshtmldeleted file mode 100644index bb6502f1f..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/CategoryAddPopup.cshtml+++ /dev/null@@ -1,175 +0,0 @@-@model DiscountModel.AddCategoryToDiscountModel-@inject AdminAreaSettings adminAreaSettings-@{- Layout = "";- ViewBag.Title = Loc["admin.marketing.Discounts.AppliedToCategories.AddNew"];-}--<form id="CategoryAddPopup" asp-area="@Constants.AreaStore" asp-controller="Discount" asp-action="CategoryAddPopup" method="post"- asp-route-DiscountId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["DiscountId"])"- asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"- asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">-- <div class="row">- <div class="col-md-12">- <div class="x_panel light form-fit">- <div class="x_title">- <div class="caption">- <i class="fa fa-cubes"></i>- @Loc["admin.marketing.Discounts.AppliedToCategories.AddNew"]- </div>- </div>- <div class="x_content form">- <div class="form-horizontal">- <div class="form-body">- <div class="main-header col-12 px-0 mb-3">- <div class="row align-items-end">- <div class="col-md-8 col-sm-12 col-12">- <div class="form-group mb-0">- <admin-label asp-for="SearchCategoryName" class="control-label"/>- <admin-input asp-for="SearchCategoryName"/>- </div>- </div>- <div class="col-md-4 col-sm-12 col-12">- <div class="form-actions">- <div class="btn-group btn-group-devided">- <button class="btn btn-success filter-submit" id="search-categories">- <i class="fa fa-search"></i> @Loc["Admin.Common.Search"]- </button>- <button class="btn btn-success" type="submit" name="save">- <i class="fa fa-check"></i> @Loc["Admin.Common.Save"]- </button>- </div>- </div>- </div>- </div>- </div>- <div id="categories-grid"></div>- </div>- </div>- </div>- </div>- </div>- </div>-- <script>- var mfp = $.magnificPopup.instance;- $("#CategoryAddPopup").submit(function (e) {- e.preventDefault();- var form = $(this);- var url = form.attr('action');- $.ajax({- type: "POST",- url: url,- data: form.serialize(),- success: function (data) {- if (data == "") {- mfp.close();- $('#btnRefreshCategories').click();- } else {- $.magnificPopup.open({- items: {- src: data,- type: 'inline'- },- callbacks: {- open: function () {- $('.mfp-wrap').removeAttr('tabindex');- }- }- });- }- }- });- });- $("#categories-grid").kendoGrid({- dataSource: {- transport: {- read: {- url: "@Html.Raw(Url.Action("CategoryAddPopupList", "Discount", new { area = Constants.AreaStore }))",- type: "POST",- dataType: "json",- data: additionalData- }- },- schema: {- data: "Data",- total: "Total",- errors: "Errors"- },- error: function(e) {- display_kendoui_grid_error(e);- this.cancelChanges();- },- pageSize: @(adminAreaSettings.DefaultGridPageSize),- serverPaging: true,- serverFiltering: true,- serverSorting: true- },- pageable: {- refresh: true,- pageSizes: [@(adminAreaSettings.GridPageSizes)]- },- editable: {- confirmation: false,- mode: "inline"- },- scrollable: false,- columns: [{- field: "Id",- headerTemplate: "<input id='mastercheckbox' type='checkbox'/>",- headerAttributes: { style: "text-align:center" },- template: "<input type='checkbox' name='SelectedCategoryIds' value='#=Id#' class='checkboxGroups' />",- attributes: { style: "text-align:center" },- width: 50- }, {- field: "Breadcrumb",- title: "@Loc["Admin.Catalog.Categories.Fields.Name"]"- }, {- field: "Published",- title: "@Loc["Admin.Catalog.Categories.Fields.Published"]",- width: 100,- headerAttributes: { style: "text-align:center" },- attributes: { style: "text-align:center" },- template: '# if(Published) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'- }]- });-- $('#search-categories').click(function() {- var grid = $('#categories-grid').data('kendoGrid');- grid.dataSource.page(1);- $('.checkboxGroups').prop('checked', false).change();- return false;- });-- $("#@Html.IdFor(model => model.SearchCategoryName)").keydown(function(event) {- if (event.keyCode == 13) {- $("#search-categories").click();- return false;- }- });-- //wire up checkboxes- $('#mastercheckbox').click(function() {- $('.checkboxGroups').prop('checked', $(this).is(':checked')).change();- });-- $('#categories-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {- updateMasterCheckbox();- });-- function additionalData() {- var data = {- SearchCategoryName: $('#@Html.IdFor(model => model.SearchCategoryName)').val()- };- addAntiForgeryToken(data);- return data;- }-- function updateMasterCheckbox() {- var numChkBoxes = $('#categories-grid input[type=checkbox][id!=mastercheckbox]').length;- var numChkBoxesChecked = $('#categories-grid input[type=checkbox][id!=mastercheckbox]:checked').length;- $('#mastercheckbox').prop('checked', numChkBoxes == numChkBoxesChecked && numChkBoxes > 0);- }- </script>-</form>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.cshtmldeleted file mode 100644index 0dac9032c..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/CollectionAddPopup.cshtml+++ /dev/null@@ -1,175 +0,0 @@-@model DiscountModel.AddCollectionToDiscountModel-@inject AdminAreaSettings adminAreaSettings-@{- Layout = "";- ViewBag.Title = Loc["admin.marketing.Discounts.AppliedToCollections.AddNew"];-}--<form id="CollectionAddPopup" asp-area="@Constants.AreaStore" asp-controller="Discount" asp-action="CollectionAddPopup" method="post"- asp-route-DiscountId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["DiscountId"])"- asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"- asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">-- <div class="row">- <div class="col-md-12">- <div class="x_panel light form-fit">- <div class="x_title">- <div class="caption">- <i class="fa fa-cubes"></i>- @Loc["admin.marketing.Discounts.AppliedToCollections.AddNew"]- </div>- </div>- <div class="x_content form">- <div class="form-horizontal">- <div class="form-body">- <div class="main-header col-12 px-0 mb-3">- <div class="row align-items-end">- <div class="col-md-8 col-sm-12 col-12">- <div class="form-group mb-0">- <admin-label asp-for="SearchCollectionName" class="control-label"/>- <admin-input asp-for="SearchCollectionName"/>- </div>- </div>- <div class="col-md-4 col-sm-12 col-12">- <div class="form-actions">- <div class="btn-group btn-group-sm btn-group-devided">- <button class="btn btn-success filter-submit" id="search-collections">- <i class="fa fa-search"></i> @Loc["Admin.Common.Search"]- </button>- <button class="btn btn-success" type="submit" name="save">- <i class="fa fa-check"></i> @Loc["Admin.Common.Save"]- </button>- </div>- </div>- </div>- </div>- </div>- <div id="collections-grid"></div>- </div>- </div>- </div>- </div>- </div>- </div>-- <script>- var mfp = $.magnificPopup.instance;- $("#CollectionAddPopup").submit(function (e) {- e.preventDefault();- var form = $(this);- var url = form.attr('action');- $.ajax({- type: "POST",- url: url,- data: form.serialize(),- success: function (data) {- if (data == "") {- mfp.close();- $('#btnRefreshCollections').click();- } else {- $.magnificPopup.open({- items: {- src: data,- type: 'inline'- },- callbacks: {- open: function () {- $('.mfp-wrap').removeAttr('tabindex');- }- }- });- }- }- });- });- $("#collections-grid").kendoGrid({- dataSource: {- transport: {- read: {- url: "@Html.Raw(Url.Action("CollectionAddPopupList", "Discount", new { area = Constants.AreaStore }))",- type: "POST",- dataType: "json",- data: additionalData- }- },- schema: {- data: "Data",- total: "Total",- errors: "Errors"- },- error: function(e) {- display_kendoui_grid_error(e);- this.cancelChanges();- },- pageSize: @(adminAreaSettings.DefaultGridPageSize),- serverPaging: true,- serverFiltering: true,- serverSorting: true- },- pageable: {- refresh: true,- pageSizes: [@(adminAreaSettings.GridPageSizes)]- },- editable: {- confirmation: false,- mode: "inline"- },- scrollable: false,- columns: [{- field: "Id",- headerTemplate: "<input id='mastercheckbox' type='checkbox'/>",- headerAttributes: { style: "text-align:center" },- template: "<input type='checkbox' name='SelectedCollectionIds' value='#=Id#' class='checkboxGroups' />",- attributes: { style: "text-align:center" },- width: 50- }, {- field: "Name",- title: "@Loc["Admin.Catalog.Collections.Fields.Name"]"- }, {- field: "Published",- title: "@Loc["Admin.Catalog.Collections.Fields.Published"]",- width: 100,- headerAttributes: { style: "text-align:center" },- attributes: { style: "text-align:center" },- template: '# if(Published) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'- }]- });-- $('#search-collections').click(function() {- var grid = $('#collections-grid').data('kendoGrid');- grid.dataSource.page(1);- $('.checkboxGroups').prop('checked', false).change();- return false;- });-- $("#@Html.IdFor(model => model.SearchCollectionName)").keydown(function(event) {- if (event.keyCode == 13) {- $("#search-collections").click();- return false;- }- });-- //wire up checkboxes- $('#mastercheckbox').click(function() {- $('.checkboxGroups').prop('checked', $(this).is(':checked')).change();- });-- $('#collections-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {- updateMasterCheckbox();- });-- function additionalData() {- var data = {- SearchCollectionName: $('#@Html.IdFor(model => model.SearchCollectionName)').val()- };- addAntiForgeryToken(data);- return data;- }-- function updateMasterCheckbox() {- var numChkBoxes = $('#collections-grid input[type=checkbox][id!=mastercheckbox]').length;- var numChkBoxesChecked = $('#collections-grid input[type=checkbox][id!=mastercheckbox]:checked').length;- $('#mastercheckbox').prop('checked', numChkBoxes == numChkBoxesChecked && numChkBoxes > 0);- }- </script>-</form>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.cshtmldeleted file mode 100644index 3920812d7..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/List.cshtml+++ /dev/null@@ -1,169 +0,0 @@-@model DiscountListModel-@inject AdminAreaSettings adminAreaSettings-@{- ViewBag.Title = Loc["admin.marketing.Discounts"];-}--<div class="row">- <div class="col-md-12">- <div class="x_panel light form-fit">- <div class="x_title">- <div class="caption">- <i class="fa fa-tags"></i>- @Loc["admin.marketing.Discounts"]- </div>- <div class="actions btn-group btn-group-devided">- <a href="@Url.Action("Create", new { area = Constants.AreaStore })" class="btn green">- <i class="fa fa-plus"></i><span class="d-none d-sm-inline"> @Loc["Admin.Common.AddNew"] </span>- </a>- </div>- </div>- <div class="x_content form">- <div class="form-horizontal">- <div class="form-body">- <div class="row align-items-end">- <div class="col-md-3 col-sm-12 col-12">- <div class="form-group mb-0">- <admin-label asp-for="SearchDiscountName" class="d-flex flex-column align-items-start mw-100 px-0 text-left"/>- <admin-input asp-for="SearchDiscountName"/>- </div>- </div>- <div class="col-md-3 col-sm-12 col-12">- <div class="form-group mb-0">- <admin-label asp-for="SearchDiscountCouponCode" class="d-flex flex-column align-items-start mw-100 px-0 text-left"/>- <admin-input asp-for="SearchDiscountCouponCode"/>- </div>- </div>- <div class="col-md-3 col-sm-12 col-12">- <div class="form-group mb-0">- <admin-label asp-for="SearchDiscountTypeId" class="d-flex flex-column align-items-start mw-100 px-0 text-left"/>- <admin-select asp-for="SearchDiscountTypeId" asp-items="Model.AvailableDiscountTypes"/>- </div>- </div>- <div class="col-md-3 col-sm-12 col-12 mt-md-0 mt-3">- <div class="form-actions">- <button class="btn btn-success filter-submit" id="search-discounts">- <i class="fa fa-search"></i> @Loc["Admin.Common.Search"]- </button>- </div>- </div>- </div>- </div>- </div>- </div>- <div class="x_content">- <div id="discounts-grid"></div>- </div>- </div>- </div>-</div>--<script>- $(document).ready(function () {- $("#discounts-grid").kendoGrid({- dataSource: {- transport: {- read: {- url: "@Html.Raw(Url.Action("List", "Discount", new { area = Constants.AreaStore }))",- type: "POST",- dataType: "json",- data: additionalData- }- },- schema: {- data: "Data",- total: "Total",- errors: "Errors"- },- error: function(e) {- display_kendoui_grid_error(e);- this.cancelChanges();- },- pageSize: @(adminAreaSettings.DefaultGridPageSize),- serverPaging: true,- serverFiltering: true,- serverSorting: true- },- pageable: {- refresh: true,- pageSizes: [@(adminAreaSettings.GridPageSizes)]- },- editable: {- confirmation: false,- mode: "inline"- },- scrollable: false,- columns: [{- field: "Name",- title: "@Loc["admin.marketing.Discounts.Fields.Name"]",- width: 350,- template: '<a class="k-link" href="Edit/#=Id#">#=kendo.htmlEncode(Name)#</a>',- }, {- field: "DiscountTypeName",- title: "@Loc["admin.marketing.Discounts.Fields.DiscountType"]",- width: 250- }, {- field: "DiscountAmount",- title: "@Loc["admin.marketing.Discounts.Fields.Discount"]",- width: 200,- template: '# if(!CalculateByPlugin) { if(UsePercentage) {# #=DiscountPercentage# % #} else {# #=DiscountAmount# #=CurrencyCode# #} } # '- }, {- field: "StartDate",- title: "@Loc["admin.marketing.Discounts.Fields.StartDate"]",- width: 200,- type: "date",- format: "{0:G}"- }, {- field: "EndDate",- title: "@Loc["admin.marketing.Discounts.Fields.EndDate"]",- width: 200,- type: "date",- format: "{0:G}"- }, {- field: "TimesUsed",- title: "@Loc["admin.marketing.Discounts.Fields.TimesUsed"]",- width: 200- }, {- field: "IsEnabled",- title: "@Loc["admin.marketing.Discounts.Fields.IsEnabled"]",- width: 100,- headerAttributes: { style: "text-align:center" },- attributes: { style: "text-align:center" },- template: '# if(IsEnabled) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'- }]- });- });-</script>-<script>- $(document).ready(function () {- $('#search-discounts').click(function () {- var grid = $('#discounts-grid').data('kendoGrid');- grid.dataSource.page(1);- return false;- });- });-- $("#@Html.IdFor(model => model.SearchDiscountName)").keydown(function (event) {- if (event.keyCode == 13) {- $("#search-discounts").click();- return false;- }- });-- $("#@Html.IdFor(model => model.SearchDiscountCouponCode)").keydown(function (event) {- if (event.keyCode == 13) {- $("#search-discounts").click();- return false;- }- });-- function additionalData() {- var data = {- SearchDiscountTypeId: $('#@Html.IdFor(model => model.SearchDiscountTypeId)').val(),- SearchDiscountCouponCode: $('#@Html.IdFor(model => model.SearchDiscountCouponCode)').val(),- SearchDiscountName: $('#@Html.IdFor(model => model.SearchDiscountName)').val()- };- addAntiForgeryToken(data);- return data;- }-</script>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.cshtmldeleted file mode 100644index e40b3c89f..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabAppliedToBrands.cshtml+++ /dev/null@@ -1,107 +0,0 @@-@model DiscountModel-@{- if (!string.IsNullOrEmpty(Model.Id))- {- <div class="panel panel-default">- <div class="panel-body">- <div id="brands-grid"></div>- </div>- <div class="panel-footer">- <a id="btnAddNewBrand" href="@(Url.Action("BrandAddPopup", "Discount", new { discountId = Model.Id, btnId = "btnRefreshBrands", formId = "discount-form", area = Constants.AreaStore }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Marketing.Discounts.AppliedToBrands.AddNew"]</a>- <input type="submit" id="btnRefreshBrands" style="display: none"/>- </div>- </div>-- <script>- $(document).ready(function () {- $('#btnAddNewBrand').magnificPopup({- type: 'ajax',- settings: { cache: false, async: false },- midClick: true,- callbacks: {- parseAjax: function (mfpResponse) {- mfpResponse.data = $('<div></div>').html(mfpResponse.data);- },- ajaxContentAdded: function () {- $('.mfp-wrap').removeAttr('tabindex');- }- }- });- $("#brands-grid").kendoGrid({- dataSource: {- transport: {- read: {- url: "@Html.Raw(Url.Action("BrandList", "Discount", new { discountId = Model.Id, area = Constants.AreaStore }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- },- destroy: {- url: "@Html.Raw(Url.Action("BrandDelete", "Discount", new { discountId = Model.Id, area = Constants.AreaStore }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- }- },- schema: {- data: "Data",- total: "Total",- errors: "Errors",- model: {- id: "BrandId",- fields: {- BrandName: {editable: false, type: "string" },- BrandId: {editable: false, type: "string" }- }- }- },- error: function(e) {- display_kendoui_grid_error(e);- this.cancelChanges();- },- serverPaging: true,- serverFiltering: true,- serverSorting: true- },- pageable: {- refresh: true,- numeric: false,- previousNext: false,- info: false- },- editable: {- confirmation: false,- mode: "inline"- },- scrollable: false,- columns: [{- field: "BrandName",- title: "@Loc["admin.marketing.Discounts.AppliedToBrands.Brand"]",- template: '<a class="k-link" href="@Url.Action("Edit", "Brand", new { area = Constants.AreaStore })/#=BrandId#">#=kendo.htmlEncode(BrandName)#</a>',- }, {- command: [{- name: "destroy",- text: "@Loc["Admin.Common.Delete"]"- }],- width: 150- }]- });- });- </script>- <script>- $(document).ready(function () {- $('#btnRefreshBrands').click(function () {- var grid = $("#brands-grid").data('kendoGrid');- grid.dataSource.read();- return false;- });- });- </script>- }- else- {- <div class="note note-info">- @Loc["admin.marketing.Discounts.AppliedToBrands.SaveBeforeEdit"]- </div>- }-}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.cshtmldeleted file mode 100644index 569fc171a..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabAppliedToCategories.cshtml+++ /dev/null@@ -1,107 +0,0 @@-@model DiscountModel-@{- if (!string.IsNullOrEmpty(Model.Id))- {- <div class="panel panel-default">- <div class="panel-body">- <div id="categories-grid"></div>- </div>- <div class="panel-footer">- <a id="btnAddNewCategory" href="@(Url.Action("CategoryAddPopup", "Discount", new { discountId = Model.Id, btnId = "btnRefreshCategories", formId = "discount-form", area = Constants.AreaStore }))" class="k-button"><i class="fa fa-plus"></i> @Loc["admin.marketing.Discounts.AppliedToCategories.AddNew"]</a>- <input type="submit" id="btnRefreshCategories" style="display: none"/>- </div>- </div>- <script>- $(document).ready(function () {- $('#btnAddNewCategory').magnificPopup({- type: 'ajax',- settings: { cache: false, async: false },- midClick: true,- callbacks: {- parseAjax: function (mfpResponse) {- mfpResponse.data = $('<div></div>').html(mfpResponse.data);- },- ajaxContentAdded: function () {- $('.mfp-wrap').removeAttr('tabindex');- }- }- });- $("#categories-grid").kendoGrid({- dataSource: {- transport: {- read: {- url: "@Html.Raw(Url.Action("CategoryList", "Discount", new { discountId = Model.Id, area = Constants.AreaStore }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- },- destroy: {- url: "@Html.Raw(Url.Action("CategoryDelete", "Discount", new { discountId = Model.Id, area = Constants.AreaStore }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- }- },- schema: {- data: "Data",- total: "Total",- errors: "Errors",- model: {- id: "CategoryId",- fields: {- CategoryName: {editable: false, type: "string" },- CategoryId: {editable: false, type: "string" }- }- }- },- error: function(e) {- display_kendoui_grid_error(e);- this.cancelChanges();- },- serverPaging: true,- serverFiltering: true,- serverSorting: true- },- pageable: {- refresh: true,- numeric: false,- previousNext: false,- info: false- },- editable: {- confirmation: false,- mode: "inline"- },- scrollable: false,- columns: [{- field: "CategoryName",- title: "@Loc["admin.marketing.Discounts.AppliedToCategories.Category"]",- template: '<a class="k-link" href="@Url.Action("Edit", "Category", new { area = Constants.AreaStore })/#=CategoryId#">#=kendo.htmlEncode(CategoryName)#</a>',- }, {- command: [{- name: "destroy",- text: "@Loc["Admin.Common.Delete"]"- }],- width: 150- }]- });- });- </script>-- <script>- $(document).ready(function () {- $('#btnRefreshCategories').click(function () {- var grid = $("#categories-grid").data('kendoGrid');- grid.dataSource.read();- return false;- });- });- </script>- }- else- {- <div class="note note-info">- @Loc["admin.marketing.Discounts.AppliedToCategories.SaveBeforeEdit"]- </div>- }-}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.cshtmldeleted file mode 100644index c7b638d8f..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabAppliedToCollections.cshtml+++ /dev/null@@ -1,106 +0,0 @@-@model DiscountModel-@{- if (!string.IsNullOrEmpty(Model.Id))- {- <div class="panel panel-default">- <div class="panel-body">- <div id="collections-grid"></div>- </div>- <div class="panel-footer">- <a id="btnAddNewCollection" href="@(Url.Action("CollectionAddPopup", "Discount", new { discountId = Model.Id, btnId = "btnRefreshCollections", formId = "discount-form", area = Constants.AreaStore }))" class="k-button"><i class="fa fa-plus"></i> @Loc["admin.marketing.Discounts.AppliedToCollections.AddNew"]</a>- <input type="submit" id="btnRefreshCollections" style="display: none"/>- </div>- </div>- <script>- $(document).ready(function () {- $('#btnAddNewCollection').magnificPopup({- type: 'ajax',- settings: { cache: false, async: false },- midClick: true,- callbacks: {- parseAjax: function (mfpResponse) {- mfpResponse.data = $('<div></div>').html(mfpResponse.data);- },- ajaxContentAdded: function () {- $('.mfp-wrap').removeAttr('tabindex');- }- }- });- $("#collections-grid").kendoGrid({- dataSource: {- transport: {- read: {- url: "@Html.Raw(Url.Action("CollectionList", "Discount", new { discountId = Model.Id, area = Constants.AreaStore }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- },- destroy: {- url: "@Html.Raw(Url.Action("CollectionDelete", "Discount", new { discountId = Model.Id, area = Constants.AreaStore }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- }- },- schema: {- data: "Data",- total: "Total",- errors: "Errors",- model: {- id: "CollectionId",- fields: {- CollectionName: {editable: false, type: "string" },- CollectionId: {editable: false, type: "string" }- }- }- },- error: function(e) {- display_kendoui_grid_error(e);- this.cancelChanges();- },- serverPaging: true,- serverFiltering: true,- serverSorting: true- },- pageable: {- refresh: true,- numeric: false,- previousNext: false,- info: false- },- editable: {- confirmation: false,- mode: "inline"- },- scrollable: false,- columns: [{- field: "CollectionName",- title: "@Loc["admin.marketing.Discounts.AppliedToCollections.Collection"]",- template: '<a class="k-link" href="@Url.Action("Edit", "Collection", new { area = Constants.AreaStore })/#=CollectionId#">#=kendo.htmlEncode(CollectionName)#</a>',- }, {- command: [{- name: "destroy",- text: "@Loc["Admin.Common.Delete"]"- }],- width: 150- }]- });- });- </script>- <script>- $(document).ready(function () {- $('#btnRefreshCollections').click(function () {- var grid = $("#collections-grid").data('kendoGrid');- grid.dataSource.read();- return false;- });- });- </script>- }- else- {- <div class="note note-info">- @Loc["admin.marketing.Discounts.AppliedToCollections.SaveBeforeEdit"]- </div>- }-}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.cshtmldeleted file mode 100644index ca5710b26..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabAppliedToProducts.cshtml+++ /dev/null@@ -1,109 +0,0 @@-@model DiscountModel-@inject AdminAreaSettings adminAreaSettings--@{- if (!string.IsNullOrEmpty(Model.Id))- {- <div class="panel panel-default">- <div class="panel-body">- <div id="products-grid"></div>- </div>- <div class="panel-footer">- <a id="btnAddNewProduct" href="@(Url.Action("ProductAddPopup", "Discount", new { discountId = Model.Id, btnId = "btnRefreshProducts", formId = "discount-form", area = Constants.AreaStore }))" class="k-button"><i class="fa fa-plus"></i> @Loc["admin.marketing.Discounts.AppliedToProducts.AddNew"]</a>- <input type="submit" id="btnRefreshProducts" style="display: none"/>- </div>- </div>-- <script>- $(document).ready(function () {- $('#btnAddNewProduct').magnificPopup({- type: 'ajax',- settings: { cache: false, async: false },- midClick: true,- callbacks: {- parseAjax: function (mfpResponse) {- mfpResponse.data = $('<div></div>').html(mfpResponse.data);- },- ajaxContentAdded: function () {- $('.mfp-wrap').removeAttr('tabindex');- }- }- });- $("#products-grid").kendoGrid({- dataSource: {- transport: {- read: {- url: "@Html.Raw(Url.Action("ProductList", "Discount", new { discountId = Model.Id, area = Constants.AreaStore }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- },- destroy: {- url: "@Html.Raw(Url.Action("ProductDelete", "Discount", new { discountId = Model.Id, area = Constants.AreaStore }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- }- },- schema: {- data: "Data",- total: "Total",- errors: "Errors",- model: {- id: "ProductId",- fields: {- ProductName: {editable: false, type: "string" },- ProductId: {editable: false, type: "string" }- }- }- },- error: function(e) {- display_kendoui_grid_error(e);- this.cancelChanges();- },- pageSize: @(adminAreaSettings.DefaultGridPageSize),- serverPaging: true,- serverFiltering: true,- serverSorting: true- },- pageable: {- refresh: true,- pageSizes: [@(adminAreaSettings.GridPageSizes)]- },- editable: {- confirmation: false,- mode: "inline"- },- scrollable: false,- columns: [{- field: "ProductName",- title: "@Loc["admin.marketing.Discounts.AppliedToProducts.Product"]",- template: '<a class="k-link" href="@Url.Action("Edit", "Product", new { area = Constants.AreaStore })/#=ProductId#">#=kendo.htmlEncode(ProductName)#</a>',- }, {- command: [{- name: "destroy",- text: "@Loc["Admin.Common.Delete"]"- }],- width: 150- }]- });- });- </script>-- <script>- $(document).ready(function () {- $('#btnRefreshProducts').click(function () {- var grid = $("#products-grid").data('kendoGrid');- grid.dataSource.read();- return false;- });- });- </script>- }- else- {- <div class="note note-info">- @Loc["admin.marketing.Discounts.AppliedToProducts.SaveBeforeEdit"]- </div>- }-}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.cshtmldeleted file mode 100644index cc95bdf4c..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabCouponCodes.cshtml+++ /dev/null@@ -1,99 +0,0 @@-@model DiscountModel-@inject AdminAreaSettings adminAreaSettings--@if (!string.IsNullOrEmpty(Model.Id))-{- <div class="panel panel-default">- <div class="panel-body">- <div id="couponcode-grid"></div>- </div>- </div>- <script>- $(document).ready(function () {- $("#couponcode-grid").kendoGrid({- dataSource: {- transport: {- read: {- url: "@Html.Raw(Url.Action("CouponCodeList", "Discount", new { discountId = Model.Id, area = Constants.AreaStore }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- },- create: {- url: "@Html.Raw(Url.Action("CouponCodeInsert", "Discount", new { discountId = Model.Id, area = Constants.AreaStore }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- },- destroy: {- url: "@Html.Raw(Url.Action("CouponCodeDelete", "Discount", new { discountId = Model.Id, area = Constants.AreaStore }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- }- },- schema: {- data: "Data",- total: "Total",- errors: "Errors",- model: {- id: "Id",- fields: {- CouponCode: { editable: true, type: "string" },- Used: { editable: false, type: "boolean" },- }- }- },- requestEnd: function (e) {- if (e.type == "create") {- this.read();- }- },- error: function(e) {- display_kendoui_grid_error(e);- this.cancelChanges();- },- pageSize: @(adminAreaSettings.DefaultGridPageSize),- serverPaging: true,- serverFiltering: true,- serverSorting: true- },- pageable: {- refresh: true,- pageSizes: [@(adminAreaSettings.GridPageSizes)]- },- toolbar: [{ name: "create", text: "@Loc["Admin.Common.AddNewRecord"]" }, { name: "save", text: "@Loc["Admin.Common.Save"]" }, { name: "cancel", text: "@Loc["Admin.Common.Cancel"]" }],- editable: {- confirmation: false,- mode: "inline",- },- scrollable: false,- columns: [{- field: "CouponCode",- title: "@Loc["admin.marketing.Discounts.Fields.CouponCode"]"- },- {- field: "Used",- title: "@Loc["admin.marketing.Discounts.Fields.Used"]",- width: 100,- headerAttributes: { style: "text-align:center" },- attributes: { style: "text-align:center" },- template: '# if(Used) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'- },- {- command: [{- name: "destroy",- text: "@Loc["Admin.Common.Delete"]"- }],- width: 150- }]- });- });- </script>-}-else-{- <div class="note note-info">- @Loc["admin.marketing.Discounts.CouponCodes.SaveBeforeEdit"]- </div>-}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.cshtmldeleted file mode 100644index ad2b4659f..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/CreateOrUpdate.TabHistory.cshtml+++ /dev/null@@ -1,75 +0,0 @@-@model DiscountModel-@inject AdminAreaSettings adminAreaSettings-@{- <div id="usagehistory-grid"></div>- <script>- $(document).ready(function () {- $("#usagehistory-grid").kendoGrid({- dataSource: {- transport: {- read: {- url: "@Html.Raw(Url.Action("UsageHistoryList", "Discount", new { discountId = Model.Id, area = Constants.AreaStore }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- },- destroy: {- url: "@Html.Raw(Url.Action("UsageHistoryDelete", "Discount", new { area = Constants.AreaStore }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- }- },- schema: {- data: "Data",- total: "Total",- errors: "Errors",- model: {- id: "Id",- fields: {- CreatedOn: {type: "date" }- }- }- },- error: function(e) {- display_kendoui_grid_error(e);- this.cancelChanges();- },- pageSize: @(adminAreaSettings.DefaultGridPageSize),- serverPaging: true,- serverFiltering: true,- serverSorting: true- },- pageable: {- refresh: true,- pageSizes: [@(adminAreaSettings.GridPageSizes)]- },- editable: {- confirmation: false,- mode: "inline"- },- scrollable: false,- columns: [{- field: "CreatedOn",- title: "@Loc["admin.marketing.Discounts.History.CreatedOn"]",- width: 200,- type: "date",- format: "{0:G}"- }, {- field: "OrderId",- title: "@Loc["admin.marketing.Discounts.History.Order"]",- width: 200,- template: '<a class="btn btn-sm btn-default" href="@Url.Action("Edit", "Order", new { area = Constants.AreaStore })/#=OrderId#"><i class="fa fa-search"></i> #=OrderNumber# - @Loc["Admin.Common.View"]</a>'- }, {- field: "OrderTotal",- title: "@Loc["admin.marketing.Discounts.History.OrderTotal"]",- width: 200- },{- command: {name: "destroy", text: "@Loc["Admin.Common.Delete"]"},- title: "@Loc["Admin.Common.Delete"]",- width: 100- }]- });- });- </script>-}diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.AppliedToBrands.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.AppliedToBrands.Bottom.cshtmlnew file mode 100644index 000000000..90d3de5d3--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.AppliedToBrands.Bottom.cshtml@@ -0,0 +1,2 @@+@model DiscountModel+<vc:store-widget widget-zone="store_discount_details_applied_to_brands_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.AppliedToBrands.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.AppliedToBrands.Top.cshtmlnew file mode 100644index 000000000..e38235aaf--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.AppliedToBrands.Top.cshtml@@ -0,0 +1,2 @@+@model DiscountModel+<vc:store-widget widget-zone="store_discount_details_applied_to_brands_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.AppliedToCategories.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.AppliedToCategories.Bottom.cshtmlnew file mode 100644index 000000000..90fa7913b--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.AppliedToCategories.Bottom.cshtml@@ -0,0 +1,2 @@+@model DiscountModel+<vc:store-widget widget-zone="store_discount_details_applied_to_categories_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.AppliedToCategories.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.AppliedToCategories.Top.cshtmlnew file mode 100644index 000000000..a740a46ff--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.AppliedToCategories.Top.cshtml@@ -0,0 +1,2 @@+@model DiscountModel+<vc:store-widget widget-zone="store_discount_details_applied_to_categories_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.AppliedToCollections.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.AppliedToCollections.Bottom.cshtmlnew file mode 100644index 000000000..dd9f9c439--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.AppliedToCollections.Bottom.cshtml@@ -0,0 +1,2 @@+@model DiscountModel+<vc:store-widget widget-zone="store_discount_details_applied_to_collections_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.AppliedToCollections.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.AppliedToCollections.Top.cshtmlnew file mode 100644index 000000000..c769e087f--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.AppliedToCollections.Top.cshtml@@ -0,0 +1,2 @@+@model DiscountModel+<vc:store-widget widget-zone="store_discount_details_applied_to_collections_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.AppliedToProducts.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.AppliedToProducts.Bottom.cshtmlnew file mode 100644index 000000000..24b972949--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.AppliedToProducts.Bottom.cshtml@@ -0,0 +1,2 @@+@model DiscountModel+<vc:store-widget widget-zone="store_discount_details_applied_to_products_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.AppliedToProducts.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.AppliedToProducts.Top.cshtmlnew file mode 100644index 000000000..545593fca--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.AppliedToProducts.Top.cshtml@@ -0,0 +1,2 @@+@model DiscountModel+<vc:store-widget widget-zone="store_discount_details_applied_to_products_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.CouponCodes.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.CouponCodes.Bottom.cshtmlnew file mode 100644index 000000000..2e2ecec2c--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.CouponCodes.Bottom.cshtml@@ -0,0 +1,2 @@+@model DiscountModel+<vc:store-widget widget-zone="store_discount_details_coupon_codes_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.CouponCodes.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.CouponCodes.Top.cshtmlnew file mode 100644index 000000000..bf5cb6fbc--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.CouponCodes.Top.cshtml@@ -0,0 +1,2 @@+@model DiscountModel+<vc:store-widget widget-zone="store_discount_details_coupon_codes_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.DetailsButtons.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.DetailsButtons.cshtmlnew file mode 100644index 000000000..7ad64ebeb--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.DetailsButtons.cshtml@@ -0,0 +1,2 @@+@model DiscountModel+<vc:store-widget widget-zone="store_discount_details_buttons" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.History.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.History.Bottom.cshtmlnew file mode 100644index 000000000..1053c15a4--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.History.Bottom.cshtml@@ -0,0 +1,2 @@+@model DiscountModel+<vc:store-widget widget-zone="store_discount_details_history_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.History.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.History.Top.cshtmlnew file mode 100644index 000000000..d0dddf5a0--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.History.Top.cshtml@@ -0,0 +1,2 @@+@model DiscountModel+<vc:store-widget widget-zone="store_discount_details_history_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.ListButtons.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.ListButtons.cshtmlnew file mode 100644index 000000000..3cd89739f--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.ListButtons.cshtml@@ -0,0 +1 @@+<vc:store-widget widget-zone="store_discount_list_buttons" additional-data="null"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.Requirements.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.Requirements.Bottom.cshtmlnew file mode 100644index 000000000..0627d4348--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.Requirements.Bottom.cshtml@@ -0,0 +1,2 @@+@model DiscountModel+<vc:store-widget widget-zone="store_discount_details_requirements_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.Requirements.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.Requirements.Top.cshtmlnew file mode 100644index 000000000..95a93e315--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Discount/Partials/WidgetZone.Requirements.Top.cshtml@@ -0,0 +1,2 @@+@model DiscountModel+<vc:store-widget widget-zone="store_discount_details_requirements_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Controllers/DiscountController.cs b/src/Web/Grand.Web.Store/Controllers/DiscountController.csindex c46479ffc..4d4e97abd 100644--- a/src/Web/Grand.Web.Store/Controllers/DiscountController.cs+++ b/src/Web/Grand.Web.Store/Controllers/DiscountController.cs@@ -1,782 +1,34 @@-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.Mediator;+using Grand.Web.AdminShared.Controllers;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 Grand.Mediator;+using Grand.Web.Store.Extensions;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<IActionResult> 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<IActionResult> 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<IActionResult> 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<IActionResult> 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<IActionResult> 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<IActionResult> 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<IActionResult> 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<IActionResult> 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<IActionResult> 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<IActionResult> 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<IActionResult> 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<IActionResult> 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<IActionResult> 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<IActionResult> 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<IActionResult> ProductAddPopup(string discountId)- {- var model = await _discountViewModelService.PrepareProductToDiscountModel();- return View(model);- }-- [PermissionAuthorizeAction(PermissionActionName.Edit)]- [HttpPost]- public async Task<IActionResult> 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<IActionResult> 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<IActionResult> 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<DiscountModel.AppliedToCategoryModel>();- 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<IActionResult> 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<IActionResult> CategoryAddPopupList(DataSourceRequest command,- DiscountModel.AddCategoryToDiscountModel model, [FromServices] ICategoryService categoryService)- {- var categories = await categoryService.GetAllCategories(parentId: null, categoryName: model.SearchCategoryName,- storeId: CurrentStoreId, pageIndex: command.Page - 1, pageSize: command.PageSize, showHidden: true);- var items = new List<CategoryModel>();- 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<IActionResult> 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<IActionResult> 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<IActionResult> 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<IActionResult> 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<IActionResult> 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<IActionResult> 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<IActionResult> 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<IActionResult> 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<IActionResult> 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<IActionResult> 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<IActionResult> 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-}+// Concrete host subclass of BaseDiscountController (ARCH-001 Discount consolidation). This class+// supplies Store's DI wiring plus the attributes that used to arrive transitively via+// BaseStoreController - BaseDiscountController can't inherit any single host's base controller+// (it's shared across Admin/Store, each with a different [Area]/[Authorize*] pair), so each+// subclass restates its own host's attribute set explicitly, same pattern as OrderController and+// MerchandiseReturnController. Store never had an "Applied to vendors" region (see Admin's+// DiscountController), so this subclass is a true thin subclass with no extra actions.+[AutoValidateAntiforgeryToken]+[Area(Constants.AreaStore)]+[AuthorizeStore]+[AuthorizeMenu]+public class DiscountController(+ IDiscountViewModelService discountViewModelService,+ IDiscountService discountService,+ ITranslationService translationService,+ IDateTimeService dateTimeService,+ IMediator mediator,+ IDiscountProviderLoader discountProviderLoader,+ IAdminDataScope<Discount> scope)+ : BaseDiscountController(discountViewModelService, discountService, translationService, dateTimeService,+ mediator, discountProviderLoader, scope);