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 11: attributes family consolidation (#803)
Krzysztof Pajakd12ca7689ddc
diff --git a/src/Tests/Grand.Mapping.Tests/AdminShared/CommonMappingTests.AddressAttribute_ToModel.verified.txt b/src/Tests/Grand.Mapping.Tests/AdminShared/CommonMappingTests.AddressAttribute_ToModel.verified.txtindex 23f3a0fe5..6483b03b7 100644--- a/src/Tests/Grand.Mapping.Tests/AdminShared/CommonMappingTests.AddressAttribute_ToModel.verified.txt+++ b/src/Tests/Grand.Mapping.Tests/AdminShared/CommonMappingTests.AddressAttribute_ToModel.verified.txt@@ -3,5 +3,6 @@IsRequired: true,AttributeControlTypeId: 1,DisplayOrder: 1,+ IsGlobalAttribute: false,Id: aa-001}\ No newline at end of filediff --git a/src/Tests/Grand.Mapping.Tests/AdminShared/CustomerMappingTests.ContactAttribute_ToModel.verified.txt b/src/Tests/Grand.Mapping.Tests/AdminShared/CustomerMappingTests.ContactAttribute_ToModel.verified.txtindex 54aec7598..195fc3e32 100644--- a/src/Tests/Grand.Mapping.Tests/AdminShared/CustomerMappingTests.ContactAttribute_ToModel.verified.txt+++ b/src/Tests/Grand.Mapping.Tests/AdminShared/CustomerMappingTests.ContactAttribute_ToModel.verified.txt@@ -5,5 +5,6 @@AttributeControlTypeId: 1,DisplayOrder: 1,ConditionAllowed: false,+ IsReadOnly: false,Id: coa-001}\ No newline at end of filediff --git a/src/Tests/Grand.Mapping.Tests/AdminShared/CustomerMappingTests.CustomerAttribute_ToModel.verified.txt b/src/Tests/Grand.Mapping.Tests/AdminShared/CustomerMappingTests.CustomerAttribute_ToModel.verified.txtindex 9725c2340..34f5acdcb 100644--- a/src/Tests/Grand.Mapping.Tests/AdminShared/CustomerMappingTests.CustomerAttribute_ToModel.verified.txt+++ b/src/Tests/Grand.Mapping.Tests/AdminShared/CustomerMappingTests.CustomerAttribute_ToModel.verified.txt@@ -4,5 +4,6 @@IsReadOnly: false,AttributeControlTypeId: 2,DisplayOrder: 1,+ IsGlobalAttribute: false,Id: ca-001}\ No newline at end of filediff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/AttributeFamilyControllerRoutingTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/AttributeFamilyControllerRoutingTests.csnew file mode 100644index 000000000..44f1b7ffc--- /dev/null+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/AttributeFamilyControllerRoutingTests.cs@@ -0,0 +1,114 @@+using Grand.Domain.Permissions;+using Grand.Web.Admin.Controllers;+using Grand.Web.Admin.Extensions;+using Grand.Web.AdminShared.Controllers;+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>+/// Regression test suite for attribute-family controllers' routing attributes.+/// Catches dropped [Area]/[Authorize*]/[AuthorizeMenu]/[PermissionAuthorize] attributes+/// across all 6 attribute-family entities (AddressAttribute, ContactAttribute, CustomerAttribute,+/// CheckoutAttribute, ProductAttribute, SpecificationAttribute).+/// This is the mandatory gate from ARCH-001 Phase 11.+/// </summary>+[TestClass]+public class AttributeFamilyControllerRoutingTests+{+ private static readonly (Type Controller, Type Base, string Name)[] ControllerPairs =+ [+ (typeof(AddressAttributeController), typeof(BaseAddressAttributeController), nameof(AddressAttributeController)),+ (typeof(ContactAttributeController), typeof(BaseContactAttributeController), nameof(ContactAttributeController)),+ (typeof(CustomerAttributeController), typeof(BaseCustomerAttributeController), nameof(CustomerAttributeController)),+ (typeof(CheckoutAttributeController), typeof(BaseCheckoutAttributeController), nameof(CheckoutAttributeController)),+ (typeof(ProductAttributeController), typeof(BaseProductAttributeController), nameof(ProductAttributeController)),+ (typeof(SpecificationAttributeController), typeof(BaseSpecificationAttributeController), nameof(SpecificationAttributeController)),+ ];++ [TestMethod]+ public void AllAdminControllers_InheritFromBaseControllers()+ {+ foreach (var (controller, baseType, name) in ControllerPairs)+ {+ Assert.IsTrue(baseType.IsAssignableFrom(controller),+ $"{name} does not inherit from {baseType.Name}.");+ }+ }++ [TestMethod]+ public void AllAdminControllers_HaveAutoValidateAntiforgeryToken()+ {+ foreach (var (controller, _, name) in ControllerPairs)+ {+ var hasAttr = typeof(AutoValidateAntiforgeryTokenAttribute)+ .IsAssignableFrom(controller)+ || controller.GetCustomAttributes(typeof(AutoValidateAntiforgeryTokenAttribute), false).Length > 0;++ Assert.IsTrue(hasAttr,+ $"{name} is missing [AutoValidateAntiforgeryToken].");+ }+ }++ [TestMethod]+ public void AllAdminControllers_HaveAreaAttributeWithAdminArea()+ {+ foreach (var (controller, _, name) in ControllerPairs)+ {+ var areaAttr = (AreaAttribute)Attribute.GetCustomAttribute(controller, typeof(AreaAttribute), false);+ Assert.IsNotNull(areaAttr, $"{name} is missing [Area].");+ Assert.AreEqual(Constants.AreaAdmin, areaAttr.RouteValue,+ $"{name}'s [Area] does not have Constants.AreaAdmin value.");+ }+ }++ [TestMethod]+ public void AllAdminControllers_HaveAuthorizeAdminAttribute()+ {+ foreach (var (controller, _, name) in ControllerPairs)+ {+ var hasAttr = controller.IsDefined(typeof(AuthorizeAdminAttribute), false);+ Assert.IsTrue(hasAttr, $"{name} is missing [AuthorizeAdmin].");+ }+ }++ [TestMethod]+ public void AllAdminControllers_HaveAuthorizationMenuAttribute()+ {+ foreach (var (controller, _, name) in ControllerPairs)+ {+ var hasAttr = controller.IsDefined(typeof(AuthorizeMenuAttribute), false);+ Assert.IsTrue(hasAttr, $"{name} is missing [AuthorizeMenu].");+ }+ }++ [TestMethod]+ public void AllAdminControllers_HavePermissionAuthorize()+ {+ foreach (var (controller, baseType, name) in ControllerPairs)+ {+ // [PermissionAuthorize] can be on the concrete controller or the base controller+ var concreteHasAttr = controller.IsDefined(typeof(PermissionAuthorizeAttribute), false);+ var baseHasAttr = baseType.IsDefined(typeof(PermissionAuthorizeAttribute), false);++ Assert.IsTrue(concreteHasAttr || baseHasAttr,+ $"{name} is missing [PermissionAuthorize] (neither on concrete nor on base).");+ }+ }++ [TestMethod]+ public void AdminCustomerAttributeController_HasPermissionAuthorizeForSettings()+ {+ // CustomerAttribute deliberately has [PermissionAuthorize(PermissionSystemName.Settings)]+ // on the concrete Admin controller, not on the base class - this is a preserved quirk+ var attr = (PermissionAuthorizeAttribute)Attribute.GetCustomAttribute(+ typeof(CustomerAttributeController), typeof(PermissionAuthorizeAttribute), false);++ Assert.IsNotNull(attr, "CustomerAttributeController is missing [PermissionAuthorize].");+ Assert.AreEqual(PermissionSystemName.Settings, attr.Permission,+ "CustomerAttributeController's [PermissionAuthorize] should use PermissionSystemName.Settings.");+ }+}diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseAddressAttributeControllerTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseAddressAttributeControllerTests.csnew file mode 100644index 000000000..ea684ba0a--- /dev/null+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseAddressAttributeControllerTests.cs@@ -0,0 +1,158 @@+using Grand.Business.Core.Interfaces.Common.Addresses;+using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Domain.Common;+using Grand.Web.AdminShared.Controllers;+using Grand.Web.AdminShared.Interfaces;+using Grand.Web.AdminShared.Models.Common;+using Grand.Web.Admin.Controllers;+using Grand.Web.Common.DataSource;+using Grand.Web.Common.Filters;+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 BaseAddressAttributeControllerTests+{+ // BaseAddressAttributeController is abstract; this minimal subclass exists only so actions under test+ // can be invoked directly.+ private class TestAddressAttributeController(+ IAddressAttributeService addressAttributeService,+ IAddressAttributeViewModelService addressAttributeViewModelService,+ ILanguageService languageService,+ ITranslationService translationService,+ IAdminDataScope<AddressAttribute> scope)+ : BaseAddressAttributeController(addressAttributeService, addressAttributeViewModelService,+ languageService, translationService, scope);++ private Mock<IAddressAttributeViewModelService> _vmService = null!;+ private Mock<IAddressAttributeService> _service = null!;+ private Mock<IAdminDataScope<AddressAttribute>> _scope = null!;+ private TestAddressAttributeController _sut = null!;++ [TestInitialize]+ public void Setup()+ {+ _vmService = new Mock<IAddressAttributeViewModelService>();+ _service = new Mock<IAddressAttributeService>();+ _scope = new Mock<IAdminDataScope<AddressAttribute>>();+ _sut = new TestAddressAttributeController(+ _service.Object, _vmService.Object,+ Mock.Of<ILanguageService>(), Mock.Of<ITranslationService>(), _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 List_GlobalScope_ReturnsAllAttributesUnfiltered()+ {+ _scope.Setup(x => x.DefaultStoreId).Returns((string?)null);+ var attrs = new List<AddressAttributeModel> {+ new() { Id = "1", Stores = null }, new() { Id = "2", Stores = ["store-a"] }+ };+ _vmService.Setup(x => x.PrepareAddressAttributes())+ .ReturnsAsync((attrs.AsEnumerable(), attrs.Count));++ var result = await _sut.List(new DataSourceRequest()) as JsonResult;++ var data = (DataSourceResult)result!.Value!;+ Assert.AreEqual(2, data.Total);+ }++ [TestMethod]+ public async Task List_StoreScope_FiltersToVisibleAttributesOnly()+ {+ _scope.Setup(x => x.DefaultStoreId).Returns("store-a");+ var attrs = new List<AddressAttributeModel> {+ new() { Id = "1", Stores = null }, new() { Id = "2", Stores = ["store-a"] },+ new() { Id = "3", Stores = ["store-b"] }+ };+ _vmService.Setup(x => x.PrepareAddressAttributes())+ .ReturnsAsync((attrs.AsEnumerable(), attrs.Count));++ var result = await _sut.List(new DataSourceRequest()) as JsonResult;++ var data = (DataSourceResult)result!.Value!;+ Assert.AreEqual(2, data.Total); // global (id 1) + store-a's own (id 2), not store-b's (id 3)+ }++ [TestMethod]+ public async Task List_StoreScope_MarksSingleStoreAttributeAsNotGlobal()+ {+ _scope.Setup(x => x.DefaultStoreId).Returns("store-a");+ var attrs = new List<AddressAttributeModel> {+ new() { Id = "2", Name = "X", Stores = ["store-a"] }+ };+ _vmService.Setup(x => x.PrepareAddressAttributes())+ .ReturnsAsync((attrs.AsEnumerable(), attrs.Count));++ var result = await _sut.List(new DataSourceRequest()) as JsonResult;+ var data = (DataSourceResult)result!.Value!;+ var row = data.Data!.Cast<object>().Single();+ var isGlobal = (bool)row.GetType().GetProperty("IsGlobalAttribute")!.GetValue(row)!;+ Assert.IsFalse(isGlobal);+ }+}++/// <summary>+/// Regression test for ARCH-001 authorization attributes on thin subclasses.+/// Verifies that both Admin and Store AddressAttributeController subclasses carry+/// the required [AutoValidateAntiforgeryToken] and [AuthorizeMenu] attributes that+/// used to arrive transitively from BaseAdminController/BaseStoreController.+/// See Critical Finding 2 in Task 2 code review.+/// </summary>+[TestClass]+public class AddressAttributeControllerAttributeTests+{+ [TestMethod]+ public void AdminAddressAttributeController_HasAutoValidateAntiforgeryToken()+ {+ var controller = Type.GetType("Grand.Web.Admin.Controllers.AddressAttributeController, Grand.Web.Admin");+ Assert.IsNotNull(controller, "Admin AddressAttributeController type not found");+ var attr = controller!.GetCustomAttributes(typeof(AutoValidateAntiforgeryTokenAttribute), false);+ Assert.IsTrue(attr.Length > 0, "Admin AddressAttributeController missing [AutoValidateAntiforgeryToken]");+ }++ [TestMethod]+ public void AdminAddressAttributeController_HasAuthorizeMenu()+ {+ var controller = Type.GetType("Grand.Web.Admin.Controllers.AddressAttributeController, Grand.Web.Admin");+ Assert.IsNotNull(controller, "Admin AddressAttributeController type not found");+ var attr = controller!.GetCustomAttributes(typeof(AuthorizeMenuAttribute), false);+ Assert.IsTrue(attr.Length > 0, "Admin AddressAttributeController missing [AuthorizeMenu]");+ }++ [TestMethod]+ public void StoreAddressAttributeController_HasAutoValidateAntiforgeryToken()+ {+ var controller = Type.GetType("Grand.Web.Store.Controllers.AddressAttributeController, Grand.Web.Store");+ Assert.IsNotNull(controller, "Store AddressAttributeController type not found");+ var attr = controller!.GetCustomAttributes(typeof(AutoValidateAntiforgeryTokenAttribute), false);+ Assert.IsTrue(attr.Length > 0, "Store AddressAttributeController missing [AutoValidateAntiforgeryToken]");+ }++ [TestMethod]+ public void StoreAddressAttributeController_HasAuthorizeMenu()+ {+ var controller = Type.GetType("Grand.Web.Store.Controllers.AddressAttributeController, Grand.Web.Store");+ Assert.IsNotNull(controller, "Store AddressAttributeController type not found");+ var attr = controller!.GetCustomAttributes(typeof(AuthorizeMenuAttribute), false);+ Assert.IsTrue(attr.Length > 0, "Store AddressAttributeController missing [AuthorizeMenu]");+ }+}diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseCheckoutAttributeControllerTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseCheckoutAttributeControllerTests.csnew file mode 100644index 000000000..2cbcb740e--- /dev/null+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseCheckoutAttributeControllerTests.cs@@ -0,0 +1,143 @@+using Grand.Business.Core.Interfaces.Catalog.Directory;+using Grand.Business.Core.Interfaces.Checkout.CheckoutAttributes;+using Grand.Business.Core.Interfaces.Common.Directory;+using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Domain.Directory;+using Grand.Domain.Orders;+using Grand.Web.AdminShared.Controllers;+using Grand.Web.AdminShared.Interfaces;+using Grand.Web.AdminShared.Models.Orders;+using Grand.Web.Common.Filters;+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 BaseCheckoutAttributeControllerTests+{+ // BaseCheckoutAttributeController is abstract; this minimal subclass exists only so actions under test+ // can be invoked directly.+ private class TestCheckoutAttributeController(+ ICheckoutAttributeService checkoutAttributeService,+ ILanguageService languageService,+ ITranslationService translationService,+ ICurrencyService currencyService,+ CurrencySettings currencySettings,+ IMeasureService measureService,+ MeasureSettings measureSettings,+ ICheckoutAttributeViewModelService checkoutAttributeViewModelService,+ IAdminDataScope<CheckoutAttribute> scope)+ : BaseCheckoutAttributeController(checkoutAttributeService, languageService, translationService,+ currencyService, currencySettings, measureService, measureSettings,+ checkoutAttributeViewModelService, scope);++ private Mock<ICheckoutAttributeService> _service = null!;+ private Mock<ICheckoutAttributeViewModelService> _vmService = null!;+ private Mock<IAdminDataScope<CheckoutAttribute>> _scope = null!;+ private TestCheckoutAttributeController _sut = null!;++ [TestInitialize]+ public void Setup()+ {+ _service = new Mock<ICheckoutAttributeService>();+ _vmService = new Mock<ICheckoutAttributeViewModelService>();+ _scope = new Mock<IAdminDataScope<CheckoutAttribute>>();+ _sut = new TestCheckoutAttributeController(_service.Object, Mock.Of<ILanguageService>(),+ Mock.Of<ITranslationService>(), Mock.Of<ICurrencyService>(), new CurrencySettings(),+ Mock.Of<IMeasureService>(), new MeasureSettings(), _vmService.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 Create_StoreScope_ClearsCustomerGroupsAlongsideStores()+ {+ _scope.Setup(x => x.DefaultStoreId).Returns("store-a");+ _sut.ModelState.Clear();+ var model = new CheckoutAttributeModel { CustomerGroups = ["group-1"] };+ _vmService.Setup(x => x.InsertCheckoutAttributeModel(model))+ .ReturnsAsync(new CheckoutAttribute { Id = "new-id" });++ await _sut.Create(model, false);++ Assert.IsTrue(model.Stores.SequenceEqual(new[] { "store-a" }));+ Assert.AreEqual(0, model.CustomerGroups.Length);+ }++ [TestMethod]+ public async Task Create_GlobalScope_LeavesCustomerGroupsUntouched()+ {+ _scope.Setup(x => x.DefaultStoreId).Returns((string?)null);+ _sut.ModelState.Clear();+ var model = new CheckoutAttributeModel { CustomerGroups = ["group-1"] };+ _vmService.Setup(x => x.InsertCheckoutAttributeModel(model))+ .ReturnsAsync(new CheckoutAttribute { Id = "new-id" });++ await _sut.Create(model, false);++ Assert.IsNull(model.Stores);+ Assert.IsTrue(model.CustomerGroups.SequenceEqual(new[] { "group-1" }));+ }+}++/// <summary>+/// Regression test for ARCH-001 authorization attributes on thin subclasses.+/// Verifies that both Admin and Store CheckoutAttributeController subclasses carry+/// the required [AutoValidateAntiforgeryToken] and [AuthorizeMenu] attributes that+/// used to arrive transitively from BaseAdminController/BaseStoreController.+/// </summary>+[TestClass]+public class CheckoutAttributeControllerAttributeTests+{+ [TestMethod]+ public void AdminCheckoutAttributeController_HasAutoValidateAntiforgeryToken()+ {+ var controller = Type.GetType("Grand.Web.Admin.Controllers.CheckoutAttributeController, Grand.Web.Admin");+ Assert.IsNotNull(controller, "Admin CheckoutAttributeController type not found");+ var attr = controller!.GetCustomAttributes(typeof(AutoValidateAntiforgeryTokenAttribute), false);+ Assert.IsTrue(attr.Length > 0, "Admin CheckoutAttributeController missing [AutoValidateAntiforgeryToken]");+ }++ [TestMethod]+ public void AdminCheckoutAttributeController_HasAuthorizeMenu()+ {+ var controller = Type.GetType("Grand.Web.Admin.Controllers.CheckoutAttributeController, Grand.Web.Admin");+ Assert.IsNotNull(controller, "Admin CheckoutAttributeController type not found");+ var attr = controller!.GetCustomAttributes(typeof(AuthorizeMenuAttribute), false);+ Assert.IsTrue(attr.Length > 0, "Admin CheckoutAttributeController missing [AuthorizeMenu]");+ }++ [TestMethod]+ public void StoreCheckoutAttributeController_HasAutoValidateAntiforgeryToken()+ {+ var controller = Type.GetType("Grand.Web.Store.Controllers.CheckoutAttributeController, Grand.Web.Store");+ Assert.IsNotNull(controller, "Store CheckoutAttributeController type not found");+ var attr = controller!.GetCustomAttributes(typeof(AutoValidateAntiforgeryTokenAttribute), false);+ Assert.IsTrue(attr.Length > 0, "Store CheckoutAttributeController missing [AutoValidateAntiforgeryToken]");+ }++ [TestMethod]+ public void StoreCheckoutAttributeController_HasAuthorizeMenu()+ {+ var controller = Type.GetType("Grand.Web.Store.Controllers.CheckoutAttributeController, Grand.Web.Store");+ Assert.IsNotNull(controller, "Store CheckoutAttributeController type not found");+ var attr = controller!.GetCustomAttributes(typeof(AuthorizeMenuAttribute), false);+ Assert.IsTrue(attr.Length > 0, "Store CheckoutAttributeController missing [AuthorizeMenu]");+ }+}diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseContactAttributeControllerTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseContactAttributeControllerTests.csnew file mode 100644index 000000000..c8e5701d2--- /dev/null+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseContactAttributeControllerTests.cs@@ -0,0 +1,178 @@+using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Business.Core.Interfaces.Marketing.Contacts;+using Grand.Domain.Catalog;+using Grand.Domain.Messages;+using Grand.Infrastructure.Mapper;+using Grand.Mapping;+using Grand.Web.AdminShared.Controllers;+using Grand.Web.AdminShared.Interfaces;+using Grand.Web.AdminShared.Mapper;+using Grand.Web.AdminShared.Models.Messages;+using Grand.Web.Admin.Controllers;+using Grand.Web.Common.DataSource;+using Grand.Web.Common.Filters;+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 BaseContactAttributeControllerTests+{+ // BaseContactAttributeController is abstract; this minimal subclass exists only so actions under test+ // can be invoked directly.+ private class TestContactAttributeController(+ IContactAttributeViewModelService contactAttributeViewModelService,+ IContactAttributeService contactAttributeService,+ ILanguageService languageService,+ ITranslationService translationService,+ IAdminDataScope<ContactAttribute> scope)+ : BaseContactAttributeController(contactAttributeViewModelService, contactAttributeService,+ languageService, translationService, scope);++ private Mock<IContactAttributeViewModelService> _vmService = null!;+ private Mock<IContactAttributeService> _service = null!;+ private Mock<IAdminDataScope<ContactAttribute>> _scope = null!;+ private TestContactAttributeController _sut = null!;++ [TestInitialize]+ public void Setup()+ {+ var mapperConfig = new MapperConfiguration(cfg => cfg.AddProfile<ContactAttributeProfile>());+ AutoMapperConfig.Init(mapperConfig);++ _vmService = new Mock<IContactAttributeViewModelService>();+ _service = new Mock<IContactAttributeService>();+ _scope = new Mock<IAdminDataScope<ContactAttribute>>();++ var languageServiceMock = new Mock<ILanguageService>();+ languageServiceMock.Setup(l => l.GetAllLanguages(true, It.IsAny<string>())).ReturnsAsync(new List<Grand.Domain.Localization.Language>());+ var translationServiceMock = new Mock<ITranslationService>();+ translationServiceMock.Setup(t => t.GetResource(It.IsAny<string>())).Returns("resource");++ _sut = new TestContactAttributeController(+ _vmService.Object, _service.Object,+ languageServiceMock.Object, translationServiceMock.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_GlobalScope_CanViewAlwaysTrue()+ {+ var entity = new ContactAttribute { Id = "1" };+ _service.Setup(x => x.GetContactAttributeById("1")).ReturnsAsync(entity);+ _scope.Setup(x => x.CanView(entity)).ReturnsAsync(true);+ _vmService.Setup(x => x.PrepareConditionAttributes(It.IsAny<ContactAttributeModel>(), entity))+ .Returns(Task.CompletedTask);++ var result = await _sut.Edit("1") as ViewResult;++ Assert.IsNotNull(result);+ }++ [TestMethod]+ public async Task Edit_ScopeDeniesView_RedirectsToList()+ {+ var entity = new ContactAttribute { Id = "1" };+ _service.Setup(x => x.GetContactAttributeById("1")).ReturnsAsync(entity);+ _scope.Setup(x => x.CanView(entity)).ReturnsAsync(false);++ var result = await _sut.Edit("1") as RedirectToActionResult;++ Assert.AreEqual("List", result!.ActionName);+ }++ [TestMethod]+ public async Task Delete_ScopeDeniesAccess_RedirectsToEditNotList()+ {+ var entity = new ContactAttribute { Id = "1" };+ _service.Setup(x => x.GetContactAttributeById("1")).ReturnsAsync(entity);+ _scope.Setup(x => x.HasAccess(entity)).ReturnsAsync(false);++ var result = await _sut.Delete("1") as RedirectToActionResult;++ Assert.AreEqual("Edit", result!.ActionName);+ }++ [TestMethod]+ public async Task ValueDelete_ScopeCanViewButDeniesAccess_ReturnsAccessDenied()+ {+ // Regression test for critical IDOR-class bug: ValueDelete (a mutation) must use HasAccess (strict)+ // not CanView (looser). A Store user viewing a global/multi-store attribute should NOT be able to+ // delete its values even though they can view the parent. This test proves the gap where CanView+ // and HasAccess diverge: CanView=true (can view), HasAccess=false (cannot mutate).+ var entity = new ContactAttribute { Id = "1" };+ _service.Setup(x => x.GetContactAttributeById("1")).ReturnsAsync(entity);+ _scope.Setup(x => x.CanView(entity)).ReturnsAsync(true); // View allowed+ _scope.Setup(x => x.HasAccess(entity)).ReturnsAsync(false); // Mutation denied++ var result = await _sut.ValueDelete("value-1", "1") as JsonResult;++ Assert.IsNotNull(result);+ var data = result!.Value as DataSourceResult;+ Assert.AreEqual("Access denied", data!.Errors);+ }+}++/// <summary>+/// Regression test for ARCH-001 authorization attributes on thin subclasses.+/// Verifies that both Admin and Store ContactAttributeController subclasses carry+/// the required [AutoValidateAntiforgeryToken] and [AuthorizeMenu] attributes that+/// used to arrive transitively from BaseAdminController/BaseStoreController.+/// See Critical Finding 2 in Task 2 code review.+/// </summary>+[TestClass]+public class ContactAttributeControllerAttributeTests+{+ [TestMethod]+ public void AdminContactAttributeController_HasAutoValidateAntiforgeryToken()+ {+ var controller = Type.GetType("Grand.Web.Admin.Controllers.ContactAttributeController, Grand.Web.Admin");+ Assert.IsNotNull(controller, "Admin ContactAttributeController type not found");+ var attr = controller!.GetCustomAttributes(typeof(AutoValidateAntiforgeryTokenAttribute), false);+ Assert.IsTrue(attr.Length > 0, "Admin ContactAttributeController missing [AutoValidateAntiforgeryToken]");+ }++ [TestMethod]+ public void AdminContactAttributeController_HasAuthorizeMenu()+ {+ var controller = Type.GetType("Grand.Web.Admin.Controllers.ContactAttributeController, Grand.Web.Admin");+ Assert.IsNotNull(controller, "Admin ContactAttributeController type not found");+ var attr = controller!.GetCustomAttributes(typeof(AuthorizeMenuAttribute), false);+ Assert.IsTrue(attr.Length > 0, "Admin ContactAttributeController missing [AuthorizeMenu]");+ }++ [TestMethod]+ public void StoreContactAttributeController_HasAutoValidateAntiforgeryToken()+ {+ var controller = Type.GetType("Grand.Web.Store.Controllers.ContactAttributeController, Grand.Web.Store");+ Assert.IsNotNull(controller, "Store ContactAttributeController type not found");+ var attr = controller!.GetCustomAttributes(typeof(AutoValidateAntiforgeryTokenAttribute), false);+ Assert.IsTrue(attr.Length > 0, "Store ContactAttributeController missing [AutoValidateAntiforgeryToken]");+ }++ [TestMethod]+ public void StoreContactAttributeController_HasAuthorizeMenu()+ {+ var controller = Type.GetType("Grand.Web.Store.Controllers.ContactAttributeController, Grand.Web.Store");+ Assert.IsNotNull(controller, "Store ContactAttributeController type not found");+ var attr = controller!.GetCustomAttributes(typeof(AuthorizeMenuAttribute), false);+ Assert.IsTrue(attr.Length > 0, "Store ContactAttributeController missing [AuthorizeMenu]");+ }+}diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseCustomerAttributeControllerTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseCustomerAttributeControllerTests.csnew file mode 100644index 000000000..e1a26c375--- /dev/null+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseCustomerAttributeControllerTests.cs@@ -0,0 +1,129 @@+using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Business.Core.Interfaces.Customers;+using Grand.Domain.Customers;+using Grand.Web.AdminShared.Controllers;+using Grand.Web.AdminShared.Interfaces;+using Grand.Web.AdminShared.Models.Customers;+using Grand.Web.Common.DataSource;+using Grand.Web.Common.Filters;+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 BaseCustomerAttributeControllerTests+{+ // BaseCustomerAttributeController is abstract; this minimal subclass exists only so actions under test+ // can be invoked directly.+ private class TestCustomerAttributeController(+ ICustomerAttributeService customerAttributeService,+ ICustomerAttributeViewModelService customerAttributeViewModelService,+ ILanguageService languageService,+ ITranslationService translationService,+ IAdminDataScope<CustomerAttribute> scope)+ : BaseCustomerAttributeController(customerAttributeService, customerAttributeViewModelService,+ languageService, translationService, scope);++ private Mock<ICustomerAttributeService> _service = null!;+ private Mock<ICustomerAttributeViewModelService> _vmService = null!;+ private Mock<IAdminDataScope<CustomerAttribute>> _scope = null!;+ private TestCustomerAttributeController _sut = null!;++ [TestInitialize]+ public void Setup()+ {+ _service = new Mock<ICustomerAttributeService>();+ _vmService = new Mock<ICustomerAttributeViewModelService>();+ _scope = new Mock<IAdminDataScope<CustomerAttribute>>();+ _sut = new TestCustomerAttributeController(_service.Object, _vmService.Object,+ Mock.Of<ILanguageService>(), Mock.Of<ITranslationService>(), _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 Delete_UsesViewModelServiceNotRawService()+ {+ await _sut.Delete("attr-1");++ _vmService.Verify(x => x.DeleteCustomerAttribute("attr-1"), Times.Once);+ _service.Verify(x => x.GetCustomerAttributeById(It.IsAny<string>()), Times.Never);+ }++ [TestMethod]+ public async Task List_StoreScope_ExcludesOtherStoreAttributes()+ {+ _scope.Setup(x => x.DefaultStoreId).Returns("store-a");+ var attrs = new List<CustomerAttributeModel> {+ new() { Id = "1", Stores = ["store-b"] }+ };+ _vmService.Setup(x => x.PrepareCustomerAttributes()).ReturnsAsync(attrs.AsEnumerable());++ var result = await _sut.List(new DataSourceRequest()) as JsonResult;++ var data = (DataSourceResult)result!.Value!;+ Assert.AreEqual(0, data.Total);+ }+}++/// <summary>+/// Regression test for ARCH-001 authorization attributes on thin subclasses.+/// Verifies that both Admin and Store CustomerAttributeController subclasses carry+/// the required [AutoValidateAntiforgeryToken] and [AuthorizeMenu] attributes that+/// used to arrive transitively from BaseAdminController/BaseStoreController.+/// </summary>+[TestClass]+public class CustomerAttributeControllerAttributeTests+{+ [TestMethod]+ public void AdminCustomerAttributeController_HasAutoValidateAntiforgeryToken()+ {+ var controller = Type.GetType("Grand.Web.Admin.Controllers.CustomerAttributeController, Grand.Web.Admin");+ Assert.IsNotNull(controller, "Admin CustomerAttributeController type not found");+ var attr = controller!.GetCustomAttributes(typeof(AutoValidateAntiforgeryTokenAttribute), false);+ Assert.IsTrue(attr.Length > 0, "Admin CustomerAttributeController missing [AutoValidateAntiforgeryToken]");+ }++ [TestMethod]+ public void AdminCustomerAttributeController_HasAuthorizeMenu()+ {+ var controller = Type.GetType("Grand.Web.Admin.Controllers.CustomerAttributeController, Grand.Web.Admin");+ Assert.IsNotNull(controller, "Admin CustomerAttributeController type not found");+ var attr = controller!.GetCustomAttributes(typeof(AuthorizeMenuAttribute), false);+ Assert.IsTrue(attr.Length > 0, "Admin CustomerAttributeController missing [AuthorizeMenu]");+ }++ [TestMethod]+ public void StoreCustomerAttributeController_HasAutoValidateAntiforgeryToken()+ {+ var controller = Type.GetType("Grand.Web.Store.Controllers.CustomerAttributeController, Grand.Web.Store");+ Assert.IsNotNull(controller, "Store CustomerAttributeController type not found");+ var attr = controller!.GetCustomAttributes(typeof(AutoValidateAntiforgeryTokenAttribute), false);+ Assert.IsTrue(attr.Length > 0, "Store CustomerAttributeController missing [AutoValidateAntiforgeryToken]");+ }++ [TestMethod]+ public void StoreCustomerAttributeController_HasAuthorizeMenu()+ {+ var controller = Type.GetType("Grand.Web.Store.Controllers.CustomerAttributeController, Grand.Web.Store");+ Assert.IsNotNull(controller, "Store CustomerAttributeController type not found");+ var attr = controller!.GetCustomAttributes(typeof(AuthorizeMenuAttribute), false);+ Assert.IsTrue(attr.Length > 0, "Store CustomerAttributeController missing [AuthorizeMenu]");+ }+}diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseProductAttributeControllerTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseProductAttributeControllerTests.csnew file mode 100644index 000000000..6779f9df2--- /dev/null+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseProductAttributeControllerTests.cs@@ -0,0 +1,143 @@+using Grand.Business.Core.Interfaces.Catalog.Products;+using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Domain;+using Grand.Domain.Catalog;+using Grand.Domain.Seo;+using Grand.Web.AdminShared.Controllers;+using Grand.Web.AdminShared.Interfaces;+using Grand.Web.Common.DataSource;+using Grand.Web.Common.Filters;+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 BaseProductAttributeControllerTests+{+ // BaseProductAttributeController is abstract; this minimal subclass exists only so actions under test+ // can be invoked directly.+ private class TestProductAttributeController(+ IProductService productService,+ IProductAttributeService productAttributeService,+ ILanguageService languageService,+ ITranslationService translationService,+ SeoSettings seoSettings,+ IAdminDataScope<ProductAttribute> scope)+ : BaseProductAttributeController(productService, productAttributeService, languageService,+ translationService, seoSettings, scope);++ private Mock<IProductService> _productService = null!;+ private Mock<IProductAttributeService> _attributeService = null!;+ private Mock<IAdminDataScope<ProductAttribute>> _scope = null!;+ private TestProductAttributeController _sut = null!;++ [TestInitialize]+ public void Setup()+ {+ _productService = new Mock<IProductService>();+ _attributeService = new Mock<IProductAttributeService>();+ _scope = new Mock<IAdminDataScope<ProductAttribute>>();+ _sut = new TestProductAttributeController(_productService.Object, _attributeService.Object,+ Mock.Of<ILanguageService>(), Mock.Of<ITranslationService>(), new SeoSettings(), _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 List_PassesScopeStoreIdToService()+ {+ _scope.Setup(x => x.DefaultStoreId).Returns("store-a");+ _attributeService.Setup(x => x.GetAllProductAttributes("store-a", 0, 10))+ .ReturnsAsync(new PagedList<ProductAttribute>(new List<ProductAttribute>(), 0, 10, 0));++ await _sut.List(new DataSourceRequest { Page = 1, PageSize = 10 });++ _attributeService.Verify(x => x.GetAllProductAttributes("store-a", 0, 10), Times.Once);+ }++ [TestMethod]+ public async Task List_GlobalScope_PassesEmptyStoreId()+ {+ _scope.Setup(x => x.DefaultStoreId).Returns((string?)null);+ _attributeService.Setup(x => x.GetAllProductAttributes("", 0, 10))+ .ReturnsAsync(new PagedList<ProductAttribute>(new List<ProductAttribute>(), 0, 10, 0));++ await _sut.List(new DataSourceRequest { Page = 1, PageSize = 10 });++ _attributeService.Verify(x => x.GetAllProductAttributes("", 0, 10), Times.Once);+ }++ [TestMethod]+ public async Task Edit_ScopeDeniesAccess_RedirectsToList()+ {+ var entity = new ProductAttribute { Id = "1" };+ _attributeService.Setup(x => x.GetProductAttributeById("1")).ReturnsAsync(entity);+ _scope.Setup(x => x.CanView(entity)).ReturnsAsync(false);++ var result = await _sut.Edit("1") as RedirectToActionResult;++ Assert.AreEqual("List", result!.ActionName);+ }+}++/// <summary>+/// Regression test for ARCH-001 authorization attributes on thin subclasses.+/// Verifies that both Admin and Store ProductAttributeController subclasses carry+/// the required [AutoValidateAntiforgeryToken] and [AuthorizeMenu] attributes that+/// used to arrive transitively from BaseAdminController/BaseStoreController.+/// </summary>+[TestClass]+public class ProductAttributeControllerAttributeTests+{+ [TestMethod]+ public void AdminProductAttributeController_HasAutoValidateAntiforgeryToken()+ {+ var controller = Type.GetType("Grand.Web.Admin.Controllers.ProductAttributeController, Grand.Web.Admin");+ Assert.IsNotNull(controller, "Admin ProductAttributeController type not found");+ var attr = controller!.GetCustomAttributes(typeof(AutoValidateAntiforgeryTokenAttribute), false);+ Assert.IsTrue(attr.Length > 0, "Admin ProductAttributeController missing [AutoValidateAntiforgeryToken]");+ }++ [TestMethod]+ public void AdminProductAttributeController_HasAuthorizeMenu()+ {+ var controller = Type.GetType("Grand.Web.Admin.Controllers.ProductAttributeController, Grand.Web.Admin");+ Assert.IsNotNull(controller, "Admin ProductAttributeController type not found");+ var attr = controller!.GetCustomAttributes(typeof(AuthorizeMenuAttribute), false);+ Assert.IsTrue(attr.Length > 0, "Admin ProductAttributeController missing [AuthorizeMenu]");+ }++ [TestMethod]+ public void StoreProductAttributeController_HasAutoValidateAntiforgeryToken()+ {+ var controller = Type.GetType("Grand.Web.Store.Controllers.ProductAttributeController, Grand.Web.Store");+ Assert.IsNotNull(controller, "Store ProductAttributeController type not found");+ var attr = controller!.GetCustomAttributes(typeof(AutoValidateAntiforgeryTokenAttribute), false);+ Assert.IsTrue(attr.Length > 0, "Store ProductAttributeController missing [AutoValidateAntiforgeryToken]");+ }++ [TestMethod]+ public void StoreProductAttributeController_HasAuthorizeMenu()+ {+ var controller = Type.GetType("Grand.Web.Store.Controllers.ProductAttributeController, Grand.Web.Store");+ Assert.IsNotNull(controller, "Store ProductAttributeController type not found");+ var attr = controller!.GetCustomAttributes(typeof(AuthorizeMenuAttribute), false);+ Assert.IsTrue(attr.Length > 0, "Store ProductAttributeController missing [AuthorizeMenu]");+ }+}diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseSpecificationAttributeControllerTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseSpecificationAttributeControllerTests.csnew file mode 100644index 000000000..7d98e34d5--- /dev/null+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseSpecificationAttributeControllerTests.cs@@ -0,0 +1,193 @@+using Grand.Business.Core.Interfaces.Catalog.Products;+using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Domain;+using Grand.Domain.Catalog;+using Grand.Domain.Seo;+using Grand.Web.AdminShared.Controllers;+using Grand.Web.AdminShared.Interfaces;+using Grand.Web.Common.DataSource;+using Grand.Web.Common.Filters;+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;+using System.Collections.Generic;++namespace Grand.Web.Admin.Tests.Controllers;++[TestClass]+public class BaseSpecificationAttributeControllerTests+{+ // BaseSpecificationAttributeController is abstract; this minimal subclass exists only so actions under test+ // can be invoked directly.+ private class TestSpecificationAttributeController(+ ISpecificationAttributeService specificationAttributeService,+ ILanguageService languageService,+ ITranslationService translationService,+ IProductService productService,+ SeoSettings seoSettings,+ IAdminDataScope<SpecificationAttribute> scope)+ : BaseSpecificationAttributeController(specificationAttributeService, languageService,+ translationService, productService, seoSettings, scope);++ private Mock<ISpecificationAttributeService> _service = null!;+ private Mock<IProductService> _productService = null!;+ private Mock<IAdminDataScope<SpecificationAttribute>> _scope = null!;+ private TestSpecificationAttributeController _sut = null!;++ [TestInitialize]+ public void Setup()+ {+ _service = new Mock<ISpecificationAttributeService>();+ _productService = new Mock<IProductService>();+ _scope = new Mock<IAdminDataScope<SpecificationAttribute>>();+ _sut = new TestSpecificationAttributeController(_service.Object, Mock.Of<ILanguageService>(),+ Mock.Of<ITranslationService>(), _productService.Object, new SeoSettings(), _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 List_PassesScopeStoreIdToService()+ {+ _scope.Setup(x => x.DefaultStoreId).Returns("store-a");+ _service.Setup(x => x.GetSpecificationAttributes("store-a", 0, 10))+ .ReturnsAsync(new PagedList<SpecificationAttribute>(new List<SpecificationAttribute>(), 0, 10, 0));++ await _sut.List(new DataSourceRequest { Page = 1, PageSize = 10 });++ _service.Verify(x => x.GetSpecificationAttributes("store-a", 0, 10), Times.Once);+ }++ [TestMethod]+ public async Task UsedByProducts_PassesScopeStoreIdToSearchProducts()+ {+ _scope.Setup(x => x.DefaultStoreId).Returns("store-a");+ var spec = new SpecificationAttribute { Id = "s1" };+ // Add option to the collection manually to avoid setter restrictions+ var option = new SpecificationAttributeOption { Id = "o1" };+ spec.SpecificationAttributeOptions.Add(option);++ _service.Setup(x => x.GetSpecificationAttributeById("s1")).ReturnsAsync(spec);+ _scope.Setup(x => x.CanView(spec)).ReturnsAsync(true);+ _productService.Setup(x => x.SearchProducts(+ loadFilterableSpecificationAttributeOptionIds: false,+ pageIndex: 0,+ pageSize: 10,+ categoryIds: null,+ brandId: "",+ collectionId: "",+ storeId: "store-a",+ vendorId: "",+ warehouseId: "",+ productType: null,+ visibleIndividuallyOnly: false,+ markedAsNewOnly: false,+ showOnHomePage: null,+ featuredProducts: null,+ priceMin: null,+ priceMax: null,+ productTag: "",+ keywords: null,+ searchDescriptions: false,+ searchSku: true,+ searchProductTags: false,+ languageId: "",+ filteredSpecs: null,+ specificationOptions: It.Is<IList<string>>(l => l.Contains("o1")),+ orderBy: It.IsAny<ProductSortingEnum>(),+ showHidden: true,+ overridePublished: null))+ .ReturnsAsync((new PagedList<Product>(new List<Product>(), 0, 10, 0), (IList<string>)new List<string>()));++ await _sut.UsedByProducts(new DataSourceRequest { Page = 1, PageSize = 10 }, "s1");++ _productService.Verify(x => x.SearchProducts(+ loadFilterableSpecificationAttributeOptionIds: false,+ pageIndex: 0,+ pageSize: 10,+ categoryIds: null,+ brandId: "",+ collectionId: "",+ storeId: "store-a",+ vendorId: "",+ warehouseId: "",+ productType: null,+ visibleIndividuallyOnly: false,+ markedAsNewOnly: false,+ showOnHomePage: null,+ featuredProducts: null,+ priceMin: null,+ priceMax: null,+ productTag: "",+ keywords: null,+ searchDescriptions: false,+ searchSku: true,+ searchProductTags: false,+ languageId: "",+ filteredSpecs: null,+ specificationOptions: It.IsAny<IList<string>>(),+ orderBy: It.IsAny<ProductSortingEnum>(),+ showHidden: true,+ overridePublished: null), Times.Once);+ }+}++/// <summary>+/// Regression test for ARCH-001 authorization attributes on thin subclasses.+/// Verifies that both Admin and Store SpecificationAttributeController subclasses carry+/// the required [AutoValidateAntiforgeryToken] and [AuthorizeMenu] attributes that+/// used to arrive transitively from BaseAdminController/BaseStoreController.+/// </summary>+[TestClass]+public class SpecificationAttributeControllerAttributeTests+{+ [TestMethod]+ public void AdminSpecificationAttributeController_HasAutoValidateAntiforgeryToken()+ {+ var controller = Type.GetType("Grand.Web.Admin.Controllers.SpecificationAttributeController, Grand.Web.Admin");+ Assert.IsNotNull(controller, "Admin SpecificationAttributeController type not found");+ var attr = controller!.GetCustomAttributes(typeof(AutoValidateAntiforgeryTokenAttribute), false);+ Assert.IsTrue(attr.Length > 0, "Admin SpecificationAttributeController missing [AutoValidateAntiforgeryToken]");+ }++ [TestMethod]+ public void AdminSpecificationAttributeController_HasAuthorizeMenu()+ {+ var controller = Type.GetType("Grand.Web.Admin.Controllers.SpecificationAttributeController, Grand.Web.Admin");+ Assert.IsNotNull(controller, "Admin SpecificationAttributeController type not found");+ var attr = controller!.GetCustomAttributes(typeof(AuthorizeMenuAttribute), false);+ Assert.IsTrue(attr.Length > 0, "Admin SpecificationAttributeController missing [AuthorizeMenu]");+ }++ [TestMethod]+ public void StoreSpecificationAttributeController_HasAutoValidateAntiforgeryToken()+ {+ var controller = Type.GetType("Grand.Web.Store.Controllers.SpecificationAttributeController, Grand.Web.Store");+ Assert.IsNotNull(controller, "Store SpecificationAttributeController type not found");+ var attr = controller!.GetCustomAttributes(typeof(AutoValidateAntiforgeryTokenAttribute), false);+ Assert.IsTrue(attr.Length > 0, "Store SpecificationAttributeController missing [AutoValidateAntiforgeryToken]");+ }++ [TestMethod]+ public void StoreSpecificationAttributeController_HasAuthorizeMenu()+ {+ var controller = Type.GetType("Grand.Web.Store.Controllers.SpecificationAttributeController, Grand.Web.Store");+ Assert.IsNotNull(controller, "Store SpecificationAttributeController type not found");+ var attr = controller!.GetCustomAttributes(typeof(AuthorizeMenuAttribute), false);+ Assert.IsTrue(attr.Length > 0, "Store SpecificationAttributeController missing [AuthorizeMenu]");+ }+}diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/RoutedAddressAttributeDataScopeTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/RoutedAddressAttributeDataScopeTests.csnew file mode 100644index 000000000..c3a70cbed--- /dev/null+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/RoutedAddressAttributeDataScopeTests.cs@@ -0,0 +1,87 @@+#nullable enable++using Grand.Domain.Common;+using Grand.Domain.Customers;+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<AddressAttribute> the resolver+/// delegates to for each area, and that an unrecognized or missing area fails closed rather than+/// falling back to the unscoped global scope.+/// </summary>+[TestClass]+public class RoutedAddressAttributeDataScopeTests+{+ private const string StaffStoreId = "store-1";++ private GlobalAdminDataScope<AddressAttribute> _globalScope = null!;+ private StoreAdminDataScope<AddressAttribute> _storeScope = null!;++ [TestInitialize]+ public void Setup()+ {+ var contextAccessor = new Mock<IContextAccessor>();+ var workContext = new Mock<IWorkContext>();+ workContext.Setup(x => x.CurrentCustomer).Returns(new Customer { StaffStoreId = StaffStoreId });+ contextAccessor.Setup(x => x.WorkContext).Returns(workContext.Object);++ _globalScope = new GlobalAdminDataScope<AddressAttribute>();+ _storeScope = new StoreAdminDataScope<AddressAttribute>(contextAccessor.Object);+ }++ private RoutedAddressAttributeDataScope 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 RoutedAddressAttributeDataScope(httpContextAccessor.Object, _globalScope, _storeScope);+ }++ [TestMethod]+ public void AdminArea_ResolvesToGlobalScope()+ {+ var resolver = ResolverForArea("Admin");+ Assert.AreEqual("Admin", resolver.ResourceKeyPrefix);+ Assert.IsNull(resolver.DefaultStoreId);+ Assert.IsTrue(resolver.ShowStoreSelector);+ }++ [TestMethod]+ public void StoreArea_ResolvesToStoreScope()+ {+ var resolver = ResolverForArea("Store");+ Assert.AreEqual("Admin", resolver.ResourceKeyPrefix);+ Assert.AreEqual(StaffStoreId, resolver.DefaultStoreId);+ Assert.IsTrue(resolver.ShowStoreSelector);+ }++ [TestMethod]+ public void MissingArea_Throws()+ {+ var resolver = ResolverForArea(null);+ Assert.Throws<InvalidOperationException>(() => _ = resolver.ResourceKeyPrefix);+ }++ [TestMethod]+ public void UnrecognizedArea_Throws()+ {+ var resolver = ResolverForArea("Vendor");+ Assert.Throws<InvalidOperationException>(() => _ = resolver.ResourceKeyPrefix);+ }++ [TestMethod]+ public void NoHttpContext_Throws()+ {+ var httpContextAccessor = new Mock<IHttpContextAccessor>();+ httpContextAccessor.Setup(x => x.HttpContext).Returns((HttpContext)null!);+ var resolver = new RoutedAddressAttributeDataScope(httpContextAccessor.Object, _globalScope, _storeScope);+ Assert.Throws<InvalidOperationException>(() => _ = resolver.ResourceKeyPrefix);+ }+}diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/RoutedCheckoutAttributeDataScopeTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/RoutedCheckoutAttributeDataScopeTests.csnew file mode 100644index 000000000..d58aff648--- /dev/null+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/RoutedCheckoutAttributeDataScopeTests.cs@@ -0,0 +1,87 @@+#nullable enable++using Grand.Domain.Customers;+using Grand.Domain.Orders;+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<CheckoutAttribute> the resolver+/// delegates to for each area, and that an unrecognized or missing area fails closed rather than+/// falling back to the unscoped global scope.+/// </summary>+[TestClass]+public class RoutedCheckoutAttributeDataScopeTests+{+ private const string StaffStoreId = "store-1";++ private GlobalAdminDataScope<CheckoutAttribute> _globalScope = null!;+ private StoreAdminDataScope<CheckoutAttribute> _storeScope = null!;++ [TestInitialize]+ public void Setup()+ {+ var contextAccessor = new Mock<IContextAccessor>();+ var workContext = new Mock<IWorkContext>();+ workContext.Setup(x => x.CurrentCustomer).Returns(new Customer { StaffStoreId = StaffStoreId });+ contextAccessor.Setup(x => x.WorkContext).Returns(workContext.Object);++ _globalScope = new GlobalAdminDataScope<CheckoutAttribute>();+ _storeScope = new StoreAdminDataScope<CheckoutAttribute>(contextAccessor.Object);+ }++ private RoutedCheckoutAttributeDataScope 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 RoutedCheckoutAttributeDataScope(httpContextAccessor.Object, _globalScope, _storeScope);+ }++ [TestMethod]+ public void AdminArea_ResolvesToGlobalScope()+ {+ var resolver = ResolverForArea("Admin");+ Assert.AreEqual("Admin", resolver.ResourceKeyPrefix);+ Assert.IsNull(resolver.DefaultStoreId);+ Assert.IsTrue(resolver.ShowStoreSelector);+ }++ [TestMethod]+ public void StoreArea_ResolvesToStoreScope()+ {+ var resolver = ResolverForArea("Store");+ Assert.AreEqual("Admin", resolver.ResourceKeyPrefix);+ Assert.AreEqual(StaffStoreId, resolver.DefaultStoreId);+ Assert.IsTrue(resolver.ShowStoreSelector);+ }++ [TestMethod]+ public void MissingArea_Throws()+ {+ var resolver = ResolverForArea(null);+ Assert.Throws<InvalidOperationException>(() => _ = resolver.ResourceKeyPrefix);+ }++ [TestMethod]+ public void UnrecognizedArea_Throws()+ {+ var resolver = ResolverForArea("Vendor");+ Assert.Throws<InvalidOperationException>(() => _ = resolver.ResourceKeyPrefix);+ }++ [TestMethod]+ public void NoHttpContext_Throws()+ {+ var httpContextAccessor = new Mock<IHttpContextAccessor>();+ httpContextAccessor.Setup(x => x.HttpContext).Returns((HttpContext)null!);+ var resolver = new RoutedCheckoutAttributeDataScope(httpContextAccessor.Object, _globalScope, _storeScope);+ Assert.Throws<InvalidOperationException>(() => _ = resolver.ResourceKeyPrefix);+ }+}diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/RoutedContactAttributeDataScopeTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/RoutedContactAttributeDataScopeTests.csnew file mode 100644index 000000000..b78995005--- /dev/null+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/RoutedContactAttributeDataScopeTests.cs@@ -0,0 +1,87 @@+#nullable enable++using Grand.Domain.Customers;+using Grand.Domain.Messages;+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<ContactAttribute> the resolver+/// delegates to for each area, and that an unrecognized or missing area fails closed rather than+/// falling back to the unscoped global scope.+/// </summary>+[TestClass]+public class RoutedContactAttributeDataScopeTests+{+ private const string StaffStoreId = "store-1";++ private GlobalAdminDataScope<ContactAttribute> _globalScope = null!;+ private StoreAdminDataScope<ContactAttribute> _storeScope = null!;++ [TestInitialize]+ public void Setup()+ {+ var contextAccessor = new Mock<IContextAccessor>();+ var workContext = new Mock<IWorkContext>();+ workContext.Setup(x => x.CurrentCustomer).Returns(new Customer { StaffStoreId = StaffStoreId });+ contextAccessor.Setup(x => x.WorkContext).Returns(workContext.Object);++ _globalScope = new GlobalAdminDataScope<ContactAttribute>();+ _storeScope = new StoreAdminDataScope<ContactAttribute>(contextAccessor.Object);+ }++ private RoutedContactAttributeDataScope 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 RoutedContactAttributeDataScope(httpContextAccessor.Object, _globalScope, _storeScope);+ }++ [TestMethod]+ public void AdminArea_ResolvesToGlobalScope()+ {+ var resolver = ResolverForArea("Admin");+ Assert.AreEqual("Admin", resolver.ResourceKeyPrefix);+ Assert.IsNull(resolver.DefaultStoreId);+ Assert.IsTrue(resolver.ShowStoreSelector);+ }++ [TestMethod]+ public void StoreArea_ResolvesToStoreScope()+ {+ var resolver = ResolverForArea("Store");+ Assert.AreEqual("Admin", resolver.ResourceKeyPrefix);+ Assert.AreEqual(StaffStoreId, resolver.DefaultStoreId);+ Assert.IsTrue(resolver.ShowStoreSelector);+ }++ [TestMethod]+ public void MissingArea_Throws()+ {+ var resolver = ResolverForArea(null);+ Assert.Throws<InvalidOperationException>(() => _ = resolver.ResourceKeyPrefix);+ }++ [TestMethod]+ public void UnrecognizedArea_Throws()+ {+ var resolver = ResolverForArea("Vendor");+ Assert.Throws<InvalidOperationException>(() => _ = resolver.ResourceKeyPrefix);+ }++ [TestMethod]+ public void NoHttpContext_Throws()+ {+ var httpContextAccessor = new Mock<IHttpContextAccessor>();+ httpContextAccessor.Setup(x => x.HttpContext).Returns((HttpContext)null!);+ var resolver = new RoutedContactAttributeDataScope(httpContextAccessor.Object, _globalScope, _storeScope);+ Assert.Throws<InvalidOperationException>(() => _ = resolver.ResourceKeyPrefix);+ }+}diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/RoutedCustomerAttributeDataScopeTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/RoutedCustomerAttributeDataScopeTests.csnew file mode 100644index 000000000..2ce24b6b0--- /dev/null+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/RoutedCustomerAttributeDataScopeTests.cs@@ -0,0 +1,86 @@+#nullable enable++using Grand.Domain.Customers;+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<CustomerAttribute> the resolver+/// delegates to for each area, and that an unrecognized or missing area fails closed rather than+/// falling back to the unscoped global scope.+/// </summary>+[TestClass]+public class RoutedCustomerAttributeDataScopeTests+{+ private const string StaffStoreId = "store-1";++ private GlobalAdminDataScope<CustomerAttribute> _globalScope = null!;+ private StoreAdminDataScope<CustomerAttribute> _storeScope = null!;++ [TestInitialize]+ public void Setup()+ {+ var contextAccessor = new Mock<IContextAccessor>();+ var workContext = new Mock<IWorkContext>();+ workContext.Setup(x => x.CurrentCustomer).Returns(new Customer { StaffStoreId = StaffStoreId });+ contextAccessor.Setup(x => x.WorkContext).Returns(workContext.Object);++ _globalScope = new GlobalAdminDataScope<CustomerAttribute>();+ _storeScope = new StoreAdminDataScope<CustomerAttribute>(contextAccessor.Object);+ }++ private RoutedCustomerAttributeDataScope 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 RoutedCustomerAttributeDataScope(httpContextAccessor.Object, _globalScope, _storeScope);+ }++ [TestMethod]+ public void AdminArea_ResolvesToGlobalScope()+ {+ var resolver = ResolverForArea("Admin");+ Assert.AreEqual("Admin", resolver.ResourceKeyPrefix);+ Assert.IsNull(resolver.DefaultStoreId);+ Assert.IsTrue(resolver.ShowStoreSelector);+ }++ [TestMethod]+ public void StoreArea_ResolvesToStoreScope()+ {+ var resolver = ResolverForArea("Store");+ Assert.AreEqual("Admin", resolver.ResourceKeyPrefix);+ Assert.AreEqual(StaffStoreId, resolver.DefaultStoreId);+ Assert.IsTrue(resolver.ShowStoreSelector);+ }++ [TestMethod]+ public void MissingArea_Throws()+ {+ var resolver = ResolverForArea(null);+ Assert.Throws<InvalidOperationException>(() => _ = resolver.ResourceKeyPrefix);+ }++ [TestMethod]+ public void UnrecognizedArea_Throws()+ {+ var resolver = ResolverForArea("Vendor");+ Assert.Throws<InvalidOperationException>(() => _ = resolver.ResourceKeyPrefix);+ }++ [TestMethod]+ public void NoHttpContext_Throws()+ {+ var httpContextAccessor = new Mock<IHttpContextAccessor>();+ httpContextAccessor.Setup(x => x.HttpContext).Returns((HttpContext)null!);+ var resolver = new RoutedCustomerAttributeDataScope(httpContextAccessor.Object, _globalScope, _storeScope);+ Assert.Throws<InvalidOperationException>(() => _ = resolver.ResourceKeyPrefix);+ }+}diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/RoutedProductAttributeDataScopeTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/RoutedProductAttributeDataScopeTests.csnew file mode 100644index 000000000..40a7e9127--- /dev/null+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/RoutedProductAttributeDataScopeTests.cs@@ -0,0 +1,87 @@+#nullable enable++using Grand.Domain.Catalog;+using Grand.Domain.Customers;+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<ProductAttribute> the resolver+/// delegates to for each area, and that an unrecognized or missing area fails closed rather than+/// falling back to the unscoped global scope.+/// </summary>+[TestClass]+public class RoutedProductAttributeDataScopeTests+{+ private const string StaffStoreId = "store-1";++ private GlobalAdminDataScope<ProductAttribute> _globalScope = null!;+ private StoreAdminDataScope<ProductAttribute> _storeScope = null!;++ [TestInitialize]+ public void Setup()+ {+ var contextAccessor = new Mock<IContextAccessor>();+ var workContext = new Mock<IWorkContext>();+ workContext.Setup(x => x.CurrentCustomer).Returns(new Customer { StaffStoreId = StaffStoreId });+ contextAccessor.Setup(x => x.WorkContext).Returns(workContext.Object);++ _globalScope = new GlobalAdminDataScope<ProductAttribute>();+ _storeScope = new StoreAdminDataScope<ProductAttribute>(contextAccessor.Object);+ }++ private RoutedProductAttributeDataScope 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 RoutedProductAttributeDataScope(httpContextAccessor.Object, _globalScope, _storeScope);+ }++ [TestMethod]+ public void AdminArea_ResolvesToGlobalScope()+ {+ var resolver = ResolverForArea("Admin");+ Assert.AreEqual("Admin", resolver.ResourceKeyPrefix);+ Assert.IsNull(resolver.DefaultStoreId);+ Assert.IsTrue(resolver.ShowStoreSelector);+ }++ [TestMethod]+ public void StoreArea_ResolvesToStoreScope()+ {+ var resolver = ResolverForArea("Store");+ Assert.AreEqual("Admin", resolver.ResourceKeyPrefix);+ Assert.AreEqual(StaffStoreId, resolver.DefaultStoreId);+ Assert.IsTrue(resolver.ShowStoreSelector);+ }++ [TestMethod]+ public void MissingArea_Throws()+ {+ var resolver = ResolverForArea(null);+ Assert.Throws<InvalidOperationException>(() => _ = resolver.ResourceKeyPrefix);+ }++ [TestMethod]+ public void UnrecognizedArea_Throws()+ {+ var resolver = ResolverForArea("Vendor");+ Assert.Throws<InvalidOperationException>(() => _ = resolver.ResourceKeyPrefix);+ }++ [TestMethod]+ public void NoHttpContext_Throws()+ {+ var httpContextAccessor = new Mock<IHttpContextAccessor>();+ httpContextAccessor.Setup(x => x.HttpContext).Returns((HttpContext)null!);+ var resolver = new RoutedProductAttributeDataScope(httpContextAccessor.Object, _globalScope, _storeScope);+ Assert.Throws<InvalidOperationException>(() => _ = resolver.ResourceKeyPrefix);+ }+}diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/RoutedSpecificationAttributeDataScopeTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/RoutedSpecificationAttributeDataScopeTests.csnew file mode 100644index 000000000..b97547cb0--- /dev/null+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/RoutedSpecificationAttributeDataScopeTests.cs@@ -0,0 +1,87 @@+#nullable enable++using Grand.Domain.Catalog;+using Grand.Domain.Customers;+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<SpecificationAttribute> the resolver+/// delegates to for each area, and that an unrecognized or missing area fails closed rather than+/// falling back to the unscoped global scope.+/// </summary>+[TestClass]+public class RoutedSpecificationAttributeDataScopeTests+{+ private const string StaffStoreId = "store-1";++ private GlobalAdminDataScope<SpecificationAttribute> _globalScope = null!;+ private StoreAdminDataScope<SpecificationAttribute> _storeScope = null!;++ [TestInitialize]+ public void Setup()+ {+ var contextAccessor = new Mock<IContextAccessor>();+ var workContext = new Mock<IWorkContext>();+ workContext.Setup(x => x.CurrentCustomer).Returns(new Customer { StaffStoreId = StaffStoreId });+ contextAccessor.Setup(x => x.WorkContext).Returns(workContext.Object);++ _globalScope = new GlobalAdminDataScope<SpecificationAttribute>();+ _storeScope = new StoreAdminDataScope<SpecificationAttribute>(contextAccessor.Object);+ }++ private RoutedSpecificationAttributeDataScope 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 RoutedSpecificationAttributeDataScope(httpContextAccessor.Object, _globalScope, _storeScope);+ }++ [TestMethod]+ public void AdminArea_ResolvesToGlobalScope()+ {+ var resolver = ResolverForArea("Admin");+ Assert.AreEqual("Admin", resolver.ResourceKeyPrefix);+ Assert.IsNull(resolver.DefaultStoreId);+ Assert.IsTrue(resolver.ShowStoreSelector);+ }++ [TestMethod]+ public void StoreArea_ResolvesToStoreScope()+ {+ var resolver = ResolverForArea("Store");+ Assert.AreEqual("Admin", resolver.ResourceKeyPrefix);+ Assert.AreEqual(StaffStoreId, resolver.DefaultStoreId);+ Assert.IsTrue(resolver.ShowStoreSelector);+ }++ [TestMethod]+ public void MissingArea_Throws()+ {+ var resolver = ResolverForArea(null);+ Assert.Throws<InvalidOperationException>(() => _ = resolver.ResourceKeyPrefix);+ }++ [TestMethod]+ public void UnrecognizedArea_Throws()+ {+ var resolver = ResolverForArea("Vendor");+ Assert.Throws<InvalidOperationException>(() => _ = resolver.ResourceKeyPrefix);+ }++ [TestMethod]+ public void NoHttpContext_Throws()+ {+ var httpContextAccessor = new Mock<IHttpContextAccessor>();+ httpContextAccessor.Setup(x => x.HttpContext).Returns((HttpContext)null!);+ var resolver = new RoutedSpecificationAttributeDataScope(httpContextAccessor.Object, _globalScope, _storeScope);+ Assert.Throws<InvalidOperationException>(() => _ = resolver.ResourceKeyPrefix);+ }+}diff --git a/src/Tests/Grand.Web.Store.Tests/Controllers/AttributeFamilyControllerRoutingTests.cs b/src/Tests/Grand.Web.Store.Tests/Controllers/AttributeFamilyControllerRoutingTests.csnew file mode 100644index 000000000..a65483ec9--- /dev/null+++ b/src/Tests/Grand.Web.Store.Tests/Controllers/AttributeFamilyControllerRoutingTests.cs@@ -0,0 +1,115 @@+using Grand.Domain.Permissions;+using Grand.Web.AdminShared.Controllers;+using Grand.Web.Common.Filters;+using Grand.Web.Common.Security.Authorization;+using Grand.Web.Store.Controllers;+using Grand.Web.Store.Extensions;+using Microsoft.AspNetCore.Mvc;+using Microsoft.VisualStudio.TestTools.UnitTesting;+using Constants = Grand.Web.Store.Extensions.Constants;++namespace Grand.Web.Store.Tests.Controllers;++/// <summary>+/// Regression test suite for attribute-family controllers' routing attributes (Store side).+/// Catches dropped [Area]/[Authorize*]/[AuthorizeMenu]/[PermissionAuthorize] attributes+/// across all 6 attribute-family entities (AddressAttribute, ContactAttribute, CustomerAttribute,+/// CheckoutAttribute, ProductAttribute, SpecificationAttribute) in the Store host.+/// This is the mandatory gate from ARCH-001 Phase 11.+/// </summary>+[TestClass]+public class AttributeFamilyControllerRoutingTests+{+ private static readonly (Type Controller, Type Base, string Name)[] ControllerPairs =+ [+ (typeof(AddressAttributeController), typeof(BaseAddressAttributeController), nameof(AddressAttributeController)),+ (typeof(ContactAttributeController), typeof(BaseContactAttributeController), nameof(ContactAttributeController)),+ (typeof(CustomerAttributeController), typeof(BaseCustomerAttributeController), nameof(CustomerAttributeController)),+ (typeof(CheckoutAttributeController), typeof(BaseCheckoutAttributeController), nameof(CheckoutAttributeController)),+ (typeof(ProductAttributeController), typeof(BaseProductAttributeController), nameof(ProductAttributeController)),+ (typeof(SpecificationAttributeController), typeof(BaseSpecificationAttributeController), nameof(SpecificationAttributeController)),+ ];++ [TestMethod]+ public void AllStoreControllers_InheritFromBaseControllers()+ {+ foreach (var (controller, baseType, name) in ControllerPairs)+ {+ Assert.IsTrue(baseType.IsAssignableFrom(controller),+ $"Store.{name} does not inherit from {baseType.Name}.");+ }+ }++ [TestMethod]+ public void AllStoreControllers_HaveAutoValidateAntiforgeryToken()+ {+ foreach (var (controller, _, name) in ControllerPairs)+ {+ var hasAttr = typeof(AutoValidateAntiforgeryTokenAttribute)+ .IsAssignableFrom(controller)+ || controller.GetCustomAttributes(typeof(AutoValidateAntiforgeryTokenAttribute), false).Length > 0;++ Assert.IsTrue(hasAttr,+ $"Store.{name} is missing [AutoValidateAntiforgeryToken].");+ }+ }++ [TestMethod]+ public void AllStoreControllers_HaveAreaAttributeWithStoreArea()+ {+ foreach (var (controller, _, name) in ControllerPairs)+ {+ var areaAttr = (AreaAttribute)Attribute.GetCustomAttribute(controller, typeof(AreaAttribute), false);+ Assert.IsNotNull(areaAttr, $"Store.{name} is missing [Area].");+ Assert.AreEqual(Constants.AreaStore, areaAttr.RouteValue,+ $"Store.{name}'s [Area] does not have Constants.AreaStore value.");+ }+ }++ [TestMethod]+ public void AllStoreControllers_HaveAuthorizeStoreAttribute()+ {+ foreach (var (controller, _, name) in ControllerPairs)+ {+ var hasAttr = controller.IsDefined(typeof(AuthorizeStoreAttribute), false);+ Assert.IsTrue(hasAttr, $"Store.{name} is missing [AuthorizeStore].");+ }+ }++ [TestMethod]+ public void AllStoreControllers_HaveAuthorizationMenuAttribute()+ {+ foreach (var (controller, _, name) in ControllerPairs)+ {+ var hasAttr = controller.IsDefined(typeof(AuthorizeMenuAttribute), false);+ Assert.IsTrue(hasAttr, $"Store.{name} is missing [AuthorizeMenu].");+ }+ }++ [TestMethod]+ public void AllStoreControllers_HavePermissionAuthorize()+ {+ foreach (var (controller, baseType, name) in ControllerPairs)+ {+ // [PermissionAuthorize] can be on the concrete controller or the base controller+ var concreteHasAttr = controller.IsDefined(typeof(PermissionAuthorizeAttribute), false);+ var baseHasAttr = baseType.IsDefined(typeof(PermissionAuthorizeAttribute), false);++ Assert.IsTrue(concreteHasAttr || baseHasAttr,+ $"Store.{name} is missing [PermissionAuthorize] (neither on concrete nor on base).");+ }+ }++ [TestMethod]+ public void StoreCustomerAttributeController_HasPermissionAuthorizeForCustomerAttributes()+ {+ // CustomerAttribute in Store deliberately has [PermissionAuthorize(PermissionSystemName.CustomerAttributes)]+ // on the concrete Store controller, preserving a different permission value than Admin's PermissionSystemName.Settings+ var attr = (PermissionAuthorizeAttribute)Attribute.GetCustomAttribute(+ typeof(CustomerAttributeController), typeof(PermissionAuthorizeAttribute), false);++ Assert.IsNotNull(attr, "Store.CustomerAttributeController is missing [PermissionAuthorize].");+ Assert.AreEqual(PermissionSystemName.CustomerAttributes, attr.Permission,+ "Store.CustomerAttributeController's [PermissionAuthorize] should use PermissionSystemName.CustomerAttributes.");+ }+}diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Edit.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Edit.cshtmldeleted file mode 100644index 680f80ca8..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Edit.cshtml+++ /dev/null@@ -1,43 +0,0 @@-@model AddressAttributeModel-@{- //page title- ViewBag.Title = Loc["Admin.Address.AddressAttributes.EditAttributeDetails"];-}--<form asp-area="@Constants.AreaAdmin" asp-controller="AddressAttribute" asp-action="Edit" method="post" id="addressattribute-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-list-ol"></i>- @Loc["Admin.Address.AddressAttributes.EditAttributeDetails"] - @Model.Name- <small>- <i class="fa fa-arrow-circle-left"></i>@Html.ActionLink(Loc["Admin.Address.AddressAttributes.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="addressattribute-delete" class="btn red">- <i class="fa fa-trash-o"></i> @Loc["Admin.Common.Delete"]- </span>- </div>- </div>- </div>- <vc:admin-widget widget-zone="address_attribute_details_buttons" additional-data="Model"/>- <div class="x_content form">- <partial name="Partials/CreateOrUpdate" model="Model"/>- </div>- </div>- </div>- </div>-</form>--<admin-delete-confirmation button-id="addressattribute-delete"/>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/List.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/List.cshtmldeleted file mode 100644index c7bd88361..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/List.cshtml+++ /dev/null@@ -1,93 +0,0 @@-@{- //page title- ViewBag.Title = Loc["Admin.Address.AddressAttributes"];-}-<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-list-alt"></i>- @Loc["Admin.Address.AddressAttributes"]- </div>- <div class="actions btn-group btn-group-devided">- <a href="@Url.Action("Create", "AddressAttribute", new { area = Constants.AreaAdmin })" 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="address_attribute_list_buttons" additional-data="null"/>- </div>- </div>- <div class="x_content form">- <div class="form-horizontal">- <div class="form-body">- <div class="x_content">- <div id="addressattributes-grid"></div>- </div>- </div>- </div>- </div>- </div>- </div>-</div>--<script>- $(document).ready(function () {- $("#addressattributes-grid").kendoGrid({- dataSource: {- transport: {- read: {- url: "@Html.Raw(Url.Action("List", "AddressAttribute", new { area = Constants.AreaAdmin }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- }- },- schema: {- data: "Data",- total: "Total",- errors: "Errors"- },- error: function(e) {- display_kendoui_grid_error(e);- // Cancel the changes- 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: "Name",- title: "@Loc["Admin.Address.AddressAttributes.Fields.Name"]",- width: 300,- template: '<a class="k-link" href="@Url.Action("Edit", "AddressAttribute", new { area = Constants.AreaAdmin })/#=Id#">#=kendo.htmlEncode(Name)#</a>',- }, {- field: "AttributeControlTypeName",- title: "@Loc["Admin.Address.AddressAttributes.Fields.AttributeControlType"]",- width: 200- },{- field: "IsRequired",- title: "@Loc["Admin.Address.AddressAttributes.Fields.IsRequired"]",- width: 100,- headerAttributes: { style: "text-align:center" },- attributes: { style: "text-align:center" },- template: '# if(IsRequired) {# <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> #} #'- }, {- field: "DisplayOrder",- title: "@Loc["Admin.Address.AddressAttributes.Fields.DisplayOrder"]",- width: 100- }]- });- });-</script>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/CreateOrUpdate.TabInfo.cshtmldeleted file mode 100644index f966fb3cd..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/CreateOrUpdate.TabInfo.cshtml+++ /dev/null@@ -1,87 +0,0 @@-@using Microsoft.AspNetCore.Mvc.Razor-@model AddressAttributeModel-<script>- $(document).ready(function () {- $("#@Html.IdFor(model => model.AttributeControlTypeId)").change(toggleAttributeControlType);- toggleAttributeControlType();-- });- function toggleAttributeControlType() {- var selectedAttributeControlTypeId = $("#@Html.IdFor(model => model.AttributeControlTypeId)").val();- if (selectedAttributeControlTypeId == @(((int)AttributeControlType.TextBox).ToString())) {- $('#tab-addressattributesvalues').hide();- } else if (selectedAttributeControlTypeId == @(((int)AttributeControlType.MultilineTextbox).ToString())) {- $('#tab-addressattributesvalues').hide();- } else {- $('#tab-addressattributesvalues').show();- }- }--</script>-<vc:admin-widget widget-zone="address_attribute_details_info_top" additional-data="Model"/>-@{- Func<int, HelperResult>- template = @<div class="form-body">- <div class="form-group">- <admin-label asp-for="@Model.Locales[item].Name"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="@Model.Locales[item].Name"/>- <span asp-validation-for="@Model.Locales[item].Name"></span>- </div>- </div>- <input type="hidden" asp-for="@Model.Locales[item].LanguageId"/>- </div>;-}--<div class="form-horizontal">- <localized-editor localized-template="@template" name="addressattribute-localized" language-ids="@Model.Locales.Select(c => c.LanguageId).ToList()">- <div class="form-body">- <div class="form-group">- <admin-label asp-for="Name"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="Name"/>- <span asp-validation-for="Name"></span>- </div>- </div>- </div>- </localized-editor>- <div class="form-body">- <div class="form-group">- <admin-label asp-for="IsRequired"/>- <div class="col-md-9 col-sm-9">- <label class="mt-checkbox mt-checkbox-outline control control-checkbox">- <admin-input asp-for="IsRequired"/>- <div class="control__indicator"></div>- </label>- <span asp-validation-for="IsRequired"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="AttributeControlTypeId"/>- <div class="col-md-9 col-sm-9">- @{- var attributeControlTypes = EnumTranslationService.ToSelectList(((AttributeControlType)Model.AttributeControlTypeId), valuesToExclude:- //custom address attributes don't support some attribute control types- [(int)AttributeControlType.Hidden, (int)AttributeControlType.FileUpload, (int)AttributeControlType.Datepicker, (int)AttributeControlType.ColorSquares, (int)AttributeControlType.ImageSquares]);- }- <admin-select asp-for="AttributeControlTypeId" asp-items="attributeControlTypes"/>- <span asp-validation-for="AttributeControlTypeId"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="Stores"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="Stores"/>- <span asp-validation-for="Stores"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="DisplayOrder"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="DisplayOrder"/>- <span asp-validation-for="DisplayOrder"></span>- </div>- </div>- </div>-</div>-<vc:admin-widget widget-zone="address_attribute_details_info_bottom" additional-data="Model"/>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/CreateOrUpdate.TabValues.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/CreateOrUpdate.TabValues.cshtmldeleted file mode 100644index 57fd0ac40..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/CreateOrUpdate.TabValues.cshtml+++ /dev/null@@ -1,132 +0,0 @@-@model AddressAttributeModel-@{- if (!string.IsNullOrEmpty(Model.Id))- {- <div class="panel panel-default">- <div class="panel-body">- <vc:admin-widget widget-zone="address_attribute_details_values_top" additional-data="Model"/>- <div id="addressattributevalues-grid"></div>- <vc:admin-widget widget-zone="address_attribute_details_values_bottom" additional-data="Model"/>- </div>- <div class="panel-footer">- <a id="btnAddNewValue" href="@(Url.Action("ValueCreatePopup", "AddressAttribute", new { addressAttributeId = Model.Id, area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Address.AddressAttributes.Values.AddNew"]</a>- <input type="submit" id="btnRefresh" style="display: none"/>- </div>- </div>- <script>- $(document).ready(function () {- $('#btnAddNewValue').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');- }- }- });- $("#addressattributevalues-grid").kendoGrid({- dataBound: function () {- $('.editvalue').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');- }- }- });- },- dataSource: {- transport: {- read: {- url: "@Html.Raw(Url.Action("ValueList", "AddressAttribute", new { addressAttributeId = Model.Id, area = Constants.AreaAdmin }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- },- destroy: {- url: "@Html.Raw(Url.Action("ValueDelete", "AddressAttribute", new { area = Constants.AreaAdmin }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- }- },- schema: {- data: "Data",- total: "Total",- errors: "Errors",- model: {- id: "Id"- }- },- error: function(e) {- display_kendoui_grid_error(e);- // Cancel the changes- this.cancelChanges();- },- serverPaging: true,- serverFiltering: true,- serverSorting: true- },- pageable: {- refresh: true,- numeric: false,- previousNext: false,- info: false- },- editable: {- confirmation: true,- mode: "inline"- },- scrollable: false,- columns: [{- field: "Name",- title: "@Loc["Admin.Address.AddressAttributes.Values.Fields.Name"]",- template: "<a class='k-link editvalue' href=\"@Url.Action("ValueEditPopup", "AddressAttribute", new { area = Constants.AreaAdmin })/#=Id#?addressAttributeId=@(Model.Id)\">#=Name#</a>",- }, {- field: "IsPreSelected",- title: "@Loc["Admin.Address.AddressAttributes.Values.Fields.IsPreSelected"]",- width: 100,- headerAttributes: { style: "text-align:center" },- attributes: { style: "text-align:center" },- template: '# if(IsPreSelected) {# <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> #} #'- }, {- field: "DisplayOrder",- title: "@Loc["Admin.Address.AddressAttributes.Values.Fields.DisplayOrder"]",- width: 100- }, {- command: {name: "destroy", text: "@Loc["Admin.Common.Delete"]"},- title: "@Loc["Admin.Common.Delete"]",- width: 100- }]- });- });- </script>- <script>- $(document).ready(function () {- $('#btnRefresh').click(function () {- //refresh grid- var grid = $("#addressattributevalues-grid").data('kendoGrid');- grid.dataSource.read();-- //return false to don't reload a page- return false;- });- });- </script>- }- else- {- <div class="note note-info">- @Loc["Admin.Address.AddressAttributes.Values.SaveBeforeEdit"]- </div>- }-}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/CreateOrUpdate.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/CreateOrUpdate.cshtmldeleted file mode 100644index b0aee742f..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/CreateOrUpdate.cshtml+++ /dev/null@@ -1,24 +0,0 @@-@model AddressAttributeModel--<div asp-validation-summary="All"></div>-<input asp-for="Id" type="hidden"/>-<input id="active-menu-item" type="hidden" value="/@Constants.AreaAdmin/AddressAttribute"/>-<admin-tabstrip name="addressattribute-edit">- <items>- <tabstrip-item text="@Loc["Admin.Address.AddressAttributes.Info"]" tab-index="0">- <content>- <div>- <partial name="Partials/CreateOrUpdate.TabInfo" model="Model"/>- </div>- </content>- </tabstrip-item>- <tabstrip-item text="@Loc["Admin.Address.AddressAttributes.Values"]" tab-index="1" id="tab-addressattributesvalues">- <content>- <div>- <partial name="Partials/CreateOrUpdate.TabValues" model="Model"/>- </div>- </content>- </tabstrip-item>- <vc:admin-widget widget-zone="address_attribute_details_tabs" additional-data="Model"/>- </items>-</admin-tabstrip>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/CreateOrUpdateValue.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/CreateOrUpdateValue.cshtmldeleted file mode 100644index 92de3501c..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/CreateOrUpdateValue.cshtml+++ /dev/null@@ -1,61 +0,0 @@-@using Microsoft.AspNetCore.Mvc.Razor-@model AddressAttributeValueModel-<div asp-validation-summary="All"></div>-<input asp-for="Id" type="hidden"/>-<input asp-for="AddressAttributeId" type="hidden"/>--<vc:admin-widget widget-zone="address_attribute_value_details_top" additional-data="Model"/>-@{- Func<int, HelperResult>- template = @<div class="form-body">- <div class="form-group">- <admin-label asp-for="@Model.Locales[item].Name"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="@Model.Locales[item].Name"/>- <span asp-validation-for="@Model.Locales[item].Name"></span>- </div>- </div>- <input type="hidden" asp-for="@Model.Locales[item].LanguageId"/>- </div>;-}--<div class="form-horizontal">- <localized-editor localized-template="@template" name="addressattributevalue-localized" language-ids="@Model.Locales.Select(c => c.LanguageId).ToList()">- <div class="form-body">- <div class="form-group">- <admin-label asp-for="Name"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="Name"/>- <span asp-validation-for="Name"></span>- </div>- </div>- </div>- </localized-editor>- <div class="form-body">- <div class="form-group">- <admin-label asp-for="IsPreSelected"/>- <div class="col-md-9 col-sm-9">- <label class="mt-checkbox mt-checkbox-outline control control-checkbox">- <admin-input asp-for="IsPreSelected"/>- <div class="control__indicator"></div>- </label>- <span asp-validation-for="IsPreSelected"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="DisplayOrder"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="DisplayOrder"/>- <span asp-validation-for="DisplayOrder"></span>- </div>- </div>- <div class="form-group">- <div class="offset-sm-3 offset-md-3 col-md-9 col-sm-9">- <button class="btn btn-success" type="submit" name="save">- <i class="fa fa-check"></i> @Loc["Admin.Common.Save"]- </button>- </div>- </div>- </div>-</div>-<vc:admin-widget widget-zone="address_attribute_value_details_bottom" additional-data="Model"/>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/WidgetZone.DetailsButtons.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/WidgetZone.DetailsButtons.cshtmlnew file mode 100644index 000000000..3656acebf--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/WidgetZone.DetailsButtons.cshtml@@ -0,0 +1,2 @@+@model AddressAttributeModel+<vc:admin-widget widget-zone="address_attribute_details_buttons" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/WidgetZone.Info.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/WidgetZone.Info.Bottom.cshtmlnew file mode 100644index 000000000..8a91b5909--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/WidgetZone.Info.Bottom.cshtml@@ -0,0 +1,2 @@+@model AddressAttributeModel+<vc:admin-widget widget-zone="address_attribute_details_info_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/WidgetZone.Info.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/WidgetZone.Info.Top.cshtmlnew file mode 100644index 000000000..86a5a88fe--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/WidgetZone.Info.Top.cshtml@@ -0,0 +1,2 @@+@model AddressAttributeModel+<vc:admin-widget widget-zone="address_attribute_details_info_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/WidgetZone.ListButtons.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/WidgetZone.ListButtons.cshtmlnew file mode 100644index 000000000..2e5e1abe8--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/WidgetZone.ListButtons.cshtml@@ -0,0 +1 @@+<vc:admin-widget widget-zone="address_attribute_list_buttons" additional-data="null"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/WidgetZone.Tabs.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/WidgetZone.Tabs.cshtmlnew file mode 100644index 000000000..fcfcea554--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/WidgetZone.Tabs.cshtml@@ -0,0 +1,2 @@+@model AddressAttributeModel+<vc:admin-widget widget-zone="address_attribute_details_tabs" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/WidgetZone.Value.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/WidgetZone.Value.Bottom.cshtmlnew file mode 100644index 000000000..b7db718d8--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/WidgetZone.Value.Bottom.cshtml@@ -0,0 +1,2 @@+@model AddressAttributeValueModel+<vc:admin-widget widget-zone="address_attribute_value_details_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/WidgetZone.Value.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/WidgetZone.Value.Top.cshtmlnew file mode 100644index 000000000..f34a720e9--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/WidgetZone.Value.Top.cshtml@@ -0,0 +1,2 @@+@model AddressAttributeValueModel+<vc:admin-widget widget-zone="address_attribute_value_details_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/WidgetZone.ValueButtons.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/WidgetZone.ValueButtons.cshtmlnew file mode 100644index 000000000..dd964410d--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/WidgetZone.ValueButtons.cshtml@@ -0,0 +1,2 @@+@model AddressAttributeValueModel+<vc:admin-widget widget-zone="address_attribute_value_details_buttons" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/WidgetZone.Values.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/WidgetZone.Values.Bottom.cshtmlnew file mode 100644index 000000000..72bc80128--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/WidgetZone.Values.Bottom.cshtml@@ -0,0 +1,2 @@+@model AddressAttributeModel+<vc:admin-widget widget-zone="address_attribute_details_values_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/WidgetZone.Values.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/WidgetZone.Values.Top.cshtmlnew file mode 100644index 000000000..e4bc7db8f--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Partials/WidgetZone.Values.Top.cshtml@@ -0,0 +1,2 @@+@model AddressAttributeModel+<vc:admin-widget widget-zone="address_attribute_details_values_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/ValueEditPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/ValueEditPopup.cshtmldeleted file mode 100644index 6d4888e63..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/ValueEditPopup.cshtml+++ /dev/null@@ -1,55 +0,0 @@-@model AddressAttributeValueModel-@{- Layout = "";- ViewBag.Title = Loc["Admin.Address.AddressAttributes.Values.EditValueDetails"];-}--<form id="ValueEditPopup" asp-area="@Constants.AreaAdmin" asp-controller="AddressAttribute" asp-action="ValueEditPopup">- <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-list-alt"></i>- @Loc["Admin.Address.AddressAttributes.Values.EditValueDetails"]- </div>- </div>- <vc:admin-widget widget-zone="address_attribute_value_details_buttons" additional-data="Model"/>- <div class="x_content form">- <partial name="Partials/CreateOrUpdateValue" model="Model"/>- </div>- </div>- </div>- </div>- <script>- var mfp = $.magnificPopup.instance;- $("#ValueEditPopup").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();- $('#btnRefresh').click();- } else {- $.magnificPopup.open({- items: {- src: data,- type: 'inline'- },- callbacks: {- open: function () {- $('.mfp-wrap').removeAttr('tabindex');- }- }- });- }- }- });- });- </script>-</form>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Create.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Create.cshtmldeleted file mode 100644index 4689176d6..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Create.cshtml+++ /dev/null@@ -1,37 +0,0 @@-@model CheckoutAttributeModel-@{- //page title- ViewBag.Title = Loc["Admin.Orders.CheckoutAttributes.AddNew"];-}-<form asp-area="@Constants.AreaAdmin" asp-controller="CheckoutAttribute" asp-action="Create" method="post" id="checkoutattribute-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-list-alt"></i>- @Loc["Admin.Orders.CheckoutAttributes.AddNew"]- <small>- <i class="fa fa-arrow-circle-left"></i>@Html.ActionLink(Loc["Admin.Orders.CheckoutAttributes.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="checkout_attribute_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/CheckoutAttribute/Edit.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Edit.cshtmldeleted file mode 100644index cce5aa028..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Edit.cshtml+++ /dev/null@@ -1,42 +0,0 @@-@model CheckoutAttributeModel--@{- //page title- ViewBag.Title = Loc["Admin.Orders.CheckoutAttributes.EditAttributeDetails"];-}-<form asp-area="@Constants.AreaAdmin" asp-controller="CheckoutAttribute" asp-action="Edit" method="post" id="checkoutattribute-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-list-alt"></i>- @Loc["Admin.Orders.CheckoutAttributes.EditAttributeDetails"] - @Model.Name- <small>- <i class="fa fa-arrow-circle-left"></i>@Html.ActionLink(Loc["Admin.Orders.CheckoutAttributes.BackToList"], "List")- </small>- </div>- <div class="actions">- <div class="btn-group btn-group-devided util-btn-margin-bottom-5">- <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="checkoutattribute-delete" class="btn red">- <i class="fa fa-trash-o"></i> @Loc["Admin.Common.Delete"]- </span>- <vc:admin-widget widget-zone="checkout_attribute_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="checkoutattribute-delete"/>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/List.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/List.cshtmldeleted file mode 100644index 80ff20c92..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/List.cshtml+++ /dev/null@@ -1,98 +0,0 @@-@{- //page title- ViewBag.Title = Loc["Admin.Orders.CheckoutAttributes"];-}--<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-list-alt"></i>- @Loc["Admin.Orders.CheckoutAttributes"]- </div>- <div class="actions btn-group btn-group-devided">- <a href="@Url.Action("Create", new { area = Constants.AreaAdmin })" 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="checkout_attribute_list_buttons" additional-data="null"/>- </div>-- </div>- <div class="x_content form">- <div class="form-horizontal">- <div class="form-body">- <div class="x_content">- <div id="checkoutattributes-grid"></div>- </div>- </div>- </div>- </div>- </div>- </div>-</div>--<script>- $(document).ready(function () {- $("#checkoutattributes-grid").kendoGrid({- dataSource: {- transport: {- read: {- url: "@Html.Raw(Url.Action("List", "CheckoutAttribute", new { area = Constants.AreaAdmin }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- }- },- schema: {- data: "Data",- total: "Total",- errors: "Errors"- },- error: function(e) {- display_kendoui_grid_error(e);- // Cancel the changes- 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: "Name",- title: "@Loc["Admin.Orders.CheckoutAttributes.Fields.Name"]",- template: '<a class="k-link" href="@Url.Action("Edit", "CheckoutAttribute", new { area = Constants.AreaAdmin })/#=Id#">#=kendo.htmlEncode(Name)#</a>',- }, {- field: "AttributeControlTypeName",- title: "@Loc["Admin.Orders.CheckoutAttributes.Fields.AttributeControlType"]",- headerAttributes: { style: "text-align:center" },- attributes: { style: "text-align:center" },- width: 200,- minScreenWidth: 750,- },{- field: "IsRequired",- title: "@Loc["Admin.Orders.CheckoutAttributes.Fields.IsRequired"]",- width: 100,- headerAttributes: { style: "text-align:center" },- attributes: { style: "text-align:center" },- template: '# if(IsRequired) {# <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> #} #'- }, {- field: "DisplayOrder",- title: "@Loc["Admin.Orders.CheckoutAttributes.Fields.DisplayOrder"]",- width: 100,- minScreenWidth: 750,- }]- });- });-</script>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/CreateOrUpdate.TabCondition.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/CreateOrUpdate.TabCondition.cshtmldeleted file mode 100644index 3031f4945..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/CreateOrUpdate.TabCondition.cshtml+++ /dev/null@@ -1,126 +0,0 @@-@model CheckoutAttributeModel-<vc:admin-widget widget-zone="checkout_attribute_details_condition_top" additional-data="Model"/>-@{- if (!string.IsNullOrEmpty(Model.Id))- {- <script>- $(document).ready(function () {- $("#@Html.IdFor(model => model.ConditionModel.EnableCondition)").click(toggleEnableCondition);- toggleEnableCondition();- });-- function toggleEnableCondition() {- if ($('#@Html.IdFor(model => model.ConditionModel.EnableCondition)').is(':checked')) {- $('#pnlAttributes').show();- } else {- $('#pnlAttributes').hide();- }- }- </script>-- <div class="form-horizontal">- <div class="form-body">- <div class="form-group">- <admin-label asp-for="ConditionModel.EnableCondition"/>- <div class="col-md-9 col-sm-9">- <label class="mt-checkbox mt-checkbox-outline control control-checkbox">- <admin-input asp-for="ConditionModel.EnableCondition"/>- <div class="control__indicator"></div>- </label>- <span asp-validation-for="ConditionModel.EnableCondition"></span>- </div>- </div>- </div>- </div>- <div id="pnlAttributes">- @if (Model.ConditionModel.ConditionAttributes.Count > 0)- {- <div class="form-horizontal">- <div class="form-body">- <div class="form-group">- <admin-label asp-for="ConditionModel.SelectedAttributeId"/>- <div class="col-md-9 col-sm-9">- <admin-select asp-for="ConditionModel.SelectedAttributeId" asp-items="Model.ConditionModel.ConditionAttributes.Select(x => new SelectListItem { Text = x.Name, Value = x.Id.ToString() })"/>- <script>- $(document).ready(function() {- $("#@Html.IdFor(model => model.ConditionModel.SelectedAttributeId)").change(toggleConditionAttributes);- toggleConditionAttributes();- });- function toggleConditionAttributes() {- var selectedCheckoutAttributeId = $("#@Html.IdFor(model => model.ConditionModel.SelectedAttributeId)").val();- $('[id^="pnl_attribute_values_"]').hide();- $('#pnl_attribute_values_' + selectedCheckoutAttributeId).show();- }- </script>- </div>- </div>- <div class="form-group">- <label class="control-label col-md-3"></label>- <div class="col-md-9 col-sm-9">- @for (var i = 0; i < Model.ConditionModel.ConditionAttributes.Count; i++)- {- <input type="hidden" asp-for="@Model.ConditionModel.ConditionAttributes[i].Id"/>- <div id="@($"pnl_attribute_values_{Model.ConditionModel.ConditionAttributes[i].Id}")">- @switch (Model.ConditionModel.ConditionAttributes[i].AttributeControlType)- {- case AttributeControlType.DropdownList:- <admin-select asp-for="@Model.ConditionModel.ConditionAttributes[i].SelectedValueId" asp-items="Model.ConditionModel.ConditionAttributes[i].Values"/>- break;- case AttributeControlType.RadioList:- case AttributeControlType.ColorSquares:- case AttributeControlType.ImageSquares:- foreach (var value in Model.ConditionModel.ConditionAttributes[i].Values)- {- <div>- <input type="radio" asp-for="@Model.ConditionModel.ConditionAttributes[i].SelectedValueId" value="@value.Value" checked="@value.Selected"/>- <label class="control-label">@value.Text</label>- </div>- }-- break;- case AttributeControlType.Checkboxes:- for (var j = 0; j < Model.ConditionModel.ConditionAttributes[i].Values.Count; j++)- {- <div>- <label class="mt-checkbox mt-checkbox-outline control control-checkbox">- <input type="hidden" asp-for="@Model.ConditionModel.ConditionAttributes[i].Values[j].Value"/>- <admin-input asp-for="@Model.ConditionModel.ConditionAttributes[i].Values[j].Selected"/>- @Model.ConditionModel.ConditionAttributes[i].Values[j].Text- <div class="control__indicator"></div>- </label>- </div>- }-- break;- case AttributeControlType.ReadonlyCheckboxes:- case AttributeControlType.TextBox:- case AttributeControlType.MultilineTextbox:- case AttributeControlType.Datepicker:- case AttributeControlType.FileUpload:- default:- //not supported as conditions- break;- }- </div>- }- </div>- </div>- </div>- </div>- }- else- {- <div class="note note-info">- @Loc["Admin.Orders.CheckoutAttributes.Condition.NoAttributeExists"]- </div>- }- </div>- }- else- {- <div class="note note-info">- @Loc["Admin.Orders.CheckoutAttributes.Condition.SaveBeforeEdit"]- </div>- }-}-<vc:admin-widget widget-zone="checkout_attribute_details_condition_bottom" additional-data="Model"/>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/CreateOrUpdate.TabValues.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/CreateOrUpdate.TabValues.cshtmldeleted file mode 100644index 472c7c540..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/CreateOrUpdate.TabValues.cshtml+++ /dev/null@@ -1,146 +0,0 @@-@model CheckoutAttributeModel-<vc:admin-widget widget-zone="checkout_attribute_details_values_top" additional-data="Model"/>-@{- if (!string.IsNullOrEmpty(Model.Id))- {- <div class="panel panel-default">- <div class="panel-body">- <div id="checkoutattributevalues-grid"></div>- </div>- <div class="panel-footer">- <a id="btnAddNewValue" href="@(Url.Action("ValueCreatePopup", "CheckoutAttribute", new { checkoutAttributeId = Model.Id, area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Orders.CheckoutAttributes.Values.AddNew"]</a>- <input type="submit" id="btnRefresh" style="display: none"/>- </div>- </div>-- <script>- $(document).ready(function () {- $('#btnAddNewValue').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');- }- }- });- $("#checkoutattributevalues-grid").kendoGrid({- dataBound: function () {- $('.editvalue').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');- }- }- });- },- dataSource: {- transport: {- read: {- url: "@Html.Raw(Url.Action("ValueList", "CheckoutAttribute", new { checkoutAttributeId = Model.Id, area = Constants.AreaAdmin }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- },- destroy: {- url: "@Html.Raw(Url.Action("ValueDelete", "CheckoutAttribute", new { area = Constants.AreaAdmin }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- }- },- schema: {- data: "Data",- total: "Total",- errors: "Errors",- model: {- id: "Id"- }- },- error: function(e) {- display_kendoui_grid_error(e);- // Cancel the changes- this.cancelChanges();- },- serverPaging: true,- serverFiltering: true,- serverSorting: true- },- pageable: {- refresh: true,- numeric: false,- previousNext: false,- info: false- },- editable: {- confirmation: true,- mode: "inline"- },- scrollable: false,- columns: [{- field: "Name",- title: "@Loc["Admin.Orders.CheckoutAttributes.Values.Fields.Name"]",- template: "<a class='k-link editvalue' href=\"@Url.Action("ValueEditPopup", "CheckoutAttribute", new { area = Constants.AreaAdmin })/#=Id#[email protected]\">#=kendo.htmlEncode(Name)#</a>"- }, {- field: "PriceAdjustment",- title: "@Loc["Admin.Orders.CheckoutAttributes.Values.Fields.PriceAdjustment"]",- width: 150,- minScreenWidth: 750,- }, {- field: "WeightAdjustment",- title: "@Loc["Admin.Orders.CheckoutAttributes.Values.Fields.WeightAdjustment"]",- width: 150,- minScreenWidth: 750,- }, {- field: "IsPreSelected",- title: "@Loc["Admin.Orders.CheckoutAttributes.Values.Fields.IsPreSelected"]",- width: 100,- minScreenWidth: 500,- headerAttributes: { style: "text-align:center" },- attributes: { style: "text-align:center" },- template: '# if(IsPreSelected) {# <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> #} #'- }, {- field: "DisplayOrder",- title: "@Loc["Admin.Orders.CheckoutAttributes.Values.Fields.DisplayOrder"]",- headerAttributes: { style: "text-align:center" },- attributes: { style: "text-align:center" },- width: 100- }, {- command: {name: "destroy", text: "@Loc["Admin.Common.Delete"]"},- title: "@Loc["Admin.Common.Delete"]",- width: 100- }]- });- });- </script>- <script>- $(document).ready(function () {- $('#btnRefresh').click(function () {- //refresh grid- var grid = $("#checkoutattributevalues-grid").data('kendoGrid');- grid.dataSource.read();-- //return false to don't reload a page- return false;- });- });- </script>- }- else- {- <div class="note note-info">- @Loc["Admin.Orders.CheckoutAttributes.Values.SaveBeforeEdit"]- </div>- }-}-<vc:admin-widget widget-zone="checkout_attribute_details_values_bottom" additional-data="Model"/>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/CreateOrUpdateValue.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/CreateOrUpdateValue.cshtmldeleted file mode 100644index e05bbca6f..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/CreateOrUpdateValue.cshtml+++ /dev/null@@ -1,95 +0,0 @@-@using Microsoft.AspNetCore.Mvc.Razor-@model CheckoutAttributeValueModel--<div asp-validation-summary="All"></div>-<input asp-for="Id" type="hidden"/>-<input asp-for="CheckoutAttributeId" type="hidden"/>-<input asp-for="DisplayColorSquaresRgb" type="hidden"/>--<vc:admin-widget widget-zone="checkout_attribute_top" additional-data="Model"/>--@{- Func<int, HelperResult>- template = @<div class="form-body">- <div class="form-group">- <admin-label asp-for="@Model.Locales[item].Name" class="col-sm-3 control-label"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="@Model.Locales[item].Name"/>- <span asp-validation-for="@Model.Locales[item].Name"></span>- </div>- </div>- <input type="hidden" asp-for="@Model.Locales[item].LanguageId"/>- </div>;-}--<div class="form-horizontal">- <localized-editor localized-template="@template" name="checkoutattributevalue-localized" language-ids="@Model.Locales.Select(c => c.LanguageId).ToList()">- <div class="form-body">- <div class="form-group">- <admin-label asp-for="Name" class="col-sm-3 control-label"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="Name"/>- <span asp-validation-for="Name"></span>- </div>- </div>- </div>- </localized-editor>- <div class="form-body">- @if (Model.DisplayColorSquaresRgb)- {- <div class="form-group">- <admin-label asp-for="ColorSquaresRgb" class="col-sm-3 control-label"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="ColorSquaresRgb"/>- <div id="color-picker"></div>- <script type="text/javascript">- $(document).ready(function(){- $('#color-picker').farbtastic('#@Html.IdFor(model => model.ColorSquaresRgb)');- });- </script>- <span asp-validation-for="ColorSquaresRgb"></span>- </div>- </div>- }- <div class="form-group">- <admin-label asp-for="PriceAdjustment" class="col-sm-3 control-label"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="PriceAdjustment"/> [@Model.PrimaryStoreCurrencyCode]- <span asp-validation-for="PriceAdjustment"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="WeightAdjustment" class="col-sm-3 control-label"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="WeightAdjustment"/> [@Model.BaseWeightIn]- <span asp-validation-for="WeightAdjustment"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="IsPreSelected" class="col-sm-3 control-label"/>- <div class="col-md-9 col-sm-9">- <label class="mt-checkbox mt-checkbox-outline control control-checkbox">- <admin-input asp-for="IsPreSelected"/>- <div class="control__indicator"></div>- </label>- <span asp-validation-for="IsPreSelected"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="DisplayOrder" class="col-sm-3 control-label"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="DisplayOrder"/>- <span asp-validation-for="DisplayOrder"></span>- </div>- </div>- <div class="form-group">- <div class="offset-sm-3 offset-md-3 col-md-9 col-sm-9">- <button class="btn btn-success" type="submit" name="save">- <i class="fa fa-check"></i> @Loc["Admin.Common.Save"]- </button>- <vc:admin-widget widget-zone="checkout_attribute_value_details_buttons" additional-data="Model"/>- </div>- </div>- </div>-</div>-<vc:admin-widget widget-zone="checkout_attribute_bottom" additional-data="Model"/>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/WidgetZone.Condition.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/WidgetZone.Condition.Bottom.cshtmlnew file mode 100644index 000000000..cec03e0e2--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/WidgetZone.Condition.Bottom.cshtml@@ -0,0 +1,2 @@+@model CheckoutAttributeModel+<vc:admin-widget widget-zone="checkout_attribute_details_condition_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/WidgetZone.Condition.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/WidgetZone.Condition.Top.cshtmlnew file mode 100644index 000000000..a9047b019--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/WidgetZone.Condition.Top.cshtml@@ -0,0 +1,2 @@+@model CheckoutAttributeModel+<vc:admin-widget widget-zone="checkout_attribute_details_condition_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/WidgetZone.DetailsButtons.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/WidgetZone.DetailsButtons.cshtmlnew file mode 100644index 000000000..d98790436--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/WidgetZone.DetailsButtons.cshtml@@ -0,0 +1,2 @@+@model CheckoutAttributeModel+<vc:admin-widget widget-zone="checkout_attribute_details_buttons" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/WidgetZone.Info.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/WidgetZone.Info.Bottom.cshtmlnew file mode 100644index 000000000..3a6400924--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/WidgetZone.Info.Bottom.cshtml@@ -0,0 +1,2 @@+@model CheckoutAttributeModel+<vc:admin-widget widget-zone="checkout_attribute_details_info_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/WidgetZone.Info.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/WidgetZone.Info.Top.cshtmlnew file mode 100644index 000000000..64e065628--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/WidgetZone.Info.Top.cshtml@@ -0,0 +1,2 @@+@model CheckoutAttributeModel+<vc:admin-widget widget-zone="checkout_attribute_details_info_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/WidgetZone.ListButtons.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/WidgetZone.ListButtons.cshtmlnew file mode 100644index 000000000..6989f210a--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/WidgetZone.ListButtons.cshtml@@ -0,0 +1 @@+<vc:admin-widget widget-zone="checkout_attribute_list_buttons" additional-data="null"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/WidgetZone.Tabs.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/WidgetZone.Tabs.cshtmlnew file mode 100644index 000000000..03d6efb42--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/WidgetZone.Tabs.cshtml@@ -0,0 +1,2 @@+@model CheckoutAttributeModel+<vc:admin-widget widget-zone="checkout_attribute_details_tabs" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/WidgetZone.Value.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/WidgetZone.Value.Bottom.cshtmlnew file mode 100644index 000000000..ab05a64ae--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/WidgetZone.Value.Bottom.cshtml@@ -0,0 +1,2 @@+@model CheckoutAttributeValueModel+<vc:admin-widget widget-zone="checkout_attribute_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/WidgetZone.Value.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/WidgetZone.Value.Top.cshtmlnew file mode 100644index 000000000..6844b83e9--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/WidgetZone.Value.Top.cshtml@@ -0,0 +1,2 @@+@model CheckoutAttributeValueModel+<vc:admin-widget widget-zone="checkout_attribute_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/WidgetZone.ValueButtons.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/WidgetZone.ValueButtons.cshtmlnew file mode 100644index 000000000..b40e0509c--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/WidgetZone.ValueButtons.cshtml@@ -0,0 +1,2 @@+@model CheckoutAttributeValueModel+<vc:admin-widget widget-zone="checkout_attribute_value_details_buttons" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/WidgetZone.Values.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/WidgetZone.Values.Bottom.cshtmlnew file mode 100644index 000000000..70420bc88--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/WidgetZone.Values.Bottom.cshtml@@ -0,0 +1,2 @@+@model CheckoutAttributeModel+<vc:admin-widget widget-zone="checkout_attribute_details_values_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/WidgetZone.Values.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/WidgetZone.Values.Top.cshtmlnew file mode 100644index 000000000..f903e7802--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/WidgetZone.Values.Top.cshtml@@ -0,0 +1,2 @@+@model CheckoutAttributeModel+<vc:admin-widget widget-zone="checkout_attribute_details_values_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Edit.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Edit.cshtmldeleted file mode 100644index 0962c4911..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Edit.cshtml+++ /dev/null@@ -1,42 +0,0 @@-@model ContactAttributeModel--@{- //page title- ViewBag.Title = Loc["Admin.Catalog.Attributes.ContactAttributes.EditAttributeDetails"];-}-<form asp-area="@Constants.AreaAdmin" asp-controller="ContactAttribute" asp-action="Edit" method="post" id="contactattribute-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-list-alt"></i>- @Loc["Admin.Catalog.Attributes.ContactAttributes.EditAttributeDetails"] - @Model.Name- <small>- <i class="fa fa-arrow-circle-left"></i>@Html.ActionLink(Loc["Admin.Catalog.Attributes.ContactAttributes.BackToList"], "List")- </small>- </div>- <div class="actions">- <div class="btn-group btn-group-devided util-btn-margin-bottom-5">- <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="contactattribute-delete" class="btn red">- <i class="fa fa-trash-o"></i> @Loc["Admin.Common.Delete"]- </span>- <vc:admin-widget widget-zone="contact_attribute_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="contactattribute-delete"/>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/List.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/List.cshtmldeleted file mode 100644index 5454f175e..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/List.cshtml+++ /dev/null@@ -1,98 +0,0 @@-@{- //page title- ViewBag.Title = Loc["Admin.Catalog.Attributes.ContactAttributes"];-}--<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-list-alt"></i>- @Loc["Admin.Catalog.Attributes.ContactAttributes"]- </div>- <div class="actions btn-group btn-group-devided">- <a href="@Url.Action("Create", new { area = Constants.AreaAdmin })" 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="contact_attribute_list_buttons" additional-data="null"/>- </div>-- </div>- <div class="x_content form">- <div class="form-horizontal">- <div class="form-body">- <div class="x_content">- <div id="contactattributes-grid"></div>- </div>- </div>- </div>- </div>- </div>- </div>-</div>--<script>- $(document).ready(function () {- $("#contactattributes-grid").kendoGrid({- dataSource: {- transport: {- read: {- url: "@Html.Raw(Url.Action("List", "ContactAttribute", new { area = Constants.AreaAdmin }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- }- },- schema: {- data: "Data",- total: "Total",- errors: "Errors"- },- error: function(e) {- display_kendoui_grid_error(e);- // Cancel the changes- 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: "Name",- title: "@Loc["Admin.Catalog.Attributes.ContactAttributes.Fields.Name"]",- template: '<a class="k-link" href="@Url.Action("Edit", "ContactAttribute", new { area = Constants.AreaAdmin })/#=Id#">#=kendo.htmlEncode(Name)#</a>',- }, {- field: "AttributeControlTypeName",- title: "@Loc["Admin.Catalog.Attributes.ContactAttributes.Fields.AttributeControlType"]",- headerAttributes: { style: "text-align:center" },- attributes: { style: "text-align:center" },- width: 200,- minScreenWidth: 750,- },{- field: "IsRequired",- title: "@Loc["Admin.Catalog.Attributes.ContactAttributes.Fields.IsRequired"]",- width: 100,- headerAttributes: { style: "text-align:center" },- attributes: { style: "text-align:center" },- template: '# if(IsRequired) {# <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> #} #'- }, {- field: "DisplayOrder",- title: "@Loc["Admin.Catalog.Attributes.ContactAttributes.Fields.DisplayOrder"]",- width: 100,- minScreenWidth: 750,- }]- });- });-</script>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/CreateOrUpdate.TabCondition.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/CreateOrUpdate.TabCondition.cshtmldeleted file mode 100644index 9782f0b6e..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/CreateOrUpdate.TabCondition.cshtml+++ /dev/null@@ -1,126 +0,0 @@-@model ContactAttributeModel-<vc:admin-widget widget-zone="contact_attribute_details_condition_top" additional-data="Model"/>-@{- if (!string.IsNullOrEmpty(Model.Id))- {- <script>- $(document).ready(function () {- $("#@Html.IdFor(model => model.ConditionModel.EnableCondition)").click(toggleEnableCondition);- toggleEnableCondition();- });-- function toggleEnableCondition() {- if ($('#@Html.IdFor(model => model.ConditionModel.EnableCondition)').is(':checked')) {- $('#pnlAttributes').show();- } else {- $('#pnlAttributes').hide();- }- }- </script>-- <div class="form-horizontal">- <div class="form-body">- <div class="form-group">- <admin-label asp-for="ConditionModel.EnableCondition"/>- <div class="col-md-9 col-sm-9">- <label class="mt-checkbox mt-checkbox-outline control control-checkbox">- <admin-input asp-for="ConditionModel.EnableCondition"/>- <div class="control__indicator"></div>- </label>- <span asp-validation-for="ConditionModel.EnableCondition"></span>- </div>- </div>- </div>- </div>- <div id="pnlAttributes">- @if (Model.ConditionModel.ConditionAttributes.Count > 0)- {- <div class="form-horizontal">- <div class="form-body">- <div class="form-group">- <admin-label asp-for="ConditionModel.SelectedAttributeId"/>- <div class="col-md-9 col-sm-9">- <admin-select asp-for="ConditionModel.SelectedAttributeId" asp-items="Model.ConditionModel.ConditionAttributes.Select(x => new SelectListItem { Text = x.Name, Value = x.Id.ToString() })"/>- <script>- $(document).ready(function() {- $("#@Html.IdFor(model => model.ConditionModel.SelectedAttributeId)").change(toggleConditionAttributes);- toggleConditionAttributes();- });- function toggleConditionAttributes() {- var selectedContactAttributeId = $("#@Html.IdFor(model => model.ConditionModel.SelectedAttributeId)").val();- $('[id^="pnl_attribute_values_"]').hide();- $('#pnl_attribute_values_' + selectedContactAttributeId).show();- }- </script>- </div>- </div>- <div class="form-group">- <label class="control-label col-md-3"></label>- <div class="col-md-9 col-sm-9">- @for (var i = 0; i < Model.ConditionModel.ConditionAttributes.Count; i++)- {- <input type="hidden" asp-for="@Model.ConditionModel.ConditionAttributes[i].Id"/>- <div id="@($"pnl_attribute_values_{Model.ConditionModel.ConditionAttributes[i].Id}")">- @switch (Model.ConditionModel.ConditionAttributes[i].AttributeControlType)- {- case AttributeControlType.DropdownList:- <admin-select asp-for="@Model.ConditionModel.ConditionAttributes[i].SelectedValueId" asp-items="Model.ConditionModel.ConditionAttributes[i].Values"/>- break;- case AttributeControlType.RadioList:- case AttributeControlType.ColorSquares:- case AttributeControlType.ImageSquares:- foreach (var value in Model.ConditionModel.ConditionAttributes[i].Values)- {- <div>- <input type="radio" asp-for="@Model.ConditionModel.ConditionAttributes[i].SelectedValueId" value="@value.Value" checked="@value.Selected"/>- <label class="control-label">@value.Text</label>- </div>- }-- break;- case AttributeControlType.Checkboxes:- for (var j = 0; j < Model.ConditionModel.ConditionAttributes[i].Values.Count; j++)- {- <div>- <label class="mt-checkbox mt-checkbox-outline control control-checkbox">- <input type="hidden" asp-for="@Model.ConditionModel.ConditionAttributes[i].Values[j].Value"/>- <admin-input asp-for="@Model.ConditionModel.ConditionAttributes[i].Values[j].Selected"/>- @Model.ConditionModel.ConditionAttributes[i].Values[j].Text- <div class="control__indicator"></div>- </label>- </div>- }-- break;- case AttributeControlType.ReadonlyCheckboxes:- case AttributeControlType.TextBox:- case AttributeControlType.MultilineTextbox:- case AttributeControlType.Datepicker:- case AttributeControlType.FileUpload:- default:- //not supported as conditions- break;- }- </div>- }- </div>- </div>- </div>- </div>- }- else- {- <div class="note note-info">- @Loc["Admin.Catalog.Attributes.ContactAttributes.Condition.NoAttributeExists"]- </div>- }- </div>- }- else- {- <div class="note note-info">- @Loc["Admin.Catalog.Attributes.ContactAttributes.Condition.SaveBeforeEdit"]- </div>- }-}-<vc:admin-widget widget-zone="contact_attribute_details_condition_bottom" additional-data="Model"/>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/CreateOrUpdate.TabInfo.cshtmldeleted file mode 100644index fdccbd31b..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/CreateOrUpdate.TabInfo.cshtml+++ /dev/null@@ -1,175 +0,0 @@-@using Microsoft.AspNetCore.Mvc.Razor-@model ContactAttributeModel--<script>- $(document).ready(function () {- $("#@Html.IdFor(model => model.AttributeControlTypeId)").change(toggleAttributeControlType);- toggleAttributeControlType();- });-- function toggleAttributeControlType() {- var selectedAttributeControlTypeId = $("#@Html.IdFor(model => model.AttributeControlTypeId)").val();- if (selectedAttributeControlTypeId == @(((int)AttributeControlType.TextBox).ToString())) {- $('#pnlValidationMinLength').show();- $('#pnlValidationMaxLength').show();- $('#pnlValidationFileMaximumSize').hide();- $('#pnlValidationFileAllowedExtensions').hide();- $('#pnlDefaultValue').show();- $('#tab-contactAttributesValues').hide();- } else if (selectedAttributeControlTypeId == @(((int)AttributeControlType.MultilineTextbox).ToString())) {- $('#pnlValidationMinLength').show();- $('#pnlValidationMaxLength').show();- $('#pnlValidationFileMaximumSize').hide();- $('#pnlValidationFileAllowedExtensions').hide();- $('#pnlDefaultValue').show();- $('#tab-contactAttributesValues').hide();- } else if (selectedAttributeControlTypeId == @(((int)AttributeControlType.FileUpload).ToString())) {- $('#pnlValidationMinLength').hide();- $('#pnlValidationMaxLength').hide();- $('#pnlValidationFileMaximumSize').show();- $('#pnlValidationFileAllowedExtensions').show();- $('#pnlDefaultValue').hide();- $('#tab-contactAttributesValues').hide();- } else if (selectedAttributeControlTypeId == @(((int)AttributeControlType.Checkboxes).ToString()) ||- selectedAttributeControlTypeId == @(((int)AttributeControlType.ReadonlyCheckboxes).ToString()) ||- selectedAttributeControlTypeId == @(((int)AttributeControlType.RadioList).ToString()) ||- selectedAttributeControlTypeId == @(((int)AttributeControlType.ColorSquares).ToString()) ||- selectedAttributeControlTypeId == @(((int)AttributeControlType.DropdownList).ToString())){- $('#pnlValidationMinLength').hide();- $('#pnlValidationMaxLength').hide();- $('#pnlValidationFileMaximumSize').hide();- $('#pnlValidationFileAllowedExtensions').hide();- $('#pnlDefaultValue').hide();- $('#tab-contactAttributesValues').show();- }else {- $('#pnlValidationMinLength').hide();- $('#pnlValidationMaxLength').hide();- $('#pnlValidationFileMaximumSize').hide();- $('#pnlValidationFileAllowedExtensions').hide();- $('#pnlDefaultValue').hide();- $('#tab-contactAttributesValues').hide();- }- }-</script>-<vc:admin-widget widget-zone="contact_attribute_details_info_top" additional-data="Model"/>--@{- Func<int, HelperResult>- template = @<div class="form-body">- <div class="form-group">- <admin-label asp-for="@Model.Locales[item].Name"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="@Model.Locales[item].Name"/>- <span asp-validation-for="@Model.Locales[item].Name"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="@Model.Locales[item].TextPrompt"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="@Model.Locales[item].TextPrompt"/>- <span asp-validation-for="@Model.Locales[item].TextPrompt"></span>- </div>- </div>- <input type="hidden" asp-for="@Model.Locales[item].LanguageId"/>- </div>;-}--<div class="form-horizontal">- <localized-editor localized-template="@template" name="contactattribute-localized" language-ids="@Model.Locales.Select(c => c.LanguageId).ToList()">- <div class="form-body">- <div class="form-group">- <admin-label asp-for="Name"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="Name"/>- <span asp-validation-for="Name"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="TextPrompt"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="TextPrompt"/>- <span asp-validation-for="TextPrompt"></span>- </div>- </div>- </div>- </localized-editor>- <div class="form-body">- <div class="form-group">- <admin-label asp-for="IsRequired"/>- <div class="col-md-9 col-sm-9">- <label class="mt-checkbox mt-checkbox-outline control control-checkbox">- <admin-input asp-for="IsRequired"/>- <div class="control__indicator"></div>- </label>- <span asp-validation-for="IsRequired"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="AttributeControlTypeId"/>- <div class="col-md-9 col-sm-9">- @{- var attributeControlTypes = EnumTranslationService.ToSelectList(((AttributeControlType)Model.AttributeControlTypeId), valuesToExclude: [(int)AttributeControlType.ImageSquares, (int)AttributeControlType.Hidden]);- }- <admin-select asp-for="AttributeControlTypeId" asp-items="attributeControlTypes"/>- <span asp-validation-for="AttributeControlTypeId"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="CustomerGroups"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="CustomerGroups"/>- <span asp-validation-for="CustomerGroups"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="Stores"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="Stores"/>- <span asp-validation-for="Stores"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="DisplayOrder"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="DisplayOrder"/>- <span asp-validation-for="DisplayOrder"></span>- </div>- </div>- <div class="form-group" id="pnlValidationMinLength">- <admin-label asp-for="ValidationMinLength"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="ValidationMinLength"/>- <span asp-validation-for="ValidationMinLength"></span>- </div>- </div>- <div class="form-group" id="pnlValidationMaxLength">- <admin-label asp-for="ValidationMaxLength"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="ValidationMaxLength"/>- <span asp-validation-for="ValidationMaxLength"></span>- </div>- </div>- <div class="form-group" id="pnlValidationFileAllowedExtensions">- <admin-label asp-for="ValidationFileAllowedExtensions"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="ValidationFileAllowedExtensions"/>- <span asp-validation-for="ValidationFileAllowedExtensions"></span>- </div>- </div>- <div id="pnlValidationFileMaximumSize">- <admin-label asp-for="ValidationFileMaximumSize"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="ValidationFileMaximumSize"/>- <span asp-validation-for="ValidationFileMaximumSize"></span>- </div>- </div>- <div class="form-group" id="pnlDefaultValue">- <admin-label asp-for="DefaultValue"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="DefaultValue"/>- <span asp-validation-for="DefaultValue"></span>- </div>- </div>- </div>-</div>-<vc:admin-widget widget-zone="contact_attribute_details_info_bottom" additional-data="Model"/>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/CreateOrUpdate.TabValues.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/CreateOrUpdate.TabValues.cshtmldeleted file mode 100644index e3c40bde6..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/CreateOrUpdate.TabValues.cshtml+++ /dev/null@@ -1,136 +0,0 @@-@model ContactAttributeModel-<vc:admin-widget widget-zone="contact_attribute_details_values_top" additional-data="Model"/>-@{- if (!string.IsNullOrEmpty(Model.Id))- {- <div class="panel panel-default">- <div class="panel-body">- <div id="contactattributevalues-grid"></div>- </div>- <div class="panel-footer">- <a id="btnAddNewValue" href="@(Url.Action("ValueCreatePopup", "ContactAttribute", new { contactAttributeId = Model.Id, area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Catalog.Attributes.ContactAttributes.Values.AddNew"]</a>- <input type="submit" id="btnRefresh" style="display: none"/>- </div>- </div>-- <script>- $(document).ready(function () {- $('#btnAddNewValue').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');- }- }- });- $("#contactattributevalues-grid").kendoGrid({- dataBound: function () {- $('.editvalue').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');- }- }- });- },- dataSource: {- transport: {- read: {- url: "@Html.Raw(Url.Action("ValueList", "ContactAttribute", new { contactAttributeId = Model.Id, area = Constants.AreaAdmin }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- },- destroy: {- url: "@Html.Raw(Url.Action("ValueDelete", "ContactAttribute", new { area = Constants.AreaAdmin }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- }- },- schema: {- data: "Data",- total: "Total",- errors: "Errors",- model: {- id: "Id"- }- },- error: function(e) {- display_kendoui_grid_error(e);- // Cancel the changes- this.cancelChanges();- },- serverPaging: true,- serverFiltering: true,- serverSorting: true- },- pageable: {- refresh: true,- numeric: false,- previousNext: false,- info: false- },- editable: {- confirmation: true,- mode: "inline"- },- scrollable: false,- columns: [{- field: "Name",- title: "@Loc["Admin.Catalog.Attributes.ContactAttributes.Values.Fields.Name"]",- template: "<a class='k-link editvalue' href=\"@Url.Action("ValueEditPopup", "ContactAttribute", new { area = Constants.AreaAdmin })/#=Id#[email protected]\">#=kendo.htmlEncode(Name)#</a>"- }, {- field: "IsPreSelected",- title: "@Loc["Admin.Catalog.Attributes.ContactAttributes.Values.Fields.IsPreSelected"]",- width: 100,- minScreenWidth: 500,- headerAttributes: { style: "text-align:center" },- attributes: { style: "text-align:center" },- template: '# if(IsPreSelected) {# <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> #} #'- }, {- field: "DisplayOrder",- title: "@Loc["Admin.Catalog.Attributes.ContactAttributes.Values.Fields.DisplayOrder"]",- headerAttributes: { style: "text-align:center" },- attributes: { style: "text-align:center" },- width: 100- }, {- command: {name: "destroy", text: "@Loc["Admin.Common.Delete"]"},- title: "@Loc["Admin.Common.Delete"]",- width: 100- }]- });- });- </script>- <script>- $(document).ready(function () {- $('#btnRefresh').click(function () {- //refresh grid- var grid = $("#contactattributevalues-grid").data('kendoGrid');- grid.dataSource.read();-- //return false to don't reload a page- return false;- });- });- </script>- }- else- {- <div class="note note-info">- @Loc["Admin.Catalog.Attributes.ContactAttributes.Values.SaveBeforeEdit"]- </div>- }-}-<vc:admin-widget widget-zone="contact_attribute_details_values_bottom" additional-data="Model"/>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/CreateOrUpdate.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/CreateOrUpdate.cshtmldeleted file mode 100644index 4d2eebf35..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/CreateOrUpdate.cshtml+++ /dev/null@@ -1,34 +0,0 @@-@model ContactAttributeModel--<div asp-validation-summary="All"></div>-<input asp-for="Id" type="hidden"/>--<admin-tabstrip name="contactattribute-edit">- <items>- <tabstrip-item text="@Loc["Admin.Catalog.Attributes.ContactAttributes.Info"]" tab-index="0">- <content>- <div>- <partial name="Partials/CreateOrUpdate.TabInfo" model="Model"/>- </div>- </content>- </tabstrip-item>- <tabstrip-item text="@Loc["Admin.Catalog.Attributes.ContactAttributes.Values"]" tab-index="1" id="tab-contactAttributesValues">- <content>- <div>- <partial name="Partials/CreateOrUpdate.TabValues" model="Model"/>- </div>- </content>- </tabstrip-item>- @if (Model.ConditionAllowed)- {- <tabstrip-item text="@Loc["Admin.Catalog.Attributes.ContactAttributes.Condition"]" tab-index="2">- <content>- <div>- <partial name="Partials/CreateOrUpdate.TabCondition" model="Model"/>- </div>- </content>- </tabstrip-item>- }- <vc:admin-widget widget-zone="contact_attribute_details_tabs" additional-data="Model"/>- </items>-</admin-tabstrip>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/WidgetZone.Condition.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/WidgetZone.Condition.Bottom.cshtmlnew file mode 100644index 000000000..27fa5276b--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/WidgetZone.Condition.Bottom.cshtml@@ -0,0 +1,2 @@+@model ContactAttributeModel+<vc:admin-widget widget-zone="contact_attribute_details_condition_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/WidgetZone.Condition.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/WidgetZone.Condition.Top.cshtmlnew file mode 100644index 000000000..7c9bf2da9--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/WidgetZone.Condition.Top.cshtml@@ -0,0 +1,2 @@+@model ContactAttributeModel+<vc:admin-widget widget-zone="contact_attribute_details_condition_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/WidgetZone.DetailsButtons.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/WidgetZone.DetailsButtons.cshtmlnew file mode 100644index 000000000..75b91a6d7--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/WidgetZone.DetailsButtons.cshtml@@ -0,0 +1,2 @@+@model ContactAttributeModel+<vc:admin-widget widget-zone="contact_attribute_details_buttons" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/WidgetZone.Info.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/WidgetZone.Info.Bottom.cshtmlnew file mode 100644index 000000000..443bb0872--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/WidgetZone.Info.Bottom.cshtml@@ -0,0 +1,2 @@+@model ContactAttributeModel+<vc:admin-widget widget-zone="contact_attribute_details_info_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/WidgetZone.Info.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/WidgetZone.Info.Top.cshtmlnew file mode 100644index 000000000..b29317b08--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/WidgetZone.Info.Top.cshtml@@ -0,0 +1,2 @@+@model ContactAttributeModel+<vc:admin-widget widget-zone="contact_attribute_details_info_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/WidgetZone.ListButtons.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/WidgetZone.ListButtons.cshtmlnew file mode 100644index 000000000..05b6cdb5e--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/WidgetZone.ListButtons.cshtml@@ -0,0 +1 @@+<vc:admin-widget widget-zone="contact_attribute_list_buttons" additional-data="null"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/WidgetZone.Tabs.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/WidgetZone.Tabs.cshtmlnew file mode 100644index 000000000..2553dc8cb--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/WidgetZone.Tabs.cshtml@@ -0,0 +1,2 @@+@model ContactAttributeModel+<vc:admin-widget widget-zone="contact_attribute_details_tabs" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/WidgetZone.Value.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/WidgetZone.Value.Bottom.cshtmlnew file mode 100644index 000000000..3812f1932--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/WidgetZone.Value.Bottom.cshtml@@ -0,0 +1,2 @@+@model ContactAttributeValueModel+<vc:admin-widget widget-zone="contact_attribute_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/WidgetZone.Value.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/WidgetZone.Value.Top.cshtmlnew file mode 100644index 000000000..78732e942--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/WidgetZone.Value.Top.cshtml@@ -0,0 +1,2 @@+@model ContactAttributeValueModel+<vc:admin-widget widget-zone="contact_attribute_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/WidgetZone.ValueButtons.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/WidgetZone.ValueButtons.cshtmlnew file mode 100644index 000000000..4e657a01c--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/WidgetZone.ValueButtons.cshtml@@ -0,0 +1 @@+<vc:admin-widget widget-zone="contact_attribute_value_details_buttons" additional-data="null"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/WidgetZone.Values.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/WidgetZone.Values.Bottom.cshtmlnew file mode 100644index 000000000..8436f1d18--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/WidgetZone.Values.Bottom.cshtml@@ -0,0 +1,2 @@+@model ContactAttributeModel+<vc:admin-widget widget-zone="contact_attribute_details_values_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/WidgetZone.Values.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/WidgetZone.Values.Top.cshtmlnew file mode 100644index 000000000..1f84e26dc--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/WidgetZone.Values.Top.cshtml@@ -0,0 +1,2 @@+@model ContactAttributeModel+<vc:admin-widget widget-zone="contact_attribute_details_values_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/ValueCreatePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/ValueCreatePopup.cshtmldeleted file mode 100644index dcacc6653..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/ValueCreatePopup.cshtml+++ /dev/null@@ -1,54 +0,0 @@-@{- Layout = "";-}--@model ContactAttributeValueModel-<form id="ValueCreatePopup" asp-area="@Constants.AreaAdmin" asp-controller="ContactAttribute" asp-action="ValueCreatePopup"- asp-route-contactAttributeId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["contactAttributeId"])">- <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-list-alt"></i>- @Loc["Admin.Catalog.Attributes.ContactAttributes.Values.AddNew"]- </div>- </div>- <div class="x_content form">- <partial name="Partials/CreateOrUpdateValue" model="Model"/>- </div>- </div>- </div>- </div>- <script>- var mfp = $.magnificPopup.instance;- $("#ValueCreatePopup").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();- $('#btnRefresh').click();- } else {- $.magnificPopup.open({- items: {- src: data,- type: 'inline'- },- callbacks: {- open: function () {- $('.mfp-wrap').removeAttr('tabindex');- }- }- });- }- }- });- });- </script>-</form>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/ValueEditPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/ValueEditPopup.cshtmldeleted file mode 100644index d4ca5bf20..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/ValueEditPopup.cshtml+++ /dev/null@@ -1,53 +0,0 @@-@model ContactAttributeValueModel-@{- Layout = "";-}-<form id="ValueEditPopup" asp-area="@Constants.AreaAdmin" asp-controller="ContactAttribute" asp-action="ValueEditPopup"- asp-route-contactAttributeId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["contactAttributeId"])">- <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-list-alt"></i>- @Loc["Admin.Catalog.Attributes.ContactAttributes.Values.EditValueDetails"]- </div>- </div>- <div class="x_content form">- <partial name="Partials/CreateOrUpdateValue" model="Model"/>- </div>- </div>- </div>- </div>- <script>- var mfp = $.magnificPopup.instance;- $("#ValueEditPopup").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();- $('#btnRefresh').click();- } else {- $.magnificPopup.open({- items: {- src: data,- type: 'inline'- },- callbacks: {- open: function () {- $('.mfp-wrap').removeAttr('tabindex');- }- }- });- }- }- });- });- </script>-</form>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Create.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Create.cshtmldeleted file mode 100644index 424b972f4..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Create.cshtml+++ /dev/null@@ -1,37 +0,0 @@-@model CustomerAttributeModel-@{- //page title- ViewBag.Title = Loc["Admin.Customers.CustomerAttributes.AddNew"];-}-<form asp-area="@Constants.AreaAdmin" asp-controller="CustomerAttribute" asp-action="Create" method="post" id="customerattribute-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-list-ol"></i>- @Loc["Admin.Customers.CustomerAttributes.AddNew"]- <small>- <i class="fa fa-arrow-circle-left"></i>@Html.ActionLink(Loc["Admin.Address.AddressAttributes.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="customer_attribute_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/CustomerAttribute/Edit.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Edit.cshtmldeleted file mode 100644index efb608dc1..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Edit.cshtml+++ /dev/null@@ -1,42 +0,0 @@-@model CustomerAttributeModel--@{- //page title- ViewBag.Title = Loc["Admin.Customers.CustomerAttributes.EditAttributeDetails"];-}-<form asp-area="@Constants.AreaAdmin" asp-controller="CustomerAttribute" asp-action="Edit" method="post" id="customerattribute-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-list-ol"></i>- @Loc["Admin.Customers.CustomerAttributes.EditAttributeDetails"] - @Model.Name- <small>- <i class="fa fa-arrow-circle-left"></i>@Html.ActionLink(Loc["Admin.Customers.CustomerAttributes.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="customerattribute-delete" class="btn red">- <i class="fa fa-trash-o"></i> @Loc["Admin.Common.Delete"]- </span>- <vc:admin-widget widget-zone="customer_attribute_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="customerattribute-delete"/>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/List.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/List.cshtmldeleted file mode 100644index a149118dd..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/List.cshtml+++ /dev/null@@ -1,92 +0,0 @@-@{- //page title- ViewBag.Title = Loc["Admin.Customers.CustomerAttributes"];-}-<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-list-alt"></i>- @Loc["Admin.Customers.CustomerAttributes"]- </div>- <div class="actions btn-group btn-group-devided">- <a href="@Url.Action("Create", "CustomerAttribute", new { area = Constants.AreaAdmin })" 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="customer_attribute_list_buttons" additional-data="null"/>- </div>- </div>- <div class="x_content form">- <div class="form-horizontal">- <div class="form-body">- <div class="x_content">- <div id="customerattributes-grid"></div>- </div>- </div>- </div>- </div>- </div>- </div>-</div>-<script>- $(document).ready(function () {- $("#customerattributes-grid").kendoGrid({- dataSource: {- transport: {- read: {- url: "@Html.Raw(Url.Action("List", "CustomerAttribute", new { area = Constants.AreaAdmin }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- }- },- schema: {- data: "Data",- total: "Total",- errors: "Errors"- },- error: function(e) {- display_kendoui_grid_error(e);- // Cancel the changes- 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: "Name",- title: "@Loc["Admin.Customers.CustomerAttributes.Fields.Name"]",- width: 300,- template: '<a class="k-link" href="@Url.Action("Edit", "CustomerAttribute", new { area = Constants.AreaAdmin })/#=Id#">#=kendo.htmlEncode(Name)#</a>',- }, {- field: "AttributeControlTypeName",- title: "@Loc["Admin.Customers.CustomerAttributes.Fields.AttributeControlType"]",- width: 200- },{- field: "IsRequired",- title: "@Loc["Admin.Customers.CustomerAttributes.Fields.IsRequired"]",- width: 100,- headerAttributes: { style: "text-align:center" },- attributes: { style: "text-align:center" },- template: '# if(IsRequired) {# <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> #} #'- }, {- field: "DisplayOrder",- title: "@Loc["Admin.Customers.CustomerAttributes.Fields.DisplayOrder"]",- width: 100- }]- });- });-</script>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/CreateOrUpdate.TabInfo.cshtmldeleted file mode 100644index b7a29b415..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/CreateOrUpdate.TabInfo.cshtml+++ /dev/null@@ -1,111 +0,0 @@-@using Microsoft.AspNetCore.Mvc.Razor-@model CustomerAttributeModel--<script>- $(document).ready(function () {- $("#@Html.IdFor(model => model.AttributeControlTypeId)").change(toggleAttributeControlType);- toggleAttributeControlType();- $("#@Html.IdFor(model => model.IsReadOnly)").click(toggleIsReadOnly);- toggleIsReadOnly();- });-- function toggleIsReadOnly() {- if ($('#@Html.IdFor(model => model.IsReadOnly)').is(':checked')) {- $('#pnlIsRequired').hide();- } else {- $('#pnlIsRequired').show();- }-- }-- function toggleAttributeControlType() {- var selectedAttributeControlTypeId = $("#@Html.IdFor(model => model.AttributeControlTypeId)").val();- if (selectedAttributeControlTypeId == @(((int)AttributeControlType.TextBox).ToString()) || selectedAttributeControlTypeId == @(((int)AttributeControlType.Hidden).ToString())) {- $('#tab-customerattributesvalues').hide();- } else if (selectedAttributeControlTypeId == @(((int)AttributeControlType.MultilineTextbox).ToString())) {- $('#tab-customerattributesvalues').hide();- } else {- $('#tab-customerattributesvalues').show();- }- }--</script>-<vc:admin-widget widget-zone="customer_attribute_details_info_top" additional-data="Model"/>--@{- Func<int, HelperResult>- template = @<div class="form-body">- <div class="form-group">- <admin-label asp-for="@Model.Locales[item].Name"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="@Model.Locales[item].Name"/>- <span asp-validation-for="@Model.Locales[item].Name"></span>- </div>- </div>- <input type="hidden" asp-for="@Model.Locales[item].LanguageId"/>- </div>;-}--<div class="form-horizontal">- <localized-editor localized-template="@template" name="customerattribute-localized" language-ids="@Model.Locales.Select(c => c.LanguageId).ToList()">- <div class="form-body">- <div class="form-group">- <admin-label asp-for="Name"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="Name"/>- <span asp-validation-for="Name"></span>- </div>- </div>- </div>- </localized-editor>- <div class="form-body">- <div class="form-group">- <admin-label asp-for="IsReadOnly"/>- <div class="col-md-9 col-sm-9">- <label class="mt-checkbox mt-checkbox-outline control control-checkbox">- <admin-input asp-for="IsReadOnly"/>- <div class="control__indicator"></div>- </label>- <span asp-validation-for="IsReadOnly"></span>- </div>- </div>- <div class="form-group" id="pnlIsRequired">- <admin-label asp-for="IsRequired"/>- <div class="col-md-9 col-sm-9">- <label class="mt-checkbox mt-checkbox-outline control control-checkbox">- <admin-input asp-for="IsRequired"/>- <div class="control__indicator"></div>- </label>- <span asp-validation-for="IsRequired"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="AttributeControlTypeId"/>- <div class="col-md-9 col-sm-9">- @{- var attributeControlTypes =- EnumTranslationService.ToSelectList(- ((AttributeControlType)Model.AttributeControlTypeId), valuesToExclude: //custom customer attributes don't support some attribute control types- [(int)AttributeControlType.FileUpload, (int)AttributeControlType.Datepicker, (int)AttributeControlType.ColorSquares, (int)AttributeControlType.ImageSquares, (int)AttributeControlType.ReadonlyCheckboxes]);- }- <admin-select asp-for="AttributeControlTypeId" asp-items="attributeControlTypes"/>- <span asp-validation-for="AttributeControlTypeId"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="Stores"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="Stores"/>- <span asp-validation-for="Stores"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="DisplayOrder"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="DisplayOrder"/>- <span asp-validation-for="DisplayOrder"></span>- </div>- </div>- </div>-</div>-<vc:admin-widget widget-zone="customer_attribute_details_info_bottom" additional-data="Model"/>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/CreateOrUpdate.TabValues.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/CreateOrUpdate.TabValues.cshtmldeleted file mode 100644index d136551c2..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/CreateOrUpdate.TabValues.cshtml+++ /dev/null@@ -1,134 +0,0 @@-@model CustomerAttributeModel-<vc:admin-widget widget-zone="customer_attribute_details_values_top" additional-data="Model"/>-@{- if (!string.IsNullOrEmpty(Model.Id))- {- <div class="panel panel-default">- <div class="panel-body">- <div id="customerattributevalues-grid"></div>- </div>- <div class="panel-footer">- <a id="btnAddNewValue" href="@(Url.Action("ValueCreatePopup", "CustomerAttribute", new { customerAttributeId = Model.Id, btnId = "btnRefresh", formId = "customerattribute-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Customers.CustomerAttributes.Values.AddNew"]</a>- <input type="submit" id="btnRefresh" style="display: none"/>- </div>- </div>--- <script>- $(document).ready(function () {- $('#btnAddNewValue').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');- }- }- });- $("#customerattributevalues-grid").kendoGrid({- dataBound: function () {- $('.editvalue').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');- }- }- });- },- dataSource: {- transport: {- read: {- url: "@Html.Raw(Url.Action("ValueList", "CustomerAttribute", new { customerAttributeId = Model.Id, area = Constants.AreaAdmin }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- },- destroy: {- url: "@Html.Raw(Url.Action("ValueDelete", "CustomerAttribute", new { area = Constants.AreaAdmin }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- }- },- schema: {- data: "Data",- total: "Total",- errors: "Errors",- model: {- id: "Id"- }- },- error: function(e) {- display_kendoui_grid_error(e);- // Cancel the changes- this.cancelChanges();- },- serverPaging: true,- serverFiltering: true,- serverSorting: true- },- pageable: {- refresh: true,- numeric: false,- previousNext: false,- info: false- },- editable: {- confirmation: true,- mode: "inline"- },- scrollable: false,- columns: [{- field: "Name",- title: "@Loc["Admin.Customers.CustomerAttributes.Values.Fields.Name"]",- template: "<a class='k-link editvalue' href=\"@Url.Action("ValueEditPopup", "CustomerAttribute", new { area = Constants.AreaAdmin })/#=Id#?customerAttributeId=@(Model.Id)&btnId=btnRefresh&formId=customerattribute-form\">#=kendo.htmlEncode(Name)#</a>",- }, {- field: "IsPreSelected",- title: "@Loc["Admin.Customers.CustomerAttributes.Values.Fields.IsPreSelected"]",- width: 100,- headerAttributes: { style: "text-align:center" },- attributes: { style: "text-align:center" },- template: '# if(IsPreSelected) {# <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> #} #'- }, {- field: "DisplayOrder",- title: "@Loc["Admin.Customers.CustomerAttributes.Values.Fields.DisplayOrder"]",- width: 100- }, {- command: {name: "destroy", text: "@Loc["Admin.Common.Delete"]"},- title: "@Loc["Admin.Common.Delete"]",- width: 100- }]- });- });- </script>- <script>- $(document).ready(function () {- $('#btnRefresh').click(function () {- //refresh grid- var grid = $("#customerattributevalues-grid").data('kendoGrid');- grid.dataSource.read();-- //return false to don't reload a page- return false;- });- });- </script>- }- else- {- <div class="note note-info">- @Loc["Admin.Customers.CustomerAttributes.Values.SaveBeforeEdit"]- </div>- }-}-<vc:admin-widget widget-zone="customer_attribute_details_values_bottom" additional-data="Model"/>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/CreateOrUpdate.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/CreateOrUpdate.cshtmldeleted file mode 100644index cedb1aea6..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/CreateOrUpdate.cshtml+++ /dev/null@@ -1,25 +0,0 @@-@model CustomerAttributeModel--<div asp-validation-summary="All"></div>-<input asp-for="Id" type="hidden"/>--<input id="active-menu-item" type="hidden" value="/@Constants.AreaAdmin/CustomerAttribute/List"/>-<admin-tabstrip name="customerattribute-edit">- <items>- <tabstrip-item text="@Loc["Admin.Customers.CustomerAttributes.Info"]" tab-index="0">- <content>- <div>- <partial name="Partials/CreateOrUpdate.TabInfo" model="Model"/>- </div>- </content>- </tabstrip-item>- <tabstrip-item text="@Loc["Admin.Customers.CustomerAttributes.Values"]" tab-index="1" id="tab-customerattributesvalues">- <content>- <div>- <partial name="Partials/CreateOrUpdate.TabValues" model="Model"/>- </div>- </content>- </tabstrip-item>- <vc:admin-widget widget-zone="customer_attribute_details_tabs" additional-data="Model"/>- </items>-</admin-tabstrip>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/CreateOrUpdateValue.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/CreateOrUpdateValue.cshtmldeleted file mode 100644index 17dad13d6..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/CreateOrUpdateValue.cshtml+++ /dev/null@@ -1,61 +0,0 @@-@using Microsoft.AspNetCore.Mvc.Razor-@model CustomerAttributeValueModel-<div asp-validation-summary="All"></div>-<input asp-for="Id" type="hidden"/>-<input asp-for="CustomerAttributeId" type="hidden"/>-<vc:admin-widget widget-zone="customer_attribute_values_details_top" additional-data="Model"/>--@{- Func<int, HelperResult>- template = @<div class="form-body">- <div class="form-group">- <admin-label asp-for="@Model.Locales[item].Name"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="@Model.Locales[item].Name"/>- <span asp-validation-for="@Model.Locales[item].Name"></span>- </div>- </div>- <input type="hidden" asp-for="@Model.Locales[item].LanguageId"/>- </div>;-}-<div class="form-horizontal">- <localized-editor localized-template="@template" name="customerattributevalue-localized" language-ids="@Model.Locales.Select(c => c.LanguageId).ToList()">- <div class="form-body">- <div class="form-group">- <admin-label asp-for="Name"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="Name"/>- <span asp-validation-for="Name"></span>- </div>- </div>- </div>- </localized-editor>- <div class="form-body">- <div class="form-group">- <admin-label asp-for="IsPreSelected"/>- <div class="col-md-9 col-sm-9">- <label class="mt-checkbox mt-checkbox-outline control control-checkbox">- <admin-input asp-for="IsPreSelected"/>- <div class="control__indicator"></div>- </label>- <span asp-validation-for="IsPreSelected"></span>- </div>- </div>- <dic class="form-group">- <admin-label asp-for="DisplayOrder"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="DisplayOrder"/>- <span asp-validation-for="DisplayOrder"></span>- </div>- </dic>- <div class="form-group">- <div class="offset-sm-3 offset-md-3 col-md-9 col-sm-9">- <button class="btn btn-success" type="submit" name="save">- <i class="fa fa-check"></i> @Loc["Admin.Common.Save"]- </button>- <vc:admin-widget widget-zone="customer_attribute_value_details_buttons" additional-data="null"/>- </div>- </div>- </div>-</div>-<vc:admin-widget widget-zone="customer_attribute_values_details_bottom" additional-data="Model"/>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/WidgetZone.DetailsButtons.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/WidgetZone.DetailsButtons.cshtmlnew file mode 100644index 000000000..61edd92cb--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/WidgetZone.DetailsButtons.cshtml@@ -0,0 +1,2 @@+@model CustomerAttributeModel+<vc:admin-widget widget-zone="customer_attribute_details_buttons" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/WidgetZone.Info.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/WidgetZone.Info.Bottom.cshtmlnew file mode 100644index 000000000..cb37552cc--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/WidgetZone.Info.Bottom.cshtml@@ -0,0 +1,2 @@+@model CustomerAttributeModel+<vc:admin-widget widget-zone="customer_attribute_details_info_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/WidgetZone.Info.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/WidgetZone.Info.Top.cshtmlnew file mode 100644index 000000000..94d428c85--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/WidgetZone.Info.Top.cshtml@@ -0,0 +1,2 @@+@model CustomerAttributeModel+<vc:admin-widget widget-zone="customer_attribute_details_info_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/WidgetZone.ListButtons.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/WidgetZone.ListButtons.cshtmlnew file mode 100644index 000000000..0e810b0c6--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/WidgetZone.ListButtons.cshtml@@ -0,0 +1 @@+<vc:admin-widget widget-zone="customer_attribute_list_buttons" additional-data="null"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/WidgetZone.Tabs.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/WidgetZone.Tabs.cshtmlnew file mode 100644index 000000000..4c2a9039d--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/WidgetZone.Tabs.cshtml@@ -0,0 +1,2 @@+@model CustomerAttributeModel+<vc:admin-widget widget-zone="customer_attribute_details_tabs" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/WidgetZone.Value.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/WidgetZone.Value.Bottom.cshtmlnew file mode 100644index 000000000..70c6a5777--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/WidgetZone.Value.Bottom.cshtml@@ -0,0 +1,2 @@+@model CustomerAttributeValueModel+<vc:admin-widget widget-zone="customer_attribute_values_details_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/WidgetZone.Value.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/WidgetZone.Value.Top.cshtmlnew file mode 100644index 000000000..3c48529c6--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/WidgetZone.Value.Top.cshtml@@ -0,0 +1,2 @@+@model CustomerAttributeValueModel+<vc:admin-widget widget-zone="customer_attribute_values_details_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/WidgetZone.ValueButtons.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/WidgetZone.ValueButtons.cshtmlnew file mode 100644index 000000000..5cb12fb69--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/WidgetZone.ValueButtons.cshtml@@ -0,0 +1 @@+<vc:admin-widget widget-zone="customer_attribute_value_details_buttons" additional-data="null"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/WidgetZone.Values.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/WidgetZone.Values.Bottom.cshtmlnew file mode 100644index 000000000..185b6974e--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/WidgetZone.Values.Bottom.cshtml@@ -0,0 +1,2 @@+@model CustomerAttributeModel+<vc:admin-widget widget-zone="customer_attribute_details_values_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/WidgetZone.Values.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/WidgetZone.Values.Top.cshtmlnew file mode 100644index 000000000..e0b4b3429--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/Partials/WidgetZone.Values.Top.cshtml@@ -0,0 +1,2 @@+@model CustomerAttributeModel+<vc:admin-widget widget-zone="customer_attribute_details_values_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Edit.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Edit.cshtmldeleted file mode 100644index 0bab6c7b1..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Edit.cshtml+++ /dev/null@@ -1,41 +0,0 @@-@model ProductAttributeModel-@{- //page title- ViewBag.Title = Loc["Admin.Catalog.Attributes.ProductAttributes.EditAttributeDetails"];-}-<form asp-area="@Constants.AreaAdmin" asp-controller="ProductAttribute" asp-action="Edit" method="post" id="productattribute-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-list-alt"></i>- @Loc["Admin.Catalog.Attributes.ProductAttributes.EditAttributeDetails"] - @Model.Name- <small>- <i class="fa fa-arrow-circle-left"></i>@Html.ActionLink(Loc["Admin.Catalog.Attributes.ProductAttributes.BackToList"], "List")- </small>- </div>- <div class="actions">- <div class="btn-group btn-group-devided util-btn-margin-bottom-5">- <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="productattribute-delete" class="btn red">- <i class="fa fa-trash-o"></i> @Loc["Admin.Common.Delete"]- </span>- <vc:admin-widget widget-zone="product_attribute_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="productattribute-delete"/>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/CreateOrUpdate.TabPredefinedValues.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/CreateOrUpdate.TabPredefinedValues.cshtmldeleted file mode 100644index 5a39c531c..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/CreateOrUpdate.TabPredefinedValues.cshtml+++ /dev/null@@ -1,144 +0,0 @@-@model ProductAttributeModel-@{- if (!string.IsNullOrEmpty(Model.Id))- {- <div class="panel panel-default">- <vc:admin-widget widget-zone="product_attribute_details_predefined_values_top" additional-data="Model"/>- <div class="panel-body">- <div id="productattributevalues-grid"></div>- </div>- <div class="panel-footer">- <a id="btnAddNewValue" href="@(Url.Action("PredefinedProductAttributeValueCreatePopup", "ProductAttribute", new { productAttributeId = Model.Id, area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Catalog.Attributes.ProductAttributes.PredefinedValues.AddNew"]</a>- <input type="submit" id="btnRefresh" style="display:none"/>- </div>- <vc:admin-widget widget-zone="product_attribute_details_predefined_values_bottom" additional-data="Model"/>- </div>- <script>- $(document).ready(function() {- $('#btnAddNewValue').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');- }- }- });- $("#productattributevalues-grid").kendoGrid({- dataBound: function () {- $('.editvalue').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');- }- }- });- },- dataSource: {- transport: {- read: {- url: "@Html.Raw(Url.Action("PredefinedProductAttributeValueList", "ProductAttribute", new { productAttributeId = Model.Id, area = Constants.AreaAdmin }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- },- destroy: {- url: "@Html.Raw(Url.Action("PredefinedProductAttributeValueDelete", "ProductAttribute", new { area = Constants.AreaAdmin }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- }- },- schema: {- data: "Data",- total: "Total",- errors: "Errors",- model: {- id: "Id",- fields: {- Product2Name: { editable: false, type: "string" },- ProductId2: { editable: false, type: "string" }- }- }- },- error: function(e) {- display_kendoui_grid_error(e);- // Cancel the changes- this.cancelChanges();- },- serverPaging: true,- serverFiltering: true,- serverSorting: true- },- pageable: {- refresh: true,- numeric: false,- previousNext: false,- info: false- },- editable: {- confirmation: true,- mode: "inline"- },- scrollable: false,- columns: [- {- field: "Name",- title: "@Loc["Admin.Catalog.Attributes.ProductAttributes.PredefinedValues.Fields.Name"]",- width: 200,- template: "<a class='k-link editvalue' href=\"@Url.Action("PredefinedProductAttributeValueEditPopup", "ProductAttribute", new { area = Constants.AreaAdmin })/#=Id#[email protected]\">#=kendo.htmlEncode(Name)#</a>"- }, {- field: "PriceAdjustmentStr",- title: "@Loc["Admin.Catalog.Attributes.ProductAttributes.PredefinedValues.Fields.PriceAdjustment"]",- width: 150- }, {- field: "WeightAdjustmentStr",- title: "@Loc["Admin.Catalog.Attributes.ProductAttributes.PredefinedValues.Fields.WeightAdjustment"]",- width: 150- }, {- field: "IsPreSelected",- title: "@Loc["Admin.Catalog.Attributes.ProductAttributes.PredefinedValues.Fields.IsPreSelected"]",- width: 100,- headerAttributes: { style: "text-align:center" },- attributes: { style: "text-align:center" },- template: '# if(IsPreSelected) {# <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> #} #'- }, {- field: "DisplayOrder",- title: "@Loc["Admin.Catalog.Attributes.ProductAttributes.PredefinedValues.Fields.DisplayOrder"]",- width: 100- }, {- command: { name: "destroy", text: "@Loc["Admin.Common.Delete"]" },- title: "@Loc["Admin.Common.Delete"]",- width: 200- }- ]- });-- $('#btnRefresh').click(function () {- //refresh grid- var grid = $("#productattributevalues-grid").data('kendoGrid');- grid.dataSource.read();-- //return false to don't reload a page- return false;- });- });- </script>- }- else- {- <div class="note note-info">- @Loc["Admin.Catalog.Attributes.ProductAttributes.PredefinedValues.SaveBeforeEdit"]- </div>- }-}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/CreateOrUpdate.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/CreateOrUpdate.cshtmldeleted file mode 100644index 44465c653..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/CreateOrUpdate.cshtml+++ /dev/null@@ -1,40 +0,0 @@-@model ProductAttributeModel--<div asp-validation-summary="All"></div>-<input asp-for="Id" type="hidden"/>-<admin-tabstrip name="product-attribute-edit">- <items>- <tabstrip-item text="@Loc["Admin.Catalog.Attributes.ProductAttributes.Info"]" tab-index="0">- <content>- <div>- <partial name="Partials/CreateOrUpdate.TabInfo" model="Model"/>- </div>- </content>- </tabstrip-item>- @if (!string.IsNullOrEmpty(Model.Id))- {- <tabstrip-item text="@Loc["Admin.Catalog.Attributes.ProductAttributes.UsedByProducts"]" tab-index="1">- <content>- <div>- <partial name="Partials/CreateOrUpdate.TabUsedByProducts" model="Model"/>- </div>- </content>- </tabstrip-item>- }- <tabstrip-item text="@Loc["Admin.Catalog.Attributes.ProductAttributes.PredefinedValues"]" tab-index="2">- <content>- <div>- <partial name="Partials/CreateOrUpdate.TabPredefinedValues" model="Model"/>- </div>- </content>- </tabstrip-item>- <tabstrip-item text="@Loc["Admin.Common.UserFields.Tab"]" tab-index="3">- <content>- <div>- <partial name="Partials/UserFields" model="Model"/>- </div>- </content>- </tabstrip-item>- <vc:admin-widget widget-zone="product_attribute_details_tabs" additional-data="Model"/>- </items>-</admin-tabstrip>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/CreateOrUpdatePredefinedProductAttributeValue.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/CreateOrUpdatePredefinedProductAttributeValue.cshtmldeleted file mode 100644index b004b7240..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/CreateOrUpdatePredefinedProductAttributeValue.cshtml+++ /dev/null@@ -1,86 +0,0 @@-@using Microsoft.AspNetCore.Mvc.Razor-@model PredefinedProductAttributeValueModel--<div asp-validation-summary="All"></div>-<input asp-for="Id" type="hidden"/>-<input asp-for="ProductAttributeId" type="hidden"/>--<vc:admin-widget widget-zone="product_attribute_predefined_values_details_top" additional-data="Model"/>--@{- Func<int, HelperResult>- template = @<div class="form-body">- <div class="form-group">- <admin-label asp-for="@Model.Locales[item].Name" class="col-sm-3"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="@Model.Locales[item].Name"/>- <span asp-validation-for="@Model.Locales[item].Name"></span>- </div>- </div>- <input asp-for="@Model.Locales[item].LanguageId" type="hidden"/>- </div>;-}--<div class="form-horizontal">- <localized-editor localized-template="@template" name="productattributevalue-localized" language-ids="@Model.Locales.Select(c => c.LanguageId).ToList()">- <div class="form-group">- <div class="form-group">- <admin-label asp-for="Name" class="col-sm-3"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="Name"/>- <span asp-validation-for="Name"></span>- </div>- </div>- </div>- </localized-editor>-- <div class="form-body">- <div class="form-group">- <admin-label asp-for="PriceAdjustment" class="col-sm-3"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="PriceAdjustment"/>- <span asp-validation-for="PriceAdjustment"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="WeightAdjustment" class="col-sm-3"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="WeightAdjustment"/>- <span asp-validation-for="WeightAdjustment"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="Cost" class="col-sm-3"/>- <div class="col-sm-9 col-md-9">- <admin-input asp-for="Cost"/>- <span asp-validation-for="Cost"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="IsPreSelected" class="col-sm-3"/>- <div class="col-md-9 col-sm-9">- <label class="mt-checkbox mt-checkbox-outline control control-checkbox">- <admin-input asp-for="IsPreSelected"/>- <div class="control__indicator"></div>- </label>- <span asp-validation-for="IsPreSelected"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="DisplayOrder" class="col-sm-3"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="DisplayOrder"/>- <span asp-validation-for="DisplayOrder"></span>- </div>- </div>- <div class="form-group">- <div class="offset-sm-3 offset-md-3 col-md-9 col-sm-9">- <button class="btn btn-success" type="submit" name="save">- <i class="fa fa-check"></i> @Loc["Admin.Common.Save"]- </button>- <vc:admin-widget widget-zone="product_attribute_predefined_values_details_buttons" additional-data="null"/>- </div>- </div>- </div>-</div>-<vc:admin-widget widget-zone="product_attribute_predefined_values_details_bottom" additional-data="Model"/>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/WidgetZone.DetailsButtons.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/WidgetZone.DetailsButtons.cshtmlnew file mode 100644index 000000000..4e820abe3--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/WidgetZone.DetailsButtons.cshtml@@ -0,0 +1,2 @@+@model ProductAttributeModel+<vc:admin-widget widget-zone="product_attribute_details_buttons" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/WidgetZone.Info.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/WidgetZone.Info.Bottom.cshtmlnew file mode 100644index 000000000..30bd5a76b--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/WidgetZone.Info.Bottom.cshtml@@ -0,0 +1,2 @@+@model ProductAttributeModel+<vc:admin-widget widget-zone="product_attribute_details_info_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/WidgetZone.Info.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/WidgetZone.Info.Top.cshtmlnew file mode 100644index 000000000..5d0b9d4c0--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/WidgetZone.Info.Top.cshtml@@ -0,0 +1,2 @@+@model ProductAttributeModel+<vc:admin-widget widget-zone="product_attribute_details_info_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/WidgetZone.ListButtons.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/WidgetZone.ListButtons.cshtmlnew file mode 100644index 000000000..91e9ba52d--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/WidgetZone.ListButtons.cshtml@@ -0,0 +1 @@+<vc:admin-widget widget-zone="product_attribute_list_buttons" additional-data="null"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/WidgetZone.PredefinedValues.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/WidgetZone.PredefinedValues.Bottom.cshtmlnew file mode 100644index 000000000..1110437ba--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/WidgetZone.PredefinedValues.Bottom.cshtml@@ -0,0 +1,2 @@+@model ProductAttributeModel+<vc:admin-widget widget-zone="product_attribute_details_predefined_values_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/WidgetZone.PredefinedValues.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/WidgetZone.PredefinedValues.Top.cshtmlnew file mode 100644index 000000000..e9f07e7f7--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/WidgetZone.PredefinedValues.Top.cshtml@@ -0,0 +1,2 @@+@model ProductAttributeModel+<vc:admin-widget widget-zone="product_attribute_details_predefined_values_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/WidgetZone.Tabs.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/WidgetZone.Tabs.cshtmlnew file mode 100644index 000000000..c7325ce2b--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/WidgetZone.Tabs.cshtml@@ -0,0 +1,2 @@+@model ProductAttributeModel+<vc:admin-widget widget-zone="product_attribute_details_tabs" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/WidgetZone.UsedByProducts.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/WidgetZone.UsedByProducts.Bottom.cshtmlnew file mode 100644index 000000000..0e2b338ba--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/WidgetZone.UsedByProducts.Bottom.cshtml@@ -0,0 +1,2 @@+@model ProductAttributeModel+<vc:admin-widget widget-zone="product_attribute_details_used_by_products_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/WidgetZone.UsedByProducts.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/WidgetZone.UsedByProducts.Top.cshtmlnew file mode 100644index 000000000..edf060e60--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/WidgetZone.UsedByProducts.Top.cshtml@@ -0,0 +1,2 @@+@model ProductAttributeModel+<vc:admin-widget widget-zone="product_attribute_details_used_by_products_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/WidgetZone.Value.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/WidgetZone.Value.Bottom.cshtmlnew file mode 100644index 000000000..d5444b589--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/WidgetZone.Value.Bottom.cshtml@@ -0,0 +1,2 @@+@model PredefinedProductAttributeValueModel+<vc:admin-widget widget-zone="product_attribute_predefined_values_details_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/WidgetZone.Value.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/WidgetZone.Value.Top.cshtmlnew file mode 100644index 000000000..f0e25a4e2--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/WidgetZone.Value.Top.cshtml@@ -0,0 +1,2 @@+@model PredefinedProductAttributeValueModel+<vc:admin-widget widget-zone="product_attribute_predefined_values_details_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/WidgetZone.ValueButtons.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/WidgetZone.ValueButtons.cshtmlnew file mode 100644index 000000000..fdba7a692--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/WidgetZone.ValueButtons.cshtml@@ -0,0 +1 @@+<vc:admin-widget widget-zone="product_attribute_predefined_values_details_buttons" additional-data="null"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/PredefinedProductAttributeValueCreatePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/PredefinedProductAttributeValueCreatePopup.cshtmldeleted file mode 100644index a00bed4a2..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/PredefinedProductAttributeValueCreatePopup.cshtml+++ /dev/null@@ -1,52 +0,0 @@-@model PredefinedProductAttributeValueModel-@{- Layout = "";-}-<form id="PredefinedProductAttributeValueCreatePopup" asp-area="@Constants.AreaAdmin" asp-controller="ProductAttribute" asp-action="PredefinedProductAttributeValueCreatePopup" method="post">- <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-list-alt"></i>- @Loc["Admin.Catalog.Attributes.ProductAttributes.PredefinedValues.AddNew"]- </div>- </div>- <div class="x_content form">- <partial name="Partials/CreateOrUpdatePredefinedProductAttributeValue" model="Model"/>- </div>- </div>- </div>- </div>- <script>- var mfp = $.magnificPopup.instance;- $("#PredefinedProductAttributeValueCreatePopup").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();- $('#btnRefresh').click();- } else {- $.magnificPopup.open({- items: {- src: data,- type: 'inline'- },- callbacks: {- open: function () {- $('.mfp-wrap').removeAttr('tabindex');- }- }- });- }- }- });- });- </script>-</form>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Edit.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Edit.cshtmldeleted file mode 100644index eaf84027c..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Edit.cshtml+++ /dev/null@@ -1,42 +0,0 @@-@model SpecificationAttributeModel-@{- //page title- ViewBag.Title = Loc["Admin.Catalog.Attributes.SpecificationAttributes.EditAttributeDetails"];-}--<form asp-area="@Constants.AreaAdmin" asp-controller="SpecificationAttribute" asp-action="Edit" method="post" id="specificationattribute-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-list-alt"></i>- @Loc["Admin.Catalog.Attributes.SpecificationAttributes.EditAttributeDetails"] - @Model.Name- <small>- <i class="fa fa-arrow-circle-left"></i>@Html.ActionLink(Loc["Admin.Catalog.Attributes.SpecificationAttributes.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="specificationattribute-delete" class="btn red">- <i class="fa fa-trash-o"></i> @Loc["Admin.Common.Delete"]- </span>- <vc:admin-widget widget-zone="specification_attribute_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="specificationattribute-delete"/>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/OptionEditPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/OptionEditPopup.cshtmldeleted file mode 100644index a76dba87f..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/OptionEditPopup.cshtml+++ /dev/null@@ -1,58 +0,0 @@-@{- Layout = "";-}-@model SpecificationAttributeOptionModel-@{- //page title- ViewBag.Title = Loc["Admin.Catalog.Attributes.SpecificationAttributes.Options.EditOptionDetails"];-}-<form asp-area="@Constants.AreaAdmin" asp-controller="SpecificationAttribute" asp-action="OptionEditPopup" method="post" id="specificationattribute-form"- asp-route-SpecificationAttributeId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["SpecificationAttributeId"])">-- <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-list-alt"></i>- @Loc["Admin.Catalog.Attributes.SpecificationAttributes.Options.EditOptionDetails"]- </div>- </div>- <div class="x_content form">- <partial name="Partials/CreateOrUpdateOption" model="Model"/>- </div>- </div>- </div>- </div>- <script>- var mfp = $.magnificPopup.instance;- $("#specificationattribute-form").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();- $('#btnRefresh').click();- } else {- $.magnificPopup.open({- items: {- src: data,- type: 'inline'- },- callbacks: {- open: function () {- $('.mfp-wrap').removeAttr('tabindex');- }- }- });- }- }- });- });- </script>-</form>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/CreateOrUpdateOption.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/CreateOrUpdateOption.cshtmldeleted file mode 100644index 702b1ecbb..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/CreateOrUpdateOption.cshtml+++ /dev/null@@ -1,103 +0,0 @@-@using Microsoft.AspNetCore.Mvc.Razor-@model SpecificationAttributeOptionModel--<div asp-validation-summary="All"></div>-<input asp-for="Id" type="hidden"/>-<input asp-for="SpecificationAttributeId" type="hidden"/>-@{- if (string.IsNullOrEmpty(Model.ColorSquaresRgb))- {- Model.ColorSquaresRgb = "#FFFFFF";- }-}--<script>-- $("#@Html.IdFor(model => model.EnableColorSquaresRgb)").click(toggleEnableColorSquaresRgb);- toggleEnableColorSquaresRgb();---function toggleEnableColorSquaresRgb() {- if ($('#@Html.IdFor(model => model.EnableColorSquaresRgb)').is(':checked')) {- $('#pnlColorSquaresRgb').show();- } else {- $('#pnlColorSquaresRgb').hide();- }-}-</script>-<vc:admin-widget widget-zone="specification_attribute_option_details_top" additional-data="null"/>--@{- Func<int, HelperResult>- template = @<div class="form-body">- <div class="form-group">- <admin-label asp-for="@Model.Locales[item].Name" class="col-sm-3"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="@Model.Locales[item].Name"/>- <span asp-validation-for="@Model.Locales[item].Name"></span>- </div>- </div>- <input asp-for="@Model.Locales[item].LanguageId" type="hidden"/>- </div>;-}-<div class="form-horizontal">- <localized-editor localized-template="@template" name="specificationattribute-localized" language-ids="@Model.Locales.Select(c => c.LanguageId).ToList()">- <div class="form-body">- <div class="form-group">- <admin-label asp-for="Name" class="col-sm-3"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="Name"/>- <span asp-validation-for="Name"></span>- </div>- </div>- </div>- </localized-editor>- <div class="form-body">- <div class="form-body">- <div class="form-group">- <admin-label asp-for="SeName"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="SeName"/>- <span asp-validation-for="SeName"></span>- </div>- </div>- </div>- <div class="form-group">- <admin-label asp-for="EnableColorSquaresRgb" class="col-sm-3"/>- <div class="col-md-9 col-sm-9">- <label class="mt-checkbox mt-checkbox-outline control control-checkbox">- <admin-input asp-for="EnableColorSquaresRgb"/>- <div class="control__indicator"></div>- </label>- <span asp-validation-for="EnableColorSquaresRgb"></span>- </div>- </div>- <div class="form-group" id="pnlColorSquaresRgb">- <admin-label asp-for="ColorSquaresRgb" class="col-sm-3"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="ColorSquaresRgb"/>- <div id="color-picker"></div>- <script>- $('#color-picker').farbtastic('#@Html.IdFor(model => model.ColorSquaresRgb)');- </script>- <span asp-validation-for="ColorSquaresRgb"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="DisplayOrder" class="col-sm-3"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="DisplayOrder"/>- <span asp-validation-for="DisplayOrder"></span>- </div>- </div>- <div class="form-group">- <div class="offset-sm-3 offset-md-3 col-md-9 col-sm-9">- <button class="btn btn-success" type="submit" name="save">- <i class="fa fa-check"></i>@Loc["Admin.Common.Save"]- </button>- <vc:admin-widget widget-zone="specification_attribute_option_details_buttons" additional-data="null"/>- </div>- </div>- </div>-</div>-<vc:admin-widget widget-zone="specification_attribute_option_details_bottom" additional-data="Model"/>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/WidgetZone.DetailsButtons.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/WidgetZone.DetailsButtons.cshtmlnew file mode 100644index 000000000..aa642c67c--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/WidgetZone.DetailsButtons.cshtml@@ -0,0 +1,2 @@+@model SpecificationAttributeModel+<vc:admin-widget widget-zone="specification_attribute_details_buttons" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/WidgetZone.Info.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/WidgetZone.Info.Bottom.cshtmlnew file mode 100644index 000000000..ca3de3162--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/WidgetZone.Info.Bottom.cshtml@@ -0,0 +1,2 @@+@model SpecificationAttributeModel+<vc:admin-widget widget-zone="specification_attribute_details_info_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/WidgetZone.Info.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/WidgetZone.Info.Top.cshtmlnew file mode 100644index 000000000..a392080b3--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/WidgetZone.Info.Top.cshtml@@ -0,0 +1 @@+<vc:admin-widget widget-zone="specification_attribute_details_info_top" additional-data="null"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/WidgetZone.ListButtons.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/WidgetZone.ListButtons.cshtmlnew file mode 100644index 000000000..479390921--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/WidgetZone.ListButtons.cshtml@@ -0,0 +1 @@+<vc:admin-widget widget-zone="specification_attribute_list_buttons" additional-data="null"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/WidgetZone.Option.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/WidgetZone.Option.Bottom.cshtmlnew file mode 100644index 000000000..3030fa784--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/WidgetZone.Option.Bottom.cshtml@@ -0,0 +1,2 @@+@model SpecificationAttributeOptionModel+<vc:admin-widget widget-zone="specification_attribute_option_details_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/WidgetZone.Option.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/WidgetZone.Option.Top.cshtmlnew file mode 100644index 000000000..c42928953--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/WidgetZone.Option.Top.cshtml@@ -0,0 +1 @@+<vc:admin-widget widget-zone="specification_attribute_option_details_top" additional-data="null"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/WidgetZone.OptionButtons.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/WidgetZone.OptionButtons.cshtmlnew file mode 100644index 000000000..890b87386--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/WidgetZone.OptionButtons.cshtml@@ -0,0 +1 @@+<vc:admin-widget widget-zone="specification_attribute_option_details_buttons" additional-data="null"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/WidgetZone.Options.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/WidgetZone.Options.Bottom.cshtmlnew file mode 100644index 000000000..892f9f32e--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/WidgetZone.Options.Bottom.cshtml@@ -0,0 +1,2 @@+@model SpecificationAttributeModel+<vc:admin-widget widget-zone="specification_attribute_details_options_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/WidgetZone.Options.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/WidgetZone.Options.Top.cshtmlnew file mode 100644index 000000000..674010abe--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/WidgetZone.Options.Top.cshtml@@ -0,0 +1 @@+<vc:admin-widget widget-zone="specification_attribute_details_options_top" additional-data="null"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/WidgetZone.Tabs.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/WidgetZone.Tabs.cshtmlnew file mode 100644index 000000000..d261f8381--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/WidgetZone.Tabs.cshtml@@ -0,0 +1,2 @@+@model SpecificationAttributeModel+<vc:admin-widget widget-zone="specification_attribute_details_tabs" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/WidgetZone.UsedByProducts.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/WidgetZone.UsedByProducts.Bottom.cshtmlnew file mode 100644index 000000000..708ac1558--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/WidgetZone.UsedByProducts.Bottom.cshtml@@ -0,0 +1,2 @@+@model SpecificationAttributeModel+<vc:admin-widget widget-zone="specification_attribute_details_used_by_products_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/WidgetZone.UsedByProducts.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/WidgetZone.UsedByProducts.Top.cshtmlnew file mode 100644index 000000000..af9d44b5a--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/WidgetZone.UsedByProducts.Top.cshtml@@ -0,0 +1,2 @@+@model SpecificationAttributeModel+<vc:admin-widget widget-zone="specification_attribute_details_used_by_products_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Admin/Controllers/AddressAttributeController.cs b/src/Web/Grand.Web.Admin/Controllers/AddressAttributeController.csindex f29f4fce8..4fd1392b9 100644--- a/src/Web/Grand.Web.Admin/Controllers/AddressAttributeController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/AddressAttributeController.cs@@ -1,268 +1,42 @@-using Grand.Business.Core.Extensions;-using Grand.Business.Core.Interfaces.Common.Addresses;+using Grand.Business.Core.Interfaces.Common.Addresses;using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Domain.Common;using Grand.Domain.Permissions;+using Grand.Web.Admin.Extensions;+using Grand.Web.AdminShared.Controllers;using Grand.Web.AdminShared.Interfaces;using Grand.Web.AdminShared.Models.Common;using Grand.Web.Common.DataSource;using Grand.Web.Common.Filters;+using Grand.Web.Common.Localization;using Grand.Web.Common.Security.Authorization;using Microsoft.AspNetCore.Mvc;namespace Grand.Web.Admin.Controllers;-[PermissionAuthorize(PermissionSystemName.AddressAttributes)]-public class AddressAttributeController : BaseAdminController+[AuthorizeAdmin]+[AutoValidateAntiforgeryToken]+[Area(Constants.AreaAdmin)]+[AuthorizeMenu]+public class AddressAttributeController(+ IAddressAttributeService addressAttributeService,+ IAddressAttributeViewModelService addressAttributeViewModelService,+ ILanguageService languageService,+ ITranslationService translationService,+ IAdminDataScope<AddressAttribute> scope)+ : BaseAddressAttributeController(addressAttributeService, addressAttributeViewModelService,+ languageService, translationService, scope){- #region Constructors-- public AddressAttributeController(IAddressAttributeService addressAttributeService,- ILanguageService languageService,- ITranslationService translationService,- IAddressAttributeViewModelService addressAttributeViewModelService)- {- _addressAttributeService = addressAttributeService;- _languageService = languageService;- _translationService = translationService;- _addressAttributeViewModelService = addressAttributeViewModelService;- }-- #endregion-- #region Fields-- private readonly IAddressAttributeService _addressAttributeService;- private readonly ILanguageService _languageService;- private readonly ITranslationService _translationService;- private readonly IAddressAttributeViewModelService _addressAttributeViewModelService;-- #endregion-- #region Address attributes-- public IActionResult Index()- {- return RedirectToAction("List");- }--- public IActionResult List()- {- return View();- }-- [PermissionAuthorizeAction(PermissionActionName.List)]- [HttpPost]- public async Task<IActionResult> List(DataSourceRequest command)- {- var model = await _addressAttributeViewModelService.PrepareAddressAttributes();- var gridModel = new DataSourceResult {- Data = model.addressAttributes,- Total = model.totalCount- };- return Json(gridModel);- }-- //create[PermissionAuthorizeAction(PermissionActionName.Create)]- public async Task<IActionResult> Create()- {- var model = _addressAttributeViewModelService.PrepareAddressAttributeModel();- //locales- await AddLocales(_languageService, model.Locales);- return View(model);- }-- [HttpPost]- [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]- public async Task<IActionResult> Create(AddressAttributeModel model, bool continueEditing)- {- if (ModelState.IsValid)- {- var addressAttribute = await _addressAttributeViewModelService.InsertAddressAttributeModel(model);- Success(_translationService.GetResource("Admin.Address.AddressAttributes.Added"));- return continueEditing- ? RedirectToAction("Edit", new { id = addressAttribute.Id })- : RedirectToAction("List");- }-- //If we got this far, something failed, redisplay form- return View(model);- }-- [PermissionAuthorizeAction(PermissionActionName.Preview)]- //edit- public async Task<IActionResult> Edit(string id)- {- var addressAttribute = await _addressAttributeService.GetAddressAttributeById(id);- if (addressAttribute == null)- //No address attribute found with the specified id- return RedirectToAction("List");-- var model = _addressAttributeViewModelService.PrepareAddressAttributeModel(addressAttribute);- //locales- await AddLocales(_languageService, model.Locales, (locale, languageId) =>- {- locale.Name = addressAttribute.GetTranslation(x => x.Name, languageId, false);- });- return View(model);- }-- [PermissionAuthorizeAction(PermissionActionName.Edit)]- [HttpPost]- [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]- public async Task<IActionResult> Edit(AddressAttributeModel model, bool continueEditing)- {- var addressAttribute = await _addressAttributeService.GetAddressAttributeById(model.Id);- if (addressAttribute == null)- //No address attribute found with the specified id- return RedirectToAction("List");-- if (ModelState.IsValid)- {- addressAttribute =- await _addressAttributeViewModelService.UpdateAddressAttributeModel(model, addressAttribute);- Success(_translationService.GetResource("Admin.Address.AddressAttributes.Updated"));- if (continueEditing)- {- //selected tab- await SaveSelectedTabIndex();-- return RedirectToAction("Edit", new { id = addressAttribute.Id });- }-- return RedirectToAction("List");- }-- //If we got this far, something failed, redisplay form- return View(model);- }-- //delete- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Delete)]- public async Task<IActionResult> Delete(string id)- {- var addressAttribute = await _addressAttributeService.GetAddressAttributeById(id);- if (addressAttribute == null)- //No address attribute found with the specified id- return RedirectToAction("List");-- await _addressAttributeService.DeleteAddressAttribute(addressAttribute);-- Success(_translationService.GetResource("Admin.Address.AddressAttributes.Deleted"));- return RedirectToAction("List");- }-- #endregion+ public override async Task<IActionResult> ValueCreatePopup(string addressAttributeId) =>+ await base.ValueCreatePopup(addressAttributeId);- #region Address attribute values-- //list- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Preview)]- public async Task<IActionResult> ValueList(string addressAttributeId, DataSourceRequest command)- {- var model = await _addressAttributeViewModelService.PrepareAddressAttributeValues(addressAttributeId);- var gridModel = new DataSourceResult {- Data = model.addressAttributeValues,- Total = model.totalCount- };- return Json(gridModel);- }-- //create[PermissionAuthorizeAction(PermissionActionName.Create)]- public async Task<IActionResult> ValueCreatePopup(string addressAttributeId)- {- var addressAttribute = await _addressAttributeService.GetAddressAttributeById(addressAttributeId);- if (addressAttribute == null)- //No address attribute found with the specified id- return RedirectToAction("List");-- var model = _addressAttributeViewModelService.PrepareAddressAttributeValueModel(addressAttributeId);- //locales- await AddLocales(_languageService, model.Locales);- return View(model);- }-[HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Create)]- public async Task<IActionResult> ValueCreatePopup(AddressAttributeValueModel model)- {- var addressAttribute = await _addressAttributeService.GetAddressAttributeById(model.AddressAttributeId);- if (addressAttribute == null)- //No address attribute found with the specified id- return RedirectToAction("List");-- if (ModelState.IsValid)- {- await _addressAttributeViewModelService.InsertAddressAttributeValueModel(model);- return Content("");- }-- //If we got this far, something failed, redisplay form- return View(model);- }+ public override async Task<IActionResult> ValueCreatePopup(AddressAttributeValueModel model) =>+ await base.ValueCreatePopup(model);- //edit[PermissionAuthorizeAction(PermissionActionName.Preview)]- public async Task<IActionResult> ValueEditPopup(string id, string addressAttributeId)- {- var av = await _addressAttributeService.GetAddressAttributeById(addressAttributeId);- if (av == null)- //No address attribute found with the specified id- return RedirectToAction("List");-- var cav = av.AddressAttributeValues.FirstOrDefault(x => x.Id == id);- if (cav == null)- //No address attribute value found with the specified id- return RedirectToAction("List");-- var model = _addressAttributeViewModelService.PrepareAddressAttributeValueModel(cav);-- //locales- await AddLocales(_languageService, model.Locales, (locale, languageId) =>- {- locale.Name = cav.GetTranslation(x => x.Name, languageId, false);- });-- return View(model);- }-- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> ValueEditPopup(AddressAttributeValueModel model)- {- var av = await _addressAttributeService.GetAddressAttributeById(model.AddressAttributeId);- var cav = av.AddressAttributeValues.FirstOrDefault(x => x.Id == model.Id);- if (cav == null)- //No address attribute value found with the specified id- return RedirectToAction("List");-- if (ModelState.IsValid)- {- await _addressAttributeViewModelService.UpdateAddressAttributeValueModel(model, cav);- return Content("");- }-- //If we got this far, something failed, redisplay form- return View(model);- }-- //delete- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> ValueDelete(AddressAttributeValueModel model)- {- var av = await _addressAttributeService.GetAddressAttributeById(model.AddressAttributeId);- var cav = av.AddressAttributeValues.FirstOrDefault(x => x.Id == model.Id);- if (cav == null)- throw new ArgumentException("No address attribute value found with the specified id");- await _addressAttributeService.DeleteAddressAttributeValue(cav);-- return new JsonResult("");- }-- #endregion+ public override async Task<IActionResult> ValueEditPopup(string id, string addressAttributeId) =>+ await base.ValueEditPopup(id, addressAttributeId);}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Controllers/CheckoutAttributeController.cs b/src/Web/Grand.Web.Admin/Controllers/CheckoutAttributeController.csindex 0f41142c4..b5dbbc22b 100644--- a/src/Web/Grand.Web.Admin/Controllers/CheckoutAttributeController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/CheckoutAttributeController.cs@@ -1,301 +1,38 @@-using Grand.Business.Core.Extensions;-using Grand.Business.Core.Interfaces.Catalog.Directory;+using Grand.Business.Core.Interfaces.Catalog.Directory;using Grand.Business.Core.Interfaces.Checkout.CheckoutAttributes;using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Interfaces.Common.Localization;-using Grand.Domain.Permissions;using Grand.Domain.Directory;-using Grand.Web.AdminShared.Extensions.Mapping;+using Grand.Domain.Orders;+using Grand.Web.Admin.Extensions;+using Grand.Web.AdminShared.Controllers;using Grand.Web.AdminShared.Interfaces;-using Grand.Web.AdminShared.Models.Orders;-using Grand.Web.Common.DataSource;using Grand.Web.Common.Filters;-using Grand.Web.Common.Security.Authorization;+using Grand.Web.Common.Localization;using Microsoft.AspNetCore.Mvc;namespace Grand.Web.Admin.Controllers;-[PermissionAuthorize(PermissionSystemName.CheckoutAttributes)]-public class CheckoutAttributeController : BaseAdminController-{- #region Constructors-- public CheckoutAttributeController(ICheckoutAttributeService checkoutAttributeService,- ILanguageService languageService,- ITranslationService translationService,- ICurrencyService currencyService,- CurrencySettings currencySettings,- IMeasureService measureService,- MeasureSettings measureSettings,- ICheckoutAttributeViewModelService checkoutAttributeViewModelService)- {- _checkoutAttributeService = checkoutAttributeService;- _languageService = languageService;- _translationService = translationService;- _currencyService = currencyService;- _currencySettings = currencySettings;- _measureService = measureService;- _measureSettings = measureSettings;- _checkoutAttributeViewModelService = checkoutAttributeViewModelService;- }-- #endregion-- #region Fields-- private readonly ICheckoutAttributeService _checkoutAttributeService;- private readonly ILanguageService _languageService;- private readonly ITranslationService _translationService;- private readonly ICurrencyService _currencyService;- private readonly CurrencySettings _currencySettings;- private readonly IMeasureService _measureService;- private readonly MeasureSettings _measureSettings;- private readonly ICheckoutAttributeViewModelService _checkoutAttributeViewModelService;-- #endregion-- #region Checkout attributes-- //list- public IActionResult Index()- {- return RedirectToAction("List");- }-- public IActionResult List()- {- return View();- }-- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.List)]- public async Task<IActionResult> List(DataSourceRequest command)- {- var checkoutAttributes = await _checkoutAttributeViewModelService.PrepareCheckoutAttributeListModel();- var gridModel = new DataSourceResult {- Data = checkoutAttributes.ToList(),- Total = checkoutAttributes.Count()- };- return Json(gridModel);- }-- //create- [PermissionAuthorizeAction(PermissionActionName.Create)]- public async Task<IActionResult> Create()- {- var model = await _checkoutAttributeViewModelService.PrepareCheckoutAttributeModel();- //locales- await AddLocales(_languageService, model.Locales);-- return View(model);- }-- [HttpPost]- [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]- [PermissionAuthorizeAction(PermissionActionName.Create)]- public async Task<IActionResult> Create(CheckoutAttributeModel model, bool continueEditing)- {- if (ModelState.IsValid)- {- var checkoutAttribute = await _checkoutAttributeViewModelService.InsertCheckoutAttributeModel(model);- Success(_translationService.GetResource("Admin.Orders.CheckoutAttributes.Added"));- return continueEditing- ? RedirectToAction("Edit", new { id = checkoutAttribute.Id })- : RedirectToAction("List");- }-- //If we got this far, something failed, redisplay form- //tax categories- await _checkoutAttributeViewModelService.PrepareTaxCategories(model, null, true);-- return View(model);- }-- //edit- [PermissionAuthorizeAction(PermissionActionName.Preview)]- public async Task<IActionResult> Edit(string id)- {- var checkoutAttribute = await _checkoutAttributeService.GetCheckoutAttributeById(id);- if (checkoutAttribute == null)- //No checkout attribute found with the specified id- return RedirectToAction("List");-- var model = checkoutAttribute.ToModel();- //locales- await AddLocales(_languageService, model.Locales, (locale, languageId) =>- {- locale.Name = checkoutAttribute.GetTranslation(x => x.Name, languageId, false);- locale.TextPrompt = checkoutAttribute.GetTranslation(x => x.TextPrompt, languageId, false);- });-- //tax categories- await _checkoutAttributeViewModelService.PrepareTaxCategories(model, checkoutAttribute, false);-- //condition- await _checkoutAttributeViewModelService.PrepareConditionAttributes(model, checkoutAttribute);-- return View(model);- }-- [HttpPost]- [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> Edit(CheckoutAttributeModel model, bool continueEditing)- {- var checkoutAttribute = await _checkoutAttributeService.GetCheckoutAttributeById(model.Id);- if (checkoutAttribute == null)- //No checkout attribute found with the specified id- return RedirectToAction("List");-- if (ModelState.IsValid)- {- checkoutAttribute =- await _checkoutAttributeViewModelService.UpdateCheckoutAttributeModel(checkoutAttribute, model);- Success(_translationService.GetResource("Admin.Orders.CheckoutAttributes.Updated"));- if (continueEditing)- {- //selected tab- await SaveSelectedTabIndex();-- return RedirectToAction("Edit", new { id = checkoutAttribute.Id });- }-- return RedirectToAction("List");- }-- //If we got this far, something failed, redisplay form- //tax categories- await _checkoutAttributeViewModelService.PrepareTaxCategories(model, checkoutAttribute, true);- return View(model);- }-- //delete- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Delete)]- public async Task<IActionResult> Delete(string id)- {- var checkoutAttribute = await _checkoutAttributeService.GetCheckoutAttributeById(id);- await _checkoutAttributeService.DeleteCheckoutAttribute(checkoutAttribute);-- Success(_translationService.GetResource("Admin.Orders.CheckoutAttributes.Deleted"));- return RedirectToAction("List");- }-- #endregion-- #region Checkout attribute values-- //list- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Preview)]- public async Task<IActionResult> ValueList(string checkoutAttributeId, DataSourceRequest command)- {- var checkoutAttribute =- await _checkoutAttributeViewModelService.PrepareCheckoutAttributeValuesModel(checkoutAttributeId);- var gridModel = new DataSourceResult {- Data = checkoutAttribute.ToList(),- Total = checkoutAttribute.Count()- };- return Json(gridModel);- }-- //create- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> ValueCreatePopup(string checkoutAttributeId)- {- var model = await _checkoutAttributeViewModelService.PrepareCheckoutAttributeValueModel(checkoutAttributeId);- //locales- await AddLocales(_languageService, model.Locales);- return View(model);- }-- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> ValueCreatePopup(CheckoutAttributeValueModel model)- {- var checkoutAttribute = await _checkoutAttributeService.GetCheckoutAttributeById(model.CheckoutAttributeId);- if (checkoutAttribute == null)- //No checkout attribute found with the specified id- return RedirectToAction("List");-- if (ModelState.IsValid)- {- await _checkoutAttributeViewModelService.InsertCheckoutAttributeValueModel(checkoutAttribute, model);- return Content("");- }-- //If we got this far, something failed, redisplay form- model.PrimaryStoreCurrencyCode =- (await _currencyService.GetCurrencyById(_currencySettings.PrimaryStoreCurrencyId)).CurrencyCode;- model.BaseWeightIn = (await _measureService.GetMeasureWeightById(_measureSettings.BaseWeightId)).Name;- return View(model);- }-- //edit- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> ValueEditPopup(string id, string checkoutAttributeId)- {- var checkoutAttribute = await _checkoutAttributeService.GetCheckoutAttributeById(checkoutAttributeId);- var cav = checkoutAttribute.CheckoutAttributeValues.FirstOrDefault(x => x.Id == id);- if (cav == null)- //No checkout attribute value found with the specified id- return RedirectToAction("List");-- var model = await _checkoutAttributeViewModelService.PrepareCheckoutAttributeValueModel(checkoutAttribute, cav);-- //locales- await AddLocales(_languageService, model.Locales, (locale, languageId) =>- {- locale.Name = cav.GetTranslation(x => x.Name, languageId, false);- });-- return View(model);- }-- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> ValueEditPopup(CheckoutAttributeValueModel model)- {- var checkoutAttribute = await _checkoutAttributeService.GetCheckoutAttributeById(model.CheckoutAttributeId);-- var cav = checkoutAttribute.CheckoutAttributeValues.FirstOrDefault(x => x.Id == model.Id);- if (cav == null)- //No checkout attribute value found with the specified id- return RedirectToAction("List");-- if (ModelState.IsValid)- {- await _checkoutAttributeViewModelService.UpdateCheckoutAttributeValueModel(checkoutAttribute, cav, model);- return Content("");- }-- //If we got this far, something failed, redisplay form- model.PrimaryStoreCurrencyCode =- (await _currencyService.GetCurrencyById(_currencySettings.PrimaryStoreCurrencyId)).CurrencyCode;- model.BaseWeightIn = (await _measureService.GetMeasureWeightById(_measureSettings.BaseWeightId)).Name;-- return View(model);- }-- //delete- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> ValueDelete(string id, string checkoutAttributeId)- {- var checkoutAttribute = await _checkoutAttributeService.GetCheckoutAttributeById(checkoutAttributeId);- var cav = checkoutAttribute.CheckoutAttributeValues.FirstOrDefault(x => x.Id == id);- if (cav == null)- throw new ArgumentException("No checkout attribute value found with the specified id");-- if (ModelState.IsValid)- {- checkoutAttribute.CheckoutAttributeValues.Remove(cav);- await _checkoutAttributeService.UpdateCheckoutAttribute(checkoutAttribute);- return new JsonResult("");- }-- return ErrorForKendoGridJson(ModelState);- }-- #endregion-}\ No newline at end of file+// Reduced to a thin subclass of BaseCheckoutAttributeController (ARCH-001 CheckoutAttribute consolidation). All+// regions of behavior live in the shared base; this class only supplies Admin's DI wiring plus the+// attributes that used to arrive transitively via BaseAdminController - BaseCheckoutAttributeController+// 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.+[AuthorizeAdmin]+[AutoValidateAntiforgeryToken]+[Area(Constants.AreaAdmin)]+[AuthorizeMenu]+public class CheckoutAttributeController(+ ICheckoutAttributeService checkoutAttributeService,+ ILanguageService languageService,+ ITranslationService translationService,+ ICurrencyService currencyService,+ CurrencySettings currencySettings,+ IMeasureService measureService,+ MeasureSettings measureSettings,+ ICheckoutAttributeViewModelService checkoutAttributeViewModelService,+ IAdminDataScope<CheckoutAttribute> scope)+ : BaseCheckoutAttributeController(checkoutAttributeService, languageService, translationService,+ currencyService, currencySettings, measureService, measureSettings,+ checkoutAttributeViewModelService, scope);\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Controllers/ContactAttributeController.cs b/src/Web/Grand.Web.Admin/Controllers/ContactAttributeController.csindex 3fe355eb7..4eb9d5b9f 100644--- a/src/Web/Grand.Web.Admin/Controllers/ContactAttributeController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/ContactAttributeController.cs@@ -1,291 +1,32 @@-using Grand.Business.Core.Extensions;-using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Business.Core.Interfaces.Marketing.Contacts;-using Grand.Domain.Permissions;using Grand.Domain.Catalog;-using Grand.Web.AdminShared.Extensions.Mapping;+using Grand.Domain.Messages;+using Grand.Domain.Permissions;+using Grand.Web.Admin.Extensions;+using Grand.Web.AdminShared.Controllers;using Grand.Web.AdminShared.Interfaces;-using Grand.Web.AdminShared.Models.Messages;-using Grand.Web.Common.DataSource;using Grand.Web.Common.Filters;using Grand.Web.Common.Security.Authorization;using Microsoft.AspNetCore.Mvc;namespace Grand.Web.Admin.Controllers;-[PermissionAuthorize(PermissionSystemName.ContactAttributes)]-public class ContactAttributeController : BaseAdminController-{- #region Constructors-- public ContactAttributeController(- IContactAttributeViewModelService contactAttributeViewModelService,- IContactAttributeService contactAttributeService,- ILanguageService languageService,- ITranslationService translationService)- {- _contactAttributeViewModelService = contactAttributeViewModelService;- _contactAttributeService = contactAttributeService;- _languageService = languageService;- _translationService = translationService;- }-- #endregion-- #region Fields-- private readonly IContactAttributeViewModelService _contactAttributeViewModelService;- private readonly IContactAttributeService _contactAttributeService;- private readonly ILanguageService _languageService;- private readonly ITranslationService _translationService;-- #endregion-- #region Contact attributes-- //list- public IActionResult Index()- {- return RedirectToAction("List");- }-- public IActionResult List()- {- return View();- }-- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.List)]- public async Task<IActionResult> List(DataSourceRequest command)- {- var contactAttributes = await _contactAttributeViewModelService.PrepareContactAttributeListModel();- var gridModel = new DataSourceResult {- Data = contactAttributes.ToList(),- Total = contactAttributes.Count()- };- return Json(gridModel);- }-- //create- [PermissionAuthorizeAction(PermissionActionName.Create)]- public async Task<IActionResult> Create()- {- var model = new ContactAttributeModel();- //locales- await AddLocales(_languageService, model.Locales);- //condition- await _contactAttributeViewModelService.PrepareConditionAttributes(model, null);-- return View(model);- }-- [HttpPost]- [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]- [PermissionAuthorizeAction(PermissionActionName.Create)]- public async Task<IActionResult> Create(ContactAttributeModel model, bool continueEditing)- {- if (ModelState.IsValid)- {- var contactAttribute = await _contactAttributeViewModelService.InsertContactAttributeModel(model);- Success(_translationService.GetResource("Admin.Catalog.Attributes.ContactAttributes.Added"));- return continueEditing- ? RedirectToAction("Edit", new { id = contactAttribute.Id })- : RedirectToAction("List");- }-- //If we got this far, something failed, redisplay form- return View(model);- }-- //edit- [PermissionAuthorizeAction(PermissionActionName.Preview)]- public async Task<IActionResult> Edit(string id)- {- var contactAttribute = await _contactAttributeService.GetContactAttributeById(id);- if (contactAttribute == null)- //No contact attribute found with the specified id- return RedirectToAction("List");-- var model = contactAttribute.ToModel();- //locales- await AddLocales(_languageService, model.Locales, (locale, languageId) =>- {- locale.Name = contactAttribute.GetTranslation(x => x.Name, languageId, false);- locale.TextPrompt = contactAttribute.GetTranslation(x => x.TextPrompt, languageId, false);- });- //condition- await _contactAttributeViewModelService.PrepareConditionAttributes(model, contactAttribute);-- return View(model);- }-- [HttpPost]- [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> Edit(ContactAttributeModel model, bool continueEditing)- {- var contactAttribute = await _contactAttributeService.GetContactAttributeById(model.Id);- if (contactAttribute == null)- //No contact attribute found with the specified id- return RedirectToAction("List");-- if (ModelState.IsValid)- {- contactAttribute =- await _contactAttributeViewModelService.UpdateContactAttributeModel(contactAttribute, model);- Success(_translationService.GetResource("Admin.Catalog.Attributes.ContactAttributes.Updated"));- if (continueEditing)- {- //selected tab- await SaveSelectedTabIndex();-- return RedirectToAction("Edit", new { id = contactAttribute.Id });- }-- return RedirectToAction("List");- }-- //If we got this far, something failed, redisplay form- await _contactAttributeViewModelService.PrepareConditionAttributes(model, contactAttribute);- return View(model);- }-- //delete- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Delete)]- public async Task<IActionResult> Delete(string id)- {- if (ModelState.IsValid)- {- var contactAttribute = await _contactAttributeService.GetContactAttributeById(id);- await _contactAttributeService.DeleteContactAttribute(contactAttribute);-- Success(_translationService.GetResource("Admin.Catalog.Attributes.ContactAttributes.Deleted"));- return RedirectToAction("List");- }-- Error(ModelState);- return RedirectToAction("Edit", new { id });- }-- #endregion-- #region Contact attribute values-- //list- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Preview)]- public async Task<IActionResult> ValueList(string contactAttributeId, DataSourceRequest command)- {- var contactAttribute = await _contactAttributeService.GetContactAttributeById(contactAttributeId);- var values = contactAttribute.ContactAttributeValues;- var gridModel = new DataSourceResult {- Data = values.Select(x => new ContactAttributeValueModel {- Id = x.Id,- ContactAttributeId = x.ContactAttributeId,- Name = contactAttribute.AttributeControlType != AttributeControlType.ColorSquares- ? x.Name- : $"{x.Name} - {x.ColorSquaresRgb}",- ColorSquaresRgb = x.ColorSquaresRgb,- IsPreSelected = x.IsPreSelected,- DisplayOrder = x.DisplayOrder- }),- Total = values.Count- };- return Json(gridModel);- }-- //create- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> ValueCreatePopup(string contactAttributeId)- {- var contactAttribute = await _contactAttributeService.GetContactAttributeById(contactAttributeId);- var model = _contactAttributeViewModelService.PrepareContactAttributeValueModel(contactAttribute);-- //locales- await AddLocales(_languageService, model.Locales);- return View(model);- }-- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> ValueCreatePopup(ContactAttributeValueModel model)- {- var contactAttribute = await _contactAttributeService.GetContactAttributeById(model.ContactAttributeId);- if (contactAttribute == null)- //No contact attribute found with the specified id- return RedirectToAction("List");- if (ModelState.IsValid)- {- await _contactAttributeViewModelService.InsertContactAttributeValueModel(contactAttribute, model);- return Content("");- }-- //If we got this far, something failed, redisplay form- return View(model);- }-- //edit- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> ValueEditPopup(string id, string contactAttributeId)- {- var contactAttribute = await _contactAttributeService.GetContactAttributeById(contactAttributeId);- var cav = contactAttribute.ContactAttributeValues.FirstOrDefault(x => x.Id == id);- if (cav == null)- //No contact attribute value found with the specified id- return RedirectToAction("List");-- var model = _contactAttributeViewModelService.PrepareContactAttributeValueModel(contactAttribute, cav);- //locales- await AddLocales(_languageService, model.Locales, (locale, languageId) =>- {- locale.Name = cav.GetTranslation(x => x.Name, languageId, false);- });-- return View(model);- }-- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> ValueEditPopup(ContactAttributeValueModel model)- {- var contactAttribute = await _contactAttributeService.GetContactAttributeById(model.ContactAttributeId);-- var cav = contactAttribute.ContactAttributeValues.FirstOrDefault(x => x.Id == model.Id);- if (cav == null)- //No contact attribute value found with the specified id- return RedirectToAction("List");-- if (ModelState.IsValid)- {- await _contactAttributeViewModelService.UpdateContactAttributeValueModel(contactAttribute, cav, model);-- return Content("");- }-- //If we got this far, something failed, redisplay form- return View(model);- }-- //delete- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> ValueDelete(string id, string contactAttributeId)- {- var contactAttribute = await _contactAttributeService.GetContactAttributeById(contactAttributeId);- var cav = contactAttribute.ContactAttributeValues.FirstOrDefault(x => x.Id == id);- if (cav == null)- throw new ArgumentException("No contact attribute value found with the specified id");- if (ModelState.IsValid)- {- contactAttribute.ContactAttributeValues.Remove(cav);- await _contactAttributeService.UpdateContactAttribute(contactAttribute);-- return new JsonResult("");- }-- return ErrorForKendoGridJson(ModelState);- }-- #endregion-}\ No newline at end of file+// Reduced to a thin subclass of BaseContactAttributeController (ARCH-001 ContactAttribute consolidation). All+// regions of behavior live in the shared base; this class only supplies Admin's DI wiring plus the+// attributes that used to arrive transitively via BaseAdminController - BaseContactAttributeController+// 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 ProductController (see that file).+[AuthorizeAdmin]+[AutoValidateAntiforgeryToken]+[Area(Constants.AreaAdmin)]+[AuthorizeMenu]+public class ContactAttributeController(+ IContactAttributeViewModelService contactAttributeViewModelService,+ IContactAttributeService contactAttributeService,+ ILanguageService languageService,+ ITranslationService translationService,+ IAdminDataScope<ContactAttribute> scope)+ : BaseContactAttributeController(contactAttributeViewModelService, contactAttributeService,+ languageService, translationService, scope);\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerAttributeController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerAttributeController.csindex 1e748ebf0..6d1859df0 100644--- a/src/Web/Grand.Web.Admin/Controllers/CustomerAttributeController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/CustomerAttributeController.cs@@ -1,255 +1,33 @@-using Grand.Business.Core.Extensions;-using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Business.Core.Interfaces.Customers;+using Grand.Domain.Customers;using Grand.Domain.Permissions;+using Grand.Web.Admin.Extensions;+using Grand.Web.AdminShared.Controllers;using Grand.Web.AdminShared.Interfaces;using Grand.Web.AdminShared.Models.Customers;-using Grand.Web.Common.DataSource;using Grand.Web.Common.Filters;+using Grand.Web.Common.Localization;using Grand.Web.Common.Security.Authorization;using Microsoft.AspNetCore.Mvc;namespace Grand.Web.Admin.Controllers;+[AuthorizeAdmin]+[AutoValidateAntiforgeryToken]+[Area(Constants.AreaAdmin)]+[AuthorizeMenu][PermissionAuthorize(PermissionSystemName.Settings)]-public class CustomerAttributeController : BaseAdminController+public class CustomerAttributeController(+ ICustomerAttributeService customerAttributeService,+ ICustomerAttributeViewModelService customerAttributeViewModelService,+ ILanguageService languageService,+ ITranslationService translationService,+ IAdminDataScope<CustomerAttribute> scope)+ : BaseCustomerAttributeController(customerAttributeService, customerAttributeViewModelService,+ languageService, translationService, scope){- #region Constructors-- public CustomerAttributeController(ICustomerAttributeService customerAttributeService,- ICustomerAttributeViewModelService customerAttributeViewModelService,- ILanguageService languageService,- ITranslationService translationService)- {- _customerAttributeService = customerAttributeService;- _customerAttributeViewModelService = customerAttributeViewModelService;- _languageService = languageService;- _translationService = translationService;- }-- #endregion-- #region Fields-- private readonly ICustomerAttributeService _customerAttributeService;- private readonly ICustomerAttributeViewModelService _customerAttributeViewModelService;- private readonly ILanguageService _languageService;- private readonly ITranslationService _translationService;-- #endregion-- #region Customer attributes-- public IActionResult Index()- {- return RedirectToAction("List");- }-- public IActionResult List()- {- return View();- }-- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.List)]- public async Task<IActionResult> List(DataSourceRequest command)- {- var customerAttributes = await _customerAttributeViewModelService.PrepareCustomerAttributes();- var gridModel = new DataSourceResult {- Data = customerAttributes.ToList(),- Total = customerAttributes.Count()- };- return Json(gridModel);- }-- //create- [PermissionAuthorizeAction(PermissionActionName.Create)]- public async Task<IActionResult> Create()- {- var model = _customerAttributeViewModelService.PrepareCustomerAttributeModel();- //locales- await AddLocales(_languageService, model.Locales);- return View(model);- }-- [HttpPost]- [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]- [PermissionAuthorizeAction(PermissionActionName.Create)]- public async Task<IActionResult> Create(CustomerAttributeModel model, bool continueEditing)- {- if (ModelState.IsValid)- {- var customerAttribute = await _customerAttributeViewModelService.InsertCustomerAttributeModel(model);- Success(_translationService.GetResource("Admin.Customers.CustomerAttributes.Added"));- return continueEditing- ? RedirectToAction("Edit", new { id = customerAttribute.Id })- : RedirectToAction("List");- }-- //If we got this far, something failed, redisplay form- return View(model);- }-- //edit[PermissionAuthorizeAction(PermissionActionName.Preview)]- public async Task<IActionResult> Edit(string id)- {- var customerAttribute = await _customerAttributeService.GetCustomerAttributeById(id);- if (customerAttribute == null)- //No customer attribute found with the specified id- return RedirectToAction("List");-- var model = _customerAttributeViewModelService.PrepareCustomerAttributeModel(customerAttribute);- //locales- await AddLocales(_languageService, model.Locales, (locale, languageId) =>- {- locale.Name = customerAttribute.GetTranslation(x => x.Name, languageId, false);- });- return View(model);- }-- [PermissionAuthorizeAction(PermissionActionName.Edit)]- [HttpPost]- [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]- public async Task<IActionResult> Edit(CustomerAttributeModel model, bool continueEditing)- {- var customerAttribute = await _customerAttributeService.GetCustomerAttributeById(model.Id);- if (customerAttribute == null)- //No customer attribute found with the specified id- return RedirectToAction("List");-- if (ModelState.IsValid)- {- customerAttribute =- await _customerAttributeViewModelService.UpdateCustomerAttributeModel(model, customerAttribute);-- Success(_translationService.GetResource("Admin.Customers.CustomerAttributes.Updated"));- if (continueEditing)- {- //selected tab- await SaveSelectedTabIndex();-- return RedirectToAction("Edit", new { id = customerAttribute.Id });- }-- return RedirectToAction("List");- }-- //If we got this far, something failed, redisplay form- return View(model);- }-- //delete- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Delete)]- public async Task<IActionResult> Delete(string id)- {- await _customerAttributeViewModelService.DeleteCustomerAttribute(id);-- Success(_translationService.GetResource("Admin.Customers.CustomerAttributes.Deleted"));- return RedirectToAction("List");- }-- #endregion-- #region Customer attribute values-- //list- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Preview)]- public async Task<IActionResult> ValueList(string customerAttributeId, DataSourceRequest command)- {- var values = await _customerAttributeViewModelService.PrepareCustomerAttributeValues(customerAttributeId);- var gridModel = new DataSourceResult {- Data = values.ToList(),- Total = values.Count()- };- return Json(gridModel);- }-- //create- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> ValueCreatePopup(string customerAttributeId)- {- var customerAttribute = await _customerAttributeService.GetCustomerAttributeById(customerAttributeId);- if (customerAttribute == null)- //No customer attribute found with the specified id- return RedirectToAction("List");-- var model = _customerAttributeViewModelService.PrepareCustomerAttributeValueModel(customerAttributeId);- //locales- await AddLocales(_languageService, model.Locales);- return View(model);- }-- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> ValueCreatePopup(CustomerAttributeValueModel model)- {- var customerAttribute = await _customerAttributeService.GetCustomerAttributeById(model.CustomerAttributeId);- if (customerAttribute == null)- //No customer attribute found with the specified id- return RedirectToAction("List");-- if (ModelState.IsValid)- {- await _customerAttributeViewModelService.InsertCustomerAttributeValueModel(model);- return Content("");- }-- //If we got this far, something failed, redisplay form- return View(model);- }-- //edit- [PermissionAuthorizeAction(PermissionActionName.Preview)]- public async Task<IActionResult> ValueEditPopup(string id, string customerAttributeId)- {- var av = await _customerAttributeService.GetCustomerAttributeById(customerAttributeId);- var cav = av.CustomerAttributeValues.FirstOrDefault(x => x.Id == id);- if (cav == null)- //No customer attribute value found with the specified id- return RedirectToAction("List");-- var model = _customerAttributeViewModelService.PrepareCustomerAttributeValueModel(cav);- //locales- await AddLocales(_languageService, model.Locales, (locale, languageId) =>- {- locale.Name = cav.GetTranslation(x => x.Name, languageId, false);- });-- return View(model);- }-- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> ValueEditPopup(CustomerAttributeValueModel model)- {- var av = await _customerAttributeService.GetCustomerAttributeById(model.CustomerAttributeId);- var cav = av.CustomerAttributeValues.FirstOrDefault(x => x.Id == model.Id);- if (cav == null)- //No customer attribute value found with the specified id- return RedirectToAction("List");-- if (ModelState.IsValid)- {- await _customerAttributeViewModelService.UpdateCustomerAttributeValueModel(model, cav);- return Content("");- }-- //If we got this far, something failed, redisplay form- return View(model);- }-- //delete- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> ValueDelete(CustomerAttributeValueModel model)- {- await _customerAttributeViewModelService.DeleteCustomerAttributeValue(model);-- return new JsonResult("");- }-- #endregion-}\ No newline at end of file+ public override async Task<IActionResult> ValueEditPopup(string id, string customerAttributeId) =>+ await base.ValueEditPopup(id, customerAttributeId);+}diff --git a/src/Web/Grand.Web.Admin/Controllers/ProductAttributeController.cs b/src/Web/Grand.Web.Admin/Controllers/ProductAttributeController.csindex 132228e55..2aadd8cbb 100644--- a/src/Web/Grand.Web.Admin/Controllers/ProductAttributeController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/ProductAttributeController.cs@@ -1,338 +1,31 @@-using Grand.Business.Core.Extensions;-using Grand.Business.Core.Interfaces.Catalog.Products;+using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Business.Core.Interfaces.Common.Localization;-using Grand.Domain.Permissions;+using Grand.Domain.Catalog;using Grand.Domain.Seo;-using Grand.Web.AdminShared.Extensions.Mapping;-using Grand.Web.AdminShared.Models.Catalog;-using Grand.Web.Common.DataSource;+using Grand.Web.Admin.Extensions;+using Grand.Web.AdminShared.Controllers;+using Grand.Web.AdminShared.Interfaces;using Grand.Web.Common.Filters;-using Grand.Web.Common.Security.Authorization;using Microsoft.AspNetCore.Mvc;namespace Grand.Web.Admin.Controllers;-[PermissionAuthorize(PermissionSystemName.ProductAttributes)]-public class ProductAttributeController : BaseAdminController-{- #region Constructors-- public ProductAttributeController(- IProductService productService,- IProductAttributeService productAttributeService,- ILanguageService languageService,- ITranslationService translationService,- SeoSettings seoSettings)- {- _productService = productService;- _productAttributeService = productAttributeService;- _languageService = languageService;- _translationService = translationService;- _seoSettings = seoSettings;- }-- #endregion-- #region Fields-- private readonly IProductService _productService;- private readonly IProductAttributeService _productAttributeService;- private readonly ILanguageService _languageService;- private readonly ITranslationService _translationService;- private readonly SeoSettings _seoSettings;-- #endregion Fields-- #region Methods-- #region Attribute list / create / edit / delete-- //list- public IActionResult Index()- {- return RedirectToAction("List");- }-- public IActionResult List()- {- return View();- }-- [PermissionAuthorizeAction(PermissionActionName.List)]- [HttpPost]- public async Task<IActionResult> List(DataSourceRequest command)- {- var productAttributes = await _productAttributeService.GetAllProductAttributes(pageIndex: command.Page - 1, pageSize: command.PageSize);- var gridModel = new DataSourceResult {- Data = productAttributes.Select(x => x.ToModel()),- Total = productAttributes.TotalCount- };-- return Json(gridModel);- }-- //create- [PermissionAuthorizeAction(PermissionActionName.Create)]- public async Task<IActionResult> Create()- {- var model = new ProductAttributeModel();- //locales- await AddLocales(_languageService, model.Locales);- return View(model);- }-- [PermissionAuthorizeAction(PermissionActionName.Create)]- [HttpPost]- [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]- public async Task<IActionResult> Create(ProductAttributeModel model, bool continueEditing)- {- if (ModelState.IsValid)- {- var productAttribute = model.ToEntity();- productAttribute.SeName = SeoExtensions.GetSeName(- string.IsNullOrEmpty(productAttribute.SeName) ? productAttribute.Name : productAttribute.SeName,- _seoSettings.ConvertNonWesternChars, _seoSettings.AllowUnicodeCharsInUrls,- _seoSettings.SeoCharConversion);-- await _productAttributeService.InsertProductAttribute(productAttribute);-- Success(_translationService.GetResource("Admin.Catalog.Attributes.ProductAttributes.Added"));- return continueEditing- ? RedirectToAction("Edit", new { id = productAttribute.Id })- : RedirectToAction("List");- }-- //If we got this far, something failed, redisplay form- return View(model);- }-- //edit- [PermissionAuthorizeAction(PermissionActionName.Preview)]- public async Task<IActionResult> Edit(string id)- {- var productAttribute = await _productAttributeService.GetProductAttributeById(id);- if (productAttribute == null)- //No product attribute found with the specified id- return RedirectToAction("List");-- var model = productAttribute.ToModel();- //locales- await AddLocales(_languageService, model.Locales, (locale, languageId) =>- {- locale.Name = productAttribute.GetTranslation(x => x.Name, languageId, false);- locale.Description = productAttribute.GetTranslation(x => x.Description, languageId, false);- });-- return View(model);- }-- [PermissionAuthorizeAction(PermissionActionName.Edit)]- [HttpPost]- [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]- public async Task<IActionResult> Edit(ProductAttributeModel model, bool continueEditing)- {- var productAttribute = await _productAttributeService.GetProductAttributeById(model.Id);- if (productAttribute == null)- //No product attribute found with the specified id- return RedirectToAction("List");-- if (ModelState.IsValid)- {- productAttribute = model.ToEntity(productAttribute);- productAttribute.SeName = SeoExtensions.GetSeName(- string.IsNullOrEmpty(productAttribute.SeName) ? productAttribute.Name : productAttribute.SeName,- _seoSettings.ConvertNonWesternChars, _seoSettings.AllowUnicodeCharsInUrls,- _seoSettings.SeoCharConversion);-- await _productAttributeService.UpdateProductAttribute(productAttribute);-- Success(_translationService.GetResource("Admin.Catalog.Attributes.ProductAttributes.Updated"));- if (continueEditing)- {- //selected tab- await SaveSelectedTabIndex();-- return RedirectToAction("Edit", new { id = productAttribute.Id });- }-- return RedirectToAction("List");- }-- //If we got this far, something failed, redisplay form- // locales- await AddLocales(_languageService, model.Locales, (locale, languageId) =>- {- locale.Name = productAttribute.GetTranslation(x => x.Name, languageId, false);- locale.Description = productAttribute.GetTranslation(x => x.Description, languageId, false);- });-- return View(model);- }-- //delete- [PermissionAuthorizeAction(PermissionActionName.Delete)]- [HttpPost]- public async Task<IActionResult> Delete(string id)- {- var productAttribute = await _productAttributeService.GetProductAttributeById(id);- if (productAttribute == null)- //No product attribute found with the specified id- return RedirectToAction("List");- if (ModelState.IsValid)- {- await _productAttributeService.DeleteProductAttribute(productAttribute);- Success(_translationService.GetResource("Admin.Catalog.Attributes.ProductAttributes.Deleted"));- return RedirectToAction("List");- }-- Error(ModelState);- return RedirectToAction("Edit", new { id = productAttribute.Id });- }-- #endregion-- #region Used by products-- //used by products- [PermissionAuthorizeAction(PermissionActionName.Preview)]- [HttpPost]- public async Task<IActionResult> UsedByProducts(DataSourceRequest command, string productAttributeId)- {- var orders = await _productService.GetProductsByProductAttributeId(- productAttributeId,- "",- command.Page - 1,- command.PageSize);- var gridModel = new DataSourceResult {- Data = orders.Select(x => new ProductAttributeModel.UsedByProductModel {- Id = x.Id,- ProductName = x.Name,- Published = x.Published- }),- Total = orders.TotalCount- };- return Json(gridModel);- }-- #endregion-- #region Predefined values-- [PermissionAuthorizeAction(PermissionActionName.Preview)]- [HttpPost]- public async Task<IActionResult> PredefinedProductAttributeValueList(string productAttributeId,- DataSourceRequest command)- {- var values = (await _productAttributeService.GetProductAttributeById(productAttributeId))- .PredefinedProductAttributeValues;- var gridModel = new DataSourceResult {- Data = values.Select(x => x.ToModel()),- Total = values.Count- };-- return Json(gridModel);- }-- //create- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> PredefinedProductAttributeValueCreatePopup(string productAttributeId)- {- var productAttribute = await _productAttributeService.GetProductAttributeById(productAttributeId);- if (productAttribute == null)- throw new ArgumentException("No product attribute found with the specified id");-- var model = new PredefinedProductAttributeValueModel {- ProductAttributeId = productAttributeId- };-- //locales- await AddLocales(_languageService, model.Locales);-- return View(model);- }-- [PermissionAuthorizeAction(PermissionActionName.Edit)]- [HttpPost]- public async Task<IActionResult> PredefinedProductAttributeValueCreatePopup(- PredefinedProductAttributeValueModel model)- {- var productAttribute = await _productAttributeService.GetProductAttributeById(model.ProductAttributeId);- if (productAttribute == null)- throw new ArgumentException("No product attribute found with the specified id");-- if (ModelState.IsValid)- {- var ppav = model.ToEntity();- productAttribute.PredefinedProductAttributeValues.Add(ppav);- await _productAttributeService.UpdateProductAttribute(productAttribute);- return Content("");- }-- //If we got this far, something failed, redisplay form- return View(model);- }-- //edit- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> PredefinedProductAttributeValueEditPopup(string id, string productAttributeId)- {- var ppav = (await _productAttributeService.GetProductAttributeById(productAttributeId))- .PredefinedProductAttributeValues.FirstOrDefault(x => x.Id == id);- if (ppav == null)- throw new ArgumentException("No product attribute value found with the specified id");-- var model = ppav.ToModel();- //locales- await AddLocales(_languageService, model.Locales, (locale, languageId) =>- {- locale.Name = ppav.GetTranslation(x => x.Name, languageId, false);- });- return View(model);- }-- [PermissionAuthorizeAction(PermissionActionName.Edit)]- [HttpPost]- public async Task<IActionResult> PredefinedProductAttributeValueEditPopup(- PredefinedProductAttributeValueModel model)- {- var productAttribute = await _productAttributeService.GetProductAttributeById(model.ProductAttributeId);- var ppav = productAttribute.PredefinedProductAttributeValues.FirstOrDefault(x => x.Id == model.Id);- if (ppav == null)- throw new ArgumentException("No product attribute value found with the specified id");-- if (ModelState.IsValid)- {- ppav = model.ToEntity(ppav);- await _productAttributeService.UpdateProductAttribute(productAttribute);- return Content("");- }-- //If we got this far, something failed, redisplay form- return View(model);- }-- //delete- [PermissionAuthorizeAction(PermissionActionName.Edit)]- [HttpPost]- public async Task<IActionResult> PredefinedProductAttributeValueDelete(string id)- {- if (ModelState.IsValid)- {- var productAttribute =- (await _productAttributeService.GetAllProductAttributes()).FirstOrDefault(x =>- x.PredefinedProductAttributeValues.Any(y => y.Id == id));- var ppav = productAttribute?.PredefinedProductAttributeValues.FirstOrDefault(x => x.Id == id);- if (ppav == null)- throw new ArgumentException("No predefined product attribute value found with the specified id");- productAttribute.PredefinedProductAttributeValues.Remove(ppav);- await _productAttributeService.UpdateProductAttribute(productAttribute);- return new JsonResult("");- }-- return ErrorForKendoGridJson(ModelState);- }-- #endregion-- #endregion-}\ No newline at end of file+// Reduced to a thin subclass of BaseProductAttributeController (ARCH-001 ProductAttribute consolidation). All+// regions of behavior live in the shared base; this class only supplies Admin's DI wiring plus the+// attributes that used to arrive transitively via BaseAdminController - BaseProductAttributeController+// 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.+[AuthorizeAdmin]+[AutoValidateAntiforgeryToken]+[Area(Constants.AreaAdmin)]+[AuthorizeMenu]+public class ProductAttributeController(+ IProductService productService,+ IProductAttributeService productAttributeService,+ ILanguageService languageService,+ ITranslationService translationService,+ SeoSettings seoSettings,+ IAdminDataScope<ProductAttribute> scope)+ : BaseProductAttributeController(productService, productAttributeService, languageService,+ translationService, seoSettings, scope);\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Controllers/SpecificationAttributeController.cs b/src/Web/Grand.Web.Admin/Controllers/SpecificationAttributeController.csindex 92129cfdf..7d28ec6bf 100644--- a/src/Web/Grand.Web.Admin/Controllers/SpecificationAttributeController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/SpecificationAttributeController.cs@@ -1,385 +1,27 @@-using Grand.Business.Core.Extensions;-using Grand.Business.Core.Interfaces.Catalog.Products;+using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Domain.Catalog;using Grand.Domain.Permissions;using Grand.Domain.Seo;-using Grand.Web.AdminShared.Extensions.Mapping;-using Grand.Web.AdminShared.Models.Catalog;-using Grand.Web.Common.DataSource;+using Grand.Web.Admin.Extensions;+using Grand.Web.AdminShared.Controllers;+using Grand.Web.AdminShared.Interfaces;using Grand.Web.Common.Filters;using Grand.Web.Common.Security.Authorization;using Microsoft.AspNetCore.Mvc;namespace Grand.Web.Admin.Controllers;-[PermissionAuthorize(PermissionSystemName.SpecificationAttributes)]-public class SpecificationAttributeController : BaseAdminController-{- #region Constructors-- public SpecificationAttributeController(- ISpecificationAttributeService specificationAttributeService,- ILanguageService languageService,- ITranslationService translationService,- IProductService productService,- SeoSettings seoSettings)- {- _specificationAttributeService = specificationAttributeService;- _languageService = languageService;- _translationService = translationService;- _productService = productService;- _seoSettings = seoSettings;- }-- #endregion-- #region Used by products-- //used by products- [PermissionAuthorizeAction(PermissionActionName.Preview)]- [HttpPost]- public async Task<IActionResult> UsedByProducts(DataSourceRequest command, string specificationAttributeId)- {- var specyfication =- await _specificationAttributeService.GetSpecificationAttributeById(specificationAttributeId);- if (specyfication == null)- throw new ArgumentException("No specification found with the specified id");-- var searchStoreId = string.Empty;-- var specificationProducts = new List<SpecificationAttributeModel.UsedByProductModel>();- var total = 0;-- var searchspecificationOptions = specyfication.SpecificationAttributeOptions.Select(x => x.Id).ToList();- if (searchspecificationOptions.Any())- {- var products = (await _productService.SearchProducts(- storeId: searchStoreId,- specificationOptions: searchspecificationOptions,- pageIndex: command.Page - 1,- pageSize: command.PageSize,- showHidden: true- )).products;-- total = products.TotalCount;-- foreach (var item in products)- {- var specOption =- item.ProductSpecificationAttributes.FirstOrDefault(x =>- x.SpecificationAttributeId == specificationAttributeId);- specificationProducts.Add(new SpecificationAttributeModel.UsedByProductModel {- Id = item.Id,- ProductName = item.Name,- OptionName = specyfication.SpecificationAttributeOptions- .FirstOrDefault(x => x.Id == specOption?.SpecificationAttributeOptionId)?.Name,- Published = item.Published- });- }- }-- var gridModel = new DataSourceResult {- Data = specificationProducts,- Total = total- };- return Json(gridModel);- }-- #endregion-- #region Fields-- private readonly ISpecificationAttributeService _specificationAttributeService;- private readonly IProductService _productService;- private readonly ILanguageService _languageService;- private readonly ITranslationService _translationService;- private readonly SeoSettings _seoSettings;-- #endregion Fields-- #region Specification attributes-- //list- public IActionResult Index()- {- return RedirectToAction("List");- }-- public IActionResult List()- {- return View();- }-- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.List)]- public async Task<IActionResult> List(DataSourceRequest command)- {- var specificationAttributes = await _specificationAttributeService.GetSpecificationAttributes(pageIndex: command.Page - 1, pageSize: command.PageSize);- var gridModel = new DataSourceResult {- Data = specificationAttributes.Select(x => x.ToModel()),- Total = specificationAttributes.TotalCount- };-- return Json(gridModel);- }-- //create- [PermissionAuthorizeAction(PermissionActionName.Create)]- public async Task<IActionResult> Create()- {- var model = new SpecificationAttributeModel();- //locales- await AddLocales(_languageService, model.Locales);-- return View(model);- }-- [HttpPost]- [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]- [PermissionAuthorizeAction(PermissionActionName.Create)]- public async Task<IActionResult> Create(SpecificationAttributeModel model, bool continueEditing)- {- if (ModelState.IsValid)- {- var specificationAttribute = model.ToEntity();- specificationAttribute.SeName = SeoExtensions.GetSeName(- string.IsNullOrEmpty(specificationAttribute.SeName)- ? specificationAttribute.Name- : specificationAttribute.SeName, _seoSettings.ConvertNonWesternChars,- _seoSettings.AllowUnicodeCharsInUrls, _seoSettings.SeoCharConversion);-- await _specificationAttributeService.InsertSpecificationAttribute(specificationAttribute);-- Success(_translationService.GetResource("Admin.Catalog.Attributes.SpecificationAttributes.Added"));- return continueEditing- ? RedirectToAction("Edit", new { id = specificationAttribute.Id })- : RedirectToAction("List");- }-- //If we got this far, something failed, redisplay form- return View(model);- }-- //edit- [PermissionAuthorizeAction(PermissionActionName.Preview)]- public async Task<IActionResult> Edit(string id)- {- var specificationAttribute = await _specificationAttributeService.GetSpecificationAttributeById(id);- if (specificationAttribute == null)- //No specification attribute found with the specified id- return RedirectToAction("List");-- var model = specificationAttribute.ToModel();- //locales- await AddLocales(_languageService, model.Locales, (locale, languageId) =>- {- locale.Name = specificationAttribute.GetTranslation(x => x.Name, languageId, false);- });-- return View(model);- }-- [HttpPost]- [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> Edit(SpecificationAttributeModel model, bool continueEditing)- {- var specificationAttribute = await _specificationAttributeService.GetSpecificationAttributeById(model.Id);- if (specificationAttribute == null)- //No specification attribute found with the specified id- return RedirectToAction("List");-- if (ModelState.IsValid)- {- specificationAttribute = model.ToEntity(specificationAttribute);- specificationAttribute.SeName = SeoExtensions.GetSeName(- string.IsNullOrEmpty(specificationAttribute.SeName)- ? specificationAttribute.Name- : specificationAttribute.SeName, _seoSettings.ConvertNonWesternChars,- _seoSettings.AllowUnicodeCharsInUrls, _seoSettings.SeoCharConversion);-- await _specificationAttributeService.UpdateSpecificationAttribute(specificationAttribute);-- Success(_translationService.GetResource("Admin.Catalog.Attributes.SpecificationAttributes.Updated"));-- if (continueEditing)- {- //selected tab- await SaveSelectedTabIndex();-- return RedirectToAction("Edit", new { id = specificationAttribute.Id });- }-- return RedirectToAction("List");- }-- //If we got this far, something failed, redisplay form- //locales- await AddLocales(_languageService, model.Locales, (locale, languageId) =>- {- locale.Name = specificationAttribute.GetTranslation(x => x.Name, languageId, false);- });- return View(model);- }-- //delete- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Delete)]- public async Task<IActionResult> Delete(string id)- {- var specificationAttribute = await _specificationAttributeService.GetSpecificationAttributeById(id);- if (specificationAttribute == null)- //No specification attribute found with the specified id- return RedirectToAction("List");- if (ModelState.IsValid)- {- await _specificationAttributeService.DeleteSpecificationAttribute(specificationAttribute);-- Success(_translationService.GetResource("Admin.Catalog.Attributes.SpecificationAttributes.Deleted"));- return RedirectToAction("List");- }-- Error(ModelState);- return RedirectToAction("Edit", new { id = specificationAttribute.Id });- }-- #endregion-- #region Specification attribute options-- //list- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Preview)]- public async Task<IActionResult> OptionList(string specificationAttributeId, DataSourceRequest command)- {- var options =- (await _specificationAttributeService.GetSpecificationAttributeById(specificationAttributeId))- .SpecificationAttributeOptions.OrderBy(x => x.DisplayOrder);- var gridModel = new DataSourceResult {- Data = options.Select(x =>- {- var model = x.ToModel();- //in order to save performance to do not check whether a product is deleted, etc- model.NumberOfAssociatedProducts = _specificationAttributeService- .GetProductSpecificationAttributeCount("", x.Id);- return model;- }),- Total = options.Count()- };-- return Json(gridModel);- }-- //create- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> OptionCreatePopup(string specificationAttributeId)- {- var model = new SpecificationAttributeOptionModel {- SpecificationAttributeId = specificationAttributeId- };- //locales- await AddLocales(_languageService, model.Locales);- return View(model);- }-- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> OptionCreatePopup(SpecificationAttributeOptionModel model)- {- var specificationAttribute =- await _specificationAttributeService.GetSpecificationAttributeById(model.SpecificationAttributeId);- if (specificationAttribute == null)- //No specification attribute found with the specified id- return RedirectToAction("List");-- if (ModelState.IsValid)- {- var sao = model.ToEntity();- sao.SeName = SeoExtensions.GetSeName(string.IsNullOrEmpty(sao.SeName) ? sao.Name : sao.SeName,- _seoSettings.ConvertNonWesternChars, _seoSettings.AllowUnicodeCharsInUrls,- _seoSettings.SeoCharConversion);- //clear "Color" values if it's disabled- if (!model.EnableColorSquaresRgb)- sao.ColorSquaresRgb = null;-- specificationAttribute.SpecificationAttributeOptions.Add(sao);- await _specificationAttributeService.UpdateSpecificationAttribute(specificationAttribute);- return Content("");- }-- //If we got this far, something failed, redisplay form- return View(model);- }-- //edit- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> OptionEditPopup(string id)- {- var sao = (await _specificationAttributeService.GetSpecificationAttributeByOptionId(id))- .SpecificationAttributeOptions.FirstOrDefault(x => x.Id == id);- if (sao == null)- //No specification attribute option found with the specified id- return RedirectToAction("List");-- var model = sao.ToModel();- model.EnableColorSquaresRgb = !string.IsNullOrEmpty(sao.ColorSquaresRgb);- //locales- await AddLocales(_languageService, model.Locales, (locale, languageId) =>- {- locale.Name = sao.GetTranslation(x => x.Name, languageId, false);- });-- return View(model);- }-- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> OptionEditPopup(SpecificationAttributeOptionModel model)- {- var specificationAttribute = await _specificationAttributeService.GetSpecificationAttributeByOptionId(model.Id);- var sao = specificationAttribute.SpecificationAttributeOptions.FirstOrDefault(x => x.Id == model.Id);- if (sao == null)- //No specification attribute option found with the specified id- return RedirectToAction("List");-- if (ModelState.IsValid)- {- sao = model.ToEntity(sao);- sao.SeName = SeoExtensions.GetSeName(string.IsNullOrEmpty(sao.SeName) ? sao.Name : sao.SeName,- _seoSettings.ConvertNonWesternChars, _seoSettings.AllowUnicodeCharsInUrls,- _seoSettings.SeoCharConversion);-- //clear "Color" values if it's disabled- if (!model.EnableColorSquaresRgb)- sao.ColorSquaresRgb = null;-- await _specificationAttributeService.UpdateSpecificationAttribute(specificationAttribute);- return Content("");- }-- //If we got this far, something failed, redisplay form- return View(model);- }-- //delete- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> OptionDelete(string id)- {- if (ModelState.IsValid)- {- var specificationAttribute = await _specificationAttributeService.GetSpecificationAttributeByOptionId(id);- var sao = specificationAttribute.SpecificationAttributeOptions.FirstOrDefault(x => x.Id == id);- if (sao == null)- throw new ArgumentException("No specification attribute option found with the specified id");-- await _specificationAttributeService.DeleteSpecificationAttributeOption(sao);-- return new JsonResult("");- }-- return ErrorForKendoGridJson(ModelState);- }-- #endregion-}\ No newline at end of file+[AuthorizeAdmin]+[AutoValidateAntiforgeryToken]+[Area(Constants.AreaAdmin)]+[AuthorizeMenu]+public class SpecificationAttributeController(+ ISpecificationAttributeService specificationAttributeService,+ ILanguageService languageService,+ ITranslationService translationService,+ IProductService productService,+ SeoSettings seoSettings,+ IAdminDataScope<SpecificationAttribute> scope)+ : BaseSpecificationAttributeController(specificationAttributeService, languageService,+ translationService, productService, seoSettings, scope);\ No newline at end of filediff --git a/src/Web/Grand.Web.AdminShared/Controllers/BaseAddressAttributeController.cs b/src/Web/Grand.Web.AdminShared/Controllers/BaseAddressAttributeController.csnew file mode 100644index 000000000..dcc7c1388--- /dev/null+++ b/src/Web/Grand.Web.AdminShared/Controllers/BaseAddressAttributeController.cs@@ -0,0 +1,248 @@+using Grand.Business.Core.Extensions;+using Grand.Business.Core.Interfaces.Common.Addresses;+using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Domain.Common;+using Grand.Domain.Permissions;+using Grand.Web.AdminShared.Interfaces;+using Grand.Web.AdminShared.Models.Common;+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.AddressAttributes)]+[AutoValidateAntiforgeryToken]+public abstract class BaseAddressAttributeController(+ IAddressAttributeService addressAttributeService,+ IAddressAttributeViewModelService addressAttributeViewModelService,+ ILanguageService languageService,+ ITranslationService translationService,+ IAdminDataScope<AddressAttribute> scope) : BaseController+{+ #region Address attributes++ public virtual IActionResult Index() => RedirectToAction("List");++ public virtual IActionResult List() => View();++ [PermissionAuthorizeAction(PermissionActionName.List)]+ [HttpPost]+ public virtual async Task<IActionResult> List(DataSourceRequest command)+ {+ var (addressAttributes, _) = await addressAttributeViewModelService.PrepareAddressAttributes();+ var storeId = scope.DefaultStoreId;+ var visible = storeId is null+ ? addressAttributes.ToList()+ : addressAttributes+ .Where(x => x.Stores == null || x.Stores.Length == 0 || x.Stores.Contains(storeId))+ .ToList();+ var gridModel = new DataSourceResult {+ Data = visible.Select(x => new {+ x.Id, x.Name, x.AttributeControlTypeName, x.IsRequired, x.DisplayOrder,+ IsGlobalAttribute = storeId is not null &&+ !(x.Stores is { Length: 1 } && x.Stores.Contains(storeId))+ }).ToList(),+ Total = visible.Count+ };+ return Json(gridModel);+ }++ [PermissionAuthorizeAction(PermissionActionName.Create)]+ public virtual async Task<IActionResult> Create()+ {+ var model = addressAttributeViewModelService.PrepareAddressAttributeModel();+ await AddLocales(languageService, model.Locales);+ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Create)]+ [HttpPost]+ [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]+ public virtual async Task<IActionResult> Create(AddressAttributeModel model, bool continueEditing)+ {+ if (ModelState.IsValid)+ {+ if (scope.DefaultStoreId is not null) model.Stores = [scope.DefaultStoreId];+ var addressAttribute = await addressAttributeViewModelService.InsertAddressAttributeModel(model);+ Success(translationService.GetResource("Admin.Address.AddressAttributes.Added"));+ return continueEditing+ ? RedirectToAction("Edit", new { id = addressAttribute.Id })+ : RedirectToAction("List");+ }+ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Preview)]+ public virtual async Task<IActionResult> Edit(string id)+ {+ var addressAttribute = await addressAttributeService.GetAddressAttributeById(id);+ if (addressAttribute == null || !await scope.CanView(addressAttribute))+ return RedirectToAction("List");++ var model = addressAttributeViewModelService.PrepareAddressAttributeModel(addressAttribute);+ model.IsGlobalAttribute = scope.DefaultStoreId is not null &&+ !await scope.HasAccess(addressAttribute);+ await AddLocales(languageService, model.Locales, (locale, languageId) =>+ {+ locale.Name = addressAttribute.GetTranslation(x => x.Name, languageId, false);+ });+ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]+ public virtual async Task<IActionResult> Edit(AddressAttributeModel model, bool continueEditing)+ {+ var addressAttribute = await addressAttributeService.GetAddressAttributeById(model.Id);+ if (addressAttribute == null || !await scope.HasAccess(addressAttribute))+ return RedirectToAction("List");++ if (ModelState.IsValid)+ {+ if (scope.DefaultStoreId is not null) model.Stores = [scope.DefaultStoreId];+ addressAttribute = await addressAttributeViewModelService.UpdateAddressAttributeModel(model, addressAttribute);+ Success(translationService.GetResource("Admin.Address.AddressAttributes.Updated"));+ if (continueEditing)+ {+ await SaveSelectedTabIndex();+ return RedirectToAction("Edit", new { id = addressAttribute.Id });+ }+ return RedirectToAction("List");+ }++ model.IsGlobalAttribute = false;+ await AddLocales(languageService, model.Locales, (locale, languageId) =>+ {+ locale.Name = addressAttribute.GetTranslation(x => x.Name, languageId, false);+ });+ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Delete)]+ [HttpPost]+ public virtual async Task<IActionResult> Delete(string id)+ {+ var addressAttribute = await addressAttributeService.GetAddressAttributeById(id);+ if (addressAttribute == null)+ return RedirectToAction("List");+ if (!await scope.HasAccess(addressAttribute))+ return RedirectToAction("Edit", new { id });++ await addressAttributeService.DeleteAddressAttribute(addressAttribute);+ Success(translationService.GetResource("Admin.Address.AddressAttributes.Deleted"));+ return RedirectToAction("List");+ }++ #endregion++ #region Address attribute values++ [PermissionAuthorizeAction(PermissionActionName.Preview)]+ [HttpPost]+ public virtual async Task<IActionResult> ValueList(string addressAttributeId, DataSourceRequest command)+ {+ var addressAttribute = await addressAttributeService.GetAddressAttributeById(addressAttributeId);+ if (addressAttribute == null || !await scope.CanView(addressAttribute))+ return new JsonResult(new DataSourceResult { Errors = "Access denied" });++ var (values, total) = await addressAttributeViewModelService.PrepareAddressAttributeValues(addressAttributeId);+ return Json(new DataSourceResult { Data = values.ToList(), Total = total });+ }++ // Note: ValueCreatePopup (both GET and POST) intentionally undecorated here as the permission+ // action name diverges between Admin (Create) and Store (Edit). Each subclass overrides to apply+ // its own [PermissionAuthorizeAction] attribute.+ public virtual async Task<IActionResult> ValueCreatePopup(string addressAttributeId)+ {+ var addressAttribute = await addressAttributeService.GetAddressAttributeById(addressAttributeId);+ if (addressAttribute == null || !await scope.HasAccess(addressAttribute))+ return RedirectToAction("List");++ var model = addressAttributeViewModelService.PrepareAddressAttributeValueModel(addressAttributeId);+ await AddLocales(languageService, model.Locales);+ return View(model);+ }++ [HttpPost]+ public virtual async Task<IActionResult> ValueCreatePopup(AddressAttributeValueModel model)+ {+ var addressAttribute = await addressAttributeService.GetAddressAttributeById(model.AddressAttributeId);+ if (addressAttribute == null || !await scope.HasAccess(addressAttribute))+ return RedirectToAction("List");++ if (ModelState.IsValid)+ {+ await addressAttributeViewModelService.InsertAddressAttributeValueModel(model);+ return Content("");+ }+ return View(model);+ }++ // Note: ValueEditPopup GET intentionally undecorated here as the permission action name diverges+ // between Admin (Preview) and Store (Edit). Each subclass overrides to apply its own+ // [PermissionAuthorizeAction] attribute.+ public virtual async Task<IActionResult> ValueEditPopup(string id, string addressAttributeId)+ {+ var addressAttribute = await addressAttributeService.GetAddressAttributeById(addressAttributeId);+ if (addressAttribute == null || !await scope.HasAccess(addressAttribute))+ return RedirectToAction("List");++ var cav = addressAttribute.AddressAttributeValues.FirstOrDefault(x => x.Id == id);+ if (cav == null)+ return RedirectToAction("List");++ var model = addressAttributeViewModelService.PrepareAddressAttributeValueModel(cav);+ await AddLocales(languageService, model.Locales, (locale, languageId) =>+ {+ locale.Name = cav.GetTranslation(x => x.Name, languageId, false);+ });+ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ public virtual async Task<IActionResult> ValueEditPopup(AddressAttributeValueModel model)+ {+ var addressAttribute = await addressAttributeService.GetAddressAttributeById(model.AddressAttributeId);+ if (addressAttribute == null || !await scope.HasAccess(addressAttribute))+ return RedirectToAction("List");++ var cav = addressAttribute.AddressAttributeValues.FirstOrDefault(x => x.Id == model.Id);+ if (cav == null)+ return RedirectToAction("List");++ if (ModelState.IsValid)+ {+ await addressAttributeViewModelService.UpdateAddressAttributeValueModel(model, cav);+ return Content("");+ }+ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ public virtual async Task<IActionResult> ValueDelete(AddressAttributeValueModel model)+ {+ var addressAttribute = await addressAttributeService.GetAddressAttributeById(model.AddressAttributeId);+ if (addressAttribute == null || !await scope.HasAccess(addressAttribute))+ return new JsonResult(new DataSourceResult { Errors = "Access denied" });++ var cav = addressAttribute.AddressAttributeValues.FirstOrDefault(x => x.Id == model.Id);+ if (cav == null)+ return new JsonResult(new DataSourceResult+ { Errors = "No address attribute value found with the specified id" });++ if (ModelState.IsValid)+ {+ await addressAttributeService.DeleteAddressAttributeValue(cav);+ return new JsonResult("");+ }+ return ErrorForKendoGridJson(ModelState);+ }++ #endregion+}diff --git a/src/Web/Grand.Web.AdminShared/Controllers/BaseCheckoutAttributeController.cs b/src/Web/Grand.Web.AdminShared/Controllers/BaseCheckoutAttributeController.csnew file mode 100644index 000000000..a31ff7e46--- /dev/null+++ b/src/Web/Grand.Web.AdminShared/Controllers/BaseCheckoutAttributeController.cs@@ -0,0 +1,249 @@+using Grand.Business.Core.Extensions;+using Grand.Business.Core.Interfaces.Catalog.Directory;+using Grand.Business.Core.Interfaces.Checkout.CheckoutAttributes;+using Grand.Business.Core.Interfaces.Common.Directory;+using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Domain.Directory;+using Grand.Domain.Orders;+using Grand.Domain.Permissions;+using Grand.Web.AdminShared.Extensions.Mapping;+using Grand.Web.AdminShared.Interfaces;+using Grand.Web.AdminShared.Models.Orders;+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.CheckoutAttributes)]+[AutoValidateAntiforgeryToken]+public abstract class BaseCheckoutAttributeController(+ ICheckoutAttributeService checkoutAttributeService,+ ILanguageService languageService,+ ITranslationService translationService,+ ICurrencyService currencyService,+ CurrencySettings currencySettings,+ IMeasureService measureService,+ MeasureSettings measureSettings,+ ICheckoutAttributeViewModelService checkoutAttributeViewModelService,+ IAdminDataScope<CheckoutAttribute> scope) : BaseController+{+ #region Checkout attributes++ public virtual IActionResult Index() => RedirectToAction("List");+ public virtual IActionResult List() => View();++ [HttpPost]+ [PermissionAuthorizeAction(PermissionActionName.List)]+ public virtual async Task<IActionResult> List(DataSourceRequest command)+ {+ var checkoutAttributes = await checkoutAttributeViewModelService.PrepareCheckoutAttributeListModel(scope.DefaultStoreId);+ return Json(new DataSourceResult { Data = checkoutAttributes.ToList(), Total = checkoutAttributes.Count() });+ }++ [PermissionAuthorizeAction(PermissionActionName.Create)]+ public virtual async Task<IActionResult> Create()+ {+ var model = await checkoutAttributeViewModelService.PrepareCheckoutAttributeModel();+ await AddLocales(languageService, model.Locales);+ return View(model);+ }++ [HttpPost]+ [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]+ [PermissionAuthorizeAction(PermissionActionName.Create)]+ public virtual async Task<IActionResult> Create(CheckoutAttributeModel model, bool continueEditing)+ {+ if (ModelState.IsValid)+ {+ if (scope.DefaultStoreId is not null)+ {+ model.Stores = [scope.DefaultStoreId];+ model.CustomerGroups = [];+ }+ var checkoutAttribute = await checkoutAttributeViewModelService.InsertCheckoutAttributeModel(model);+ Success(translationService.GetResource("Admin.Orders.CheckoutAttributes.Added"));+ return continueEditing+ ? RedirectToAction("Edit", new { id = checkoutAttribute.Id })+ : RedirectToAction("List");+ }+ await checkoutAttributeViewModelService.PrepareTaxCategories(model, null, true);+ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Preview)]+ public virtual async Task<IActionResult> Edit(string id)+ {+ var checkoutAttribute = await checkoutAttributeService.GetCheckoutAttributeById(id);+ if (checkoutAttribute == null || !await scope.CanView(checkoutAttribute))+ return RedirectToAction("List");++ var model = checkoutAttribute.ToModel();+ await AddLocales(languageService, model.Locales, (locale, languageId) =>+ {+ locale.Name = checkoutAttribute.GetTranslation(x => x.Name, languageId, false);+ locale.TextPrompt = checkoutAttribute.GetTranslation(x => x.TextPrompt, languageId, false);+ });+ await checkoutAttributeViewModelService.PrepareTaxCategories(model, checkoutAttribute, false);+ await checkoutAttributeViewModelService.PrepareConditionAttributes(model, checkoutAttribute);+ return View(model);+ }++ [HttpPost]+ [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]+ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public virtual async Task<IActionResult> Edit(CheckoutAttributeModel model, bool continueEditing)+ {+ var checkoutAttribute = await checkoutAttributeService.GetCheckoutAttributeById(model.Id);+ if (checkoutAttribute == null || !await scope.HasAccess(checkoutAttribute))+ return RedirectToAction("List");++ if (ModelState.IsValid)+ {+ if (scope.DefaultStoreId is not null)+ {+ model.Stores = [scope.DefaultStoreId];+ model.CustomerGroups = [];+ }+ checkoutAttribute = await checkoutAttributeViewModelService.UpdateCheckoutAttributeModel(checkoutAttribute, model);+ Success(translationService.GetResource("Admin.Orders.CheckoutAttributes.Updated"));+ if (continueEditing)+ {+ await SaveSelectedTabIndex();+ return RedirectToAction("Edit", new { id = checkoutAttribute.Id });+ }+ return RedirectToAction("List");+ }+ await checkoutAttributeViewModelService.PrepareTaxCategories(model, checkoutAttribute, true);+ return View(model);+ }++ [HttpPost]+ [PermissionAuthorizeAction(PermissionActionName.Delete)]+ public virtual async Task<IActionResult> Delete(string id)+ {+ var checkoutAttribute = await checkoutAttributeService.GetCheckoutAttributeById(id);+ if (checkoutAttribute == null || !await scope.HasAccess(checkoutAttribute))+ return RedirectToAction("List");++ await checkoutAttributeService.DeleteCheckoutAttribute(checkoutAttribute);+ Success(translationService.GetResource("Admin.Orders.CheckoutAttributes.Deleted"));+ return RedirectToAction("List");+ }++ #endregion++ #region Checkout attribute values++ [HttpPost]+ [PermissionAuthorizeAction(PermissionActionName.Preview)]+ public virtual async Task<IActionResult> ValueList(string checkoutAttributeId, DataSourceRequest command)+ {+ var ca = await checkoutAttributeService.GetCheckoutAttributeById(checkoutAttributeId);+ if (!await scope.CanView(ca))+ return View("AccessDenied", translationService.GetResource("admin.Catalog.attributes.checkoutAttributes.permissions"));++ var values = await checkoutAttributeViewModelService.PrepareCheckoutAttributeValuesModel(checkoutAttributeId);+ return Json(new DataSourceResult { Data = values.ToList(), Total = values.Count() });+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public virtual async Task<IActionResult> ValueCreatePopup(string checkoutAttributeId)+ {+ var ca = await checkoutAttributeService.GetCheckoutAttributeById(checkoutAttributeId);+ if (ca == null)+ throw new ArgumentException("No checkout attribute found with the specified id");+ if (!await scope.HasAccess(ca))+ return View("AccessDenied", translationService.GetResource("admin.Catalog.attributes.checkoutattributes.permissions"));++ var model = await checkoutAttributeViewModelService.PrepareCheckoutAttributeValueModel(checkoutAttributeId);+ await AddLocales(languageService, model.Locales);+ return View(model);+ }++ [HttpPost]+ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public virtual async Task<IActionResult> ValueCreatePopup(CheckoutAttributeValueModel model)+ {+ var checkoutAttribute = await checkoutAttributeService.GetCheckoutAttributeById(model.CheckoutAttributeId);+ if (checkoutAttribute == null)+ return RedirectToAction("List");+ if (!await scope.HasAccess(checkoutAttribute))+ return View("AccessDenied", translationService.GetResource("admin.Catalog.attributes.checkoutattributes.permissions"));++ if (ModelState.IsValid)+ {+ await checkoutAttributeViewModelService.InsertCheckoutAttributeValueModel(checkoutAttribute, model);+ return Content("");+ }+ model.PrimaryStoreCurrencyCode = (await currencyService.GetCurrencyById(currencySettings.PrimaryStoreCurrencyId)).CurrencyCode;+ model.BaseWeightIn = (await measureService.GetMeasureWeightById(measureSettings.BaseWeightId)).Name;+ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public virtual async Task<IActionResult> ValueEditPopup(string id, string checkoutAttributeId)+ {+ var checkoutAttribute = await checkoutAttributeService.GetCheckoutAttributeById(checkoutAttributeId);+ if (!await scope.CanView(checkoutAttribute))+ return View("AccessDenied", translationService.GetResource("admin.Catalog.attributes.checkoutAttributes.permissions"));++ var cav = checkoutAttribute.CheckoutAttributeValues.FirstOrDefault(x => x.Id == id);+ if (cav == null)+ return RedirectToAction("List");++ var model = await checkoutAttributeViewModelService.PrepareCheckoutAttributeValueModel(checkoutAttribute, cav);+ await AddLocales(languageService, model.Locales, (locale, languageId) =>+ {+ locale.Name = cav.GetTranslation(x => x.Name, languageId, false);+ });+ return View(model);+ }++ [HttpPost]+ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public virtual async Task<IActionResult> ValueEditPopup(CheckoutAttributeValueModel model)+ {+ var checkoutAttribute = await checkoutAttributeService.GetCheckoutAttributeById(model.CheckoutAttributeId);+ if (!await scope.HasAccess(checkoutAttribute))+ return View("AccessDenied", translationService.GetResource("admin.Catalog.attributes.checkoutAttributes.permissions"));++ var cav = checkoutAttribute.CheckoutAttributeValues.FirstOrDefault(x => x.Id == model.Id);+ if (cav == null)+ return RedirectToAction("List");++ if (ModelState.IsValid)+ {+ await checkoutAttributeViewModelService.UpdateCheckoutAttributeValueModel(checkoutAttribute, cav, model);+ return Content("");+ }+ model.PrimaryStoreCurrencyCode = (await currencyService.GetCurrencyById(currencySettings.PrimaryStoreCurrencyId)).CurrencyCode;+ model.BaseWeightIn = (await measureService.GetMeasureWeightById(measureSettings.BaseWeightId)).Name;+ return View(model);+ }++ [HttpPost]+ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public virtual async Task<IActionResult> ValueDelete(string id, string checkoutAttributeId)+ {+ var checkoutAttribute = await checkoutAttributeService.GetCheckoutAttributeById(checkoutAttributeId);+ if (!await scope.HasAccess(checkoutAttribute))+ return View("AccessDenied", translationService.GetResource("admin.Catalog.attributes.checkoutAttributes.permissions"));++ var cav = checkoutAttribute.CheckoutAttributeValues.FirstOrDefault(x => x.Id == id);+ if (cav == null)+ throw new ArgumentException("No checkout attribute value found with the specified id");++ if (ModelState.IsValid)+ {+ checkoutAttribute.CheckoutAttributeValues.Remove(cav);+ await checkoutAttributeService.UpdateCheckoutAttribute(checkoutAttribute);+ return new JsonResult("");+ }+ return ErrorForKendoGridJson(ModelState);+ }++ #endregion+}diff --git a/src/Web/Grand.Web.AdminShared/Controllers/BaseContactAttributeController.cs b/src/Web/Grand.Web.AdminShared/Controllers/BaseContactAttributeController.csnew file mode 100644index 000000000..e5d511818--- /dev/null+++ b/src/Web/Grand.Web.AdminShared/Controllers/BaseContactAttributeController.cs@@ -0,0 +1,258 @@+using Grand.Business.Core.Extensions;+using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Business.Core.Interfaces.Marketing.Contacts;+using Grand.Domain.Catalog;+using Grand.Domain.Messages;+using Grand.Domain.Permissions;+using Grand.Web.AdminShared.Extensions.Mapping;+using Grand.Web.AdminShared.Interfaces;+using Grand.Web.AdminShared.Models.Messages;+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.ContactAttributes)]+[AutoValidateAntiforgeryToken]+public abstract class BaseContactAttributeController(+ IContactAttributeViewModelService contactAttributeViewModelService,+ IContactAttributeService contactAttributeService,+ ILanguageService languageService,+ ITranslationService translationService,+ IAdminDataScope<ContactAttribute> scope) : BaseController+{+ #region Contact attributes++ public IActionResult Index() => RedirectToAction("List");+ public IActionResult List() => View();++ [HttpPost]+ [PermissionAuthorizeAction(PermissionActionName.List)]+ public async Task<IActionResult> List(DataSourceRequest command)+ {+ var contactAttributes = await contactAttributeViewModelService.PrepareContactAttributeListModel();+ var storeId = scope.DefaultStoreId;+ var visible = storeId is null+ ? contactAttributes.ToList()+ : contactAttributes.Where(x => x.Stores == null || x.Stores.Length == 0 || x.Stores.Contains(storeId)).ToList();+ var gridModel = new DataSourceResult {+ Data = visible.Select(x => new {+ x.Id, x.Name, x.AttributeControlTypeName, x.IsRequired, x.DisplayOrder,+ IsReadOnly = storeId is not null && !(x.Stores is { Length: 1 } && x.Stores.Contains(storeId))+ }).ToList(),+ Total = visible.Count+ };+ return Json(gridModel);+ }++ [PermissionAuthorizeAction(PermissionActionName.Create)]+ public async Task<IActionResult> Create()+ {+ var model = new ContactAttributeModel();+ await AddLocales(languageService, model.Locales);+ await contactAttributeViewModelService.PrepareConditionAttributes(model, null);+ return View(model);+ }++ [HttpPost]+ [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]+ [PermissionAuthorizeAction(PermissionActionName.Create)]+ public async Task<IActionResult> Create(ContactAttributeModel model, bool continueEditing)+ {+ if (ModelState.IsValid)+ {+ if (scope.DefaultStoreId is not null) model.Stores = [scope.DefaultStoreId];+ var contactAttribute = await contactAttributeViewModelService.InsertContactAttributeModel(model);+ Success(translationService.GetResource("Admin.Catalog.Attributes.ContactAttributes.Added"));+ return continueEditing+ ? RedirectToAction("Edit", new { id = contactAttribute.Id })+ : RedirectToAction("List");+ }+ await contactAttributeViewModelService.PrepareConditionAttributes(model, null);+ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Preview)]+ public async Task<IActionResult> Edit(string id)+ {+ var contactAttribute = await contactAttributeService.GetContactAttributeById(id);+ if (contactAttribute == null || !await scope.CanView(contactAttribute))+ return RedirectToAction("List");++ var model = contactAttribute.ToModel();+ model.IsReadOnly = scope.DefaultStoreId is not null && !await scope.HasAccess(contactAttribute);+ await AddLocales(languageService, model.Locales, (locale, languageId) =>+ {+ locale.Name = contactAttribute.GetTranslation(x => x.Name, languageId, false);+ locale.TextPrompt = contactAttribute.GetTranslation(x => x.TextPrompt, languageId, false);+ });+ await contactAttributeViewModelService.PrepareConditionAttributes(model, contactAttribute);+ return View(model);+ }++ [HttpPost]+ [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]+ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public async Task<IActionResult> Edit(ContactAttributeModel model, bool continueEditing)+ {+ var contactAttribute = await contactAttributeService.GetContactAttributeById(model.Id);+ if (contactAttribute == null || !await scope.HasAccess(contactAttribute))+ return RedirectToAction("List");++ if (ModelState.IsValid)+ {+ if (scope.DefaultStoreId is not null) model.Stores = [scope.DefaultStoreId];+ contactAttribute = await contactAttributeViewModelService.UpdateContactAttributeModel(contactAttribute, model);+ Success(translationService.GetResource("Admin.Catalog.Attributes.ContactAttributes.Updated"));+ if (continueEditing)+ {+ await SaveSelectedTabIndex();+ return RedirectToAction("Edit", new { id = contactAttribute.Id });+ }+ return RedirectToAction("List");+ }++ model.IsReadOnly = false;+ await contactAttributeViewModelService.PrepareConditionAttributes(model, contactAttribute);+ return View(model);+ }++ [HttpPost]+ [PermissionAuthorizeAction(PermissionActionName.Delete)]+ public async Task<IActionResult> Delete(string id)+ {+ var contactAttribute = await contactAttributeService.GetContactAttributeById(id);+ if (contactAttribute == null)+ return RedirectToAction("List");+ if (!await scope.HasAccess(contactAttribute))+ return RedirectToAction("Edit", new { id });++ if (ModelState.IsValid)+ {+ await contactAttributeService.DeleteContactAttribute(contactAttribute);+ Success(translationService.GetResource("Admin.Catalog.Attributes.ContactAttributes.Deleted"));+ return RedirectToAction("List");+ }+ Error(ModelState);+ return RedirectToAction("Edit", new { id });+ }++ #endregion++ #region Contact attribute values++ [HttpPost]+ [PermissionAuthorizeAction(PermissionActionName.Preview)]+ public async Task<IActionResult> ValueList(string contactAttributeId, DataSourceRequest command)+ {+ var contactAttribute = await contactAttributeService.GetContactAttributeById(contactAttributeId);+ if (contactAttribute == null || !await scope.CanView(contactAttribute))+ return new JsonResult(new DataSourceResult { Errors = "Access denied" });++ var values = contactAttribute.ContactAttributeValues;+ var gridModel = new DataSourceResult {+ Data = values.Select(x => new ContactAttributeValueModel {+ Id = x.Id, ContactAttributeId = x.ContactAttributeId,+ Name = contactAttribute.AttributeControlType != AttributeControlType.ColorSquares+ ? x.Name : $"{x.Name} - {x.ColorSquaresRgb}",+ ColorSquaresRgb = x.ColorSquaresRgb, IsPreSelected = x.IsPreSelected, DisplayOrder = x.DisplayOrder+ }),+ Total = values.Count+ };+ return Json(gridModel);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public async Task<IActionResult> ValueCreatePopup(string contactAttributeId)+ {+ var contactAttribute = await contactAttributeService.GetContactAttributeById(contactAttributeId);+ if (contactAttribute == null || !await scope.HasAccess(contactAttribute))+ return RedirectToAction("List");++ var model = contactAttributeViewModelService.PrepareContactAttributeValueModel(contactAttribute);+ await AddLocales(languageService, model.Locales);+ return View(model);+ }++ [HttpPost]+ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public async Task<IActionResult> ValueCreatePopup(ContactAttributeValueModel model)+ {+ var contactAttribute = await contactAttributeService.GetContactAttributeById(model.ContactAttributeId);+ if (contactAttribute == null || !await scope.HasAccess(contactAttribute))+ return RedirectToAction("List");++ if (ModelState.IsValid)+ {+ await contactAttributeViewModelService.InsertContactAttributeValueModel(contactAttribute, model);+ return Content("");+ }+ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public async Task<IActionResult> ValueEditPopup(string id, string contactAttributeId)+ {+ var contactAttribute = await contactAttributeService.GetContactAttributeById(contactAttributeId);+ if (contactAttribute == null || !await scope.HasAccess(contactAttribute))+ return RedirectToAction("List");++ var cav = contactAttribute.ContactAttributeValues.FirstOrDefault(x => x.Id == id);+ if (cav == null)+ return RedirectToAction("List");++ var model = contactAttributeViewModelService.PrepareContactAttributeValueModel(contactAttribute, cav);+ await AddLocales(languageService, model.Locales, (locale, languageId) =>+ {+ locale.Name = cav.GetTranslation(x => x.Name, languageId, false);+ });+ return View(model);+ }++ [HttpPost]+ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public async Task<IActionResult> ValueEditPopup(ContactAttributeValueModel model)+ {+ var contactAttribute = await contactAttributeService.GetContactAttributeById(model.ContactAttributeId);+ if (contactAttribute == null || !await scope.HasAccess(contactAttribute))+ return RedirectToAction("List");++ var cav = contactAttribute.ContactAttributeValues.FirstOrDefault(x => x.Id == model.Id);+ if (cav == null)+ return RedirectToAction("List");++ if (ModelState.IsValid)+ {+ await contactAttributeViewModelService.UpdateContactAttributeValueModel(contactAttribute, cav, model);+ return Content("");+ }+ return View(model);+ }++ [HttpPost]+ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public async Task<IActionResult> ValueDelete(string id, string contactAttributeId)+ {+ var contactAttribute = await contactAttributeService.GetContactAttributeById(contactAttributeId);+ if (contactAttribute == null || !await scope.HasAccess(contactAttribute))+ return new JsonResult(new DataSourceResult { Errors = "Access denied" });++ var cav = contactAttribute.ContactAttributeValues.FirstOrDefault(x => x.Id == id);+ if (cav == null)+ throw new ArgumentException("No contact attribute value found with the specified id");++ if (ModelState.IsValid)+ {+ contactAttribute.ContactAttributeValues.Remove(cav);+ await contactAttributeService.UpdateContactAttribute(contactAttribute);+ return new JsonResult("");+ }++ return ErrorForKendoGridJson(ModelState);+ }++ #endregion+}diff --git a/src/Web/Grand.Web.AdminShared/Controllers/BaseCustomerAttributeController.cs b/src/Web/Grand.Web.AdminShared/Controllers/BaseCustomerAttributeController.csnew file mode 100644index 000000000..fcc58b639--- /dev/null+++ b/src/Web/Grand.Web.AdminShared/Controllers/BaseCustomerAttributeController.cs@@ -0,0 +1,241 @@+using Grand.Business.Core.Extensions;+using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Business.Core.Interfaces.Customers;+using Grand.Domain.Customers;+using Grand.Domain.Permissions;+using Grand.Web.AdminShared.Interfaces;+using Grand.Web.AdminShared.Models.Customers;+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;++[AutoValidateAntiforgeryToken]+public abstract class BaseCustomerAttributeController(+ ICustomerAttributeService customerAttributeService,+ ICustomerAttributeViewModelService customerAttributeViewModelService,+ ILanguageService languageService,+ ITranslationService translationService,+ IAdminDataScope<CustomerAttribute> scope) : BaseController+{+ #region Customer attributes++ public virtual IActionResult Index() => RedirectToAction("List");+ public virtual IActionResult List() => View();++ [HttpPost]+ [PermissionAuthorizeAction(PermissionActionName.List)]+ public virtual async Task<IActionResult> List(DataSourceRequest command)+ {+ var customerAttributes = await customerAttributeViewModelService.PrepareCustomerAttributes();+ var storeId = scope.DefaultStoreId;+ var visible = storeId is null+ ? customerAttributes.ToList()+ : customerAttributes.Where(x => x.Stores == null || x.Stores.Length == 0 || x.Stores.Contains(storeId)).ToList();+ var gridModel = new DataSourceResult {+ Data = visible.Select(x => new {+ x.Id, x.Name, x.AttributeControlTypeName, x.IsRequired, x.DisplayOrder,+ IsGlobalAttribute = storeId is not null && !(x.Stores is { Length: 1 } && x.Stores.Contains(storeId))+ }).ToList(),+ Total = visible.Count+ };+ return Json(gridModel);+ }++ [PermissionAuthorizeAction(PermissionActionName.Create)]+ public virtual async Task<IActionResult> Create()+ {+ var model = customerAttributeViewModelService.PrepareCustomerAttributeModel();+ await AddLocales(languageService, model.Locales);+ return View(model);+ }++ [HttpPost]+ [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]+ [PermissionAuthorizeAction(PermissionActionName.Create)]+ public virtual async Task<IActionResult> Create(CustomerAttributeModel model, bool continueEditing)+ {+ if (ModelState.IsValid)+ {+ if (scope.DefaultStoreId is not null) model.Stores = [scope.DefaultStoreId];+ var customerAttribute = await customerAttributeViewModelService.InsertCustomerAttributeModel(model);+ Success(translationService.GetResource("Admin.Customers.CustomerAttributes.Added"));+ return continueEditing+ ? RedirectToAction("Edit", new { id = customerAttribute.Id })+ : RedirectToAction("List");+ }+ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Preview)]+ public virtual async Task<IActionResult> Edit(string id)+ {+ var customerAttribute = await customerAttributeService.GetCustomerAttributeById(id);+ if (customerAttribute == null || !await scope.CanView(customerAttribute))+ return RedirectToAction("List");++ var model = customerAttributeViewModelService.PrepareCustomerAttributeModel(customerAttribute);+ model.IsGlobalAttribute = scope.DefaultStoreId is not null && !await scope.HasAccess(customerAttribute);+ await AddLocales(languageService, model.Locales, (locale, languageId) =>+ {+ locale.Name = customerAttribute.GetTranslation(x => x.Name, languageId, false);+ });+ return View(model);+ }++ [HttpPost]+ [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]+ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public virtual async Task<IActionResult> Edit(CustomerAttributeModel model, bool continueEditing)+ {+ var customerAttribute = await customerAttributeService.GetCustomerAttributeById(model.Id);+ if (customerAttribute == null || !await scope.HasAccess(customerAttribute))+ return RedirectToAction("List");++ if (ModelState.IsValid)+ {+ if (scope.DefaultStoreId is not null) model.Stores = [scope.DefaultStoreId];+ customerAttribute = await customerAttributeViewModelService.UpdateCustomerAttributeModel(model, customerAttribute);+ Success(translationService.GetResource("Admin.Customers.CustomerAttributes.Updated"));+ if (continueEditing)+ {+ await SaveSelectedTabIndex();+ return RedirectToAction("Edit", new { id = customerAttribute.Id });+ }+ return RedirectToAction("List");+ }++ model.IsGlobalAttribute = false;+ await AddLocales(languageService, model.Locales, (locale, languageId) =>+ {+ locale.Name = customerAttribute.GetTranslation(x => x.Name, languageId, false);+ });+ return View(model);+ }++ [HttpPost]+ [PermissionAuthorizeAction(PermissionActionName.Delete)]+ public virtual async Task<IActionResult> Delete(string id)+ {+ if (scope.DefaultStoreId is not null)+ {+ var customerAttribute = await customerAttributeService.GetCustomerAttributeById(id);+ if (customerAttribute == null)+ return RedirectToAction("List");+ if (!await scope.HasAccess(customerAttribute))+ return RedirectToAction("Edit", new { id });+ }++ await customerAttributeViewModelService.DeleteCustomerAttribute(id);+ Success(translationService.GetResource("Admin.Customers.CustomerAttributes.Deleted"));+ return RedirectToAction("List");+ }++ #endregion++ #region Customer attribute values++ [HttpPost]+ [PermissionAuthorizeAction(PermissionActionName.Preview)]+ public virtual async Task<IActionResult> ValueList(string customerAttributeId, DataSourceRequest command)+ {+ var customerAttribute = await customerAttributeService.GetCustomerAttributeById(customerAttributeId);+ if (customerAttribute == null || !await scope.CanView(customerAttribute))+ return new JsonResult(new DataSourceResult { Errors = "Access denied" });++ var values = await customerAttributeViewModelService.PrepareCustomerAttributeValues(customerAttributeId);+ return Json(new DataSourceResult { Data = values.ToList(), Total = values.Count() });+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public virtual async Task<IActionResult> ValueCreatePopup(string customerAttributeId)+ {+ var customerAttribute = await customerAttributeService.GetCustomerAttributeById(customerAttributeId);+ if (customerAttribute == null || !await scope.HasAccess(customerAttribute))+ return RedirectToAction("List");++ var model = customerAttributeViewModelService.PrepareCustomerAttributeValueModel(customerAttributeId);+ await AddLocales(languageService, model.Locales);+ return View(model);+ }++ [HttpPost]+ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public virtual async Task<IActionResult> ValueCreatePopup(CustomerAttributeValueModel model)+ {+ var customerAttribute = await customerAttributeService.GetCustomerAttributeById(model.CustomerAttributeId);+ if (customerAttribute == null || !await scope.HasAccess(customerAttribute))+ return RedirectToAction("List");++ if (ModelState.IsValid)+ {+ await customerAttributeViewModelService.InsertCustomerAttributeValueModel(model);+ return Content("");+ }+ return View(model);+ }++ // Note: ValueEditPopup GET intentionally undecorated here as the permission action name diverges+ // between Admin (Preview) and Store (Edit). Each subclass overrides to apply its own+ // [PermissionAuthorizeAction] attribute.+ public virtual async Task<IActionResult> ValueEditPopup(string id, string customerAttributeId)+ {+ var customerAttribute = await customerAttributeService.GetCustomerAttributeById(customerAttributeId);+ if (customerAttribute == null || !await scope.HasAccess(customerAttribute))+ return RedirectToAction("List");++ var cav = customerAttribute.CustomerAttributeValues.FirstOrDefault(x => x.Id == id);+ if (cav == null)+ return RedirectToAction("List");++ var model = customerAttributeViewModelService.PrepareCustomerAttributeValueModel(cav);+ await AddLocales(languageService, model.Locales, (locale, languageId) =>+ {+ locale.Name = cav.GetTranslation(x => x.Name, languageId, false);+ });+ return View(model);+ }++ [HttpPost]+ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public virtual async Task<IActionResult> ValueEditPopup(CustomerAttributeValueModel model)+ {+ var customerAttribute = await customerAttributeService.GetCustomerAttributeById(model.CustomerAttributeId);+ if (customerAttribute == null || !await scope.HasAccess(customerAttribute))+ return RedirectToAction("List");++ var cav = customerAttribute.CustomerAttributeValues.FirstOrDefault(x => x.Id == model.Id);+ if (cav == null)+ return RedirectToAction("List");++ if (ModelState.IsValid)+ {+ await customerAttributeViewModelService.UpdateCustomerAttributeValueModel(model, cav);+ return Content("");+ }+ return View(model);+ }++ [HttpPost]+ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public virtual async Task<IActionResult> ValueDelete(CustomerAttributeValueModel model)+ {+ if (scope.DefaultStoreId is not null)+ {+ var customerAttribute = await customerAttributeService.GetCustomerAttributeById(model.CustomerAttributeId);+ if (customerAttribute == null || !await scope.HasAccess(customerAttribute))+ return new JsonResult(new DataSourceResult { Errors = "Access denied" });+ if (customerAttribute.CustomerAttributeValues.All(x => x.Id != model.Id))+ return new JsonResult(new DataSourceResult+ { Errors = "No customer attribute value found with the specified id" });+ }++ await customerAttributeViewModelService.DeleteCustomerAttributeValue(model);+ return new JsonResult("");+ }++ #endregion+}diff --git a/src/Web/Grand.Web.AdminShared/Controllers/BaseProductAttributeController.cs b/src/Web/Grand.Web.AdminShared/Controllers/BaseProductAttributeController.csnew file mode 100644index 000000000..82beba38e--- /dev/null+++ b/src/Web/Grand.Web.AdminShared/Controllers/BaseProductAttributeController.cs@@ -0,0 +1,280 @@+using Grand.Business.Core.Extensions;+using Grand.Business.Core.Interfaces.Catalog.Products;+using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Domain.Catalog;+using Grand.Domain.Permissions;+using Grand.Domain.Seo;+using Grand.Web.AdminShared.Extensions.Mapping;+using Grand.Web.AdminShared.Interfaces;+using Grand.Web.AdminShared.Models.Catalog;+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.ProductAttributes)]+[AutoValidateAntiforgeryToken]+public abstract class BaseProductAttributeController(+ IProductService productService,+ IProductAttributeService productAttributeService,+ ILanguageService languageService,+ ITranslationService translationService,+ SeoSettings seoSettings,+ IAdminDataScope<ProductAttribute> scope) : BaseController+{+ #region Attribute list / create / edit / delete++ public IActionResult Index() => RedirectToAction("List");+ public IActionResult List() => View();++ [PermissionAuthorizeAction(PermissionActionName.List)]+ [HttpPost]+ public async Task<IActionResult> List(DataSourceRequest command)+ {+ var productAttributes = await productAttributeService.GetAllProductAttributes(+ scope.DefaultStoreId ?? "", command.Page - 1, command.PageSize);+ return Json(new DataSourceResult {+ Data = productAttributes.Select(x => x.ToModel()),+ Total = productAttributes.TotalCount+ });+ }++ [PermissionAuthorizeAction(PermissionActionName.Create)]+ public async Task<IActionResult> Create()+ {+ var model = new ProductAttributeModel();+ await AddLocales(languageService, model.Locales);+ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Create)]+ [HttpPost]+ [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]+ public async Task<IActionResult> Create(ProductAttributeModel model, bool continueEditing)+ {+ if (ModelState.IsValid)+ {+ if (scope.DefaultStoreId is not null) model.Stores = [scope.DefaultStoreId];+ var productAttribute = model.ToEntity();+ productAttribute.SeName = SeoExtensions.GetSeName(+ string.IsNullOrEmpty(productAttribute.SeName) ? productAttribute.Name : productAttribute.SeName,+ seoSettings.ConvertNonWesternChars, seoSettings.AllowUnicodeCharsInUrls, seoSettings.SeoCharConversion);+ await productAttributeService.InsertProductAttribute(productAttribute);+ Success(translationService.GetResource("Admin.Catalog.Attributes.ProductAttributes.Added"));+ return continueEditing+ ? RedirectToAction("Edit", new { id = productAttribute.Id })+ : RedirectToAction("List");+ }+ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Preview)]+ public async Task<IActionResult> Edit(string id)+ {+ var productAttribute = await productAttributeService.GetProductAttributeById(id);+ if (productAttribute == null || !await scope.CanView(productAttribute))+ return RedirectToAction("List");++ var model = productAttribute.ToModel();+ await AddLocales(languageService, model.Locales, (locale, languageId) =>+ {+ locale.Name = productAttribute.GetTranslation(x => x.Name, languageId, false);+ locale.Description = productAttribute.GetTranslation(x => x.Description, languageId, false);+ });+ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]+ public async Task<IActionResult> Edit(ProductAttributeModel model, bool continueEditing)+ {+ var productAttribute = await productAttributeService.GetProductAttributeById(model.Id);+ if (productAttribute == null || !await scope.HasAccess(productAttribute))+ return RedirectToAction(productAttribute == null ? "List" : "Edit", new { id = model.Id });++ if (ModelState.IsValid)+ {+ if (scope.DefaultStoreId is not null) model.Stores = [scope.DefaultStoreId];+ productAttribute = model.ToEntity(productAttribute);+ productAttribute.SeName = SeoExtensions.GetSeName(+ string.IsNullOrEmpty(productAttribute.SeName) ? productAttribute.Name : productAttribute.SeName,+ seoSettings.ConvertNonWesternChars, seoSettings.AllowUnicodeCharsInUrls, seoSettings.SeoCharConversion);+ await productAttributeService.UpdateProductAttribute(productAttribute);+ Success(translationService.GetResource("Admin.Catalog.Attributes.ProductAttributes.Updated"));+ if (continueEditing)+ {+ await SaveSelectedTabIndex();+ return RedirectToAction("Edit", new { id = productAttribute.Id });+ }+ return RedirectToAction("List");+ }++ await AddLocales(languageService, model.Locales, (locale, languageId) =>+ {+ locale.Name = productAttribute.GetTranslation(x => x.Name, languageId, false);+ locale.Description = productAttribute.GetTranslation(x => x.Description, languageId, false);+ });+ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Delete)]+ [HttpPost]+ public async Task<IActionResult> Delete(string id)+ {+ var productAttribute = await productAttributeService.GetProductAttributeById(id);+ if (productAttribute == null)+ return RedirectToAction("List");+ if (!await scope.HasAccess(productAttribute))+ return RedirectToAction("List");++ if (ModelState.IsValid)+ {+ await productAttributeService.DeleteProductAttribute(productAttribute);+ Success(translationService.GetResource("Admin.Catalog.Attributes.ProductAttributes.Deleted"));+ return RedirectToAction("List");+ }+ Error(ModelState);+ return RedirectToAction("Edit", new { id = productAttribute.Id });+ }++ #endregion++ #region Used by products++ [PermissionAuthorizeAction(PermissionActionName.Preview)]+ [HttpPost]+ public async Task<IActionResult> UsedByProducts(DataSourceRequest command, string productAttributeId)+ {+ var productAttribute = await productAttributeService.GetProductAttributeById(productAttributeId);+ if (!await scope.CanView(productAttribute))+ return RedirectToAction("List");++ var products = await productService.GetProductsByProductAttributeId(+ productAttributeId, scope.DefaultStoreId ?? "", command.Page - 1, command.PageSize);+ return Json(new DataSourceResult {+ Data = products.Select(x => new ProductAttributeModel.UsedByProductModel {+ Id = x.Id, ProductName = x.Name, Published = x.Published+ }),+ Total = products.TotalCount+ });+ }++ #endregion++ #region Predefined values++ [PermissionAuthorizeAction(PermissionActionName.Preview)]+ [HttpPost]+ public async Task<IActionResult> PredefinedProductAttributeValueList(string productAttributeId, DataSourceRequest command)+ {+ var productAttribute = await productAttributeService.GetProductAttributeById(productAttributeId);+ if (!await scope.CanView(productAttribute))+ return View("AccessDenied", translationService.GetResource("admin.Catalog.attributes.productattributes.permissions"));++ var values = productAttribute.PredefinedProductAttributeValues;+ return Json(new DataSourceResult { Data = values.Select(x => x.ToModel()), Total = values.Count });+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public async Task<IActionResult> PredefinedProductAttributeValueCreatePopup(string productAttributeId)+ {+ var productAttribute = await productAttributeService.GetProductAttributeById(productAttributeId);+ if (productAttribute == null)+ throw new ArgumentException("No product attribute found with the specified id");+ if (!await scope.HasAccess(productAttribute))+ return View("AccessDenied", translationService.GetResource("admin.Catalog.attributes.productattributes.permissions"));++ var model = new PredefinedProductAttributeValueModel { ProductAttributeId = productAttributeId };+ await AddLocales(languageService, model.Locales);+ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ public async Task<IActionResult> PredefinedProductAttributeValueCreatePopup(PredefinedProductAttributeValueModel model)+ {+ var productAttribute = await productAttributeService.GetProductAttributeById(model.ProductAttributeId);+ if (productAttribute == null)+ throw new ArgumentException("No product attribute found with the specified id");+ if (!await scope.HasAccess(productAttribute))+ return View("AccessDenied", translationService.GetResource("admin.Catalog.attributes.productattributes.permissions"));++ if (ModelState.IsValid)+ {+ var ppav = model.ToEntity();+ productAttribute.PredefinedProductAttributeValues.Add(ppav);+ await productAttributeService.UpdateProductAttribute(productAttribute);+ return Content("");+ }+ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public async Task<IActionResult> PredefinedProductAttributeValueEditPopup(string id, string productAttributeId)+ {+ var productAttribute = await productAttributeService.GetProductAttributeById(productAttributeId);+ if (!await scope.CanView(productAttribute))+ return View("AccessDenied", translationService.GetResource("admin.Catalog.attributes.productattributes.permissions"));++ var ppav = productAttribute.PredefinedProductAttributeValues.FirstOrDefault(x => x.Id == id);+ if (ppav == null)+ throw new ArgumentException("No product attribute value found with the specified id");++ var model = ppav.ToModel();+ await AddLocales(languageService, model.Locales, (locale, languageId) =>+ {+ locale.Name = ppav.GetTranslation(x => x.Name, languageId, false);+ });+ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ public async Task<IActionResult> PredefinedProductAttributeValueEditPopup(PredefinedProductAttributeValueModel model)+ {+ var productAttribute = await productAttributeService.GetProductAttributeById(model.ProductAttributeId);+ if (!await scope.HasAccess(productAttribute))+ return View("AccessDenied", translationService.GetResource("admin.Catalog.attributes.productattributes.permissions"));++ var ppav = productAttribute.PredefinedProductAttributeValues.FirstOrDefault(x => x.Id == model.Id);+ if (ppav == null)+ throw new ArgumentException("No product attribute value found with the specified id");++ if (ModelState.IsValid)+ {+ ppav = model.ToEntity(ppav);+ await productAttributeService.UpdateProductAttribute(productAttribute);+ return Content("");+ }+ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ public async Task<IActionResult> PredefinedProductAttributeValueDelete(string id)+ {+ var productAttributes = await productAttributeService.GetAllProductAttributes(scope.DefaultStoreId ?? "");+ var productAttribute = productAttributes.FirstOrDefault(x => x.PredefinedProductAttributeValues.Any(p => p.Id == id));+ if (productAttribute == null)+ throw new ArgumentException("No product attribute found with the specified id");+ if (!await scope.HasAccess(productAttribute))+ return View("AccessDenied", translationService.GetResource("admin.Catalog.attributes.productattributes.permissions"));++ if (ModelState.IsValid)+ {+ var ppav = productAttribute.PredefinedProductAttributeValues.FirstOrDefault(x => x.Id == id);+ if (ppav == null)+ throw new ArgumentException("No predefined product attribute value found with the specified id");+ productAttribute.PredefinedProductAttributeValues.Remove(ppav);+ await productAttributeService.UpdateProductAttribute(productAttribute);+ return new JsonResult("");+ }+ return ErrorForKendoGridJson(ModelState);+ }++ #endregion+}diff --git a/src/Web/Grand.Web.AdminShared/Controllers/BaseSpecificationAttributeController.cs b/src/Web/Grand.Web.AdminShared/Controllers/BaseSpecificationAttributeController.csnew file mode 100644index 000000000..db1ed3a13--- /dev/null+++ b/src/Web/Grand.Web.AdminShared/Controllers/BaseSpecificationAttributeController.cs@@ -0,0 +1,308 @@+using Grand.Business.Core.Extensions;+using Grand.Business.Core.Interfaces.Catalog.Products;+using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Domain.Catalog;+using Grand.Domain.Permissions;+using Grand.Domain.Seo;+using Grand.Web.AdminShared.Extensions.Mapping;+using Grand.Web.AdminShared.Interfaces;+using Grand.Web.AdminShared.Models.Catalog;+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.SpecificationAttributes)]+[AutoValidateAntiforgeryToken]+public abstract class BaseSpecificationAttributeController(+ ISpecificationAttributeService specificationAttributeService,+ ILanguageService languageService,+ ITranslationService translationService,+ IProductService productService,+ SeoSettings seoSettings,+ IAdminDataScope<SpecificationAttribute> scope) : BaseController+{+ #region Used by products++ [HttpPost]+ [PermissionAuthorizeAction(PermissionActionName.Preview)]+ public async Task<IActionResult> UsedByProducts(DataSourceRequest command, string specificationAttributeId)+ {+ var specification = await specificationAttributeService.GetSpecificationAttributeById(specificationAttributeId);+ if (specification == null)+ throw new ArgumentException("No specification found with the specified id");+ if (!await scope.CanView(specification))+ return RedirectToAction("List");++ var specificationProducts = new List<SpecificationAttributeModel.UsedByProductModel>();+ var total = 0;+ var optionIds = specification.SpecificationAttributeOptions.Select(x => x.Id).ToList();+ if (optionIds.Count > 0)+ {+ var products = (await productService.SearchProducts(+ storeId: scope.DefaultStoreId ?? "",+ specificationOptions: optionIds,+ pageIndex: command.Page - 1,+ pageSize: command.PageSize,+ showHidden: true)).products;++ total = products.TotalCount;+ foreach (var item in products)+ {+ var specOption = item.ProductSpecificationAttributes+ .FirstOrDefault(x => x.SpecificationAttributeId == specificationAttributeId);+ specificationProducts.Add(new SpecificationAttributeModel.UsedByProductModel {+ Id = item.Id, ProductName = item.Name,+ OptionName = specification.SpecificationAttributeOptions+ .FirstOrDefault(x => x.Id == specOption?.SpecificationAttributeOptionId)?.Name,+ Published = item.Published+ });+ }+ }+ return Json(new DataSourceResult { Data = specificationProducts, Total = total });+ }++ #endregion++ #region Specification attributes++ public IActionResult Index() => RedirectToAction("List");+ public IActionResult List() => View();++ [HttpPost]+ [PermissionAuthorizeAction(PermissionActionName.List)]+ public async Task<IActionResult> List(DataSourceRequest command)+ {+ var specificationAttributes = await specificationAttributeService.GetSpecificationAttributes(+ scope.DefaultStoreId ?? "", command.Page - 1, command.PageSize);+ return Json(new DataSourceResult {+ Data = specificationAttributes.Select(x => x.ToModel()),+ Total = specificationAttributes.TotalCount+ });+ }++ [PermissionAuthorizeAction(PermissionActionName.Create)]+ public async Task<IActionResult> Create()+ {+ var model = new SpecificationAttributeModel();+ await AddLocales(languageService, model.Locales);+ return View(model);+ }++ [HttpPost]+ [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]+ [PermissionAuthorizeAction(PermissionActionName.Create)]+ public async Task<IActionResult> Create(SpecificationAttributeModel model, bool continueEditing)+ {+ if (ModelState.IsValid)+ {+ if (scope.DefaultStoreId is not null) model.Stores = [scope.DefaultStoreId];+ var specificationAttribute = model.ToEntity();+ specificationAttribute.SeName = SeoExtensions.GetSeName(+ string.IsNullOrEmpty(specificationAttribute.SeName) ? specificationAttribute.Name : specificationAttribute.SeName,+ seoSettings.ConvertNonWesternChars, seoSettings.AllowUnicodeCharsInUrls, seoSettings.SeoCharConversion);+ await specificationAttributeService.InsertSpecificationAttribute(specificationAttribute);+ Success(translationService.GetResource("Admin.Catalog.Attributes.SpecificationAttributes.Added"));+ return continueEditing+ ? RedirectToAction("Edit", new { id = specificationAttribute.Id })+ : RedirectToAction("List");+ }+ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Preview)]+ public async Task<IActionResult> Edit(string id)+ {+ var specificationAttribute = await specificationAttributeService.GetSpecificationAttributeById(id);+ if (specificationAttribute == null || !await scope.CanView(specificationAttribute))+ return RedirectToAction("List");++ var model = specificationAttribute.ToModel();+ await AddLocales(languageService, model.Locales, (locale, languageId) =>+ {+ locale.Name = specificationAttribute.GetTranslation(x => x.Name, languageId, false);+ });+ return View(model);+ }++ [HttpPost]+ [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]+ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public async Task<IActionResult> Edit(SpecificationAttributeModel model, bool continueEditing)+ {+ var specificationAttribute = await specificationAttributeService.GetSpecificationAttributeById(model.Id);+ if (specificationAttribute == null || !await scope.HasAccess(specificationAttribute))+ return RedirectToAction("List");++ if (ModelState.IsValid)+ {+ if (scope.DefaultStoreId is not null) model.Stores = [scope.DefaultStoreId];+ specificationAttribute = model.ToEntity(specificationAttribute);+ specificationAttribute.SeName = SeoExtensions.GetSeName(+ string.IsNullOrEmpty(specificationAttribute.SeName) ? specificationAttribute.Name : specificationAttribute.SeName,+ seoSettings.ConvertNonWesternChars, seoSettings.AllowUnicodeCharsInUrls, seoSettings.SeoCharConversion);+ await specificationAttributeService.UpdateSpecificationAttribute(specificationAttribute);+ Success(translationService.GetResource("Admin.Catalog.Attributes.SpecificationAttributes.Updated"));+ if (continueEditing)+ {+ await SaveSelectedTabIndex();+ return RedirectToAction("Edit", new { id = specificationAttribute.Id });+ }+ return RedirectToAction("List");+ }++ await AddLocales(languageService, model.Locales, (locale, languageId) =>+ {+ locale.Name = specificationAttribute.GetTranslation(x => x.Name, languageId, false);+ });+ return View(model);+ }++ [HttpPost]+ [PermissionAuthorizeAction(PermissionActionName.Delete)]+ public async Task<IActionResult> Delete(string id)+ {+ var specificationAttribute = await specificationAttributeService.GetSpecificationAttributeById(id);+ if (specificationAttribute == null || !await scope.HasAccess(specificationAttribute))+ return RedirectToAction("List");++ if (ModelState.IsValid)+ {+ await specificationAttributeService.DeleteSpecificationAttribute(specificationAttribute);+ Success(translationService.GetResource("Admin.Catalog.Attributes.SpecificationAttributes.Deleted"));+ return RedirectToAction("List");+ }++ Error(ModelState);+ return RedirectToAction("Edit", new { id = specificationAttribute.Id });+ }++ #endregion++ #region Specification attribute options++ [HttpPost]+ [PermissionAuthorizeAction(PermissionActionName.Preview)]+ public async Task<IActionResult> OptionList(string specificationAttributeId, DataSourceRequest command)+ {+ var specificationAttribute = await specificationAttributeService.GetSpecificationAttributeById(specificationAttributeId);+ if (!await scope.CanView(specificationAttribute))+ return Json("");++ var options = specificationAttribute.SpecificationAttributeOptions.OrderBy(x => x.DisplayOrder);+ return Json(new DataSourceResult {+ Data = options.Select(x =>+ {+ var model = x.ToModel();+ model.NumberOfAssociatedProducts = specificationAttributeService.GetProductSpecificationAttributeCount("", x.Id);+ return model;+ }),+ Total = options.Count()+ });+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public async Task<IActionResult> OptionCreatePopup(string specificationAttributeId)+ {+ var model = new SpecificationAttributeOptionModel { SpecificationAttributeId = specificationAttributeId };+ await AddLocales(languageService, model.Locales);+ return View(model);+ }++ [HttpPost]+ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public async Task<IActionResult> OptionCreatePopup(SpecificationAttributeOptionModel model)+ {+ var specificationAttribute = await specificationAttributeService.GetSpecificationAttributeById(model.SpecificationAttributeId);+ if (specificationAttribute == null)+ return RedirectToAction("List");+ if (!await scope.HasAccess(specificationAttribute))+ return View("AccessDenied", translationService.GetResource("admin.catalog.attributes.specificationattributes.permissions"));++ if (ModelState.IsValid)+ {+ var sao = model.ToEntity();+ sao.SeName = SeoExtensions.GetSeName(string.IsNullOrEmpty(sao.SeName) ? sao.Name : sao.SeName,+ seoSettings.ConvertNonWesternChars, seoSettings.AllowUnicodeCharsInUrls, seoSettings.SeoCharConversion);+ if (!model.EnableColorSquaresRgb) sao.ColorSquaresRgb = null;++ specificationAttribute.SpecificationAttributeOptions.Add(sao);+ await specificationAttributeService.UpdateSpecificationAttribute(specificationAttribute);+ return Content("");+ }+ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public async Task<IActionResult> OptionEditPopup(string id)+ {+ var specificationAttribute = await specificationAttributeService.GetSpecificationAttributeByOptionId(id);+ if (specificationAttribute == null)+ return RedirectToAction("List");+ if (!await scope.CanView(specificationAttribute))+ return View("AccessDenied", translationService.GetResource("admin.catalog.attributes.specificationattributes.permissions"));++ var sao = specificationAttribute.SpecificationAttributeOptions.FirstOrDefault(x => x.Id == id);+ if (sao == null)+ return RedirectToAction("List");++ var model = sao.ToModel();+ model.EnableColorSquaresRgb = !string.IsNullOrEmpty(sao.ColorSquaresRgb);+ await AddLocales(languageService, model.Locales, (locale, languageId) =>+ {+ locale.Name = sao.GetTranslation(x => x.Name, languageId, false);+ });+ return View(model);+ }++ [HttpPost]+ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public async Task<IActionResult> OptionEditPopup(SpecificationAttributeOptionModel model)+ {+ var specificationAttribute = await specificationAttributeService.GetSpecificationAttributeByOptionId(model.Id);+ if (!await scope.HasAccess(specificationAttribute))+ return View("AccessDenied", translationService.GetResource("admin.catalog.attributes.specificationattributes.permissions"));++ var sao = specificationAttribute.SpecificationAttributeOptions.FirstOrDefault(x => x.Id == model.Id);+ if (sao == null)+ return RedirectToAction("List");++ if (ModelState.IsValid)+ {+ sao = model.ToEntity(sao);+ sao.SeName = SeoExtensions.GetSeName(string.IsNullOrEmpty(sao.SeName) ? sao.Name : sao.SeName,+ seoSettings.ConvertNonWesternChars, seoSettings.AllowUnicodeCharsInUrls, seoSettings.SeoCharConversion);+ if (!model.EnableColorSquaresRgb) sao.ColorSquaresRgb = null;++ await specificationAttributeService.UpdateSpecificationAttribute(specificationAttribute);+ return Content("");+ }++ return View(model);+ }++ [HttpPost]+ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public async Task<IActionResult> OptionDelete(string id)+ {+ var specificationAttribute = await specificationAttributeService.GetSpecificationAttributeByOptionId(id);+ if (!await scope.HasAccess(specificationAttribute))+ return View("AccessDenied", translationService.GetResource("admin.catalog.attributes.specificationattributes.permissions"));++ if (ModelState.IsValid)+ {+ var sao = specificationAttribute.SpecificationAttributeOptions.FirstOrDefault(x => x.Id == id);+ if (sao == null)+ throw new ArgumentException("No specification attribute option found with the specified id");+ await specificationAttributeService.DeleteSpecificationAttributeOption(sao);+ return new JsonResult("");+ }++ return ErrorForKendoGridJson(ModelState);+ }++ #endregion+}diff --git a/src/Web/Grand.Web.AdminShared/Models/Common/AddressAttributeModel.cs b/src/Web/Grand.Web.AdminShared/Models/Common/AddressAttributeModel.csindex 37f04b971..3084794c0 100644--- a/src/Web/Grand.Web.AdminShared/Models/Common/AddressAttributeModel.cs+++ b/src/Web/Grand.Web.AdminShared/Models/Common/AddressAttributeModel.cs@@ -31,6 +31,14 @@ public class AddressAttributeModel : BaseEntityModel, ILocalizedModel<AddressAtt[UIHint("Stores")]public string[] Stores { get; set; }+ /// <summary>+ /// True when this attribute is not exclusively assigned to the current host's single store.+ /// Always false for Admin (global scope has no notion of "my store"). Populated by+ /// BaseAddressAttributeController from IAdminDataScope<AddressAttribute>.DefaultStoreId,+ /// not persisted.+ /// </summary>+ public bool IsGlobalAttribute { get; set; }+public IList<AddressAttributeLocalizedModel> Locales { get; set; } = new List<AddressAttributeLocalizedModel>();}diff --git a/src/Web/Grand.Web.AdminShared/Models/Customers/CustomerAttributeModel.cs b/src/Web/Grand.Web.AdminShared/Models/Customers/CustomerAttributeModel.csindex 65a371870..bb7ef60de 100644--- a/src/Web/Grand.Web.AdminShared/Models/Customers/CustomerAttributeModel.cs+++ b/src/Web/Grand.Web.AdminShared/Models/Customers/CustomerAttributeModel.cs@@ -33,6 +33,13 @@ public class CustomerAttributeModel : BaseEntityModel, ILocalizedModel<CustomerA[UIHint("Stores")]public string[] Stores { get; set; }+ /// <summary>+ /// Gets or sets a value indicating whether this attribute is shared across all stores+ /// (i.e., not limited to the current store). Marked as read-only in store scope and+ /// calculated from <see cref="Stores"/> membership. Only relevant in store-scoped contexts.+ /// </summary>+ public bool IsGlobalAttribute { get; set; }+public IList<CustomerAttributeLocalizedModel> Locales { get; set; } = new List<CustomerAttributeLocalizedModel>();}diff --git a/src/Web/Grand.Web.AdminShared/Models/Messages/ContactAttributeModel.cs b/src/Web/Grand.Web.AdminShared/Models/Messages/ContactAttributeModel.csindex 7d01a8dea..23604e76b 100644--- a/src/Web/Grand.Web.AdminShared/Models/Messages/ContactAttributeModel.cs+++ b/src/Web/Grand.Web.AdminShared/Models/Messages/ContactAttributeModel.cs@@ -66,6 +66,13 @@ public class ContactAttributeModel : BaseEntityModel, ILocalizedModel<ContactAtt[GrandResourceDisplayName("Admin.Catalog.Attributes.ContactAttributes.Fields.LimitedToStores")][UIHint("Stores")]public string[] Stores { get; set; }++ /// <summary>+ /// True when the current host may view but not mutate this attribute (Store viewing a+ /// multi-store/global attribute). Always false for Admin. Populated by+ /// BaseContactAttributeController from IAdminDataScope<ContactAttribute>, not persisted.+ /// </summary>+ public bool IsReadOnly { get; set; }}public class ConditionModel : BaseEntityModeldiff --git a/src/Web/Grand.Web.AdminShared/Services/RoutedAddressAttributeDataScope.cs b/src/Web/Grand.Web.AdminShared/Services/RoutedAddressAttributeDataScope.csnew file mode 100644index 000000000..0ee4033a7--- /dev/null+++ b/src/Web/Grand.Web.AdminShared/Services/RoutedAddressAttributeDataScope.cs@@ -0,0 +1,45 @@+#nullable enable++using Grand.Domain.Common;+using Grand.Web.AdminShared.Interfaces;+using Microsoft.AspNetCore.Http;++namespace Grand.Web.AdminShared.Services;++/// <summary>+/// Resolves the correct per-host <see cref="IAdminDataScope{AddressAttribute}" /> implementation+/// at request time, based on the current request's "area" route value — same fix and same reason+/// as <see cref="RoutedCategoryDataScope"/>: 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.+///+/// No Vendor branch: AddressAttribute has no Vendor screen at all, so any "Vendor" (or other+/// unrecognized/missing) area value fails closed.+/// </summary>+public class RoutedAddressAttributeDataScope(+ IHttpContextAccessor httpContextAccessor,+ GlobalAdminDataScope<AddressAttribute> globalScope,+ StoreAdminDataScope<AddressAttribute> storeScope) : IAdminDataScope<AddressAttribute>+{+ private IAdminDataScope<AddressAttribute> Resolved+ {+ get+ {+ var area = httpContextAccessor.HttpContext?.Request.RouteValues["area"] as string;+ return area switch {+ "Admin" => globalScope,+ "Store" => storeScope,+ _ => throw new InvalidOperationException(+ $"RoutedAddressAttributeDataScope: unrecognized or missing area '{area}'.")+ };+ }+ }++ public Task<bool> HasAccess(AddressAttribute entity) => Resolved.HasAccess(entity);+ public Task<bool> CanView(AddressAttribute entity) => Resolved.CanView(entity);+ public string? DefaultStoreId => Resolved.DefaultStoreId;+ 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/Services/RoutedCheckoutAttributeDataScope.cs b/src/Web/Grand.Web.AdminShared/Services/RoutedCheckoutAttributeDataScope.csnew file mode 100644index 000000000..57a8ccbed--- /dev/null+++ b/src/Web/Grand.Web.AdminShared/Services/RoutedCheckoutAttributeDataScope.cs@@ -0,0 +1,45 @@+#nullable enable++using Grand.Domain.Orders;+using Grand.Web.AdminShared.Interfaces;+using Microsoft.AspNetCore.Http;++namespace Grand.Web.AdminShared.Services;++/// <summary>+/// Resolves the correct per-host <see cref="IAdminDataScope{CheckoutAttribute}" /> implementation+/// at request time, based on the current request's "area" route value — same fix and same reason+/// as <see cref="RoutedCategoryDataScope"/>: 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.+///+/// No Vendor branch: CheckoutAttribute has no Vendor screen at all, so any "Vendor" (or other+/// unrecognized/missing) area value fails closed.+/// </summary>+public class RoutedCheckoutAttributeDataScope(+ IHttpContextAccessor httpContextAccessor,+ GlobalAdminDataScope<CheckoutAttribute> globalScope,+ StoreAdminDataScope<CheckoutAttribute> storeScope) : IAdminDataScope<CheckoutAttribute>+{+ private IAdminDataScope<CheckoutAttribute> Resolved+ {+ get+ {+ var area = httpContextAccessor.HttpContext?.Request.RouteValues["area"] as string;+ return area switch {+ "Admin" => globalScope,+ "Store" => storeScope,+ _ => throw new InvalidOperationException(+ $"RoutedCheckoutAttributeDataScope: unrecognized or missing area '{area}'.")+ };+ }+ }++ public Task<bool> HasAccess(CheckoutAttribute entity) => Resolved.HasAccess(entity);+ public Task<bool> CanView(CheckoutAttribute entity) => Resolved.CanView(entity);+ public string? DefaultStoreId => Resolved.DefaultStoreId;+ 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/Services/RoutedContactAttributeDataScope.cs b/src/Web/Grand.Web.AdminShared/Services/RoutedContactAttributeDataScope.csnew file mode 100644index 000000000..2e56703f0--- /dev/null+++ b/src/Web/Grand.Web.AdminShared/Services/RoutedContactAttributeDataScope.cs@@ -0,0 +1,45 @@+#nullable enable++using Grand.Domain.Messages;+using Grand.Web.AdminShared.Interfaces;+using Microsoft.AspNetCore.Http;++namespace Grand.Web.AdminShared.Services;++/// <summary>+/// Resolves the correct per-host <see cref="IAdminDataScope{ContactAttribute}" /> implementation+/// at request time, based on the current request's "area" route value — same fix and same reason+/// as <see cref="RoutedCategoryDataScope"/>: 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.+///+/// No Vendor branch: ContactAttribute has no Vendor screen at all, so any "Vendor" (or other+/// unrecognized/missing) area value fails closed.+/// </summary>+public class RoutedContactAttributeDataScope(+ IHttpContextAccessor httpContextAccessor,+ GlobalAdminDataScope<ContactAttribute> globalScope,+ StoreAdminDataScope<ContactAttribute> storeScope) : IAdminDataScope<ContactAttribute>+{+ private IAdminDataScope<ContactAttribute> Resolved+ {+ get+ {+ var area = httpContextAccessor.HttpContext?.Request.RouteValues["area"] as string;+ return area switch {+ "Admin" => globalScope,+ "Store" => storeScope,+ _ => throw new InvalidOperationException(+ $"RoutedContactAttributeDataScope: unrecognized or missing area '{area}'.")+ };+ }+ }++ public Task<bool> HasAccess(ContactAttribute entity) => Resolved.HasAccess(entity);+ public Task<bool> CanView(ContactAttribute entity) => Resolved.CanView(entity);+ public string? DefaultStoreId => Resolved.DefaultStoreId;+ 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/Services/RoutedCustomerAttributeDataScope.cs b/src/Web/Grand.Web.AdminShared/Services/RoutedCustomerAttributeDataScope.csnew file mode 100644index 000000000..e571f3d29--- /dev/null+++ b/src/Web/Grand.Web.AdminShared/Services/RoutedCustomerAttributeDataScope.cs@@ -0,0 +1,45 @@+#nullable enable++using Grand.Domain.Customers;+using Grand.Web.AdminShared.Interfaces;+using Microsoft.AspNetCore.Http;++namespace Grand.Web.AdminShared.Services;++/// <summary>+/// Resolves the correct per-host <see cref="IAdminDataScope{CustomerAttribute}" /> implementation+/// at request time, based on the current request's "area" route value — same fix and same reason+/// as <see cref="RoutedCategoryDataScope"/>: 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.+///+/// No Vendor branch: CustomerAttribute has no Vendor screen at all, so any "Vendor" (or other+/// unrecognized/missing) area value fails closed.+/// </summary>+public class RoutedCustomerAttributeDataScope(+ IHttpContextAccessor httpContextAccessor,+ GlobalAdminDataScope<CustomerAttribute> globalScope,+ StoreAdminDataScope<CustomerAttribute> storeScope) : IAdminDataScope<CustomerAttribute>+{+ private IAdminDataScope<CustomerAttribute> Resolved+ {+ get+ {+ var area = httpContextAccessor.HttpContext?.Request.RouteValues["area"] as string;+ return area switch {+ "Admin" => globalScope,+ "Store" => storeScope,+ _ => throw new InvalidOperationException(+ $"RoutedCustomerAttributeDataScope: unrecognized or missing area '{area}'.")+ };+ }+ }++ public Task<bool> HasAccess(CustomerAttribute entity) => Resolved.HasAccess(entity);+ public Task<bool> CanView(CustomerAttribute entity) => Resolved.CanView(entity);+ public string? DefaultStoreId => Resolved.DefaultStoreId;+ 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/Services/RoutedProductAttributeDataScope.cs b/src/Web/Grand.Web.AdminShared/Services/RoutedProductAttributeDataScope.csnew file mode 100644index 000000000..8d97773d8--- /dev/null+++ b/src/Web/Grand.Web.AdminShared/Services/RoutedProductAttributeDataScope.cs@@ -0,0 +1,45 @@+#nullable enable++using Grand.Domain.Catalog;+using Grand.Web.AdminShared.Interfaces;+using Microsoft.AspNetCore.Http;++namespace Grand.Web.AdminShared.Services;++/// <summary>+/// Resolves the correct per-host <see cref="IAdminDataScope{ProductAttribute}" /> implementation+/// at request time, based on the current request's "area" route value — same fix and same reason+/// as <see cref="RoutedCategoryDataScope"/>: 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.+///+/// No Vendor branch: ProductAttribute has no Vendor screen at all, so any "Vendor" (or other+/// unrecognized/missing) area value fails closed.+/// </summary>+public class RoutedProductAttributeDataScope(+ IHttpContextAccessor httpContextAccessor,+ GlobalAdminDataScope<ProductAttribute> globalScope,+ StoreAdminDataScope<ProductAttribute> storeScope) : IAdminDataScope<ProductAttribute>+{+ private IAdminDataScope<ProductAttribute> Resolved+ {+ get+ {+ var area = httpContextAccessor.HttpContext?.Request.RouteValues["area"] as string;+ return area switch {+ "Admin" => globalScope,+ "Store" => storeScope,+ _ => throw new InvalidOperationException(+ $"RoutedProductAttributeDataScope: unrecognized or missing area '{area}'.")+ };+ }+ }++ public Task<bool> HasAccess(ProductAttribute entity) => Resolved.HasAccess(entity);+ public Task<bool> CanView(ProductAttribute entity) => Resolved.CanView(entity);+ public string? DefaultStoreId => Resolved.DefaultStoreId;+ 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/Services/RoutedSpecificationAttributeDataScope.cs b/src/Web/Grand.Web.AdminShared/Services/RoutedSpecificationAttributeDataScope.csnew file mode 100644index 000000000..b77db7421--- /dev/null+++ b/src/Web/Grand.Web.AdminShared/Services/RoutedSpecificationAttributeDataScope.cs@@ -0,0 +1,45 @@+#nullable enable++using Grand.Domain.Catalog;+using Grand.Web.AdminShared.Interfaces;+using Microsoft.AspNetCore.Http;++namespace Grand.Web.AdminShared.Services;++/// <summary>+/// Resolves the correct per-host <see cref="IAdminDataScope{SpecificationAttribute}" /> implementation+/// at request time, based on the current request's "area" route value — same fix and same reason+/// as <see cref="RoutedCategoryDataScope"/>: 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.+///+/// No Vendor branch: SpecificationAttribute has no Vendor screen at all, so any "Vendor" (or other+/// unrecognized/missing) area value fails closed.+/// </summary>+public class RoutedSpecificationAttributeDataScope(+ IHttpContextAccessor httpContextAccessor,+ GlobalAdminDataScope<SpecificationAttribute> globalScope,+ StoreAdminDataScope<SpecificationAttribute> storeScope) : IAdminDataScope<SpecificationAttribute>+{+ private IAdminDataScope<SpecificationAttribute> Resolved+ {+ get+ {+ var area = httpContextAccessor.HttpContext?.Request.RouteValues["area"] as string;+ return area switch {+ "Admin" => globalScope,+ "Store" => storeScope,+ _ => throw new InvalidOperationException(+ $"RoutedSpecificationAttributeDataScope: unrecognized or missing area '{area}'.")+ };+ }+ }++ public Task<bool> HasAccess(SpecificationAttribute entity) => Resolved.HasAccess(entity);+ public Task<bool> CanView(SpecificationAttribute entity) => Resolved.CanView(entity);+ public string? DefaultStoreId => Resolved.DefaultStoreId;+ 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 395d03e52..8c899e75f 100644--- a/src/Web/Grand.Web.AdminShared/Startup/StartupApplication.cs+++ b/src/Web/Grand.Web.AdminShared/Startup/StartupApplication.cs@@ -1,6 +1,9 @@using elFinder.Net.AspNetCore.Extensions;using elFinder.Net.Drivers.FileSystem.Extensions;using Grand.Domain.Catalog;+using Grand.Domain.Common;+using Grand.Domain.Customers;+using Grand.Domain.Messages;using Grand.Domain.Orders;using Grand.Domain.Payments;using Grand.Domain.Shipping;@@ -133,6 +136,48 @@ public class StartupApplication : IStartupApplicationservices.AddScoped<GlobalAdminDataScope<VendorReview>>();services.AddScoped<VendorVendorReviewDataScope>();services.AddScoped<IAdminDataScope<VendorReview>, RoutedVendorReviewDataScope>();++ // IAdminDataScope<AddressAttribute>: registered once here for the same reason as+ // Product/Category/Collection above — see RoutedAddressAttributeDataScope's doc comment.+ // No Vendor scope: AddressAttribute has no Vendor screen.+ services.AddScoped<GlobalAdminDataScope<AddressAttribute>>();+ services.AddScoped<StoreAdminDataScope<AddressAttribute>>();+ services.AddScoped<IAdminDataScope<AddressAttribute>, RoutedAddressAttributeDataScope>();++ // IAdminDataScope<ContactAttribute>: registered once here for the same reason as+ // AddressAttribute above — see RoutedContactAttributeDataScope's doc comment.+ // No Vendor scope: ContactAttribute has no Vendor screen.+ services.AddScoped<GlobalAdminDataScope<ContactAttribute>>();+ services.AddScoped<StoreAdminDataScope<ContactAttribute>>();+ services.AddScoped<IAdminDataScope<ContactAttribute>, RoutedContactAttributeDataScope>();++ // IAdminDataScope<CustomerAttribute>: registered once here for the same reason as+ // AddressAttribute above — see RoutedCustomerAttributeDataScope's doc comment.+ // No Vendor scope: CustomerAttribute has no Vendor screen.+ services.AddScoped<GlobalAdminDataScope<CustomerAttribute>>();+ services.AddScoped<StoreAdminDataScope<CustomerAttribute>>();+ services.AddScoped<IAdminDataScope<CustomerAttribute>, RoutedCustomerAttributeDataScope>();++ // IAdminDataScope<CheckoutAttribute>: registered once here for the same reason as+ // AddressAttribute above — see RoutedCheckoutAttributeDataScope's doc comment.+ // No Vendor scope: CheckoutAttribute has no Vendor screen.+ services.AddScoped<GlobalAdminDataScope<CheckoutAttribute>>();+ services.AddScoped<StoreAdminDataScope<CheckoutAttribute>>();+ services.AddScoped<IAdminDataScope<CheckoutAttribute>, RoutedCheckoutAttributeDataScope>();++ // IAdminDataScope<ProductAttribute>: registered once here for the same reason as+ // AddressAttribute above — see RoutedProductAttributeDataScope's doc comment.+ // No Vendor scope: ProductAttribute has no Vendor screen.+ services.AddScoped<GlobalAdminDataScope<ProductAttribute>>();+ services.AddScoped<StoreAdminDataScope<ProductAttribute>>();+ services.AddScoped<IAdminDataScope<ProductAttribute>, RoutedProductAttributeDataScope>();++ // IAdminDataScope<SpecificationAttribute>: registered once here for the same reason as+ // AddressAttribute above — see RoutedSpecificationAttributeDataScope's doc comment.+ // No Vendor scope: SpecificationAttribute has no Vendor screen.+ services.AddScoped<GlobalAdminDataScope<SpecificationAttribute>>();+ services.AddScoped<StoreAdminDataScope<SpecificationAttribute>>();+ services.AddScoped<IAdminDataScope<SpecificationAttribute>, RoutedSpecificationAttributeDataScope>();}public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment)diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Create.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/AddressAttribute/Create.cshtmlsimilarity index 81%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Create.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/AddressAttribute/Create.cshtmlindex e5eb1f2d6..0a57d2e7d 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/Create.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/AddressAttribute/Create.cshtml@@ -1,9 +1,11 @@-@model AddressAttributeModel+@using Grand.Web.AdminShared.Models.Common+@model AddressAttributeModel@{//page titleViewBag.Title = Loc["Admin.Address.AddressAttributes.AddNew"];+ var area = ViewContext.RouteData.Values["area"]?.ToString();}-<form asp-area="@Constants.AreaAdmin" asp-controller="AddressAttribute" asp-action="Create" method="post" id="addressattribute-form">+<form asp-area="@area" asp-controller="AddressAttribute" asp-action="Create" method="post" id="addressattribute-form"><div class="row"><div class="col-md-12"><div class="x_panel light form-fit">@@ -25,7 +27,7 @@</button></div></div>- <vc:admin-widget widget-zone="address_attribute_details_buttons" additional-data="null"/>+ <partial name="Partials/WidgetZone.DetailsButtons"/></div><div class="x_content form"><partial name="Partials/CreateOrUpdate" model="Model"/>@@ -33,4 +35,4 @@</div></div></div>-</form>\ No newline at end of file+</form>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Edit.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/AddressAttribute/Edit.cshtmlsimilarity index 84%rename from src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Edit.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/AddressAttribute/Edit.cshtmlindex 572cb4529..3c5e680dd 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Edit.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/AddressAttribute/Edit.cshtml@@ -1,16 +1,19 @@-@model AddressAttributeStoreModel+@using Grand.Web.AdminShared.Models.Common+@model AddressAttributeModel@{+ //page titlevar isReadOnly = Model.IsGlobalAttribute;ViewBag.Title = Loc["Admin.Address.AddressAttributes.EditAttributeDetails"];+ var area = ViewContext.RouteData.Values["area"]?.ToString();}-<form asp-area="@Constants.AreaStore" asp-controller="AddressAttribute" asp-action="Edit" method="post" id="addressattribute-form">+<form asp-area="@area" asp-controller="AddressAttribute" asp-action="Edit" method="post" id="addressattribute-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-list-alt"></i>+ <i class="fa fa-list-ol"></i>@Loc["Admin.Address.AddressAttributes.EditAttributeDetails"] - @Model.Name<small><i class="fa fa-arrow-circle-left"></i>@Html.ActionLink(Loc["Admin.Address.AddressAttributes.BackToList"], "List")@@ -19,7 +22,7 @@@if (!isReadOnly){<div class="actions">- <div class="btn-group btn-group-devided util-btn-margin-bottom-5">+ <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>@@ -40,6 +43,7 @@</div></div>}+ <partial name="Partials/WidgetZone.DetailsButtons" model="Model"/></div><div class="x_content form"><partial name="Partials/CreateOrUpdate" model="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/List.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/AddressAttribute/List.cshtmlsimilarity index 86%rename from src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/List.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/AddressAttribute/List.cshtmlindex 62ec137e6..003c0764b 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/List.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/AddressAttribute/List.cshtml@@ -1,7 +1,8 @@@{+ //page titleViewBag.Title = Loc["Admin.Address.AddressAttributes"];+ var area = ViewContext.RouteData.Values["area"]?.ToString();}-<div class="row"><div class="col-md-12"><div class="x_panel light form-fit">@@ -11,9 +12,10 @@@Loc["Admin.Address.AddressAttributes"]</div><div class="actions btn-group btn-group-devided">- <a href="@Url.Action("Create", new { area = Constants.AreaStore })" class="btn green">+ <a href="@Url.Action("Create", "AddressAttribute", new { area })" class="btn green"><i class="fa fa-plus"></i><span class="d-none d-sm-inline"> @Loc["Admin.Common.AddNew"] </span></a>+ <partial name="Partials/WidgetZone.ListButtons"/></div></div><div class="x_content form">@@ -35,7 +37,7 @@dataSource: {transport: {read: {- url: "@Html.Raw(Url.Action("List", "AddressAttribute", new { area = Constants.AreaStore }))",+ url: "@Html.Raw(Url.Action("List", "AddressAttribute", new { area }))",type: "POST",dataType: "json",data: addAntiForgeryToken@@ -90,7 +92,7 @@width: 120,headerAttributes: { style: "text-align:center" },attributes: { style: "text-align:center" },- template: '# if(IsGlobalAttribute) {# <span class="badge badge-secondary">@Loc["Admin.Common.View"]</span> #} else {# <span class="badge badge-success">@Loc["Admin.Common.Edit"]</span> #} #'+ template: '# if(IsGlobalAttribute) {# <a class="k-link" href="Edit/#=Id#"><span class="badge badge-secondary">@Loc["Admin.Common.View"]</span></a> #} else {# <a class="k-link" href="Edit/#=Id#"><span class="badge badge-success">@Loc["Admin.Common.Edit"]</span></a> #} #'}]});});diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/AddressAttribute/Partials/CreateOrUpdate.TabInfo.cshtmlsimilarity index 85%rename from src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/CreateOrUpdate.TabInfo.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/AddressAttribute/Partials/CreateOrUpdate.TabInfo.cshtmlindex de254bef5..1300d236f 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/CreateOrUpdate.TabInfo.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/AddressAttribute/Partials/CreateOrUpdate.TabInfo.cshtml@@ -1,7 +1,9 @@+@using Grand.Web.AdminShared.Models.Common@using Microsoft.AspNetCore.Mvc.Razor-@model AddressAttributeStoreModel+@model AddressAttributeModel@{var isReadOnly = Model.IsGlobalAttribute;+ var area = ViewContext.RouteData.Values["area"]?.ToString();}<script>$(document).ready(function () {@@ -21,6 +23,7 @@}</script>+<partial name="Partials/WidgetZone.Info.Top" model="Model"/>@{Func<int, HelperResult>template = @<div class="form-body">@@ -70,6 +73,16 @@<span asp-validation-for="AttributeControlTypeId"></span></div></div>+ @if (area == "Admin")+ {+ <div class="form-group">+ <admin-label asp-for="Stores"/>+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="Stores"/>+ <span asp-validation-for="Stores"></span>+ </div>+ </div>+ }<div class="form-group"><admin-label asp-for="DisplayOrder"/><div class="col-md-9 col-sm-9">@@ -79,3 +92,4 @@</div></div></div>+<partial name="Partials/WidgetZone.Info.Bottom" model="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/CreateOrUpdate.TabValues.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/AddressAttribute/Partials/CreateOrUpdate.TabValues.cshtmlsimilarity index 93%rename from src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/CreateOrUpdate.TabValues.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/AddressAttribute/Partials/CreateOrUpdate.TabValues.cshtmlindex cca808934..541e947c6 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/CreateOrUpdate.TabValues.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/AddressAttribute/Partials/CreateOrUpdate.TabValues.cshtml@@ -1,17 +1,21 @@-@model AddressAttributeStoreModel+@using Grand.Web.AdminShared.Models.Common+@model AddressAttributeModel@{var isReadOnly = Model.IsGlobalAttribute;+ var area = ViewContext.RouteData.Values["area"]?.ToString();if (!string.IsNullOrEmpty(Model.Id)){<div class="panel panel-default"><div class="panel-body">+ <partial name="Partials/WidgetZone.Values.Top" model="Model"/><div id="addressattributevalues-grid"></div>+ <partial name="Partials/WidgetZone.Values.Bottom" model="Model"/></div>@if (!isReadOnly){<div class="panel-footer">- <a id="btnAddNewValue" href="@(Url.Action("ValueCreatePopup", "AddressAttribute", new { addressAttributeId = Model.Id, area = Constants.AreaStore }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Address.AddressAttributes.Values.AddNew"]</a>+ <a id="btnAddNewValue" href="@(Url.Action("ValueCreatePopup", "AddressAttribute", new { addressAttributeId = Model.Id, area }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Address.AddressAttributes.Values.AddNew"]</a><input type="submit" id="btnRefresh" style="display: none"/></div>}@@ -58,13 +62,13 @@dataSource: {transport: {read: {- url: "@Html.Raw(Url.Action("ValueList", "AddressAttribute", new { addressAttributeId = Model.Id, area = Constants.AreaStore }))",+ url: "@Html.Raw(Url.Action("ValueList", "AddressAttribute", new { addressAttributeId = Model.Id, area }))",type: "POST",dataType: "json",data: addAntiForgeryToken},destroy: {- url: "@Html.Raw(Url.Action("ValueDelete", "AddressAttribute", new { area = Constants.AreaStore }))",+ url: "@Html.Raw(Url.Action("ValueDelete", "AddressAttribute", new { area }))",type: "POST",dataType: "json",data: addAntiForgeryToken@@ -90,7 +94,7 @@columns: [{field: "Name",title: "@Loc["Admin.Address.AddressAttributes.Values.Fields.Name"]",- template: "<a class='k-link editvalue' href=\"@Url.Action("ValueEditPopup", "AddressAttribute", new { area = Constants.AreaStore })/#=Id#[email protected]\">#=kendo.htmlEncode(Name)#</a>"+ template: "<a class='k-link editvalue' href=\"@Url.Action("ValueEditPopup", "AddressAttribute", new { area })/#=Id#[email protected]\">#=kendo.htmlEncode(Name)#</a>"}, {field: "IsPreSelected",title: "@Loc["Admin.Address.AddressAttributes.Values.Fields.IsPreSelected"]",@@ -128,7 +132,7 @@dataSource: {transport: {read: {- url: "@Html.Raw(Url.Action("ValueList", "AddressAttribute", new { addressAttributeId = Model.Id, area = Constants.AreaStore }))",+ url: "@Html.Raw(Url.Action("ValueList", "AddressAttribute", new { addressAttributeId = Model.Id, area }))",type: "POST",dataType: "json",data: addAntiForgeryTokendiff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/CreateOrUpdate.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/AddressAttribute/Partials/CreateOrUpdate.cshtmlsimilarity index 71%rename from src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/CreateOrUpdate.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/AddressAttribute/Partials/CreateOrUpdate.cshtmlindex dad3a2e0b..35f58112c 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/CreateOrUpdate.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/AddressAttribute/Partials/CreateOrUpdate.cshtml@@ -1,7 +1,14 @@-@model AddressAttributeStoreModel-+@using Grand.Web.AdminShared.Models.Common+@model AddressAttributeModel+@{+ var area = ViewContext.RouteData.Values["area"]?.ToString();+}<div asp-validation-summary="All"></div><input asp-for="Id" type="hidden"/>+@if (area == "Admin")+{+ <input id="active-menu-item" type="hidden" value="/Admin/AddressAttribute"/>+}<admin-tabstrip name="addressattribute-edit"><items>@@ -19,5 +26,6 @@</div></content></tabstrip-item>+ <partial name="Partials/WidgetZone.Tabs" model="Model"/></items></admin-tabstrip>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/CreateOrUpdateValue.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/AddressAttribute/Partials/CreateOrUpdateValue.cshtmlsimilarity index 93%rename from src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/CreateOrUpdateValue.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/AddressAttribute/Partials/CreateOrUpdateValue.cshtmlindex 32471312e..d29d189db 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/CreateOrUpdateValue.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/AddressAttribute/Partials/CreateOrUpdateValue.cshtml@@ -1,9 +1,11 @@+@using Grand.Web.AdminShared.Models.Common@using Microsoft.AspNetCore.Mvc.Razor@model AddressAttributeValueModel<div asp-validation-summary="All"></div><input asp-for="Id" type="hidden"/><input asp-for="AddressAttributeId" type="hidden"/>+<partial name="Partials/WidgetZone.Value.Top" model="Model"/>@{Func<int, HelperResult>template = @<div class="form-body">@@ -17,6 +19,7 @@<input type="hidden" asp-for="@Model.Locales[item].LanguageId"/></div>;}+<div class="form-horizontal"><localized-editor localized-template="@template" name="addressattributevalue-localized" language-ids="@Model.Locales.Select(c => c.LanguageId).ToList()"><div class="form-body">@@ -56,3 +59,4 @@</div></div></div>+<partial name="Partials/WidgetZone.Value.Bottom" model="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/ValueCreatePopup.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/AddressAttribute/ValueCreatePopup.cshtmlsimilarity index 85%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/ValueCreatePopup.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/AddressAttribute/ValueCreatePopup.cshtmlindex 4c8803ee8..68786f9dc 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/AddressAttribute/ValueCreatePopup.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/AddressAttribute/ValueCreatePopup.cshtml@@ -1,9 +1,11 @@-@model AddressAttributeValueModel+@using Grand.Web.AdminShared.Models.Common+@model AddressAttributeValueModel@{Layout = "";ViewBag.Title = Loc["Admin.Address.AddressAttributes.Values.AddNew"];+ var area = ViewContext.RouteData.Values["area"]?.ToString();}-<form id="ValueCreatePopup" asp-area="@Constants.AreaAdmin" asp-controller="AddressAttribute" asp-action="ValueCreatePopup"+<form id="ValueCreatePopup" asp-area="@area" asp-controller="AddressAttribute" asp-action="ValueCreatePopup"asp-route-addressAttributeId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["addressAttributeId"])"><div class="row"><div class="col-md-12">@@ -14,7 +16,7 @@@Loc["Admin.Address.AddressAttributes.Values.AddNew"]</div></div>- <vc:admin-widget widget-zone="address_attribute_value_details_buttons" additional-data="null"/>+ <partial name="Partials/WidgetZone.ValueButtons"/><div class="x_content form"><partial name="Partials/CreateOrUpdateValue" model="Model"/></div>@@ -52,4 +54,4 @@});});</script>-</form>\ No newline at end of file+</form>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/ValueEditPopup.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/AddressAttribute/ValueEditPopup.cshtmlsimilarity index 82%rename from src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/ValueEditPopup.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/AddressAttribute/ValueEditPopup.cshtmlindex c2b9bd21c..5a4432d31 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/ValueEditPopup.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/AddressAttribute/ValueEditPopup.cshtml@@ -1,9 +1,11 @@-@using Grand.Web.Common.Extensions+@using Grand.Web.AdminShared.Models.Common@model AddressAttributeValueModel@{Layout = "";+ ViewBag.Title = Loc["Admin.Address.AddressAttributes.Values.EditValueDetails"];+ var area = ViewContext.RouteData.Values["area"]?.ToString();}-<form id="ValueEditPopup" asp-area="@Constants.AreaStore" asp-controller="AddressAttribute" asp-action="ValueEditPopup"+<form id="ValueEditPopup" asp-area="@area" asp-controller="AddressAttribute" asp-action="ValueEditPopup"asp-route-addressAttributeId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["addressAttributeId"])"><div class="row"><div class="col-md-12">@@ -14,6 +16,7 @@@Loc["Admin.Address.AddressAttributes.Values.EditValueDetails"]</div></div>+ <partial name="Partials/WidgetZone.ValueButtons" model="Model"/><div class="x_content form"><partial name="Partials/CreateOrUpdateValue" model="Model"/></div>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Create.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/CheckoutAttribute/Create.cshtmlsimilarity index 82%rename from src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Create.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/CheckoutAttribute/Create.cshtmlindex 780ee3d3e..91c8a2106 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Create.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/CheckoutAttribute/Create.cshtml@@ -1,9 +1,10 @@-@model CheckoutAttributeModel+@model CheckoutAttributeModel@{//page titleViewBag.Title = Loc["Admin.Orders.CheckoutAttributes.AddNew"];+ var area = ViewContext.RouteData.Values["area"]?.ToString();}-<form asp-area="@Constants.AreaStore" asp-controller="CheckoutAttribute" asp-action="Create" method="post" id="checkoutattribute-form">+<form asp-area="@area" asp-controller="CheckoutAttribute" asp-action="Create" method="post" id="checkoutattribute-form"><div class="row"><div class="col-md-12">@@ -24,7 +25,7 @@<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="checkout_attribute_details_buttons" additional-data="null"/>+ <partial name="Partials/WidgetZone.DetailsButtons"/></div></div></div>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Edit.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/CheckoutAttribute/Edit.cshtmlsimilarity index 85%rename from src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Edit.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/CheckoutAttribute/Edit.cshtmlindex 34ab60b99..81f9ef6ee 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Edit.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/CheckoutAttribute/Edit.cshtml@@ -1,10 +1,11 @@-@model CheckoutAttributeModel+@model CheckoutAttributeModel@{//page titleViewBag.Title = Loc["Admin.Orders.CheckoutAttributes.EditAttributeDetails"];+ var area = ViewContext.RouteData.Values["area"]?.ToString();}-<form asp-area="@Constants.AreaStore" asp-controller="CheckoutAttribute" asp-action="Edit" method="post" id="checkoutattribute-form">+<form asp-area="@area" asp-controller="CheckoutAttribute" asp-action="Edit" method="post" id="checkoutattribute-form"><div class="row"><div class="col-md-12">@@ -28,7 +29,7 @@<span id="checkoutattribute-delete" class="btn red"><i class="fa fa-trash-o"></i> @Loc["Admin.Common.Delete"]</span>- <vc:admin-widget widget-zone="checkout_attribute_details_buttons" additional-data="Model"/>+ <partial name="Partials/WidgetZone.DetailsButtons" model="Model"/></div></div></div>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/List.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/CheckoutAttribute/List.cshtmlsimilarity index 89%rename from src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/List.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/CheckoutAttribute/List.cshtmlindex da94020f9..ac12c8ee6 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/List.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/CheckoutAttribute/List.cshtml@@ -1,6 +1,7 @@-@{+@{//page titleViewBag.Title = Loc["Admin.Orders.CheckoutAttributes"];+ var area = ViewContext.RouteData.Values["area"]?.ToString();}<div class="row">@@ -12,10 +13,10 @@@Loc["Admin.Orders.CheckoutAttributes"]</div><div class="actions btn-group btn-group-devided">- <a href="@Url.Action("Create", new { area = Constants.AreaStore })" class="btn green">+ <a href="@Url.Action("Create", new { 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="checkout_attribute_list_buttons" additional-data="null"/>+ <partial name="Partials/WidgetZone.ListButtons"/></div></div>@@ -38,7 +39,7 @@dataSource: {transport: {read: {- url: "@Html.Raw(Url.Action("List", "CheckoutAttribute", new { area = Constants.AreaStore }))",+ url: "@Html.Raw(Url.Action("List", "CheckoutAttribute", new { area }))",type: "POST",dataType: "json",data: addAntiForgeryToken@@ -72,7 +73,7 @@columns: [{field: "Name",title: "@Loc["Admin.Orders.CheckoutAttributes.Fields.Name"]",- template: '<a class="k-link" href="@Url.Action("Edit", "CheckoutAttribute", new { area = Constants.AreaStore })/#=Id#">#=kendo.htmlEncode(Name)#</a>',+ template: '<a class="k-link" href="@Url.Action("Edit", "CheckoutAttribute", new { area })/#=Id#">#=kendo.htmlEncode(Name)#</a>',}, {field: "AttributeControlTypeName",title: "@Loc["Admin.Orders.CheckoutAttributes.Fields.AttributeControlType"]",diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/CreateOrUpdate.TabCondition.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/CheckoutAttribute/Partials/CreateOrUpdate.TabCondition.cshtmlsimilarity index 96%rename from src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/CreateOrUpdate.TabCondition.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/CheckoutAttribute/Partials/CreateOrUpdate.TabCondition.cshtmlindex 3031f4945..edadee11b 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/CreateOrUpdate.TabCondition.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/CheckoutAttribute/Partials/CreateOrUpdate.TabCondition.cshtml@@ -1,5 +1,5 @@-@model CheckoutAttributeModel-<vc:admin-widget widget-zone="checkout_attribute_details_condition_top" additional-data="Model"/>+@model CheckoutAttributeModel+<partial name="Partials/WidgetZone.Condition.Top" model="Model"/>@{if (!string.IsNullOrEmpty(Model.Id)){@@ -123,4 +123,4 @@</div>}}-<vc:admin-widget widget-zone="checkout_attribute_details_condition_bottom" additional-data="Model"/>\ No newline at end of file+<partial name="Partials/WidgetZone.Condition.Bottom" model="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/CheckoutAttribute/Partials/CreateOrUpdate.TabInfo.cshtmlsimilarity index 91%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/CreateOrUpdate.TabInfo.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/CheckoutAttribute/Partials/CreateOrUpdate.TabInfo.cshtmlindex 616399a6b..6b9d1a444 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/CreateOrUpdate.TabInfo.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/CheckoutAttribute/Partials/CreateOrUpdate.TabInfo.cshtml@@ -1,6 +1,8 @@-@using Microsoft.AspNetCore.Mvc.Razor+@using Microsoft.AspNetCore.Mvc.Razor@model CheckoutAttributeModel-+@{+ var area = ViewContext.RouteData.Values["area"]?.ToString();+}<script>$(document).ready(function () {@@ -63,7 +65,7 @@}}</script>-<vc:admin-widget widget-zone="checkout_attribute_details_info_top" additional-data="Model"/>+<partial name="Partials/WidgetZone.Info.Top" model="Model"/>@{Func<int, HelperResult>@@ -161,20 +163,23 @@<span asp-validation-for="DisplayOrder"></span></div></div>- <div class="form-group">- <admin-label asp-for="CustomerGroups"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="CustomerGroups"/>- <span asp-validation-for="CustomerGroups"></span>+ @if (area == "Admin")+ {+ <div class="form-group">+ <admin-label asp-for="CustomerGroups"/>+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="CustomerGroups"/>+ <span asp-validation-for="CustomerGroups"></span>+ </div></div>- </div>- <div class="form-group">- <admin-label asp-for="Stores"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="Stores"/>- <span asp-validation-for="Stores"></span>+ <div class="form-group">+ <admin-label asp-for="Stores"/>+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="Stores"/>+ <span asp-validation-for="Stores"></span>+ </div></div>- </div>+ }<div class="form-group" id="pnlValidationMinLength"><admin-label asp-for="ValidationMinLength"/><div class="col-md-9 col-sm-9">@@ -212,4 +217,4 @@</div></div></div>-<vc:admin-widget widget-zone="checkout_attribute_details_info_bottom" additional-data="Model"/>\ No newline at end of file+<partial name="Partials/WidgetZone.Info.Bottom" model="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/CreateOrUpdate.TabValues.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/CheckoutAttribute/Partials/CreateOrUpdate.TabValues.cshtmlsimilarity index 91%rename from src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/CreateOrUpdate.TabValues.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/CheckoutAttribute/Partials/CreateOrUpdate.TabValues.cshtmlindex 183bbbbd8..6cd1acce6 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/CreateOrUpdate.TabValues.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/CheckoutAttribute/Partials/CreateOrUpdate.TabValues.cshtml@@ -1,6 +1,7 @@-@model CheckoutAttributeModel-<vc:admin-widget widget-zone="checkout_attribute_details_values_top" additional-data="Model"/>+@model CheckoutAttributeModel+<partial name="Partials/WidgetZone.Values.Top" model="Model"/>@{+ var area = ViewContext.RouteData.Values["area"]?.ToString();if (!string.IsNullOrEmpty(Model.Id)){<div class="panel panel-default">@@ -8,7 +9,7 @@<div id="checkoutattributevalues-grid"></div></div><div class="panel-footer">- <a id="btnAddNewValue" href="@(Url.Action("ValueCreatePopup", "CheckoutAttribute", new { checkoutAttributeId = Model.Id, area = Constants.AreaStore }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Orders.CheckoutAttributes.Values.AddNew"]</a>+ <a id="btnAddNewValue" href="@(Url.Action("ValueCreatePopup", "CheckoutAttribute", new { checkoutAttributeId = Model.Id, area }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Orders.CheckoutAttributes.Values.AddNew"]</a><input type="submit" id="btnRefresh" style="display: none"/></div></div>@@ -47,13 +48,13 @@dataSource: {transport: {read: {- url: "@Html.Raw(Url.Action("ValueList", "CheckoutAttribute", new { checkoutAttributeId = Model.Id, area = Constants.AreaStore }))",+ url: "@Html.Raw(Url.Action("ValueList", "CheckoutAttribute", new { checkoutAttributeId = Model.Id, area }))",type: "POST",dataType: "json",data: addAntiForgeryToken},destroy: {- url: "@Html.Raw(Url.Action("ValueDelete", "CheckoutAttribute", new { area = Constants.AreaStore }))",+ url: "@Html.Raw(Url.Action("ValueDelete", "CheckoutAttribute", new { area }))",type: "POST",dataType: "json",data: addAntiForgeryToken@@ -90,7 +91,7 @@columns: [{field: "Name",title: "@Loc["Admin.Orders.CheckoutAttributes.Values.Fields.Name"]",- template: "<a class='k-link editvalue' href=\"@Url.Action("ValueEditPopup", "CheckoutAttribute", new { area = Constants.AreaStore })/#=Id#[email protected]\">#=kendo.htmlEncode(Name)#</a>"+ template: "<a class='k-link editvalue' href=\"@Url.Action("ValueEditPopup", "CheckoutAttribute", new { area })/#=Id#[email protected]\">#=kendo.htmlEncode(Name)#</a>"}, {field: "PriceAdjustment",title: "@Loc["Admin.Orders.CheckoutAttributes.Values.Fields.PriceAdjustment"]",@@ -143,4 +144,4 @@</div>}}-<vc:admin-widget widget-zone="checkout_attribute_details_values_bottom" additional-data="Model"/>\ No newline at end of file+<partial name="Partials/WidgetZone.Values.Bottom" model="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/CreateOrUpdate.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/CheckoutAttribute/Partials/CreateOrUpdate.cshtmlsimilarity index 88%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/CreateOrUpdate.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/CheckoutAttribute/Partials/CreateOrUpdate.cshtmlindex 29de17e25..df872b6e9 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/Partials/CreateOrUpdate.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/CheckoutAttribute/Partials/CreateOrUpdate.cshtml@@ -1,4 +1,4 @@-@model CheckoutAttributeModel+@model CheckoutAttributeModel<div asp-validation-summary="All"></div><input asp-for="Id" type="hidden"/>@@ -29,6 +29,6 @@</content></tabstrip-item>}- <vc:admin-widget widget-zone="checkout_attribute_details_tabs" additional-data="Model"/>+ <partial name="Partials/WidgetZone.Tabs" model="Model"/></items></admin-tabstrip>\ No newline at end of filediff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/CreateOrUpdateValue.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/CheckoutAttribute/Partials/CreateOrUpdateValue.cshtmlsimilarity index 92%rename from src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/CreateOrUpdateValue.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/CheckoutAttribute/Partials/CreateOrUpdateValue.cshtmlindex e05bbca6f..42cb22ff2 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/CreateOrUpdateValue.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/CheckoutAttribute/Partials/CreateOrUpdateValue.cshtml@@ -1,4 +1,4 @@-@using Microsoft.AspNetCore.Mvc.Razor+@using Microsoft.AspNetCore.Mvc.Razor@model CheckoutAttributeValueModel<div asp-validation-summary="All"></div>@@ -6,7 +6,7 @@<input asp-for="CheckoutAttributeId" type="hidden"/><input asp-for="DisplayColorSquaresRgb" type="hidden"/>-<vc:admin-widget widget-zone="checkout_attribute_top" additional-data="Model"/>+<partial name="Partials/WidgetZone.Value.Top" model="Model"/>@{Func<int, HelperResult>@@ -87,9 +87,9 @@<button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"]</button>- <vc:admin-widget widget-zone="checkout_attribute_value_details_buttons" additional-data="Model"/>+ <partial name="Partials/WidgetZone.ValueButtons" model="Model"/></div></div></div></div>-<vc:admin-widget widget-zone="checkout_attribute_bottom" additional-data="Model"/>\ No newline at end of file+<partial name="Partials/WidgetZone.Value.Bottom" model="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/ValueCreatePopup.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/CheckoutAttribute/ValueCreatePopup.cshtmlsimilarity index 88%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/ValueCreatePopup.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/CheckoutAttribute/ValueCreatePopup.cshtmlindex 150882ab4..76bfc44ce 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/ValueCreatePopup.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/CheckoutAttribute/ValueCreatePopup.cshtml@@ -1,10 +1,12 @@-@{+@{Layout = "";}@model CheckoutAttributeValueModel--<form id="ValueCreatePopup" asp-area="@Constants.AreaAdmin" asp-controller="CheckoutAttribute" asp-action="ValueCreatePopup"+@{+ var area = ViewContext.RouteData.Values["area"]?.ToString();+}+<form id="ValueCreatePopup" asp-area="@area" asp-controller="CheckoutAttribute" asp-action="ValueCreatePopup"asp-route-checkoutAttributeId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["checkoutAttributeId"])"><div class="row"><div class="col-md-12">@@ -15,7 +17,7 @@@Loc["Admin.Orders.CheckoutAttributes.Values.AddNew"]</div><div class="actions">- <vc:admin-widget widget-zone="checkout_attribute_value_details_buttons" additional-data="null"/>+ <partial name="Partials/WidgetZone.ValueButtons"/></div></div><div class="x_content form">diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/ValueEditPopup.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/CheckoutAttribute/ValueEditPopup.cshtmlsimilarity index 91%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/ValueEditPopup.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/CheckoutAttribute/ValueEditPopup.cshtmlindex 4ca28c2bc..37ed87d23 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CheckoutAttribute/ValueEditPopup.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/CheckoutAttribute/ValueEditPopup.cshtml@@ -1,8 +1,9 @@@model CheckoutAttributeValueModel@{Layout = "";+ var area = ViewContext.RouteData.Values["area"]?.ToString();}-<form id="ValueEditPopup" asp-area="@Constants.AreaAdmin" asp-controller="CheckoutAttribute" asp-action="ValueEditPopup"+<form id="ValueEditPopup" asp-area="@area" asp-controller="CheckoutAttribute" asp-action="ValueEditPopup"asp-route-checkoutAttributeId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["checkoutAttributeId"])"><div class="row">diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Create.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ContactAttribute/Create.cshtmlsimilarity index 81%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Create.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/ContactAttribute/Create.cshtmlindex 166a6ba95..d0f809041 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Create.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ContactAttribute/Create.cshtml@@ -1,9 +1,11 @@-@model ContactAttributeModel+@using Grand.Web.AdminShared.Models.Messages+@model ContactAttributeModel@{//page titleViewBag.Title = Loc["Admin.Catalog.Attributes.ContactAttributes.AddNew"];+ var area = ViewContext.RouteData.Values["area"]?.ToString();}-<form asp-area="@Constants.AreaAdmin" asp-controller="ContactAttribute" asp-action="Create" method="post" id="contactattribute-form">+<form asp-area="@area" asp-controller="ContactAttribute" asp-action="Create" method="post" id="contactattribute-form"><div class="row"><div class="col-md-12">@@ -24,7 +26,7 @@<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="contact_attribute_details_buttons" additional-data="null"/>+ <partial name="Partials/WidgetZone.DetailsButtons"/></div></div></div>@@ -34,4 +36,4 @@</div></div></div>-</form>\ No newline at end of file+</form>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Edit.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ContactAttribute/Edit.cshtmlsimilarity index 86%rename from src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Edit.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/ContactAttribute/Edit.cshtmlindex c6869cd1f..86afaee64 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Edit.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ContactAttribute/Edit.cshtml@@ -1,9 +1,13 @@-@model ContactAttributeStoreModel+@using Grand.Web.AdminShared.Models.Messages+@model ContactAttributeModel+@{+ //page titlevar isReadOnly = Model.IsReadOnly;ViewBag.Title = Loc["Admin.Catalog.Attributes.ContactAttributes.EditAttributeDetails"];+ var area = ViewContext.RouteData.Values["area"]?.ToString();}-<form asp-area="@Constants.AreaStore" asp-controller="ContactAttribute" asp-action="Edit" method="post" id="contactattribute-form">+<form asp-area="@area" asp-controller="ContactAttribute" asp-action="Edit" method="post" id="contactattribute-form"><div class="row"><div class="col-md-12">@@ -29,6 +33,7 @@<span id="contactattribute-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>}diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/List.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ContactAttribute/List.cshtmlsimilarity index 87%rename from src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/List.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/ContactAttribute/List.cshtmlindex eb9bdf14b..b77f59adc 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/List.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ContactAttribute/List.cshtml@@ -1,7 +1,8 @@@{+ //page titleViewBag.Title = Loc["Admin.Catalog.Attributes.ContactAttributes"];+ var area = ViewContext.RouteData.Values["area"]?.ToString();}-<div class="row"><div class="col-md-12"><div class="x_panel light form-fit">@@ -11,9 +12,10 @@@Loc["Admin.Catalog.Attributes.ContactAttributes"]</div><div class="actions btn-group btn-group-devided">- <a href="@Url.Action("Create", new { area = Constants.AreaStore })" class="btn green">+ <a href="@Url.Action("Create", new { area })" class="btn green"><i class="fa fa-plus"></i><span class="d-none d-sm-inline"> @Loc["Admin.Common.AddNew"] </span></a>+ <partial name="Partials/WidgetZone.ListButtons"/></div></div><div class="x_content form">@@ -35,7 +37,7 @@dataSource: {transport: {read: {- url: "@Html.Raw(Url.Action("List", "ContactAttribute", new { area = Constants.AreaStore }))",+ url: "@Html.Raw(Url.Action("List", "ContactAttribute", new { area }))",type: "POST",dataType: "json",data: addAntiForgeryToken@@ -90,7 +92,7 @@width: 120,headerAttributes: { style: "text-align:center" },attributes: { style: "text-align:center" },- template: '# if(IsReadOnly) {# <span class="badge badge-secondary">@Loc["Admin.Common.View"]</span> #} else {# <span class="badge badge-success">@Loc["Admin.Common.Edit"]</span> #} #'+ template: '# if(IsReadOnly) {# <a class="k-link" href="Edit/#=Id#"><span class="badge badge-secondary">@Loc["Admin.Common.View"]</span></a> #} else {# <a class="k-link" href="Edit/#=Id#"><span class="badge badge-success">@Loc["Admin.Common.Edit"]</span></a> #} #'}]});});diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/CreateOrUpdate.TabCondition.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ContactAttribute/Partials/CreateOrUpdate.TabCondition.cshtmlsimilarity index 96%rename from src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/CreateOrUpdate.TabCondition.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/ContactAttribute/Partials/CreateOrUpdate.TabCondition.cshtmlindex 0847b9bab..b9b567768 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/CreateOrUpdate.TabCondition.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ContactAttribute/Partials/CreateOrUpdate.TabCondition.cshtml@@ -1,4 +1,6 @@+@using Grand.Web.AdminShared.Models.Messages@model ContactAttributeModel+<partial name="Partials/WidgetZone.Condition.Top" model="Model"/>@{if (!string.IsNullOrEmpty(Model.Id)){@@ -95,6 +97,7 @@case AttributeControlType.Datepicker:case AttributeControlType.FileUpload:default:+ //not supported as conditionsbreak;}</div>@@ -119,3 +122,4 @@</div>}}+<partial name="Partials/WidgetZone.Condition.Bottom" model="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ContactAttribute/Partials/CreateOrUpdate.TabInfo.cshtmlsimilarity index 89%rename from src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/CreateOrUpdate.TabInfo.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/ContactAttribute/Partials/CreateOrUpdate.TabInfo.cshtmlindex 37af1ffa3..59ee211b8 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/CreateOrUpdate.TabInfo.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ContactAttribute/Partials/CreateOrUpdate.TabInfo.cshtml@@ -1,7 +1,9 @@+@using Grand.Web.AdminShared.Models.Messages@using Microsoft.AspNetCore.Mvc.Razor-@model ContactAttributeStoreModel+@model ContactAttributeModel@{var isReadOnly = Model.IsReadOnly;+ var area = ViewContext.RouteData.Values["area"]?.ToString();}<script>@@ -54,6 +56,7 @@}}</script>+<partial name="Partials/WidgetZone.Info.Top" model="Model"/>@{Func<int, HelperResult>@@ -116,6 +119,23 @@<span asp-validation-for="AttributeControlTypeId"></span></div></div>+ @if (area == "Admin")+ {+ <div class="form-group">+ <admin-label asp-for="CustomerGroups"/>+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="CustomerGroups"/>+ <span asp-validation-for="CustomerGroups"></span>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="Stores"/>+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="Stores"/>+ <span asp-validation-for="Stores"></span>+ </div>+ </div>+ }<div class="form-group"><admin-label asp-for="DisplayOrder"/><div class="col-md-9 col-sm-9">@@ -160,3 +180,4 @@</div></div></div>+<partial name="Partials/WidgetZone.Info.Bottom" model="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/CreateOrUpdate.TabValues.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ContactAttribute/Partials/CreateOrUpdate.TabValues.cshtmlsimilarity index 93%rename from src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/CreateOrUpdate.TabValues.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/ContactAttribute/Partials/CreateOrUpdate.TabValues.cshtmlindex d23abf0dd..e6855d22a 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/CreateOrUpdate.TabValues.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ContactAttribute/Partials/CreateOrUpdate.TabValues.cshtml@@ -1,6 +1,9 @@-@model ContactAttributeStoreModel+@using Grand.Web.AdminShared.Models.Messages+@model ContactAttributeModel+<partial name="Partials/WidgetZone.Values.Top" model="Model"/>@{var isReadOnly = Model.IsReadOnly;+ var area = ViewContext.RouteData.Values["area"]?.ToString();if (!string.IsNullOrEmpty(Model.Id)){@@ -11,7 +14,7 @@@if (!isReadOnly){<div class="panel-footer">- <a id="btnAddNewValue" href="@(Url.Action("ValueCreatePopup", "ContactAttribute", new { contactAttributeId = Model.Id, area = Constants.AreaStore }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Catalog.Attributes.ContactAttributes.Values.AddNew"]</a>+ <a id="btnAddNewValue" href="@(Url.Action("ValueCreatePopup", "ContactAttribute", new { contactAttributeId = Model.Id, area }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Catalog.Attributes.ContactAttributes.Values.AddNew"]</a><input type="submit" id="btnRefresh" style="display: none"/></div>}@@ -58,13 +61,13 @@dataSource: {transport: {read: {- url: "@Html.Raw(Url.Action("ValueList", "ContactAttribute", new { contactAttributeId = Model.Id, area = Constants.AreaStore }))",+ url: "@Html.Raw(Url.Action("ValueList", "ContactAttribute", new { contactAttributeId = Model.Id, area }))",type: "POST",dataType: "json",data: addAntiForgeryToken},destroy: {- url: "@Html.Raw(Url.Action("ValueDelete", "ContactAttribute", new { area = Constants.AreaStore }))",+ url: "@Html.Raw(Url.Action("ValueDelete", "ContactAttribute", new { area }))",type: "POST",dataType: "json",data: addAntiForgeryToken@@ -90,7 +93,7 @@columns: [{field: "Name",title: "@Loc["Admin.Catalog.Attributes.ContactAttributes.Values.Fields.Name"]",- template: "<a class='k-link editvalue' href=\"@Url.Action("ValueEditPopup", "ContactAttribute", new { area = Constants.AreaStore })/#=Id#[email protected]\">#=kendo.htmlEncode(Name)#</a>"+ template: "<a class='k-link editvalue' href=\"@Url.Action("ValueEditPopup", "ContactAttribute", new { area })/#=Id#[email protected]\">#=kendo.htmlEncode(Name)#</a>"}, {field: "IsPreSelected",title: "@Loc["Admin.Catalog.Attributes.ContactAttributes.Values.Fields.IsPreSelected"]",@@ -128,7 +131,7 @@dataSource: {transport: {read: {- url: "@Html.Raw(Url.Action("ValueList", "ContactAttribute", new { contactAttributeId = Model.Id, area = Constants.AreaStore }))",+ url: "@Html.Raw(Url.Action("ValueList", "ContactAttribute", new { contactAttributeId = Model.Id, area }))",type: "POST",dataType: "json",data: addAntiForgeryToken@@ -180,3 +183,4 @@</div>}}+<partial name="Partials/WidgetZone.Values.Bottom" model="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/CreateOrUpdate.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ContactAttribute/Partials/CreateOrUpdate.cshtmlsimilarity index 90%rename from src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/CreateOrUpdate.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/ContactAttribute/Partials/CreateOrUpdate.cshtmlindex fec15355a..5e0edd467 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/CreateOrUpdate.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ContactAttribute/Partials/CreateOrUpdate.cshtml@@ -1,4 +1,5 @@-@model ContactAttributeStoreModel+@using Grand.Web.AdminShared.Models.Messages+@model ContactAttributeModel@{var isReadOnly = Model.IsReadOnly;}@@ -32,5 +33,6 @@</content></tabstrip-item>}+ <partial name="Partials/WidgetZone.Tabs" model="Model"/></items></admin-tabstrip>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/CreateOrUpdateValue.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ContactAttribute/Partials/CreateOrUpdateValue.cshtmlsimilarity index 87%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/CreateOrUpdateValue.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/ContactAttribute/Partials/CreateOrUpdateValue.cshtmlindex 731d880dd..bf6629983 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/CreateOrUpdateValue.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ContactAttribute/Partials/CreateOrUpdateValue.cshtml@@ -1,4 +1,5 @@-@using Microsoft.AspNetCore.Mvc.Razor+@using Grand.Web.AdminShared.Models.Messages+@using Microsoft.AspNetCore.Mvc.Razor@using Constants = Grand.SharedUIResources.Constants@model ContactAttributeValueModel@@ -10,7 +11,7 @@<input asp-for="ContactAttributeId" type="hidden"/><input asp-for="DisplayColorSquaresRgb" type="hidden"/>-<vc:admin-widget widget-zone="contact_attribute_top" additional-data="Model"/>+<partial name="Partials/WidgetZone.Value.Top" model="Model"/>@{Func<int, HelperResult>@@ -47,9 +48,9 @@<admin-input asp-for="ColorSquaresRgb"/><div id="color-picker"></div><script type="text/javascript">- $(document).ready(function(){- $('#color-picker').farbtastic('#@Html.IdFor(model => model.ColorSquaresRgb)');- });+ $(document).ready(function(){+ $('#color-picker').farbtastic('#@Html.IdFor(model => model.ColorSquaresRgb)');+ });</script><span asp-validation-for="ColorSquaresRgb"></span></div>@@ -77,9 +78,9 @@<button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"]</button>- <vc:admin-widget widget-zone="contact_attribute_value_details_buttons" additional-data="null"/>+ <partial name="Partials/WidgetZone.ValueButtons"/></div></div></div></div>-<vc:admin-widget widget-zone="contact_attribute_bottom" additional-data="Model"/>\ No newline at end of file+<partial name="Partials/WidgetZone.Value.Bottom" model="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/ValueCreatePopup.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ContactAttribute/ValueCreatePopup.cshtmlsimilarity index 89%rename from src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/ValueCreatePopup.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/ContactAttribute/ValueCreatePopup.cshtmlindex 29d83ebb4..da88d92d4 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/ValueCreatePopup.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ContactAttribute/ValueCreatePopup.cshtml@@ -1,9 +1,10 @@-@using Grand.Web.Common.Extensions+@using Grand.Web.AdminShared.Models.Messages@model ContactAttributeValueModel@{Layout = "";+ var area = ViewContext.RouteData.Values["area"]?.ToString();}-<form id="ValueCreatePopup" asp-area="@Constants.AreaStore" asp-controller="ContactAttribute" asp-action="ValueCreatePopup"+<form id="ValueCreatePopup" asp-area="@area" asp-controller="ContactAttribute" asp-action="ValueCreatePopup"asp-route-contactAttributeId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["contactAttributeId"])"><div class="row"><div class="col-md-12">diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/ValueEditPopup.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ContactAttribute/ValueEditPopup.cshtmlsimilarity index 89%rename from src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/ValueEditPopup.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/ContactAttribute/ValueEditPopup.cshtmlindex dbe02b891..10f5b0ee0 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/ValueEditPopup.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ContactAttribute/ValueEditPopup.cshtml@@ -1,9 +1,10 @@-@using Grand.Web.Common.Extensions+@using Grand.Web.AdminShared.Models.Messages@model ContactAttributeValueModel@{Layout = "";+ var area = ViewContext.RouteData.Values["area"]?.ToString();}-<form id="ValueEditPopup" asp-area="@Constants.AreaStore" asp-controller="ContactAttribute" asp-action="ValueEditPopup"+<form id="ValueEditPopup" asp-area="@area" asp-controller="ContactAttribute" asp-action="ValueEditPopup"asp-route-contactAttributeId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["contactAttributeId"])"><div class="row"><div class="col-md-12">diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Create.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/CustomerAttribute/Create.cshtmlsimilarity index 79%rename from src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Create.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/CustomerAttribute/Create.cshtmlindex 4d8872d79..22eae1bfa 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Create.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/CustomerAttribute/Create.cshtml@@ -1,15 +1,17 @@-@model CustomerAttributeStoreModel+@model CustomerAttributeModel@{+ //page titleViewBag.Title = Loc["Admin.Customers.CustomerAttributes.AddNew"];+ var area = ViewContext.RouteData.Values["area"]?.ToString();}-<form asp-area="@Constants.AreaStore" asp-controller="CustomerAttribute" asp-action="Create" method="post" id="customerattribute-form">+<form asp-area="@area" asp-controller="CustomerAttribute" asp-action="Create" method="post" id="customerattribute-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-list-alt"></i>+ <i class="fa fa-list-ol"></i>@Loc["Admin.Customers.CustomerAttributes.AddNew"]<small><i class="fa fa-arrow-circle-left"></i>@Html.ActionLink(Loc["Admin.Customers.CustomerAttributes.BackToList"], "List")@@ -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/CustomerAttribute/Edit.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/CustomerAttribute/Edit.cshtmlsimilarity index 85%rename from src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Edit.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/CustomerAttribute/Edit.cshtmlindex 9723f0252..626393d2e 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Edit.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/CustomerAttribute/Edit.cshtml@@ -1,16 +1,19 @@-@model CustomerAttributeStoreModel+@model CustomerAttributeModel+@{+ //page titlevar isReadOnly = Model.IsGlobalAttribute;ViewBag.Title = Loc["Admin.Customers.CustomerAttributes.EditAttributeDetails"];+ var area = ViewContext.RouteData.Values["area"]?.ToString();}-<form asp-area="@Constants.AreaStore" asp-controller="CustomerAttribute" asp-action="Edit" method="post" id="customerattribute-form">+<form asp-area="@area" asp-controller="CustomerAttribute" asp-action="Edit" method="post" id="customerattribute-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-list-alt"></i>+ <i class="fa fa-list-ol"></i>@Loc["Admin.Customers.CustomerAttributes.EditAttributeDetails"] - @Model.Name<small><i class="fa fa-arrow-circle-left"></i>@Html.ActionLink(Loc["Admin.Customers.CustomerAttributes.BackToList"], "List")@@ -19,7 +22,7 @@@if (!isReadOnly){<div class="actions">- <div class="btn-group btn-group-devided util-btn-margin-bottom-5">+ <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>@@ -29,6 +32,7 @@<span id="customerattribute-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>}diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/List.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/CustomerAttribute/List.cshtmlsimilarity index 86%rename from src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/List.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/CustomerAttribute/List.cshtmlindex 567e5f7f1..0b16838c3 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/List.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/CustomerAttribute/List.cshtml@@ -1,7 +1,8 @@@{+ //page titleViewBag.Title = Loc["Admin.Customers.CustomerAttributes"];+ var area = ViewContext.RouteData.Values["area"]?.ToString();}-<div class="row"><div class="col-md-12"><div class="x_panel light form-fit">@@ -11,9 +12,10 @@@Loc["Admin.Customers.CustomerAttributes"]</div><div class="actions btn-group btn-group-devided">- <a href="@Url.Action("Create", new { area = Constants.AreaStore })" class="btn green">+ <a href="@Url.Action("Create", "CustomerAttribute", new { area })" class="btn green"><i class="fa fa-plus"></i><span class="d-none d-sm-inline"> @Loc["Admin.Common.AddNew"] </span></a>+ <partial name="Partials/WidgetZone.ListButtons"/></div></div><div class="x_content form">@@ -35,7 +37,7 @@dataSource: {transport: {read: {- url: "@Html.Raw(Url.Action("List", "CustomerAttribute", new { area = Constants.AreaStore }))",+ url: "@Html.Raw(Url.Action("List", "CustomerAttribute", new { area }))",type: "POST",dataType: "json",data: addAntiForgeryToken@@ -90,7 +92,7 @@width: 120,headerAttributes: { style: "text-align:center" },attributes: { style: "text-align:center" },- template: '# if(IsGlobalAttribute) {# <span class="badge badge-secondary">@Loc["Admin.Common.View"]</span> #} else {# <span class="badge badge-success">@Loc["Admin.Common.Edit"]</span> #} #'+ template: '# if(IsGlobalAttribute) {# <a class="k-link" href="Edit/#=Id#"><span class="badge badge-secondary">@Loc["Admin.Common.View"]</span></a> #} else {# <a class="k-link" href="Edit/#=Id#"><span class="badge badge-success">@Loc["Admin.Common.Edit"]</span></a> #} #'}]});});diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/CustomerAttribute/Partials/CreateOrUpdate.TabInfo.cshtmlsimilarity index 89%rename from src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/CreateOrUpdate.TabInfo.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/CustomerAttribute/Partials/CreateOrUpdate.TabInfo.cshtmlindex 426e0c99f..61a8be97c 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/CreateOrUpdate.TabInfo.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/CustomerAttribute/Partials/CreateOrUpdate.TabInfo.cshtml@@ -1,7 +1,8 @@@using Microsoft.AspNetCore.Mvc.Razor-@model CustomerAttributeStoreModel+@model CustomerAttributeModel@{var isReadOnly = Model.IsGlobalAttribute;+ var area = ViewContext.RouteData.Values["area"]?.ToString();}<script>@@ -32,6 +33,7 @@}</script>+<partial name="Partials/WidgetZone.Info.Top" model="Model"/>@{Func<int, HelperResult>@@ -93,6 +95,16 @@<span asp-validation-for="AttributeControlTypeId"></span></div></div>+ @if (area == "Admin")+ {+ <div class="form-group">+ <admin-label asp-for="Stores"/>+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="Stores"/>+ <span asp-validation-for="Stores"></span>+ </div>+ </div>+ }<div class="form-group"><admin-label asp-for="DisplayOrder"/><div class="col-md-9 col-sm-9">@@ -102,3 +114,4 @@</div></div></div>+<partial name="Partials/WidgetZone.Info.Bottom" model="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/CreateOrUpdate.TabValues.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/CustomerAttribute/Partials/CreateOrUpdate.TabValues.cshtmlsimilarity index 93%rename from src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/CreateOrUpdate.TabValues.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/CustomerAttribute/Partials/CreateOrUpdate.TabValues.cshtmlindex 515719983..90bd180f9 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/CreateOrUpdate.TabValues.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/CustomerAttribute/Partials/CreateOrUpdate.TabValues.cshtml@@ -1,6 +1,8 @@-@model CustomerAttributeStoreModel+@model CustomerAttributeModel+<partial name="Partials/WidgetZone.Values.Top" model="Model"/>@{var isReadOnly = Model.IsGlobalAttribute;+ var area = ViewContext.RouteData.Values["area"]?.ToString();if (!string.IsNullOrEmpty(Model.Id)){@@ -11,7 +13,7 @@@if (!isReadOnly){<div class="panel-footer">- <a id="btnAddNewValue" href="@(Url.Action("ValueCreatePopup", "CustomerAttribute", new { customerAttributeId = Model.Id, area = Constants.AreaStore }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Customers.CustomerAttributes.Values.AddNew"]</a>+ <a id="btnAddNewValue" href="@(Url.Action("ValueCreatePopup", "CustomerAttribute", new { customerAttributeId = Model.Id, btnId = "btnRefresh", formId = "customerattribute-form", area }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Customers.CustomerAttributes.Values.AddNew"]</a><input type="submit" id="btnRefresh" style="display: none"/></div>}@@ -58,13 +60,13 @@dataSource: {transport: {read: {- url: "@Html.Raw(Url.Action("ValueList", "CustomerAttribute", new { customerAttributeId = Model.Id, area = Constants.AreaStore }))",+ url: "@Html.Raw(Url.Action("ValueList", "CustomerAttribute", new { customerAttributeId = Model.Id, area }))",type: "POST",dataType: "json",data: addAntiForgeryToken},destroy: {- url: "@Html.Raw(Url.Action("ValueDelete", "CustomerAttribute", new { area = Constants.AreaStore }))",+ url: "@Html.Raw(Url.Action("ValueDelete", "CustomerAttribute", new { area }))",type: "POST",dataType: "json",data: addAntiForgeryToken@@ -90,7 +92,7 @@columns: [{field: "Name",title: "@Loc["Admin.Customers.CustomerAttributes.Values.Fields.Name"]",- template: "<a class='k-link editvalue' href=\"@Url.Action("ValueEditPopup", "CustomerAttribute", new { area = Constants.AreaStore })/#=Id#[email protected]\">#=kendo.htmlEncode(Name)#</a>"+ template: "<a class='k-link editvalue' href=\"@Url.Action("ValueEditPopup", "CustomerAttribute", new { area })/#=Id#[email protected]&btnId=btnRefresh&formId=customerattribute-form\">#=kendo.htmlEncode(Name)#</a>"}, {field: "IsPreSelected",title: "@Loc["Admin.Customers.CustomerAttributes.Values.Fields.IsPreSelected"]",@@ -128,7 +130,7 @@dataSource: {transport: {read: {- url: "@Html.Raw(Url.Action("ValueList", "CustomerAttribute", new { customerAttributeId = Model.Id, area = Constants.AreaStore }))",+ url: "@Html.Raw(Url.Action("ValueList", "CustomerAttribute", new { customerAttributeId = Model.Id, area }))",type: "POST",dataType: "json",data: addAntiForgeryToken@@ -180,3 +182,4 @@</div>}}+<partial name="Partials/WidgetZone.Values.Bottom" model="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/CreateOrUpdate.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/CustomerAttribute/Partials/CreateOrUpdate.cshtmlsimilarity index 74%rename from src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/CreateOrUpdate.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/CustomerAttribute/Partials/CreateOrUpdate.cshtmlindex 6fae17d89..3bd7d432b 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/CreateOrUpdate.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/CustomerAttribute/Partials/CreateOrUpdate.cshtml@@ -1,7 +1,13 @@-@model CustomerAttributeStoreModel-+@model CustomerAttributeModel+@{+ var area = ViewContext.RouteData.Values["area"]?.ToString();+}<div asp-validation-summary="All"></div><input asp-for="Id" type="hidden"/>+@if (area == "Admin")+{+ <input id="active-menu-item" type="hidden" value="/Admin/CustomerAttribute/List"/>+}<admin-tabstrip name="customerattribute-edit"><items>@@ -19,5 +25,6 @@</div></content></tabstrip-item>+ <partial name="Partials/WidgetZone.Tabs" model="Model"/></items></admin-tabstrip>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/CreateOrUpdateValue.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/CustomerAttribute/Partials/CreateOrUpdateValue.cshtmlsimilarity index 92%rename from src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/CreateOrUpdateValue.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/CustomerAttribute/Partials/CreateOrUpdateValue.cshtmlindex 6c6432520..b58a16935 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/CreateOrUpdateValue.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/CustomerAttribute/Partials/CreateOrUpdateValue.cshtml@@ -4,6 +4,7 @@<input asp-for="Id" type="hidden"/><input asp-for="CustomerAttributeId" type="hidden"/>+<partial name="Partials/WidgetZone.Value.Top" model="Model"/>@{Func<int, HelperResult>template = @<div class="form-body">@@ -52,7 +53,9 @@<button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"]</button>+ <partial name="Partials/WidgetZone.ValueButtons"/></div></div></div></div>+<partial name="Partials/WidgetZone.Value.Bottom" model="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/ValueCreatePopup.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/CustomerAttribute/ValueCreatePopup.cshtmlsimilarity index 92%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/ValueCreatePopup.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/CustomerAttribute/ValueCreatePopup.cshtmlindex 8f59215fc..10cde215c 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/ValueCreatePopup.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/CustomerAttribute/ValueCreatePopup.cshtml@@ -1,10 +1,11 @@-@model CustomerAttributeValueModel+@model CustomerAttributeValueModel@{Layout = "";//page titleViewBag.Title = Loc["Admin.Customers.CustomerAttributes.Values.AddNew"];+ var area = ViewContext.RouteData.Values["area"]?.ToString();}-<form id="ValueCreatePopup" manifest="ValueCreatePopup" asp-area="@Constants.AreaAdmin" asp-controller="CustomerAttribute" asp-action="ValueCreatePopup"+<form id="ValueCreatePopup" manifest="ValueCreatePopup" asp-area="@area" asp-controller="CustomerAttribute" asp-action="ValueCreatePopup"asp-route-customerAttributeId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["customerAttributeId"])"asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">@@ -56,4 +57,4 @@});});</script>-</form>\ No newline at end of file+</form>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/ValueEditPopup.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/CustomerAttribute/ValueEditPopup.cshtmlsimilarity index 92%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/ValueEditPopup.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/CustomerAttribute/ValueEditPopup.cshtmlindex 7c1bddb36..d47b3a277 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerAttribute/ValueEditPopup.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/CustomerAttribute/ValueEditPopup.cshtml@@ -1,14 +1,11 @@-@{- Layout = "";-}-@model CustomerAttributeValueModel-@{+ Layout = "";//page titleViewBag.Title = Loc["Admin.Customers.CustomerAttributes.Values.EditValueDetails"];+ var area = ViewContext.RouteData.Values["area"]?.ToString();}-<form id="ValueEditPopup" asp-area="@Constants.AreaAdmin" asp-controller="CustomerAttribute" asp-action="ValueEditPopup"+<form id="ValueEditPopup" asp-area="@area" asp-controller="CustomerAttribute" asp-action="ValueEditPopup"asp-route-customerAttributeId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["customerAttributeId"])"asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">@@ -59,4 +56,4 @@});});</script>-</form>\ No newline at end of file+</form>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Create.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ProductAttribute/Create.cshtmlsimilarity index 83%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Create.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/ProductAttribute/Create.cshtmlindex 26e4aab25..908125681 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Create.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ProductAttribute/Create.cshtml@@ -1,9 +1,10 @@-@model ProductAttributeModel+@model ProductAttributeModel@{//page titleViewBag.Title = Loc["Admin.Catalog.Attributes.ProductAttributes.AddNew"];+ var area = ViewContext.RouteData.Values["area"]?.ToString();}-<form asp-area="@Constants.AreaAdmin" asp-controller="ProductAttribute" asp-action="Create" method="post" id="productattribute-form">+<form asp-area="@area" asp-controller="ProductAttribute" asp-action="Create" method="post" id="productattribute-form"><div class="row"><div class="col-md-12">@@ -24,7 +25,7 @@<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="product_attribute_details_buttons" additional-data="null"/>+ <partial name="Partials/WidgetZone.DetailsButtons"/></div></div></div>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Edit.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ProductAttribute/Edit.cshtmlsimilarity index 85%rename from src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Edit.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/ProductAttribute/Edit.cshtmlindex 5e5daeec9..016f1b1cd 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Edit.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ProductAttribute/Edit.cshtml@@ -1,9 +1,10 @@-@model ProductAttributeModel+@model ProductAttributeModel@{//page titleViewBag.Title = Loc["Admin.Catalog.Attributes.ProductAttributes.EditAttributeDetails"];+ var area = ViewContext.RouteData.Values["area"]?.ToString();}-<form asp-area="@Constants.AreaStore" asp-controller="ProductAttribute" asp-action="Edit" method="post" id="productattribute-form">+<form asp-area="@area" asp-controller="ProductAttribute" asp-action="Edit" method="post" id="productattribute-form"><div class="row"><div class="col-md-12">@@ -27,7 +28,7 @@<span id="productattribute-delete" class="btn red"><i class="fa fa-trash-o"></i> @Loc["Admin.Common.Delete"]</span>- <vc:admin-widget widget-zone="product_attribute_details_buttons" additional-data="Model"/>+ <partial name="Partials/WidgetZone.DetailsButtons" model="Model"/></div></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/List.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ProductAttribute/List.cshtmlsimilarity index 88%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/List.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/ProductAttribute/List.cshtmlindex f31f4eafa..beb9305e5 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/List.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ProductAttribute/List.cshtml@@ -1,7 +1,8 @@-@inject AdminAreaSettings adminAreaSettings+@inject AdminAreaSettings adminAreaSettings@{//page titleViewBag.Title = Loc["Admin.Catalog.Attributes.ProductAttributes"];+ var area = ViewContext.RouteData.Values["area"]?.ToString();}<div class="row">@@ -13,10 +14,10 @@@Loc["Admin.Catalog.Attributes.ProductAttributes"]</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 })" 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="product_attribute_list_buttons" additional-data="null"/>+ <partial name="Partials/WidgetZone.ListButtons"/></div></div><div class="x_content form">@@ -37,7 +38,7 @@dataSource: {transport: {read: {- url: "@Html.Raw(Url.Action("List", "ProductAttribute", new { area = Constants.AreaAdmin }))",+ url: "@Html.Raw(Url.Action("List", "ProductAttribute", new { area }))",type: "POST",dataType: "json",data: addAntiForgeryTokendiff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ProductAttribute/Partials/CreateOrUpdate.TabInfo.cshtmlsimilarity index 74%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/CreateOrUpdate.TabInfo.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/ProductAttribute/Partials/CreateOrUpdate.TabInfo.cshtmlindex 0654e7058..92b58636d 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/CreateOrUpdate.TabInfo.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ProductAttribute/Partials/CreateOrUpdate.TabInfo.cshtml@@ -1,7 +1,9 @@-@using Microsoft.AspNetCore.Mvc.Razor+@using Microsoft.AspNetCore.Mvc.Razor@model ProductAttributeModel--<vc:admin-widget widget-zone="product_attribute_details_info_top" additional-data="Model"/>+@{+ var area = ViewContext.RouteData.Values["area"]?.ToString();+}+<partial name="Partials/WidgetZone.Info.Top" model="Model"/>@{Func<int, HelperResult>@@ -43,21 +45,24 @@</div></div></localized-editor>- <div class="form-group">- <admin-label asp-for="Stores"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="Stores"/>- <span asp-validation-for="Stores"></span>- </div>- </div>- <div class="form-body">+ @if (area == "Admin")+ {<div class="form-group">- <admin-label asp-for="SeName"/>+ <admin-label asp-for="Stores"/><div class="col-md-9 col-sm-9">- <admin-input asp-for="SeName"/>- <span asp-validation-for="SeName"></span>+ <admin-input asp-for="Stores"/>+ <span asp-validation-for="Stores"></span>+ </div>+ </div>+ <div class="form-body">+ <div class="form-group">+ <admin-label asp-for="SeName"/>+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="SeName"/>+ <span asp-validation-for="SeName"></span>+ </div></div></div>- </div>+ }</div>-<vc:admin-widget widget-zone="product_attribute_details_info_bottom" additional-data="Model"/>\ No newline at end of file+<partial name="Partials/WidgetZone.Info.Bottom" model="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/CreateOrUpdate.TabPredefinedValues.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ProductAttribute/Partials/CreateOrUpdate.TabPredefinedValues.cshtmlsimilarity index 90%rename from src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/CreateOrUpdate.TabPredefinedValues.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/ProductAttribute/Partials/CreateOrUpdate.TabPredefinedValues.cshtmlindex 5328da963..6b27cb1c0 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/CreateOrUpdate.TabPredefinedValues.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ProductAttribute/Partials/CreateOrUpdate.TabPredefinedValues.cshtml@@ -1,17 +1,18 @@-@model ProductAttributeModel+@model ProductAttributeModel@{+ var area = ViewContext.RouteData.Values["area"]?.ToString();if (!string.IsNullOrEmpty(Model.Id)){<div class="panel panel-default">- <vc:admin-widget widget-zone="product_attribute_details_predefined_values_top" additional-data="Model"/>+ <partial name="Partials/WidgetZone.PredefinedValues.Top" model="Model"/><div class="panel-body"><div id="productattributevalues-grid"></div></div><div class="panel-footer">- <a id="btnAddNewValue" href="@(Url.Action("PredefinedProductAttributeValueCreatePopup", "ProductAttribute", new { productAttributeId = Model.Id, area = Constants.AreaStore }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Catalog.Attributes.ProductAttributes.PredefinedValues.AddNew"]</a>+ <a id="btnAddNewValue" href="@(Url.Action("PredefinedProductAttributeValueCreatePopup", "ProductAttribute", new { productAttributeId = Model.Id, area }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Catalog.Attributes.ProductAttributes.PredefinedValues.AddNew"]</a><input type="submit" id="btnRefresh" style="display:none"/></div>- <vc:admin-widget widget-zone="product_attribute_details_predefined_values_bottom" additional-data="Model"/>+ <partial name="Partials/WidgetZone.PredefinedValues.Bottom" model="Model"/></div><script>$(document).ready(function() {@@ -47,13 +48,13 @@dataSource: {transport: {read: {- url: "@Html.Raw(Url.Action("PredefinedProductAttributeValueList", "ProductAttribute", new { productAttributeId = Model.Id, area = Constants.AreaStore }))",+ url: "@Html.Raw(Url.Action("PredefinedProductAttributeValueList", "ProductAttribute", new { productAttributeId = Model.Id, area }))",type: "POST",dataType: "json",data: addAntiForgeryToken},destroy: {- url: "@Html.Raw(Url.Action("PredefinedProductAttributeValueDelete", "ProductAttribute", new { area = Constants.AreaStore }))",+ url: "@Html.Raw(Url.Action("PredefinedProductAttributeValueDelete", "ProductAttribute", new { area }))",type: "POST",dataType: "json",data: addAntiForgeryToken@@ -96,7 +97,7 @@field: "Name",title: "@Loc["Admin.Catalog.Attributes.ProductAttributes.PredefinedValues.Fields.Name"]",width: 200,- template: "<a class='k-link editvalue' href=\"@Url.Action("PredefinedProductAttributeValueEditPopup", "ProductAttribute", new { area = Constants.AreaStore })/#=Id#[email protected]\">#=kendo.htmlEncode(Name)#</a>"+ template: "<a class='k-link editvalue' href=\"@Url.Action("PredefinedProductAttributeValueEditPopup", "ProductAttribute", new { area })/#=Id#[email protected]\">#=kendo.htmlEncode(Name)#</a>"}, {field: "PriceAdjustmentStr",title: "@Loc["Admin.Catalog.Attributes.ProductAttributes.PredefinedValues.Fields.PriceAdjustment"]",diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/CreateOrUpdate.TabUsedByProducts.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ProductAttribute/Partials/CreateOrUpdate.TabUsedByProducts.cshtmlsimilarity index 85%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/CreateOrUpdate.TabUsedByProducts.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/ProductAttribute/Partials/CreateOrUpdate.TabUsedByProducts.cshtmlindex 1defce385..905006f57 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/Partials/CreateOrUpdate.TabUsedByProducts.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ProductAttribute/Partials/CreateOrUpdate.TabUsedByProducts.cshtml@@ -1,12 +1,13 @@-@model ProductAttributeModel+@model ProductAttributeModel@inject AdminAreaSettings adminAreaSettings@{+ var area = ViewContext.RouteData.Values["area"]?.ToString();<div class="panel panel-default">- <vc:admin-widget widget-zone="product_attribute_details_used_by_products_top" additional-data="Model"/>+ <partial name="Partials/WidgetZone.UsedByProducts.Top" model="Model"/><div class="panel-body"><div id="used-by-products-grid"></div></div>- <vc:admin-widget widget-zone="product_attribute_details_used_by_products_bottom" additional-data="Model"/>+ <partial name="Partials/WidgetZone.UsedByProducts.Bottom" model="Model"/></div><script>$(document).ready(function () {@@ -14,7 +15,7 @@dataSource: {transport: {read: {- url: "@Html.Raw(Url.Action("UsedByProducts", "ProductAttribute", new { productAttributeId = Model.Id, area = Constants.AreaAdmin }))",+ url: "@Html.Raw(Url.Action("UsedByProducts", "ProductAttribute", new { productAttributeId = Model.Id, area }))",type: "POST",dataType: "json",data: addAntiForgeryToken@@ -48,7 +49,7 @@field: "ProductName",title: "@Loc["Admin.Catalog.Attributes.ProductAttributes.UsedByProducts.Product"]",width: 400,- template: '<a class="k-link" href="@Url.Action("Edit", "Product", new { area = Constants.AreaAdmin })/#=Id#">#=kendo.htmlEncode(ProductName)#</a>',+ template: '<a class="k-link" href="@Url.Action("Edit", "Product", new { area })/#=Id#">#=kendo.htmlEncode(ProductName)#</a>',}, {field: "Published",title: "@Loc["Admin.Catalog.Attributes.ProductAttributes.UsedByProducts.Published"]",diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/CreateOrUpdate.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ProductAttribute/Partials/CreateOrUpdate.cshtmlsimilarity index 90%rename from src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/CreateOrUpdate.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/ProductAttribute/Partials/CreateOrUpdate.cshtmlindex 44465c653..83e9c329e 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/CreateOrUpdate.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ProductAttribute/Partials/CreateOrUpdate.cshtml@@ -1,4 +1,4 @@-@model ProductAttributeModel+@model ProductAttributeModel<div asp-validation-summary="All"></div><input asp-for="Id" type="hidden"/>@@ -35,6 +35,6 @@</div></content></tabstrip-item>- <vc:admin-widget widget-zone="product_attribute_details_tabs" additional-data="Model"/>+ <partial name="Partials/WidgetZone.Tabs" model="Model"/></items></admin-tabstrip>\ No newline at end of filediff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/CreateOrUpdatePredefinedProductAttributeValue.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ProductAttribute/Partials/CreateOrUpdatePredefinedProductAttributeValue.cshtmlsimilarity index 89%rename from src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/CreateOrUpdatePredefinedProductAttributeValue.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/ProductAttribute/Partials/CreateOrUpdatePredefinedProductAttributeValue.cshtmlindex b004b7240..1977108ab 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/CreateOrUpdatePredefinedProductAttributeValue.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ProductAttribute/Partials/CreateOrUpdatePredefinedProductAttributeValue.cshtml@@ -1,11 +1,11 @@-@using Microsoft.AspNetCore.Mvc.Razor+@using Microsoft.AspNetCore.Mvc.Razor@model PredefinedProductAttributeValueModel<div asp-validation-summary="All"></div><input asp-for="Id" type="hidden"/><input asp-for="ProductAttributeId" type="hidden"/>-<vc:admin-widget widget-zone="product_attribute_predefined_values_details_top" additional-data="Model"/>+<partial name="Partials/WidgetZone.Value.Top" model="Model"/>@{Func<int, HelperResult>@@ -78,9 +78,9 @@<button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"]</button>- <vc:admin-widget widget-zone="product_attribute_predefined_values_details_buttons" additional-data="null"/>+ <partial name="Partials/WidgetZone.ValueButtons"/></div></div></div></div>-<vc:admin-widget widget-zone="product_attribute_predefined_values_details_bottom" additional-data="Model"/>\ No newline at end of file+<partial name="Partials/WidgetZone.Value.Bottom" model="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/PredefinedProductAttributeValueCreatePopup.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ProductAttribute/PredefinedProductAttributeValueCreatePopup.cshtmlsimilarity index 90%rename from src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/PredefinedProductAttributeValueCreatePopup.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/ProductAttribute/PredefinedProductAttributeValueCreatePopup.cshtmlindex c922648da..f5e97b500 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/PredefinedProductAttributeValueCreatePopup.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ProductAttribute/PredefinedProductAttributeValueCreatePopup.cshtml@@ -1,8 +1,9 @@@model PredefinedProductAttributeValueModel@{Layout = "";+ var area = ViewContext.RouteData.Values["area"]?.ToString();}-<form id="PredefinedProductAttributeValueCreatePopup" asp-area="@Constants.AreaStore" asp-controller="ProductAttribute" asp-action="PredefinedProductAttributeValueCreatePopup" method="post">+<form id="PredefinedProductAttributeValueCreatePopup" asp-area="@area" asp-controller="ProductAttribute" asp-action="PredefinedProductAttributeValueCreatePopup" method="post"><div class="row"><div class="col-md-12"><div class="x_panel light form-fit">diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/PredefinedProductAttributeValueEditPopup.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ProductAttribute/PredefinedProductAttributeValueEditPopup.cshtmlsimilarity index 88%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/PredefinedProductAttributeValueEditPopup.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/ProductAttribute/PredefinedProductAttributeValueEditPopup.cshtmlindex 8a0b48ed5..86ded0d09 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ProductAttribute/PredefinedProductAttributeValueEditPopup.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/ProductAttribute/PredefinedProductAttributeValueEditPopup.cshtml@@ -2,8 +2,9 @@@{// layoutLayout = "";+ var area = ViewContext.RouteData.Values["area"]?.ToString();}-<form id="PredefinedProductAttributeValueEditPopup" asp-area="@Constants.AreaAdmin" asp-controller="ProductAttribute" asp-action="PredefinedProductAttributeValueEditPopup" method="post">+<form id="PredefinedProductAttributeValueEditPopup" asp-area="@area" asp-controller="ProductAttribute" asp-action="PredefinedProductAttributeValueEditPopup" method="post"><div class="row"><div class="col-md-12"><div class="x_panel light form-fit">diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Create.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/SpecificationAttribute/Create.cshtmlsimilarity index 82%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Create.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/SpecificationAttribute/Create.cshtmlindex 07c85bae0..858f18d10 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Create.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/SpecificationAttribute/Create.cshtml@@ -1,9 +1,10 @@-@model SpecificationAttributeModel+@model SpecificationAttributeModel@{//page titleViewBag.Title = Loc["Admin.Catalog.Attributes.SpecificationAttributes.AddNew"];+ var area = ViewContext.RouteData.Values["area"]?.ToString();}-<form asp-area="@Constants.AreaAdmin" asp-controller="SpecificationAttribute" asp-action="Create" method="post" id="specificationattribute-form">+<form asp-area="@area" asp-controller="SpecificationAttribute" asp-action="Create" method="post" id="specificationattribute-form"><div class="row"><div class="col-md-12">@@ -24,7 +25,7 @@<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="specification_attribute_details_buttons" additional-data="null"/>+ <partial name="Partials/WidgetZone.DetailsButtons"/></div></div></div>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Edit.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/SpecificationAttribute/Edit.cshtmlsimilarity index 84%rename from src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Edit.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/SpecificationAttribute/Edit.cshtmlindex ee1cd1b15..748c7848e 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Edit.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/SpecificationAttribute/Edit.cshtml@@ -1,10 +1,11 @@-@model SpecificationAttributeModel+@model SpecificationAttributeModel@{//page titleViewBag.Title = Loc["Admin.Catalog.Attributes.SpecificationAttributes.EditAttributeDetails"];+ var area = ViewContext.RouteData.Values["area"]?.ToString();}-<form asp-area="@Constants.AreaStore" asp-controller="SpecificationAttribute" asp-action="Edit" method="post" id="specificationattribute-form">+<form asp-area="@area" asp-controller="SpecificationAttribute" asp-action="Edit" method="post" id="specificationattribute-form"><div class="row"><div class="col-md-12">@@ -28,7 +29,7 @@<span id="specificationattribute-delete" class="btn red"><i class="fa fa-trash-o"></i> @Loc["Admin.Common.Delete"]</span>- <vc:admin-widget widget-zone="specification_attribute_details_buttons" additional-data="Model"/>+ <partial name="Partials/WidgetZone.DetailsButtons" model="Model"/></div></div></div>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/List.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/SpecificationAttribute/List.cshtmlsimilarity index 89%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/List.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/SpecificationAttribute/List.cshtmlindex dd121bd0d..50928f8b1 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/List.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/SpecificationAttribute/List.cshtml@@ -1,7 +1,8 @@-@inject AdminAreaSettings adminAreaSettings+@inject AdminAreaSettings adminAreaSettings@{//page titleViewBag.Title = Loc["Admin.Catalog.Attributes.SpecificationAttributes"];+ var area = ViewContext.RouteData.Values["area"]?.ToString();}<div class="row">@@ -13,10 +14,10 @@@Loc["Admin.Catalog.Attributes.SpecificationAttributes"]</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 })" 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="specification_attribute_list_buttons" additional-data="null"/>+ <partial name="Partials/WidgetZone.ListButtons"/></div></div>@@ -39,7 +40,7 @@dataSource: {transport: {read: {- url: "@Html.Raw(Url.Action("List", "SpecificationAttribute", new { area = Constants.AreaAdmin }))",+ url: "@Html.Raw(Url.Action("List", "SpecificationAttribute", new { area }))",type: "POST",dataType: "json",data: addAntiForgeryTokendiff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/OptionCreatePopup.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/SpecificationAttribute/OptionCreatePopup.cshtmlsimilarity index 92%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/OptionCreatePopup.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/SpecificationAttribute/OptionCreatePopup.cshtmlindex e87e265ef..8fbc70660 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/OptionCreatePopup.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/SpecificationAttribute/OptionCreatePopup.cshtml@@ -5,8 +5,9 @@@{//page titleViewBag.Title = Loc["Admin.Catalog.Attributes.SpecificationAttributes.Options.AddNew"];+ var area = ViewContext.RouteData.Values["area"]?.ToString();}-<form asp-area="@Constants.AreaAdmin" asp-controller="SpecificationAttribute" asp-action="OptionCreatePopup"+<form asp-area="@area" asp-controller="SpecificationAttribute" asp-action="OptionCreatePopup"method="post" id="specificationattribute-form" asp-route-Id="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["Id"])"><div class="row"><div class="col-md-12">diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/OptionEditPopup.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/SpecificationAttribute/OptionEditPopup.cshtmlsimilarity index 90%rename from src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/OptionEditPopup.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/SpecificationAttribute/OptionEditPopup.cshtmlindex 3ffb92caa..7a6708c94 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/OptionEditPopup.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/SpecificationAttribute/OptionEditPopup.cshtml@@ -5,8 +5,9 @@@{//page titleViewBag.Title = Loc["Admin.Catalog.Attributes.SpecificationAttributes.Options.EditOptionDetails"];+ var area = ViewContext.RouteData.Values["area"]?.ToString();}-<form asp-area="@Constants.AreaStore" asp-controller="SpecificationAttribute" asp-action="OptionEditPopup" method="post" id="specificationattribute-form"+<form asp-area="@area" asp-controller="SpecificationAttribute" asp-action="OptionEditPopup" method="post" id="specificationattribute-form"asp-route-SpecificationAttributeId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["SpecificationAttributeId"])"><div class="row">diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/SpecificationAttribute/Partials/CreateOrUpdate.TabInfo.cshtmlsimilarity index 78%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/CreateOrUpdate.TabInfo.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/SpecificationAttribute/Partials/CreateOrUpdate.TabInfo.cshtmlindex 97a0209ac..363d6bde4 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/CreateOrUpdate.TabInfo.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/SpecificationAttribute/Partials/CreateOrUpdate.TabInfo.cshtml@@ -1,7 +1,9 @@-@using Microsoft.AspNetCore.Mvc.Razor+@using Microsoft.AspNetCore.Mvc.Razor@model SpecificationAttributeModel--<vc:admin-widget widget-zone="specification_attribute_details_info_top" additional-data="null"/>+@{+ var area = ViewContext.RouteData.Values["area"]?.ToString();+}+<partial name="Partials/WidgetZone.Info.Top"/>@{Func<int, HelperResult>@@ -47,12 +49,15 @@</div></div></div>- <div class="form-group">- <admin-label asp-for="Stores"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="Stores"/>- <span asp-validation-for="Stores"></span>+ @if (area == "Admin")+ {+ <div class="form-group">+ <admin-label asp-for="Stores"/>+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="Stores"/>+ <span asp-validation-for="Stores"></span>+ </div></div>- </div>+ }</div>-<vc:admin-widget widget-zone="specification_attribute_details_info_bottom" additional-data="Model"/>\ No newline at end of file+<partial name="Partials/WidgetZone.Info.Bottom" model="Model"/>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/CreateOrUpdate.TabOptions.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/SpecificationAttribute/Partials/CreateOrUpdate.TabOptions.cshtmlsimilarity index 89%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/CreateOrUpdate.TabOptions.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/SpecificationAttribute/Partials/CreateOrUpdate.TabOptions.cshtmlindex 4abc6c44d..9ee2480f3 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/CreateOrUpdate.TabOptions.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/SpecificationAttribute/Partials/CreateOrUpdate.TabOptions.cshtml@@ -1,18 +1,19 @@-@model SpecificationAttributeModel+@model SpecificationAttributeModel@{+ var area = ViewContext.RouteData.Values["area"]?.ToString();if (!string.IsNullOrEmpty(Model.Id)){<div class="panel panel-default">- <vc:admin-widget widget-zone="specification_attribute_details_options_top" additional-data="null"/>+ <partial name="Partials/WidgetZone.Options.Top"/><div class="panel-body"><div id="specificationattributeoptions-grid"></div></div><div class="panel-footer">- <a id="btnAddNewOption" href="@(Url.Action("OptionCreatePopup", "SpecificationAttribute", new { specificationAttributeId = Model.Id, area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Catalog.Attributes.SpecificationAttributes.Options.AddNew"]</a>+ <a id="btnAddNewOption" href="@(Url.Action("OptionCreatePopup", "SpecificationAttribute", new { specificationAttributeId = Model.Id, area }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Catalog.Attributes.SpecificationAttributes.Options.AddNew"]</a><input type="submit" id="btnRefresh" style="display: none"/></div>- <vc:admin-widget widget-zone="specification_attribute_details_options_bottom" additional-data="Model"/>+ <partial name="Partials/WidgetZone.Options.Bottom" model="Model"/></div><script>@@ -49,13 +50,13 @@dataSource: {transport: {read: {- url: "@Html.Raw(Url.Action("OptionList", "SpecificationAttribute", new { specificationAttributeId = Model.Id, area = Constants.AreaAdmin }))",+ url: "@Html.Raw(Url.Action("OptionList", "SpecificationAttribute", new { specificationAttributeId = Model.Id, area }))",type: "POST",dataType: "json",data: addAntiForgeryToken},destroy: {- url: "@Html.Raw(Url.Action("OptionDelete", "SpecificationAttribute", new { area = Constants.AreaAdmin }))",+ url: "@Html.Raw(Url.Action("OptionDelete", "SpecificationAttribute", new { area }))",type: "POST",dataType: "json",data: addAntiForgeryToken@@ -93,7 +94,7 @@columns: [{field: "Name",title: "@Loc["Admin.Catalog.Attributes.SpecificationAttributes.Options.Fields.Name"]",- template: "<a class='k-link editoption' href=\"@Url.Action("OptionEditPopup", "SpecificationAttribute", new { area = Constants.AreaAdmin })/#=Id#\">#=kendo.htmlEncode(Name)#</a>"+ template: "<a class='k-link editoption' href=\"@Url.Action("OptionEditPopup", "SpecificationAttribute", new { area })/#=Id#\">#=kendo.htmlEncode(Name)#</a>"}, {field: "DisplayOrder",title: "@Loc["Admin.Catalog.Attributes.SpecificationAttributes.Options.Fields.DisplayOrder"]",diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/CreateOrUpdate.TabUsedByProducts.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/SpecificationAttribute/Partials/CreateOrUpdate.TabUsedByProducts.cshtmlsimilarity index 82%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/CreateOrUpdate.TabUsedByProducts.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/SpecificationAttribute/Partials/CreateOrUpdate.TabUsedByProducts.cshtmlindex cf190cb3a..dd2b84f77 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/CreateOrUpdate.TabUsedByProducts.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/SpecificationAttribute/Partials/CreateOrUpdate.TabUsedByProducts.cshtml@@ -1,12 +1,13 @@-@model SpecificationAttributeModel+@model SpecificationAttributeModel@inject AdminAreaSettings adminAreaSettings@{+ var area = ViewContext.RouteData.Values["area"]?.ToString();<div class="panel panel-default">- <vc:admin-widget widget-zone="specification_attribute_details_used_by_products_top" additional-data="Model"/>+ <partial name="Partials/WidgetZone.UsedByProducts.Top" model="Model"/><div class="panel-body"><div id="used-by-products-grid"></div></div>- <vc:admin-widget widget-zone="specification_attribute_details_used_by_products_bottom" additional-data="Model"/>+ <partial name="Partials/WidgetZone.UsedByProducts.Bottom" model="Model"/></div><script>$(document).ready(function () {@@ -14,7 +15,7 @@dataSource: {transport: {read: {- url: "@Html.Raw(Url.Action("UsedByProducts", "SpecificationAttribute", new { specificationAttributeId = Model.Id, area = Constants.AreaAdmin }))",+ url: "@Html.Raw(Url.Action("UsedByProducts", "SpecificationAttribute", new { specificationAttributeId = Model.Id, area }))",type: "POST",dataType: "json",data: addAntiForgeryToken@@ -48,12 +49,12 @@columns: [{field: "ProductName",title: "@Loc["Admin.Catalog.Attributes.SpecificationAttributes.UsedByProducts.Product"]",- template: '<a class="k-link" href="@Url.Action("Edit", "Product", new { area = Constants.AreaAdmin })/#=Id#">#=kendo.htmlEncode(ProductName)#</a>',+ template: '<a class="k-link" href="@Url.Action("Edit", "Product", new { area })/#=Id#">#=kendo.htmlEncode(ProductName)#</a>',},{field: "OptionName",title: "@Loc["Admin.Catalog.Attributes.SpecificationAttributes.UsedByProducts.OptionName"]",- template: '<a class="k-link" href="@Url.Action("Edit", "Product", new { area = Constants.AreaAdmin })/#=Id#">#=kendo.htmlEncode(OptionName)#</a>',+ template: '<a class="k-link" href="@Url.Action("Edit", "Product", new { area })/#=Id#">#=kendo.htmlEncode(OptionName)#</a>',},{field: "Published",diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/CreateOrUpdate.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/SpecificationAttribute/Partials/CreateOrUpdate.cshtmlsimilarity index 90%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/CreateOrUpdate.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/SpecificationAttribute/Partials/CreateOrUpdate.cshtmlindex a7d55faa8..3fa74a6e6 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/SpecificationAttribute/Partials/CreateOrUpdate.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/SpecificationAttribute/Partials/CreateOrUpdate.cshtml@@ -1,4 +1,4 @@-@model SpecificationAttributeModel+@model SpecificationAttributeModel<div asp-validation-summary="All"></div><input asp-for="Id" type="hidden"/>@@ -35,6 +35,6 @@</div></content></tabstrip-item>- <vc:admin-widget widget-zone="specification_attribute_details_tabs" additional-data="Model"/>+ <partial name="Partials/WidgetZone.Tabs" model="Model"/></items></admin-tabstrip>\ No newline at end of filediff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/CreateOrUpdateOption.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/SpecificationAttribute/Partials/CreateOrUpdateOption.cshtmlsimilarity index 91%rename from src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/CreateOrUpdateOption.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/AdminShared/SpecificationAttribute/Partials/CreateOrUpdateOption.cshtmlindex 702b1ecbb..3521cbd70 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/CreateOrUpdateOption.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/SpecificationAttribute/Partials/CreateOrUpdateOption.cshtml@@ -1,4 +1,4 @@-@using Microsoft.AspNetCore.Mvc.Razor+@using Microsoft.AspNetCore.Mvc.Razor@model SpecificationAttributeOptionModel<div asp-validation-summary="All"></div>@@ -25,7 +25,7 @@ function toggleEnableColorSquaresRgb() {}}</script>-<vc:admin-widget widget-zone="specification_attribute_option_details_top" additional-data="null"/>+<partial name="Partials/WidgetZone.Option.Top"/>@{Func<int, HelperResult>@@ -95,9 +95,9 @@ function toggleEnableColorSquaresRgb() {<button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i>@Loc["Admin.Common.Save"]</button>- <vc:admin-widget widget-zone="specification_attribute_option_details_buttons" additional-data="null"/>+ <partial name="Partials/WidgetZone.OptionButtons"/></div></div></div></div>-<vc:admin-widget widget-zone="specification_attribute_option_details_bottom" additional-data="Model"/>\ No newline at end of file+<partial name="Partials/WidgetZone.Option.Bottom" model="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Create.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Create.cshtmldeleted file mode 100644index 6c551d80a..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Create.cshtml+++ /dev/null@@ -1,35 +0,0 @@-@model AddressAttributeStoreModel-@{- ViewBag.Title = Loc["Admin.Address.AddressAttributes.AddNew"];-}-<form asp-area="@Constants.AreaStore" asp-controller="AddressAttribute" asp-action="Create" method="post" id="addressattribute-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-list-alt"></i>- @Loc["Admin.Address.AddressAttributes.AddNew"]- <small>- <i class="fa fa-arrow-circle-left"></i>@Html.ActionLink(Loc["Admin.Address.AddressAttributes.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>- </div>- </div>- </div>- <div class="x_content form">- <partial name="Partials/CreateOrUpdate" model="Model"/>- </div>- </div>- </div>- </div>-</form>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/WidgetZone.DetailsButtons.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/WidgetZone.DetailsButtons.cshtmlnew file mode 100644index 000000000..586cea953--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/WidgetZone.DetailsButtons.cshtml@@ -0,0 +1,2 @@+@model AddressAttributeModel+<vc:store-widget widget-zone="store_address_attribute_details_buttons" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/WidgetZone.Info.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/WidgetZone.Info.Bottom.cshtmlnew file mode 100644index 000000000..e077f1388--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/WidgetZone.Info.Bottom.cshtml@@ -0,0 +1,2 @@+@model AddressAttributeModel+<vc:store-widget widget-zone="store_address_attribute_details_info_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/WidgetZone.Info.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/WidgetZone.Info.Top.cshtmlnew file mode 100644index 000000000..db7487a23--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/WidgetZone.Info.Top.cshtml@@ -0,0 +1,2 @@+@model AddressAttributeModel+<vc:store-widget widget-zone="store_address_attribute_details_info_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/WidgetZone.ListButtons.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/WidgetZone.ListButtons.cshtmlnew file mode 100644index 000000000..787821237--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/WidgetZone.ListButtons.cshtml@@ -0,0 +1 @@+<vc:store-widget widget-zone="store_address_attribute_list_buttons" additional-data="null"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/WidgetZone.Tabs.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/WidgetZone.Tabs.cshtmlnew file mode 100644index 000000000..8303b52da--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/WidgetZone.Tabs.cshtml@@ -0,0 +1,2 @@+@model AddressAttributeModel+<vc:store-widget widget-zone="store_address_attribute_details_tabs" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/WidgetZone.Value.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/WidgetZone.Value.Bottom.cshtmlnew file mode 100644index 000000000..533e47e11--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/WidgetZone.Value.Bottom.cshtml@@ -0,0 +1,2 @@+@model AddressAttributeValueModel+<vc:store-widget widget-zone="store_address_attribute_value_details_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/WidgetZone.Value.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/WidgetZone.Value.Top.cshtmlnew file mode 100644index 000000000..c3f1b29d7--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/WidgetZone.Value.Top.cshtml@@ -0,0 +1,2 @@+@model AddressAttributeValueModel+<vc:store-widget widget-zone="store_address_attribute_value_details_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/WidgetZone.ValueButtons.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/WidgetZone.ValueButtons.cshtmlnew file mode 100644index 000000000..08a28ec87--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/WidgetZone.ValueButtons.cshtml@@ -0,0 +1,2 @@+@model AddressAttributeValueModel+<vc:store-widget widget-zone="store_address_attribute_value_details_buttons" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/WidgetZone.Values.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/WidgetZone.Values.Bottom.cshtmlnew file mode 100644index 000000000..44849d7a3--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/WidgetZone.Values.Bottom.cshtml@@ -0,0 +1,2 @@+@model AddressAttributeModel+<vc:store-widget widget-zone="store_address_attribute_details_values_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/WidgetZone.Values.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/WidgetZone.Values.Top.cshtmlnew file mode 100644index 000000000..0bb5aba9a--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/Partials/WidgetZone.Values.Top.cshtml@@ -0,0 +1,2 @@+@model AddressAttributeModel+<vc:store-widget widget-zone="store_address_attribute_details_values_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/ValueCreatePopup.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/ValueCreatePopup.cshtmldeleted file mode 100644index 8467d7e42..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/AddressAttribute/ValueCreatePopup.cshtml+++ /dev/null@@ -1,54 +0,0 @@-@using Grand.Web.Common.Extensions-@model AddressAttributeValueModel-@{- Layout = "";-}-<form id="ValueCreatePopup" asp-area="@Constants.AreaStore" asp-controller="AddressAttribute" asp-action="ValueCreatePopup"- asp-route-addressAttributeId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["addressAttributeId"])">- <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-list-alt"></i>- @Loc["Admin.Address.AddressAttributes.Values.AddNew"]- </div>- </div>- <div class="x_content form">- <partial name="Partials/CreateOrUpdateValue" model="Model"/>- </div>- </div>- </div>- </div>- <script>- var mfp = $.magnificPopup.instance;- $("#ValueCreatePopup").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();- $('#btnRefresh').click();- } else {- $.magnificPopup.open({- items: {- src: data,- type: 'inline'- },- callbacks: {- open: function () {- $('.mfp-wrap').removeAttr('tabindex');- }- }- });- }- }- });- });- </script>-</form>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/CreateOrUpdate.TabInfo.cshtmldeleted file mode 100644index fd67f2a7f..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/CreateOrUpdate.TabInfo.cshtml+++ /dev/null@@ -1,201 +0,0 @@-@using Microsoft.AspNetCore.Mvc.Razor-@model CheckoutAttributeModel--<script>- $(document).ready(function () {-- $("#@Html.IdFor(model => model.IsTaxExempt)").click(toggleTax);- $("#@Html.IdFor(model => model.AttributeControlTypeId)").change(toggleAttributeControlType);-- toggleTax();- toggleAttributeControlType();- });-- function toggleTax() {- if ($('#@Html.IdFor(model => model.IsTaxExempt)').is(':checked')) {- $('#pnlTaxCategory').hide();- } else {- $('#pnlTaxCategory').show();- }- }-- function toggleAttributeControlType() {- var selectedAttributeControlTypeId = $("#@Html.IdFor(model => model.AttributeControlTypeId)").val();- if (selectedAttributeControlTypeId == @(((int)AttributeControlType.TextBox).ToString())) {- $('#pnlValidationMinLength').show();- $('#pnlValidationMaxLength').show();- $('#pnlValidationFileMaximumSize').hide();- $('#pnlValidationFileAllowedExtensions').hide();- $('#pnlDefaultValue').show();- $('#tab-checkoutAttributesValues').hide();- } else if (selectedAttributeControlTypeId == @(((int)AttributeControlType.MultilineTextbox).ToString())) {- $('#pnlValidationMinLength').show();- $('#pnlValidationMaxLength').show();- $('#pnlValidationFileMaximumSize').hide();- $('#pnlValidationFileAllowedExtensions').hide();- $('#pnlDefaultValue').show();- $('#tab-checkoutAttributesValues').hide();- } else if (selectedAttributeControlTypeId == @(((int)AttributeControlType.FileUpload).ToString())) {- $('#pnlValidationMinLength').hide();- $('#pnlValidationMaxLength').hide();- $('#pnlValidationFileMaximumSize').show();- $('#pnlValidationFileAllowedExtensions').show();- $('#pnlDefaultValue').hide();- $('#tab-checkoutAttributesValues').hide();- } else if (selectedAttributeControlTypeId == @(((int)AttributeControlType.Checkboxes).ToString()) ||- selectedAttributeControlTypeId == @(((int)AttributeControlType.ReadonlyCheckboxes).ToString()) ||- selectedAttributeControlTypeId == @(((int)AttributeControlType.RadioList).ToString()) ||- selectedAttributeControlTypeId == @(((int)AttributeControlType.ColorSquares).ToString()) ||- selectedAttributeControlTypeId == @(((int)AttributeControlType.DropdownList).ToString())){- $('#pnlValidationMinLength').hide();- $('#pnlValidationMaxLength').hide();- $('#pnlValidationFileMaximumSize').hide();- $('#pnlValidationFileAllowedExtensions').hide();- $('#pnlDefaultValue').hide();- $('#tab-checkoutAttributesValues').show();- }else {- $('#pnlValidationMinLength').hide();- $('#pnlValidationMaxLength').hide();- $('#pnlValidationFileMaximumSize').hide();- $('#pnlValidationFileAllowedExtensions').hide();- $('#pnlDefaultValue').hide();- $('#tab-checkoutAttributesValues').hide();- }- }-</script>-<vc:admin-widget widget-zone="checkout_attribute_details_info_top" additional-data="Model"/>--@{- Func<int, HelperResult>- template = @<div class="form-body">- <div class="form-group">- <admin-label asp-for="@Model.Locales[item].Name"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="@Model.Locales[item].Name"/>- <span asp-validation-for="@Model.Locales[item].Name"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="@Model.Locales[item].TextPrompt"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="@Model.Locales[item].TextPrompt"/>- <span asp-validation-for="@Model.Locales[item].TextPrompt"></span>- </div>- </div>- <input type="hidden" asp-for="@Model.Locales[item].LanguageId"/>- </div>;-}--<div class="form-horizontal">- <localized-editor localized-template="@template" name="checkoutattribute-localized" language-ids="@Model.Locales.Select(c => c.LanguageId).ToList()">- <div class="form-body">- <div class="form-group">- <admin-label asp-for="Name"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="Name"/>- <span asp-validation-for="Name"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="TextPrompt"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="TextPrompt"/>- <span asp-validation-for="TextPrompt"></span>- </div>- </div>- </div>- </localized-editor>- <div class="form-body">- <div class="form-group">- <admin-label asp-for="IsRequired"/>- <div class="col-md-9 col-sm-9">- <label class="mt-checkbox mt-checkbox-outline control control-checkbox">- <admin-input asp-for="IsRequired"/>- <div class="control__indicator"></div>- </label>- <span asp-validation-for="IsRequired"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="ShippableProductRequired"/>- <div class="col-md-9 col-sm-9">- <label class="mt-checkbox mt-checkbox-outline control control-checkbox">- <admin-input asp-for="ShippableProductRequired"/>- <div class="control__indicator"></div>- </label>- <span asp-validation-for="ShippableProductRequired"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="IsTaxExempt"/>- <div class="col-md-9 col-sm-9">- <label class="mt-checkbox mt-checkbox-outline control control-checkbox">- <admin-input asp-for="IsTaxExempt"/>- <div class="control__indicator"></div>- </label>- <span asp-validation-for="IsTaxExempt"></span>- </div>- </div>- <div class="form-group" id="pnlTaxCategory">- <admin-label asp-for="TaxCategoryId"/>- <div class="col-md-9 col-sm-9">- <admin-select asp-for="TaxCategoryId" asp-items="Model.AvailableTaxCategories"/>- <span asp-validation-for="TaxCategoryId"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="AttributeControlTypeId"/>- <div class="col-md-9 col-sm-9">- @{- var attributeControlTypes =- EnumTranslationService.ToSelectList(((AttributeControlType)Model.AttributeControlTypeId), valuesToExclude: [(int)AttributeControlType.ImageSquares, (int)AttributeControlType.Hidden]);- }- <admin-select asp-for="AttributeControlTypeId" asp-items="attributeControlTypes"/>- <span asp-validation-for="AttributeControlTypeId"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="DisplayOrder"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="DisplayOrder"/>- <span asp-validation-for="DisplayOrder"></span>- </div>- </div>- <div class="form-group" id="pnlValidationMinLength">- <admin-label asp-for="ValidationMinLength"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="ValidationMinLength"/>- <span asp-validation-for="ValidationMinLength"></span>- </div>- </div>- <div class="form-group" id="pnlValidationMaxLength">- <admin-label asp-for="ValidationMaxLength"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="ValidationMaxLength"/>- <span asp-validation-for="ValidationMaxLength"></span>- </div>- </div>- <div class="form-group" id="pnlValidationFileAllowedExtensions">- <admin-label asp-for="ValidationFileAllowedExtensions"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="ValidationFileAllowedExtensions"/>- <span asp-validation-for="ValidationFileAllowedExtensions"></span>- </div>- </div>- <div id="pnlValidationFileMaximumSize">- <admin-label asp-for="ValidationFileMaximumSize"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="ValidationFileMaximumSize"/>- <span asp-validation-for="ValidationFileMaximumSize"></span>- </div>- </div>- <div class="form-group" id="pnlDefaultValue">- <admin-label asp-for="DefaultValue"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="DefaultValue"/>- <span asp-validation-for="DefaultValue"></span>- </div>- </div>- </div>-</div>-<vc:admin-widget widget-zone="checkout_attribute_details_info_bottom" additional-data="Model"/>\ No newline at end of filediff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/CreateOrUpdate.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/CreateOrUpdate.cshtmldeleted file mode 100644index 29de17e25..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/CreateOrUpdate.cshtml+++ /dev/null@@ -1,34 +0,0 @@-@model CheckoutAttributeModel--<div asp-validation-summary="All"></div>-<input asp-for="Id" type="hidden"/>--<admin-tabstrip name="checkoutattribute-edit">- <items>- <tabstrip-item text="@Loc["Admin.Orders.CheckoutAttributes.Info"]" tab-index="0">- <content>- <div>- <partial name="Partials/CreateOrUpdate.TabInfo" model="Model"/>- </div>- </content>- </tabstrip-item>- <tabstrip-item text="@Loc["Admin.Orders.CheckoutAttributes.Values"]" tab-index="1" id="tab-checkoutAttributesValues">- <content>- <div>- <partial name="Partials/CreateOrUpdate.TabValues" model="Model"/>- </div>- </content>- </tabstrip-item>- @if (Model.ConditionAllowed)- {- <tabstrip-item text="@Loc["Admin.Orders.CheckoutAttributes.Condition"]" tab-index="2">- <content>- <div>- <partial name="Partials/CreateOrUpdate.TabCondition" model="Model"/>- </div>- </content>- </tabstrip-item>- }- <vc:admin-widget widget-zone="checkout_attribute_details_tabs" additional-data="Model"/>- </items>-</admin-tabstrip>\ No newline at end of filediff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/WidgetZone.Condition.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/WidgetZone.Condition.Bottom.cshtmlnew file mode 100644index 000000000..42efd1bbc--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/WidgetZone.Condition.Bottom.cshtml@@ -0,0 +1,2 @@+@model CheckoutAttributeModel+<vc:store-widget widget-zone="store_checkout_attribute_details_condition_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/WidgetZone.Condition.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/WidgetZone.Condition.Top.cshtmlnew file mode 100644index 000000000..2d0c52815--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/WidgetZone.Condition.Top.cshtml@@ -0,0 +1,2 @@+@model CheckoutAttributeModel+<vc:store-widget widget-zone="store_checkout_attribute_details_condition_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/WidgetZone.DetailsButtons.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/WidgetZone.DetailsButtons.cshtmlnew file mode 100644index 000000000..76ce03ac0--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/WidgetZone.DetailsButtons.cshtml@@ -0,0 +1,2 @@+@model CheckoutAttributeModel+<vc:store-widget widget-zone="store_checkout_attribute_details_buttons" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/WidgetZone.Info.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/WidgetZone.Info.Bottom.cshtmlnew file mode 100644index 000000000..37e77f4d2--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/WidgetZone.Info.Bottom.cshtml@@ -0,0 +1,2 @@+@model CheckoutAttributeModel+<vc:store-widget widget-zone="store_checkout_attribute_details_info_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/WidgetZone.Info.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/WidgetZone.Info.Top.cshtmlnew file mode 100644index 000000000..44becafb5--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/WidgetZone.Info.Top.cshtml@@ -0,0 +1,2 @@+@model CheckoutAttributeModel+<vc:store-widget widget-zone="store_checkout_attribute_details_info_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/WidgetZone.ListButtons.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/WidgetZone.ListButtons.cshtmlnew file mode 100644index 000000000..53c18947a--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/WidgetZone.ListButtons.cshtml@@ -0,0 +1 @@+<vc:store-widget widget-zone="store_checkout_attribute_list_buttons" additional-data="null"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/WidgetZone.Tabs.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/WidgetZone.Tabs.cshtmlnew file mode 100644index 000000000..f0cefdec5--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/WidgetZone.Tabs.cshtml@@ -0,0 +1,2 @@+@model CheckoutAttributeModel+<vc:store-widget widget-zone="store_checkout_attribute_details_tabs" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/WidgetZone.Value.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/WidgetZone.Value.Bottom.cshtmlnew file mode 100644index 000000000..a59a064a4--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/WidgetZone.Value.Bottom.cshtml@@ -0,0 +1,2 @@+@model CheckoutAttributeValueModel+<vc:store-widget widget-zone="store_checkout_attribute_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/WidgetZone.Value.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/WidgetZone.Value.Top.cshtmlnew file mode 100644index 000000000..7ecff17be--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/WidgetZone.Value.Top.cshtml@@ -0,0 +1,2 @@+@model CheckoutAttributeValueModel+<vc:store-widget widget-zone="store_checkout_attribute_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/WidgetZone.ValueButtons.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/WidgetZone.ValueButtons.cshtmlnew file mode 100644index 000000000..fa5517f75--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/WidgetZone.ValueButtons.cshtml@@ -0,0 +1,2 @@+@model CheckoutAttributeValueModel+<vc:store-widget widget-zone="store_checkout_attribute_value_details_buttons" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/WidgetZone.Values.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/WidgetZone.Values.Bottom.cshtmlnew file mode 100644index 000000000..9c8af747e--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/WidgetZone.Values.Bottom.cshtml@@ -0,0 +1,2 @@+@model CheckoutAttributeModel+<vc:store-widget widget-zone="store_checkout_attribute_details_values_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/WidgetZone.Values.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/WidgetZone.Values.Top.cshtmlnew file mode 100644index 000000000..b3eeccbf1--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/WidgetZone.Values.Top.cshtml@@ -0,0 +1,2 @@+@model CheckoutAttributeModel+<vc:store-widget widget-zone="store_checkout_attribute_details_values_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/ValueCreatePopup.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/ValueCreatePopup.cshtmldeleted file mode 100644index 816a1f3a9..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/ValueCreatePopup.cshtml+++ /dev/null@@ -1,58 +0,0 @@-@{- Layout = "";-}--@model CheckoutAttributeValueModel--<form id="ValueCreatePopup" asp-area="@Constants.AreaStore" asp-controller="CheckoutAttribute" asp-action="ValueCreatePopup"- asp-route-checkoutAttributeId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["checkoutAttributeId"])">- <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-list-alt"></i>- @Loc["Admin.Orders.CheckoutAttributes.Values.AddNew"]- </div>- <div class="actions">- <vc:admin-widget widget-zone="checkout_attribute_value_details_buttons" additional-data="null"/>- </div>- </div>- <div class="x_content form">- <partial name="Partials/CreateOrUpdateValue" model="Model"/>- </div>- </div>- </div>- </div>- <script>- var mfp = $.magnificPopup.instance;- $("#ValueCreatePopup").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();- $('#btnRefresh').click();- } else {- $.magnificPopup.open({- items: {- src: data,- type: 'inline'- },- callbacks: {- open: function () {- $('.mfp-wrap').removeAttr('tabindex');- }- }- });- }- }- });- });- </script>-</form>\ No newline at end of filediff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/ValueEditPopup.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/ValueEditPopup.cshtmldeleted file mode 100644index d5acf93a8..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/ValueEditPopup.cshtml+++ /dev/null@@ -1,54 +0,0 @@-@model CheckoutAttributeValueModel-@{- Layout = "";-}-<form id="ValueEditPopup" asp-area="@Constants.AreaStore" asp-controller="CheckoutAttribute" asp-action="ValueEditPopup"- asp-route-checkoutAttributeId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["checkoutAttributeId"])">-- <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-list-alt"></i>- @Loc["Admin.Orders.CheckoutAttributes.Values.EditValueDetails"]- </div>- </div>- <div class="x_content form">- <partial name="Partials/CreateOrUpdateValue" model="Model"/>- </div>- </div>- </div>- </div>- <script>- var mfp = $.magnificPopup.instance;- $("#ValueEditPopup").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();- $('#btnRefresh').click();- } else {- $.magnificPopup.open({- items: {- src: data,- type: 'inline'- },- callbacks: {- open: function () {- $('.mfp-wrap').removeAttr('tabindex');- }- }- });- }- }- });- });- </script>-</form>\ No newline at end of filediff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Create.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Create.cshtmldeleted file mode 100644index a264a0f50..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Create.cshtml+++ /dev/null@@ -1,35 +0,0 @@-@model ContactAttributeStoreModel-@{- ViewBag.Title = Loc["Admin.Catalog.Attributes.ContactAttributes.AddNew"];-}-<form asp-area="@Constants.AreaStore" asp-controller="ContactAttribute" asp-action="Create" method="post" id="contactattribute-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-list-alt"></i>- @Loc["Admin.Catalog.Attributes.ContactAttributes.AddNew"]- <small>- <i class="fa fa-arrow-circle-left"></i>@Html.ActionLink(Loc["Admin.Catalog.Attributes.ContactAttributes.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>- </div>- </div>- </div>- <div class="x_content form">- <partial name="Partials/CreateOrUpdate" model="Model"/>- </div>- </div>- </div>- </div>-</form>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/CreateOrUpdateValue.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/CreateOrUpdateValue.cshtmldeleted file mode 100644index 1791f901a..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/CreateOrUpdateValue.cshtml+++ /dev/null@@ -1,81 +0,0 @@-@using Microsoft.AspNetCore.Mvc.Razor-@using SharedUIConstants = Grand.SharedUIResources.Constants-@model ContactAttributeValueModel--<link rel="stylesheet" type="text/css" asp-src="@(SharedUIConstants.WwwRoot)/administration/farbtastic/farbtastic.css"/>-<script asp-location="Footer" asp-src="@(SharedUIConstants.WwwRoot)/administration/farbtastic/farbtastic.js"></script>--<div asp-validation-summary="All"></div>-<input asp-for="Id" type="hidden"/>-<input asp-for="ContactAttributeId" type="hidden"/>-<input asp-for="DisplayColorSquaresRgb" type="hidden"/>--@{- Func<int, HelperResult>- template = @<div class="form-body">- <div class="form-group">- <admin-label asp-for="@Model.Locales[item].Name" class="col-sm-3 control-label"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="@Model.Locales[item].Name"/>- <span asp-validation-for="@Model.Locales[item].Name"></span>- </div>- </div>- <input type="hidden" asp-for="@Model.Locales[item].LanguageId"/>- </div>;-}--<div class="form-horizontal">- <localized-editor localized-template="@template" name="contactattributevalue-localized" language-ids="@Model.Locales.Select(c => c.LanguageId).ToList()">- <div class="form-body">- <div class="form-group">- <admin-label asp-for="Name" class="col-sm-3 control-label"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="Name"/>- <span asp-validation-for="Name"></span>- </div>- </div>- </div>- </localized-editor>- <div class="form-body">- @if (Model.DisplayColorSquaresRgb)- {- <div class="form-group">- <admin-label asp-for="ColorSquaresRgb" class="col-sm-3 control-label"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="ColorSquaresRgb"/>- <div id="color-picker"></div>- <script type="text/javascript">- $(document).ready(function(){- $('#color-picker').farbtastic('#@Html.IdFor(model => model.ColorSquaresRgb)');- });- </script>- <span asp-validation-for="ColorSquaresRgb"></span>- </div>- </div>- }- <div class="form-group">- <admin-label asp-for="IsPreSelected" class="col-sm-3 control-label"/>- <div class="col-md-9 col-sm-9">- <label class="mt-checkbox mt-checkbox-outline control control-checkbox">- <admin-input asp-for="IsPreSelected"/>- <div class="control__indicator"></div>- </label>- <span asp-validation-for="IsPreSelected"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="DisplayOrder" class="col-sm-3 control-label"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="DisplayOrder"/>- <span asp-validation-for="DisplayOrder"></span>- </div>- </div>- <div class="form-group">- <div class="offset-sm-3 offset-md-3 col-md-9 col-sm-9">- <button class="btn btn-success" type="submit" name="save">- <i class="fa fa-check"></i> @Loc["Admin.Common.Save"]- </button>- </div>- </div>- </div>-</div>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/WidgetZone.Condition.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/WidgetZone.Condition.Bottom.cshtmlnew file mode 100644index 000000000..8fa66627c--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/WidgetZone.Condition.Bottom.cshtml@@ -0,0 +1,2 @@+@model ContactAttributeModel+<vc:store-widget widget-zone="store_contact_attribute_details_condition_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/WidgetZone.Condition.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/WidgetZone.Condition.Top.cshtmlnew file mode 100644index 000000000..39b92df58--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/WidgetZone.Condition.Top.cshtml@@ -0,0 +1,2 @@+@model ContactAttributeModel+<vc:store-widget widget-zone="store_contact_attribute_details_condition_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/WidgetZone.DetailsButtons.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/WidgetZone.DetailsButtons.cshtmlnew file mode 100644index 000000000..efb5fa86e--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/WidgetZone.DetailsButtons.cshtml@@ -0,0 +1,2 @@+@model ContactAttributeModel+<vc:store-widget widget-zone="store_contact_attribute_details_buttons" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/WidgetZone.Info.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/WidgetZone.Info.Bottom.cshtmlnew file mode 100644index 000000000..e79e60b50--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/WidgetZone.Info.Bottom.cshtml@@ -0,0 +1,2 @@+@model ContactAttributeModel+<vc:store-widget widget-zone="store_contact_attribute_details_info_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/WidgetZone.Info.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/WidgetZone.Info.Top.cshtmlnew file mode 100644index 000000000..9b8ce7abc--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/WidgetZone.Info.Top.cshtml@@ -0,0 +1,2 @@+@model ContactAttributeModel+<vc:store-widget widget-zone="store_contact_attribute_details_info_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/WidgetZone.ListButtons.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/WidgetZone.ListButtons.cshtmlnew file mode 100644index 000000000..fde71704c--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/WidgetZone.ListButtons.cshtml@@ -0,0 +1 @@+<vc:store-widget widget-zone="store_contact_attribute_list_buttons" additional-data="null"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/WidgetZone.Tabs.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/WidgetZone.Tabs.cshtmlnew file mode 100644index 000000000..1260fbaff--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/WidgetZone.Tabs.cshtml@@ -0,0 +1,2 @@+@model ContactAttributeModel+<vc:store-widget widget-zone="store_contact_attribute_details_tabs" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/WidgetZone.Value.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/WidgetZone.Value.Bottom.cshtmlnew file mode 100644index 000000000..a4abafe6b--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/WidgetZone.Value.Bottom.cshtml@@ -0,0 +1,2 @@+@model ContactAttributeValueModel+<vc:store-widget widget-zone="store_contact_attribute_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/WidgetZone.Value.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/WidgetZone.Value.Top.cshtmlnew file mode 100644index 000000000..b4934a5f1--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/WidgetZone.Value.Top.cshtml@@ -0,0 +1,2 @@+@model ContactAttributeValueModel+<vc:store-widget widget-zone="store_contact_attribute_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/WidgetZone.ValueButtons.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/WidgetZone.ValueButtons.cshtmlnew file mode 100644index 000000000..f75adda1b--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/WidgetZone.ValueButtons.cshtml@@ -0,0 +1 @@+<vc:store-widget widget-zone="store_contact_attribute_value_details_buttons" additional-data="null"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/WidgetZone.Values.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/WidgetZone.Values.Bottom.cshtmlnew file mode 100644index 000000000..c2357074b--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/WidgetZone.Values.Bottom.cshtml@@ -0,0 +1,2 @@+@model ContactAttributeModel+<vc:store-widget widget-zone="store_contact_attribute_details_values_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/WidgetZone.Values.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/WidgetZone.Values.Top.cshtmlnew file mode 100644index 000000000..f4e98d5ad--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/WidgetZone.Values.Top.cshtml@@ -0,0 +1,2 @@+@model ContactAttributeModel+<vc:store-widget widget-zone="store_contact_attribute_details_values_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/WidgetZone.DetailsButtons.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/WidgetZone.DetailsButtons.cshtmlnew file mode 100644index 000000000..03e2aad4f--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/WidgetZone.DetailsButtons.cshtml@@ -0,0 +1,2 @@+@model CustomerAttributeModel+<vc:store-widget widget-zone="store_customer_attribute_details_buttons" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/WidgetZone.Info.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/WidgetZone.Info.Bottom.cshtmlnew file mode 100644index 000000000..370701a5f--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/WidgetZone.Info.Bottom.cshtml@@ -0,0 +1,2 @@+@model CustomerAttributeModel+<vc:store-widget widget-zone="store_customer_attribute_details_info_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/WidgetZone.Info.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/WidgetZone.Info.Top.cshtmlnew file mode 100644index 000000000..c945438b5--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/WidgetZone.Info.Top.cshtml@@ -0,0 +1,2 @@+@model CustomerAttributeModel+<vc:store-widget widget-zone="store_customer_attribute_details_info_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/WidgetZone.ListButtons.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/WidgetZone.ListButtons.cshtmlnew file mode 100644index 000000000..58941a043--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/WidgetZone.ListButtons.cshtml@@ -0,0 +1 @@+<vc:store-widget widget-zone="store_customer_attribute_list_buttons" additional-data="null"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/WidgetZone.Tabs.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/WidgetZone.Tabs.cshtmlnew file mode 100644index 000000000..5c7ac4892--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/WidgetZone.Tabs.cshtml@@ -0,0 +1,2 @@+@model CustomerAttributeModel+<vc:store-widget widget-zone="store_customer_attribute_details_tabs" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/WidgetZone.Value.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/WidgetZone.Value.Bottom.cshtmlnew file mode 100644index 000000000..a332a4f18--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/WidgetZone.Value.Bottom.cshtml@@ -0,0 +1,2 @@+@model CustomerAttributeValueModel+<vc:store-widget widget-zone="store_customer_attribute_values_details_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/WidgetZone.Value.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/WidgetZone.Value.Top.cshtmlnew file mode 100644index 000000000..7d93e6055--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/WidgetZone.Value.Top.cshtml@@ -0,0 +1,2 @@+@model CustomerAttributeValueModel+<vc:store-widget widget-zone="store_customer_attribute_values_details_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/WidgetZone.ValueButtons.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/WidgetZone.ValueButtons.cshtmlnew file mode 100644index 000000000..998887a18--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/WidgetZone.ValueButtons.cshtml@@ -0,0 +1 @@+<vc:store-widget widget-zone="store_customer_attribute_value_details_buttons" additional-data="null"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/WidgetZone.Values.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/WidgetZone.Values.Bottom.cshtmlnew file mode 100644index 000000000..22e92d5e6--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/WidgetZone.Values.Bottom.cshtml@@ -0,0 +1,2 @@+@model CustomerAttributeModel+<vc:store-widget widget-zone="store_customer_attribute_details_values_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/WidgetZone.Values.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/WidgetZone.Values.Top.cshtmlnew file mode 100644index 000000000..c8b4e538e--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/Partials/WidgetZone.Values.Top.cshtml@@ -0,0 +1,2 @@+@model CustomerAttributeModel+<vc:store-widget widget-zone="store_customer_attribute_details_values_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/ValueCreatePopup.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/ValueCreatePopup.cshtmldeleted file mode 100644index 805a709a5..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/ValueCreatePopup.cshtml+++ /dev/null@@ -1,54 +0,0 @@-@using Grand.Web.Common.Extensions-@model CustomerAttributeValueModel-@{- Layout = "";-}-<form id="ValueCreatePopup" asp-area="@Constants.AreaStore" asp-controller="CustomerAttribute" asp-action="ValueCreatePopup"- asp-route-customerAttributeId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["customerAttributeId"])">- <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-list-alt"></i>- @Loc["Admin.Customers.CustomerAttributes.Values.AddNew"]- </div>- </div>- <div class="x_content form">- <partial name="Partials/CreateOrUpdateValue" model="Model"/>- </div>- </div>- </div>- </div>- <script>- var mfp = $.magnificPopup.instance;- $("#ValueCreatePopup").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();- $('#btnRefresh').click();- } else {- $.magnificPopup.open({- items: {- src: data,- type: 'inline'- },- callbacks: {- open: function () {- $('.mfp-wrap').removeAttr('tabindex');- }- }- });- }- }- });- });- </script>-</form>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/ValueEditPopup.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/ValueEditPopup.cshtmldeleted file mode 100644index 44d941ce1..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/CustomerAttribute/ValueEditPopup.cshtml+++ /dev/null@@ -1,54 +0,0 @@-@using Grand.Web.Common.Extensions-@model CustomerAttributeValueModel-@{- Layout = "";-}-<form id="ValueEditPopup" asp-area="@Constants.AreaStore" asp-controller="CustomerAttribute" asp-action="ValueEditPopup"- asp-route-customerAttributeId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["customerAttributeId"])">- <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-list-alt"></i>- @Loc["Admin.Customers.CustomerAttributes.Values.EditValueDetails"]- </div>- </div>- <div class="x_content form">- <partial name="Partials/CreateOrUpdateValue" model="Model"/>- </div>- </div>- </div>- </div>- <script>- var mfp = $.magnificPopup.instance;- $("#ValueEditPopup").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();- $('#btnRefresh').click();- } else {- $.magnificPopup.open({- items: {- src: data,- type: 'inline'- },- callbacks: {- open: function () {- $('.mfp-wrap').removeAttr('tabindex');- }- }- });- }- }- });- });- </script>-</form>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Create.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Create.cshtmldeleted file mode 100644index c624f9e89..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Create.cshtml+++ /dev/null@@ -1,37 +0,0 @@-@model ProductAttributeModel-@{- //page title- ViewBag.Title = Loc["Admin.Catalog.Attributes.ProductAttributes.AddNew"];-}-<form asp-area="@Constants.AreaStore" asp-controller="ProductAttribute" asp-action="Create" method="post" id="productattribute-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-list-alt"></i>- @Loc["Admin.Catalog.Attributes.ProductAttributes.AddNew"] - @Model.Name- <small>- <i class="fa fa-arrow-circle-left"></i>@Html.ActionLink(Loc["Admin.Catalog.Attributes.ProductAttributes.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="product_attribute_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.Store/Areas/Store/Views/ProductAttribute/List.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/List.cshtmldeleted file mode 100644index 95c4e5726..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/List.cshtml+++ /dev/null@@ -1,77 +0,0 @@-@inject AdminAreaSettings adminAreaSettings-@{- //page title- ViewBag.Title = Loc["Admin.Catalog.Attributes.ProductAttributes"];-}--<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-list-alt"></i>- @Loc["Admin.Catalog.Attributes.ProductAttributes"]- </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>- <vc:admin-widget widget-zone="product_attribute_list_buttons" additional-data="null"/>- </div>- </div>- <div class="x_content form">- <div class="form-horizontal">- <div class="form-body">- <div class="x_content">- <div id="productattributes-grid"></div>- </div>- </div>- </div>- </div>- </div>- </div>-</div>-<script>- $(document).ready(function () {- $("#productattributes-grid").kendoGrid({- dataSource: {- transport: {- read: {- url: "@Html.Raw(Url.Action("List", "ProductAttribute", new { area = Constants.AreaStore }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- }- },- schema: {- data: "Data",- total: "Total",- errors: "Errors"- },- error: function(e) {- display_kendoui_grid_error(e);- // Cancel the changes- 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.Catalog.Attributes.ProductAttributes.Fields.Name"]",- template: '<a class="k-link" href="Edit/#=Id#">#=kendo.htmlEncode(Name)#</a>',- }]- });- });-</script>\ No newline at end of filediff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/CreateOrUpdate.TabInfo.cshtmldeleted file mode 100644index 9539f3658..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/CreateOrUpdate.TabInfo.cshtml+++ /dev/null@@ -1,47 +0,0 @@-@using Microsoft.AspNetCore.Mvc.Razor-@model ProductAttributeModel--<vc:admin-widget widget-zone="product_attribute_details_info_top" additional-data="Model"/>--@{- Func<int, HelperResult>- template = @<div class="form-body">- <div class="form-group">- <admin-label asp-for="@Model.Locales[item].Name"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="@Model.Locales[item].Name"/>- <span asp-validation-for="@Model.Locales[item].Name"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="@Model.Locales[item].Description"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="@Model.Locales[item].Description" asp-template="Editor"/>- <span asp-validation-for="@Model.Locales[item].Description"></span>- </div>- </div>- <input asp-for="@Model.Locales[item].LanguageId" type="hidden"/>- </div>;-}--<div class="form-horizontal">- <localized-editor localized-template="@template" name="productattribute-localized" language-ids="@Model.Locales.Select(c => c.LanguageId).ToList()">- <div class="form-body">- <div class="form-group">- <admin-label asp-for="Name"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="Name"/>- <span asp-validation-for="Name"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="Description"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="Description" asp-template="Editor"/>- <span asp-validation-for="Description"></span>- </div>- </div>- </div>- </localized-editor>-</div>-<vc:admin-widget widget-zone="product_attribute_details_info_bottom" additional-data="Model"/>\ No newline at end of filediff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/CreateOrUpdate.TabUsedByProducts.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/CreateOrUpdate.TabUsedByProducts.cshtmldeleted file mode 100644index 245be339f..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/CreateOrUpdate.TabUsedByProducts.cshtml+++ /dev/null@@ -1,63 +0,0 @@-@model ProductAttributeModel-@inject AdminAreaSettings adminAreaSettings-@{- <div class="panel panel-default">- <vc:admin-widget widget-zone="product_attribute_details_used_by_products_top" additional-data="Model"/>- <div class="panel-body">- <div id="used-by-products-grid"></div>- </div>- <vc:admin-widget widget-zone="product_attribute_details_used_by_products_bottom" additional-data="Model"/>- </div>- <script>- $(document).ready(function () {- $("#used-by-products-grid").kendoGrid({- dataSource: {- transport: {- read: {- url: "@Html.Raw(Url.Action("UsedByProducts", "ProductAttribute", new { productAttributeId = Model.Id, area = Constants.AreaStore }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- }- },- schema: {- data: "Data",- total: "Total",- errors: "Errors"- },- error: function(e) {- display_kendoui_grid_error(e);- // Cancel the changes- 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.Catalog.Attributes.ProductAttributes.UsedByProducts.Product"]",- width: 400,- template: '<a class="k-link" href="@Url.Action("Edit", "Product", new { area = Constants.AreaStore })/#=Id#">#=kendo.htmlEncode(ProductName)#</a>',- }, {- field: "Published",- title: "@Loc["Admin.Catalog.Attributes.ProductAttributes.UsedByProducts.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> #} #'- }]- });- });- </script>-}\ No newline at end of filediff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/WidgetZone.DetailsButtons.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/WidgetZone.DetailsButtons.cshtmlnew file mode 100644index 000000000..3afe969e8--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/WidgetZone.DetailsButtons.cshtml@@ -0,0 +1,2 @@+@model ProductAttributeModel+<vc:store-widget widget-zone="store_product_attribute_details_buttons" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/WidgetZone.Info.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/WidgetZone.Info.Bottom.cshtmlnew file mode 100644index 000000000..cc77aa1f6--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/WidgetZone.Info.Bottom.cshtml@@ -0,0 +1,2 @@+@model ProductAttributeModel+<vc:store-widget widget-zone="store_product_attribute_details_info_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/WidgetZone.Info.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/WidgetZone.Info.Top.cshtmlnew file mode 100644index 000000000..f5c074d02--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/WidgetZone.Info.Top.cshtml@@ -0,0 +1,2 @@+@model ProductAttributeModel+<vc:store-widget widget-zone="store_product_attribute_details_info_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/WidgetZone.ListButtons.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/WidgetZone.ListButtons.cshtmlnew file mode 100644index 000000000..cd6e4d7c9--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/WidgetZone.ListButtons.cshtml@@ -0,0 +1 @@+<vc:store-widget widget-zone="store_product_attribute_list_buttons" additional-data="null"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/WidgetZone.PredefinedValues.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/WidgetZone.PredefinedValues.Bottom.cshtmlnew file mode 100644index 000000000..646ac4881--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/WidgetZone.PredefinedValues.Bottom.cshtml@@ -0,0 +1,2 @@+@model ProductAttributeModel+<vc:store-widget widget-zone="store_product_attribute_details_predefined_values_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/WidgetZone.PredefinedValues.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/WidgetZone.PredefinedValues.Top.cshtmlnew file mode 100644index 000000000..82b2e86dd--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/WidgetZone.PredefinedValues.Top.cshtml@@ -0,0 +1,2 @@+@model ProductAttributeModel+<vc:store-widget widget-zone="store_product_attribute_details_predefined_values_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/WidgetZone.Tabs.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/WidgetZone.Tabs.cshtmlnew file mode 100644index 000000000..1d8847c49--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/WidgetZone.Tabs.cshtml@@ -0,0 +1,2 @@+@model ProductAttributeModel+<vc:store-widget widget-zone="store_product_attribute_details_tabs" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/WidgetZone.UsedByProducts.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/WidgetZone.UsedByProducts.Bottom.cshtmlnew file mode 100644index 000000000..70d61ae7e--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/WidgetZone.UsedByProducts.Bottom.cshtml@@ -0,0 +1,2 @@+@model ProductAttributeModel+<vc:store-widget widget-zone="store_product_attribute_details_used_by_products_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/WidgetZone.UsedByProducts.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/WidgetZone.UsedByProducts.Top.cshtmlnew file mode 100644index 000000000..0041004ba--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/WidgetZone.UsedByProducts.Top.cshtml@@ -0,0 +1,2 @@+@model ProductAttributeModel+<vc:store-widget widget-zone="store_product_attribute_details_used_by_products_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/WidgetZone.Value.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/WidgetZone.Value.Bottom.cshtmlnew file mode 100644index 000000000..ff0dd296b--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/WidgetZone.Value.Bottom.cshtml@@ -0,0 +1,2 @@+@model PredefinedProductAttributeValueModel+<vc:store-widget widget-zone="store_product_attribute_predefined_values_details_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/WidgetZone.Value.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/WidgetZone.Value.Top.cshtmlnew file mode 100644index 000000000..4416cfa4a--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/WidgetZone.Value.Top.cshtml@@ -0,0 +1,2 @@+@model PredefinedProductAttributeValueModel+<vc:store-widget widget-zone="store_product_attribute_predefined_values_details_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/WidgetZone.ValueButtons.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/WidgetZone.ValueButtons.cshtmlnew file mode 100644index 000000000..1ce7784c6--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/WidgetZone.ValueButtons.cshtml@@ -0,0 +1 @@+<vc:store-widget widget-zone="store_product_attribute_predefined_values_details_buttons" additional-data="null"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/PredefinedProductAttributeValueEditPopup.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/PredefinedProductAttributeValueEditPopup.cshtmldeleted file mode 100644index 2ea2ba46b..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/PredefinedProductAttributeValueEditPopup.cshtml+++ /dev/null@@ -1,53 +0,0 @@-@model PredefinedProductAttributeValueModel-@{- // layout- Layout = "";-}-<form id="PredefinedProductAttributeValueEditPopup" asp-area="@Constants.AreaStore" asp-controller="ProductAttribute" asp-action="PredefinedProductAttributeValueEditPopup" method="post">- <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-list-alt"></i>- @Loc["Admin.Catalog.Attributes.ProductAttributes.PredefinedValues.EditValueDetails"]- </div>- </div>- <div class="x_content form">- <partial name="Partials/CreateOrUpdatePredefinedProductAttributeValue" model="Model"/>- </div>- </div>- </div>- </div>- <script>- var mfp = $.magnificPopup.instance;- $("#PredefinedProductAttributeValueEditPopup").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();- $('#btnRefresh').click();- } else {- $.magnificPopup.open({- items: {- src: data,- type: 'inline'- },- callbacks: {- open: function () {- $('.mfp-wrap').removeAttr('tabindex');- }- }- });- }- }- });- });- </script>-</form>\ No newline at end of filediff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Create.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Create.cshtmldeleted file mode 100644index 2c1640e14..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Create.cshtml+++ /dev/null@@ -1,37 +0,0 @@-@model SpecificationAttributeModel-@{- //page title- ViewBag.Title = Loc["Admin.Catalog.Attributes.SpecificationAttributes.AddNew"];-}-<form asp-area="@Constants.AreaStore" asp-controller="SpecificationAttribute" asp-action="Create" method="post" id="specificationattribute-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-list-alt"></i>- @Loc["Admin.Catalog.Attributes.SpecificationAttributes.AddNew"]- <small>- <i class="fa fa-arrow-circle-left"></i>@Html.ActionLink(Loc["Admin.Catalog.Attributes.SpecificationAttributes.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="specification_attribute_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.Store/Areas/Store/Views/SpecificationAttribute/List.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/List.cshtmldeleted file mode 100644index 2f31c98bf..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/List.cshtml+++ /dev/null@@ -1,86 +0,0 @@-@inject AdminAreaSettings adminAreaSettings-@{- //page title- ViewBag.Title = Loc["Admin.Catalog.Attributes.SpecificationAttributes"];-}--<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-list-alt"></i>- @Loc["Admin.Catalog.Attributes.SpecificationAttributes"]- </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>- <vc:admin-widget widget-zone="specification_attribute_list_buttons" additional-data="null"/>- </div>-- </div>- <div class="x_content form">- <div class="form-horizontal">- <div class="form-body">- <div class="x_content">- <div id="specificationattributes-grid"></div>- </div>- </div>- </div>- </div>- </div>- </div>-</div>--<script>- $(document).ready(function () {- $("#specificationattributes-grid").kendoGrid({- dataSource: {- transport: {- read: {- url: "@Html.Raw(Url.Action("List", "SpecificationAttribute", new { area = Constants.AreaStore }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- }- },- schema: {- data: "Data",- total: "Total",- errors: "Errors"- },- error: function(e) {- display_kendoui_grid_error(e);- // Cancel the changes- 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.Catalog.Attributes.SpecificationAttributes.Fields.Name"]",- template: '<a class="k-link" href="Edit/#=Id#">#=kendo.htmlEncode(Name)#</a>',- width: 300- }, {- field: "DisplayOrder",- title: "@Loc["Admin.Catalog.Attributes.SpecificationAttributes.Fields.DisplayOrder"]",- width: 100,- headerAttributes: { style: "text-align:center" },- attributes: { style: "text-align:center" },- }]- });- });-</script>\ No newline at end of filediff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/OptionCreatePopup.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/OptionCreatePopup.cshtmldeleted file mode 100644index f8124efd3..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/OptionCreatePopup.cshtml+++ /dev/null@@ -1,57 +0,0 @@-@{- Layout = "";-}-@model SpecificationAttributeOptionModel-@{- //page title- ViewBag.Title = Loc["Admin.Catalog.Attributes.SpecificationAttributes.Options.AddNew"];-}-<form asp-area="@Constants.AreaStore" asp-controller="SpecificationAttribute" asp-action="OptionCreatePopup"- method="post" id="specificationattribute-form" asp-route-Id="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["Id"])">- <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-list-alt"></i>- @Loc["Admin.Catalog.Attributes.SpecificationAttributes.Options.AddNew"]- </div>- </div>- <div class="x_content form">- <partial name="Partials/CreateOrUpdateOption" model="Model"/>- </div>- </div>- </div>- </div>- <script>- var mfp = $.magnificPopup.instance;- $("#specificationattribute-form").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();- $('#btnRefresh').click();- } else {- $.magnificPopup.open({- items: {- src: data,- type: 'inline'- },- callbacks: {- open: function () {- $('.mfp-wrap').removeAttr('tabindex');- }- }- });- }- }- });- });- </script>-</form>\ No newline at end of filediff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/CreateOrUpdate.TabInfo.cshtmldeleted file mode 100644index 80a74e56c..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/CreateOrUpdate.TabInfo.cshtml+++ /dev/null@@ -1,51 +0,0 @@-@using Microsoft.AspNetCore.Mvc.Razor-@model SpecificationAttributeModel--<vc:admin-widget widget-zone="specification_attribute_details_info_top" additional-data="null"/>--@{- Func<int, HelperResult>- template = @<div class="form-body">- <div class="form-group">- <admin-label asp-for="@Model.Locales[item].Name"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="@Model.Locales[item].Name"/>- <span asp-validation-for="@Model.Locales[item].Name"></span>- </div>- </div>- <input asp-for="@Model.Locales[item].LanguageId" type="hidden"/>-- </div>;-}-<div class="form-horizontal">- <localized-editor localized-template="@template" name="specificationattribute-localized" language-ids="@Model.Locales.Select(c => c.LanguageId).ToList()">- <div class="form-body">- <div class="form-group">- <admin-label asp-for="Name"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="Name"/>- <span asp-validation-for="Name"></span>- </div>- </div>- </div>- </localized-editor>- <div class="form-body">- <div class="form-group">- <admin-label asp-for="SeName"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="SeName"/>- <span asp-validation-for="SeName"></span>- </div>- </div>- </div>- <div class="form-body">- <div class="form-group">- <admin-label asp-for="DisplayOrder"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="DisplayOrder"/>- <span asp-validation-for="DisplayOrder"></span>- </div>- </div>- </div>-</div>-<vc:admin-widget widget-zone="specification_attribute_details_info_bottom" additional-data="Model"/>\ No newline at end of filediff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/CreateOrUpdate.TabOptions.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/CreateOrUpdate.TabOptions.cshtmldeleted file mode 100644index 72cdbf50d..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/CreateOrUpdate.TabOptions.cshtml+++ /dev/null@@ -1,132 +0,0 @@-@model SpecificationAttributeModel--@{- if (!string.IsNullOrEmpty(Model.Id))- {- <div class="panel panel-default">- <vc:admin-widget widget-zone="specification_attribute_details_options_top" additional-data="null"/>- <div class="panel-body">- <div id="specificationattributeoptions-grid"></div>- </div>- <div class="panel-footer">- <a id="btnAddNewOption" href="@(Url.Action("OptionCreatePopup", "SpecificationAttribute", new { specificationAttributeId = Model.Id, area = Constants.AreaStore }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Catalog.Attributes.SpecificationAttributes.Options.AddNew"]</a>- <input type="submit" id="btnRefresh" style="display: none"/>- </div>- <vc:admin-widget widget-zone="specification_attribute_details_options_bottom" additional-data="Model"/>- </div>-- <script>- $(document).ready(function () {- $('#btnAddNewOption').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');- }- }- });- $("#specificationattributeoptions-grid").kendoGrid({- dataBound: function () {- $('.editoption').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');- }- }- });- },- dataSource: {- transport: {- read: {- url: "@Html.Raw(Url.Action("OptionList", "SpecificationAttribute", new { specificationAttributeId = Model.Id, area = Constants.AreaStore }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- },- destroy: {- url: "@Html.Raw(Url.Action("OptionDelete", "SpecificationAttribute", new { area = Constants.AreaStore }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- }- },- schema: {- data: "Data",- total: "Total",- errors: "Errors",- model: {- id: "Id"- }- },- error: function(e) {- display_kendoui_grid_error(e);- // Cancel the changes- this.cancelChanges();- },- serverPaging: true,- serverFiltering: true,- serverSorting: true- },- pageable: {- refresh: true,- numeric: false,- previousNext: false,- info: false- },- editable: {- confirmation: true,- mode: "inline"- },- autoBind: false,- scrollable: false,- columns: [{- field: "Name",- title: "@Loc["Admin.Catalog.Attributes.SpecificationAttributes.Options.Fields.Name"]",- template: "<a class='k-link editoption' href=\"@Url.Action("OptionEditPopup", "SpecificationAttribute", new { area = Constants.AreaStore })/#=Id#\">#=kendo.htmlEncode(Name)#</a>"- }, {- field: "DisplayOrder",- title: "@Loc["Admin.Catalog.Attributes.SpecificationAttributes.Options.Fields.DisplayOrder"]",- width: 100- }, {- field: "NumberOfAssociatedProducts",- title: "@Loc["Admin.Catalog.Attributes.SpecificationAttributes.Options.Fields.NumberOfAssociatedProducts"]",- width: 150- }, {- command: {name: "destroy", text: "@Loc["Admin.Common.Delete"]"},- title: "@Loc["Admin.Common.Delete"]",- width: 100- }]- });- });- </script>- <script>- $(document).ready(function () {- $('#btnRefresh').click(function () {- //refresh grid- var grid = $("#specificationattributeoptions-grid").data('kendoGrid');- grid.dataSource.read();-- //return false to don't reload a page- return false;- });- });- </script>- }- else- {- <div class="note note-info">- @Loc["Admin.Catalog.Attributes.SpecificationAttributes.Options.SaveBeforeEdit"]- </div>- }-}\ No newline at end of filediff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/CreateOrUpdate.TabUsedByProducts.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/CreateOrUpdate.TabUsedByProducts.cshtmldeleted file mode 100644index 02dabd36d..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/CreateOrUpdate.TabUsedByProducts.cshtml+++ /dev/null@@ -1,68 +0,0 @@-@model SpecificationAttributeModel-@inject AdminAreaSettings adminAreaSettings-@{- <div class="panel panel-default">- <vc:admin-widget widget-zone="specification_attribute_details_used_by_products_top" additional-data="Model"/>- <div class="panel-body">- <div id="used-by-products-grid"></div>- </div>- <vc:admin-widget widget-zone="specification_attribute_details_used_by_products_bottom" additional-data="Model"/>- </div>- <script>- $(document).ready(function () {- $("#used-by-products-grid").kendoGrid({- dataSource: {- transport: {- read: {- url: "@Html.Raw(Url.Action("UsedByProducts", "SpecificationAttribute", new { specificationAttributeId = Model.Id, area = Constants.AreaStore }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- }- },- schema: {- data: "Data",- total: "Total",- errors: "Errors"- },- error: function(e) {- display_kendoui_grid_error(e);- // Cancel the changes- this.cancelChanges();- },- pageSize: @(adminAreaSettings.DefaultGridPageSize),- serverPaging: true,- serverFiltering: true,- serverSorting: true- },- pageable: {- refresh: true,- pageSizes: [@(adminAreaSettings.GridPageSizes)]- },- editable: {- confirmation: false,- mode: "inline"- },- autoBind: false,- scrollable: false,- columns: [{- field: "ProductName",- title: "@Loc["Admin.Catalog.Attributes.SpecificationAttributes.UsedByProducts.Product"]",- template: '<a class="k-link" href="@Url.Action("Edit", "Product", new { area = Constants.AreaStore })/#=Id#">#=kendo.htmlEncode(ProductName)#</a>',- },- {- field: "OptionName",- title: "@Loc["Admin.Catalog.Attributes.SpecificationAttributes.UsedByProducts.OptionName"]",- template: '<a class="k-link" href="@Url.Action("Edit", "Product", new { area = Constants.AreaStore })/#=Id#">#=kendo.htmlEncode(OptionName)#</a>',- },- {- field: "Published",- title: "@Loc["Admin.Catalog.Attributes.SpecificationAttributes.UsedByProducts.Published"]",- 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> #} #'- }]- });- });- </script>-}\ No newline at end of filediff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/CreateOrUpdate.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/CreateOrUpdate.cshtmldeleted file mode 100644index a7d55faa8..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/CreateOrUpdate.cshtml+++ /dev/null@@ -1,40 +0,0 @@-@model SpecificationAttributeModel--<div asp-validation-summary="All"></div>-<input asp-for="Id" type="hidden"/>-<admin-tabstrip name="specificationattribute-edit" BindGrid="true">- <items>- <tabstrip-item text="@Loc["Admin.Catalog.Attributes.SpecificationAttributes.Info"]" tab-index="0">- <content>- <div>- <partial name="Partials/CreateOrUpdate.TabInfo" model="Model"/>- </div>- </content>- </tabstrip-item>- <tabstrip-item text="@Loc["Admin.Catalog.Attributes.SpecificationAttributes.Options"]" tab-index="1">- <content>- <div>- <partial name="Partials/CreateOrUpdate.TabOptions" model="Model"/>- </div>- </content>- </tabstrip-item>- @if (!string.IsNullOrEmpty(Model.Id))- {- <tabstrip-item text="@Loc["Admin.Catalog.Attributes.SpecificationAttributes.UsedByProducts"]" tab-index="1">- <content>- <div>- <partial name="Partials/CreateOrUpdate.TabUsedByProducts" model="Model"/>- </div>- </content>- </tabstrip-item>- }- <tabstrip-item text="@Loc["Admin.Common.UserFields.Tab"]" tab-index="2">- <content>- <div>- <partial name="Partials/UserFields" model="Model"/>- </div>- </content>- </tabstrip-item>- <vc:admin-widget widget-zone="specification_attribute_details_tabs" additional-data="Model"/>- </items>-</admin-tabstrip>\ No newline at end of filediff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/WidgetZone.DetailsButtons.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/WidgetZone.DetailsButtons.cshtmlnew file mode 100644index 000000000..377365ce7--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/WidgetZone.DetailsButtons.cshtml@@ -0,0 +1,2 @@+@model SpecificationAttributeModel+<vc:store-widget widget-zone="store_specification_attribute_details_buttons" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/WidgetZone.Info.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/WidgetZone.Info.Bottom.cshtmlnew file mode 100644index 000000000..d62e62cdd--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/WidgetZone.Info.Bottom.cshtml@@ -0,0 +1,2 @@+@model SpecificationAttributeModel+<vc:store-widget widget-zone="store_specification_attribute_details_info_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/WidgetZone.Info.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/WidgetZone.Info.Top.cshtmlnew file mode 100644index 000000000..2c1b25373--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/WidgetZone.Info.Top.cshtml@@ -0,0 +1 @@+<vc:store-widget widget-zone="store_specification_attribute_details_info_top" additional-data="null"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/WidgetZone.ListButtons.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/WidgetZone.ListButtons.cshtmlnew file mode 100644index 000000000..66bef2a1b--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/WidgetZone.ListButtons.cshtml@@ -0,0 +1 @@+<vc:store-widget widget-zone="store_specification_attribute_list_buttons" additional-data="null"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/WidgetZone.Option.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/WidgetZone.Option.Bottom.cshtmlnew file mode 100644index 000000000..60632262c--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/WidgetZone.Option.Bottom.cshtml@@ -0,0 +1,2 @@+@model SpecificationAttributeOptionModel+<vc:store-widget widget-zone="store_specification_attribute_option_details_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/WidgetZone.Option.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/WidgetZone.Option.Top.cshtmlnew file mode 100644index 000000000..09c3cafb0--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/WidgetZone.Option.Top.cshtml@@ -0,0 +1 @@+<vc:store-widget widget-zone="store_specification_attribute_option_details_top" additional-data="null"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/WidgetZone.OptionButtons.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/WidgetZone.OptionButtons.cshtmlnew file mode 100644index 000000000..726dba34b--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/WidgetZone.OptionButtons.cshtml@@ -0,0 +1 @@+<vc:store-widget widget-zone="store_specification_attribute_option_details_buttons" additional-data="null"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/WidgetZone.Options.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/WidgetZone.Options.Bottom.cshtmlnew file mode 100644index 000000000..187d30c92--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/WidgetZone.Options.Bottom.cshtml@@ -0,0 +1,2 @@+@model SpecificationAttributeModel+<vc:store-widget widget-zone="store_specification_attribute_details_options_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/WidgetZone.Options.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/WidgetZone.Options.Top.cshtmlnew file mode 100644index 000000000..5046f8b08--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/WidgetZone.Options.Top.cshtml@@ -0,0 +1 @@+<vc:store-widget widget-zone="store_specification_attribute_details_options_top" additional-data="null"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/WidgetZone.Tabs.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/WidgetZone.Tabs.cshtmlnew file mode 100644index 000000000..2516762b8--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/WidgetZone.Tabs.cshtml@@ -0,0 +1,2 @@+@model SpecificationAttributeModel+<vc:store-widget widget-zone="store_specification_attribute_details_tabs" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/WidgetZone.UsedByProducts.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/WidgetZone.UsedByProducts.Bottom.cshtmlnew file mode 100644index 000000000..b78f9e9b1--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/WidgetZone.UsedByProducts.Bottom.cshtml@@ -0,0 +1,2 @@+@model SpecificationAttributeModel+<vc:store-widget widget-zone="store_specification_attribute_details_used_by_products_bottom" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/WidgetZone.UsedByProducts.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/WidgetZone.UsedByProducts.Top.cshtmlnew file mode 100644index 000000000..6d04d3c0c--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/WidgetZone.UsedByProducts.Top.cshtml@@ -0,0 +1,2 @@+@model SpecificationAttributeModel+<vc:store-widget widget-zone="store_specification_attribute_details_used_by_products_top" additional-data="Model"/>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/_ViewImports.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/_ViewImports.cshtmlindex a35e3b263..6ea7e9f9e 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/_ViewImports.cshtml+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/_ViewImports.cshtml@@ -39,7 +39,6 @@@using Grand.Web.AdminShared.Models.Discounts@using Grand.Web.AdminShared.Models.Tax@using Grand.Web.Store.Models.Messages-@using Grand.Web.Store.Models.Customers@using Grand.Web.Store.Models.Common@inject LocService Locdiff --git a/src/Web/Grand.Web.Store/Controllers/AddressAttributeController.cs b/src/Web/Grand.Web.Store/Controllers/AddressAttributeController.csindex 2b68b5dd4..ace9f0dbc 100644--- a/src/Web/Grand.Web.Store/Controllers/AddressAttributeController.cs+++ b/src/Web/Grand.Web.Store/Controllers/AddressAttributeController.cs@@ -1,297 +1,42 @@-using Grand.Business.Core.Extensions;using Grand.Business.Core.Interfaces.Common.Addresses;using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Domain.Common;using Grand.Domain.Permissions;-using Grand.Infrastructure;-using Grand.Infrastructure.Mapper;-using Grand.Web.AdminShared.Extensions;+using Grand.Web.AdminShared.Controllers;using Grand.Web.AdminShared.Interfaces;using Grand.Web.AdminShared.Models.Common;-using Grand.Web.Store.Models.Common;using Grand.Web.Common.DataSource;using Grand.Web.Common.Filters;+using Grand.Web.Common.Localization;using Grand.Web.Common.Security.Authorization;+using Grand.Web.Store.Extensions;using Microsoft.AspNetCore.Mvc;namespace Grand.Web.Store.Controllers;-[PermissionAuthorize(PermissionSystemName.AddressAttributes)]-public class AddressAttributeController : BaseStoreController+[AutoValidateAntiforgeryToken]+[Area(Constants.AreaStore)]+[AuthorizeStore]+[AuthorizeMenu]+public class AddressAttributeController(+ IAddressAttributeService addressAttributeService,+ IAddressAttributeViewModelService addressAttributeViewModelService,+ ILanguageService languageService,+ ITranslationService translationService,+ IAdminDataScope<AddressAttribute> scope)+ : BaseAddressAttributeController(addressAttributeService, addressAttributeViewModelService,+ languageService, translationService, scope){- private readonly IAddressAttributeViewModelService _addressAttributeViewModelService;- private readonly IAddressAttributeService _addressAttributeService;- private readonly ILanguageService _languageService;- private readonly ITranslationService _translationService;- private readonly IContextAccessor _contextAccessor;-- public AddressAttributeController(- IAddressAttributeViewModelService addressAttributeViewModelService,- IAddressAttributeService addressAttributeService,- ILanguageService languageService,- ITranslationService translationService,- IContextAccessor contextAccessor)- {- _addressAttributeViewModelService = addressAttributeViewModelService;- _addressAttributeService = addressAttributeService;- _languageService = languageService;- _translationService = translationService;- _contextAccessor = contextAccessor;- }-- private string CurrentStoreId => _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId;-- private bool IsVisibleToStore(AddressAttribute attr) =>- !attr.LimitedToStores || attr.Stores.Contains(CurrentStoreId);-- #region Address attributes-- public IActionResult Index()- {- return RedirectToAction("List");- }-- public IActionResult List()- {- return View();- }-- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.List)]- public async Task<IActionResult> List(DataSourceRequest command)- {- var storeId = CurrentStoreId;- var (addressAttributes, _) = await _addressAttributeViewModelService.PrepareAddressAttributes();- var visibleAttributes = addressAttributes- .Where(x => x.Stores == null || x.Stores.Length == 0 || x.Stores.Contains(storeId))- .ToList();- var gridModel = new DataSourceResult {- Data = visibleAttributes.Select(x => new {- x.Id,- x.Name,- x.AttributeControlTypeName,- x.IsRequired,- x.DisplayOrder,- IsGlobalAttribute = !(x.Stores is { Length: 1 } && x.Stores.Contains(storeId))- }).ToList(),- Total = visibleAttributes.Count- };- return Json(gridModel);- }-- [PermissionAuthorizeAction(PermissionActionName.Create)]- public async Task<IActionResult> Create()- {- var model = new AddressAttributeStoreModel();- await AddLocales(_languageService, model.Locales);- return View(model);- }-- [HttpPost]- [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]- [PermissionAuthorizeAction(PermissionActionName.Create)]- public async Task<IActionResult> Create(AddressAttributeStoreModel model, bool continueEditing)- {- if (ModelState.IsValid)- {- model.Stores = [CurrentStoreId];- var addressAttribute = await _addressAttributeViewModelService.InsertAddressAttributeModel(model);- Success(_translationService.GetResource("Admin.Address.AddressAttributes.Added"));- return continueEditing- ? RedirectToAction("Edit", new { id = addressAttribute.Id })- : RedirectToAction("List");- }-- return View(model);- }-- [PermissionAuthorizeAction(PermissionActionName.Preview)]- public async Task<IActionResult> Edit(string id)- {- var addressAttribute = await _addressAttributeService.GetAddressAttributeById(id);- if (addressAttribute == null || !IsVisibleToStore(addressAttribute))- return RedirectToAction("List");-- var model = addressAttribute.MapTo<AddressAttribute, AddressAttributeStoreModel>();- model.IsGlobalAttribute = !addressAttribute.AccessToEntityByStore(CurrentStoreId);- await AddLocales(_languageService, model.Locales, (locale, languageId) =>- {- locale.Name = addressAttribute.GetTranslation(x => x.Name, languageId, false);- });-- return View(model);- }-- [HttpPost]- [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> Edit(AddressAttributeModel model, bool continueEditing)- {- var addressAttribute = await _addressAttributeService.GetAddressAttributeById(model.Id);- if (addressAttribute == null)- return RedirectToAction("List");-- if (!addressAttribute.AccessToEntityByStore(CurrentStoreId))- return RedirectToAction("List");-- if (ModelState.IsValid)- {- model.Stores = [CurrentStoreId];- addressAttribute =- await _addressAttributeViewModelService.UpdateAddressAttributeModel(model, addressAttribute);- Success(_translationService.GetResource("Admin.Address.AddressAttributes.Updated"));- if (continueEditing)- {- await SaveSelectedTabIndex();- return RedirectToAction("Edit", new { id = addressAttribute.Id });- }-- return RedirectToAction("List");- }-- var storeModel = addressAttribute.MapTo<AddressAttribute, AddressAttributeStoreModel>();- storeModel.IsGlobalAttribute = false;- await AddLocales(_languageService, storeModel.Locales, (locale, languageId) =>- {- locale.Name = addressAttribute.GetTranslation(x => x.Name, languageId, false);- });- return View(storeModel);- }-- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Delete)]- public async Task<IActionResult> Delete(string id)- {- var addressAttribute = await _addressAttributeService.GetAddressAttributeById(id);- if (addressAttribute == null)- return RedirectToAction("List");-- if (!addressAttribute.AccessToEntityByStore(CurrentStoreId))- return RedirectToAction("Edit", new { id });-- if (ModelState.IsValid)- {- await _addressAttributeService.DeleteAddressAttribute(addressAttribute);- Success(_translationService.GetResource("Admin.Address.AddressAttributes.Deleted"));- return RedirectToAction("List");- }-- Error(ModelState);- return RedirectToAction("Edit", new { id });- }-- #endregion-- #region Address attribute values-- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Preview)]- public async Task<IActionResult> ValueList(string addressAttributeId, DataSourceRequest command)- {- var addressAttribute = await _addressAttributeService.GetAddressAttributeById(addressAttributeId);- if (addressAttribute == null || !IsVisibleToStore(addressAttribute))- return new JsonResult(new DataSourceResult { Errors = "Access denied" });-- var (addressAttributeValues, totalCount) =- await _addressAttributeViewModelService.PrepareAddressAttributeValues(addressAttributeId);- var gridModel = new DataSourceResult {- Data = addressAttributeValues.ToList(),- Total = totalCount- };- return Json(gridModel);- }-[PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> ValueCreatePopup(string addressAttributeId)- {- var addressAttribute = await _addressAttributeService.GetAddressAttributeById(addressAttributeId);- if (addressAttribute == null || !addressAttribute.AccessToEntityByStore(CurrentStoreId))- return RedirectToAction("List");-- var model = _addressAttributeViewModelService.PrepareAddressAttributeValueModel(addressAttributeId);- await AddLocales(_languageService, model.Locales);- return View(model);- }-- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> ValueCreatePopup(AddressAttributeValueModel model)- {- var addressAttribute = await _addressAttributeService.GetAddressAttributeById(model.AddressAttributeId);- if (addressAttribute == null || !addressAttribute.AccessToEntityByStore(CurrentStoreId))- return RedirectToAction("List");-- if (ModelState.IsValid)- {- await _addressAttributeViewModelService.InsertAddressAttributeValueModel(model);- return Content("");- }-- return View(model);- }+ public override async Task<IActionResult> ValueCreatePopup(string addressAttributeId) =>+ await base.ValueCreatePopup(addressAttributeId);[PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> ValueEditPopup(string id, string addressAttributeId)- {- var addressAttribute = await _addressAttributeService.GetAddressAttributeById(addressAttributeId);- if (addressAttribute == null || !addressAttribute.AccessToEntityByStore(CurrentStoreId))- return RedirectToAction("List");-- var cav = addressAttribute.AddressAttributeValues.FirstOrDefault(x => x.Id == id);- if (cav == null)- return RedirectToAction("List");-- var model = _addressAttributeViewModelService.PrepareAddressAttributeValueModel(cav);- await AddLocales(_languageService, model.Locales, (locale, languageId) =>- {- locale.Name = cav.GetTranslation(x => x.Name, languageId, false);- });-- return View(model);- }-[HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> ValueEditPopup(AddressAttributeValueModel model)- {- var addressAttribute = await _addressAttributeService.GetAddressAttributeById(model.AddressAttributeId);- if (addressAttribute == null || !addressAttribute.AccessToEntityByStore(CurrentStoreId))- return RedirectToAction("List");-- var cav = addressAttribute.AddressAttributeValues.FirstOrDefault(x => x.Id == model.Id);- if (cav == null)- return RedirectToAction("List");-- if (ModelState.IsValid)- {- await _addressAttributeViewModelService.UpdateAddressAttributeValueModel(model, cav);- return Content("");- }+ public override async Task<IActionResult> ValueCreatePopup(AddressAttributeValueModel model) =>+ await base.ValueCreatePopup(model);- return View(model);- }-- [HttpPost][PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> ValueDelete(AddressAttributeValueModel model)- {- var addressAttribute = await _addressAttributeService.GetAddressAttributeById(model.AddressAttributeId);- if (addressAttribute == null || !addressAttribute.AccessToEntityByStore(CurrentStoreId))- return new JsonResult(new DataSourceResult { Errors = "Access denied" });-- var cav = addressAttribute.AddressAttributeValues.FirstOrDefault(x => x.Id == model.Id);- if (cav == null)- return new JsonResult(new DataSourceResult- { Errors = "No address attribute value found with the specified id" });-- if (ModelState.IsValid)- {- await _addressAttributeService.DeleteAddressAttributeValue(cav);- return new JsonResult("");- }-- return ErrorForKendoGridJson(ModelState);- }-- #endregion+ public override async Task<IActionResult> ValueEditPopup(string id, string addressAttributeId) =>+ await base.ValueEditPopup(id, addressAttributeId);}diff --git a/src/Web/Grand.Web.Store/Controllers/CheckoutAttributeController.cs b/src/Web/Grand.Web.Store/Controllers/CheckoutAttributeController.csindex d1510740d..845dc0e0d 100644--- a/src/Web/Grand.Web.Store/Controllers/CheckoutAttributeController.cs+++ b/src/Web/Grand.Web.Store/Controllers/CheckoutAttributeController.cs@@ -1,372 +1,38 @@-using Grand.Business.Core.Extensions;-using Grand.Business.Core.Interfaces.Catalog.Directory;+using Grand.Business.Core.Interfaces.Catalog.Directory;using Grand.Business.Core.Interfaces.Checkout.CheckoutAttributes;using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Interfaces.Common.Localization;-using Grand.Domain.Catalog;using Grand.Domain.Directory;using Grand.Domain.Orders;-using Grand.Domain.Permissions;-using Grand.Infrastructure;-using Grand.Web.AdminShared.Extensions.Mapping;+using Grand.Web.AdminShared.Controllers;using Grand.Web.AdminShared.Interfaces;-using Grand.Web.AdminShared.Models.Orders;-using Grand.Web.Common.DataSource;using Grand.Web.Common.Filters;-using Grand.Web.Common.Security.Authorization;+using Grand.Web.Common.Localization;+using Grand.Web.Store.Extensions;using Microsoft.AspNetCore.Mvc;-using Grand.Web.AdminShared.Extensions;namespace Grand.Web.Store.Controllers;-[PermissionAuthorize(PermissionSystemName.CheckoutAttributes)]-public class CheckoutAttributeController : BaseStoreController-{- #region Constructors-- public CheckoutAttributeController(ICheckoutAttributeService checkoutAttributeService,- IContextAccessor contextAccessor,- ILanguageService languageService,- ITranslationService translationService,- ICurrencyService currencyService,- CurrencySettings currencySettings,- IMeasureService measureService,- MeasureSettings measureSettings,- ICheckoutAttributeViewModelService checkoutAttributeViewModelService)- {- _checkoutAttributeService = checkoutAttributeService;- _contextAccessor = contextAccessor;- _languageService = languageService;- _translationService = translationService;- _currencyService = currencyService;- _currencySettings = currencySettings;- _measureService = measureService;- _measureSettings = measureSettings;- _checkoutAttributeViewModelService = checkoutAttributeViewModelService;- }-- #endregion-- #region Fields-- private readonly ICheckoutAttributeService _checkoutAttributeService;- private readonly IContextAccessor _contextAccessor;- private readonly ILanguageService _languageService;- private readonly ITranslationService _translationService;- private readonly ICurrencyService _currencyService;- private readonly CurrencySettings _currencySettings;- private readonly IMeasureService _measureService;- private readonly MeasureSettings _measureSettings;- private readonly ICheckoutAttributeViewModelService _checkoutAttributeViewModelService;-- #endregion-- #region Helper Methods-- /// <summary>- /// Checks access permissions for a checkout attribute and handles warnings- /// </summary>- /// <param name="checkoutAttribute">Checkout attribute to check</param>- /// <returns>True if access is allowed, false if access should be denied</returns>- private bool CheckAccessPermission(CheckoutAttribute checkoutAttribute)- {- if (checkoutAttribute == null)- return false;-- if (!checkoutAttribute.LimitedToStores || (checkoutAttribute.LimitedToStores &&- checkoutAttribute.Stores.Contains(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId) &&- checkoutAttribute.Stores.Count > 1))- {- Warning(_translationService.GetResource("admin.Catalog.attributes.checkoutAttributes.permissions"));- return true;- }-- return checkoutAttribute.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId);- }-- #endregion-- #region Checkout attributes-- //list- public IActionResult Index()- {- return RedirectToAction("List");- }-- public IActionResult List()- {- return View();- }-- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.List)]- public async Task<IActionResult> List(DataSourceRequest command)- {- var checkoutAttributes = await _checkoutAttributeViewModelService.PrepareCheckoutAttributeListModel(_contextAccessor.WorkContext.CurrentCustomer.StoreId);- var gridModel = new DataSourceResult {- Data = checkoutAttributes.ToList(),- Total = checkoutAttributes.Count()- };- return Json(gridModel);- }-- //create- [PermissionAuthorizeAction(PermissionActionName.Create)]- public async Task<IActionResult> Create()- {- var model = await _checkoutAttributeViewModelService.PrepareCheckoutAttributeModel();- //locales- await AddLocales(_languageService, model.Locales);-- return View(model);- }-- [HttpPost]- [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]- [PermissionAuthorizeAction(PermissionActionName.Create)]- public async Task<IActionResult> Create(CheckoutAttributeModel model, bool continueEditing)- {- if (ModelState.IsValid)- {- model.Stores = [_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId];- model.CustomerGroups = [];- var checkoutAttribute = await _checkoutAttributeViewModelService.InsertCheckoutAttributeModel(model);- Success(_translationService.GetResource("Admin.Orders.CheckoutAttributes.Added"));- return continueEditing- ? RedirectToAction("Edit", new { id = checkoutAttribute.Id })- : RedirectToAction("List");- }-- //If we got this far, something failed, redisplay form- //tax categories- await _checkoutAttributeViewModelService.PrepareTaxCategories(model, null, true);-- return View(model);- }-- //edit- [PermissionAuthorizeAction(PermissionActionName.Preview)]- public async Task<IActionResult> Edit(string id)- {- var checkoutAttribute = await _checkoutAttributeService.GetCheckoutAttributeById(id);- if (checkoutAttribute == null)- //No checkout attribute found with the specified id- return RedirectToAction("List");-- if (!CheckAccessPermission(checkoutAttribute))- return RedirectToAction("List");-- var model = checkoutAttribute.ToModel();- //locales- await AddLocales(_languageService, model.Locales, (locale, languageId) =>- {- locale.Name = checkoutAttribute.GetTranslation(x => x.Name, languageId, false);- locale.TextPrompt = checkoutAttribute.GetTranslation(x => x.TextPrompt, languageId, false);- });-- //tax categories- await _checkoutAttributeViewModelService.PrepareTaxCategories(model, checkoutAttribute, false);-- //condition- await _checkoutAttributeViewModelService.PrepareConditionAttributes(model, checkoutAttribute);-- return View(model);- }-- [HttpPost]- [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> Edit(CheckoutAttributeModel model, bool continueEditing)- {- var checkoutAttribute = await _checkoutAttributeService.GetCheckoutAttributeById(model.Id);- if (checkoutAttribute == null)- //No checkout attribute found with the specified id- return RedirectToAction("List");-- if (!checkoutAttribute.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))- return RedirectToAction("Edit", new { id = checkoutAttribute.Id });-- if (ModelState.IsValid)- {- model.Stores = [_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId];- model.CustomerGroups = [];-- checkoutAttribute = await _checkoutAttributeViewModelService.UpdateCheckoutAttributeModel(checkoutAttribute, model);- Success(_translationService.GetResource("Admin.Orders.CheckoutAttributes.Updated"));- if (continueEditing)- {- //selected tab- await SaveSelectedTabIndex();-- return RedirectToAction("Edit", new { id = checkoutAttribute.Id });- }-- return RedirectToAction("List");- }-- //If we got this far, something failed, redisplay form- //tax categories- await _checkoutAttributeViewModelService.PrepareTaxCategories(model, checkoutAttribute, true);- return View(model);- }-- //delete- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Delete)]- public async Task<IActionResult> Delete(string id)- {- var checkoutAttribute = await _checkoutAttributeService.GetCheckoutAttributeById(id);-- if (!checkoutAttribute.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))- return RedirectToAction("List");-- await _checkoutAttributeService.DeleteCheckoutAttribute(checkoutAttribute);-- Success(_translationService.GetResource("Admin.Orders.CheckoutAttributes.Deleted"));- return RedirectToAction("List");- }-- #endregion-- #region Checkout attribute values-- //list- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Preview)]- public async Task<IActionResult> ValueList(string checkoutAttributeId, DataSourceRequest command)- {- var ca = await _checkoutAttributeService.GetCheckoutAttributeById(checkoutAttributeId);- if (!CheckAccessPermission(ca))- return View("AccessDenied", _translationService.GetResource("admin.Catalog.attributes.checkoutAttributes.permissions"));-- var checkoutAttribute = await _checkoutAttributeViewModelService.PrepareCheckoutAttributeValuesModel(checkoutAttributeId);-- var gridModel = new DataSourceResult {- Data = checkoutAttribute.ToList(),- Total = checkoutAttribute.Count()- };- return Json(gridModel);- }-- //create- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> ValueCreatePopup(string checkoutAttributeId)- {- var ca = await _checkoutAttributeService.GetCheckoutAttributeById(checkoutAttributeId);- if (ca == null)- throw new ArgumentException("No checkout attribute found with the specified id");-- if (!ca.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))- return View("AccessDenied", _translationService.GetResource("admin.Catalog.attributes.checkoutattributes.permissions"));-- var model = await _checkoutAttributeViewModelService.PrepareCheckoutAttributeValueModel(checkoutAttributeId);- //locales- await AddLocales(_languageService, model.Locales);- return View(model);- }-- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> ValueCreatePopup(CheckoutAttributeValueModel model)- {- var checkoutAttribute = await _checkoutAttributeService.GetCheckoutAttributeById(model.CheckoutAttributeId);- if (checkoutAttribute == null)- //No checkout attribute found with the specified id- return RedirectToAction("List");-- if (!checkoutAttribute.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))- return View("AccessDenied", _translationService.GetResource("admin.Catalog.attributes.checkoutattributes.permissions"));-- if (ModelState.IsValid)- {- await _checkoutAttributeViewModelService.InsertCheckoutAttributeValueModel(checkoutAttribute, model);- return Content("");- }-- //If we got this far, something failed, redisplay form- model.PrimaryStoreCurrencyCode =- (await _currencyService.GetCurrencyById(_currencySettings.PrimaryStoreCurrencyId)).CurrencyCode;- model.BaseWeightIn = (await _measureService.GetMeasureWeightById(_measureSettings.BaseWeightId)).Name;- return View(model);- }-- //edit- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> ValueEditPopup(string id, string checkoutAttributeId)- {- var checkoutAttribute = await _checkoutAttributeService.GetCheckoutAttributeById(checkoutAttributeId);-- if (!CheckAccessPermission(checkoutAttribute))- return View("AccessDenied", _translationService.GetResource("admin.Catalog.attributes.checkoutAttributes.permissions"));-- var cav = checkoutAttribute.CheckoutAttributeValues.FirstOrDefault(x => x.Id == id);- if (cav == null)- //No checkout attribute value found with the specified id- return RedirectToAction("List");-- var model = await _checkoutAttributeViewModelService.PrepareCheckoutAttributeValueModel(checkoutAttribute, cav);-- //locales- await AddLocales(_languageService, model.Locales, (locale, languageId) =>- {- locale.Name = cav.GetTranslation(x => x.Name, languageId, false);- });-- return View(model);- }-- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> ValueEditPopup(CheckoutAttributeValueModel model)- {- var checkoutAttribute = await _checkoutAttributeService.GetCheckoutAttributeById(model.CheckoutAttributeId);-- if (!checkoutAttribute.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))- return View("AccessDenied", _translationService.GetResource("admin.Catalog.attributes.checkoutAttributes.permissions"));-- var cav = checkoutAttribute.CheckoutAttributeValues.FirstOrDefault(x => x.Id == model.Id);- if (cav == null)- //No checkout attribute value found with the specified id- return RedirectToAction("List");-- if (ModelState.IsValid)- {- await _checkoutAttributeViewModelService.UpdateCheckoutAttributeValueModel(checkoutAttribute, cav, model);- return Content("");- }-- //If we got this far, something failed, redisplay form- model.PrimaryStoreCurrencyCode =- (await _currencyService.GetCurrencyById(_currencySettings.PrimaryStoreCurrencyId)).CurrencyCode;- model.BaseWeightIn = (await _measureService.GetMeasureWeightById(_measureSettings.BaseWeightId)).Name;-- return View(model);- }-- //delete- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> ValueDelete(string id, string checkoutAttributeId)- {- var checkoutAttribute = await _checkoutAttributeService.GetCheckoutAttributeById(checkoutAttributeId);-- if (!checkoutAttribute.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))- return View("AccessDenied", _translationService.GetResource("admin.Catalog.attributes.checkoutAttributes.permissions"));-- var cav = checkoutAttribute.CheckoutAttributeValues.FirstOrDefault(x => x.Id == id);- if (cav == null)- throw new ArgumentException("No checkout attribute value found with the specified id");-- if (ModelState.IsValid)- {- checkoutAttribute.CheckoutAttributeValues.Remove(cav);- await _checkoutAttributeService.UpdateCheckoutAttribute(checkoutAttribute);- return new JsonResult("");- }-- return ErrorForKendoGridJson(ModelState);- }-- #endregion-}\ No newline at end of file+// Reduced to a thin subclass of BaseCheckoutAttributeController (ARCH-001 CheckoutAttribute consolidation). All+// regions of behavior live in the shared base; this class only supplies Store's DI wiring plus the+// attributes that used to arrive transitively via BaseStoreController - BaseCheckoutAttributeController+// 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.+[AuthorizeStore]+[AutoValidateAntiforgeryToken]+[Area(Constants.AreaStore)]+[AuthorizeMenu]+public class CheckoutAttributeController(+ ICheckoutAttributeService checkoutAttributeService,+ ILanguageService languageService,+ ITranslationService translationService,+ ICurrencyService currencyService,+ CurrencySettings currencySettings,+ IMeasureService measureService,+ MeasureSettings measureSettings,+ ICheckoutAttributeViewModelService checkoutAttributeViewModelService,+ IAdminDataScope<CheckoutAttribute> scope)+ : BaseCheckoutAttributeController(checkoutAttributeService, languageService, translationService,+ currencyService, currencySettings, measureService, measureSettings,+ checkoutAttributeViewModelService, scope);diff --git a/src/Web/Grand.Web.Store/Controllers/ContactAttributeController.cs b/src/Web/Grand.Web.Store/Controllers/ContactAttributeController.csindex a801c9f64..32f59cfe7 100644--- a/src/Web/Grand.Web.Store/Controllers/ContactAttributeController.cs+++ b/src/Web/Grand.Web.Store/Controllers/ContactAttributeController.cs@@ -1,304 +1,29 @@-using Grand.Business.Core.Extensions;using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Business.Core.Interfaces.Marketing.Contacts;+using Grand.Domain.Catalog;using Grand.Domain.Messages;using Grand.Domain.Permissions;-using Grand.Domain.Catalog;-using Grand.Infrastructure;-using Grand.Infrastructure.Mapper;-using Grand.Web.AdminShared.Extensions;-using Grand.Web.AdminShared.Extensions.Mapping;+using Grand.Web.AdminShared.Controllers;using Grand.Web.AdminShared.Interfaces;-using Grand.Web.AdminShared.Models.Messages;-using Grand.Web.Store.Models.Messages;-using Grand.Web.Common.DataSource;using Grand.Web.Common.Filters;using Grand.Web.Common.Security.Authorization;+using Grand.Web.Store.Extensions;using Microsoft.AspNetCore.Mvc;namespace Grand.Web.Store.Controllers;-[PermissionAuthorize(PermissionSystemName.ContactAttributes)]-public class ContactAttributeController : BaseStoreController-{- private readonly IContactAttributeViewModelService _contactAttributeViewModelService;- private readonly IContactAttributeService _contactAttributeService;- private readonly ILanguageService _languageService;- private readonly ITranslationService _translationService;- private readonly IContextAccessor _contextAccessor;-- public ContactAttributeController(- IContactAttributeViewModelService contactAttributeViewModelService,- IContactAttributeService contactAttributeService,- ILanguageService languageService,- ITranslationService translationService,- IContextAccessor contextAccessor)- {- _contactAttributeViewModelService = contactAttributeViewModelService;- _contactAttributeService = contactAttributeService;- _languageService = languageService;- _translationService = translationService;- _contextAccessor = contextAccessor;- }-- private string CurrentStoreId => _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId;-- private bool IsVisibleToStore(ContactAttribute attr) =>- !attr.LimitedToStores || attr.Stores.Contains(CurrentStoreId);-- #region Contact attributes-- public IActionResult Index()- {- return RedirectToAction("List");- }-- public IActionResult List()- {- return View();- }-- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.List)]- public async Task<IActionResult> List(DataSourceRequest command)- {- var contactAttributes = await _contactAttributeViewModelService.PrepareContactAttributeListModel();- var storeId = CurrentStoreId;- var gridModel = new DataSourceResult {- Data = contactAttributes.Select(x => new {- x.Id,- x.Name,- x.AttributeControlTypeName,- x.IsRequired,- x.DisplayOrder,- IsReadOnly = !(x.Stores != null && x.Stores.Length == 1 && x.Stores.Contains(storeId))- }).ToList(),- Total = contactAttributes.Count()- };- return Json(gridModel);- }-- [PermissionAuthorizeAction(PermissionActionName.Create)]- public async Task<IActionResult> Create()- {- var model = new ContactAttributeStoreModel();- await AddLocales(_languageService, model.Locales);- await _contactAttributeViewModelService.PrepareConditionAttributes(model, null);- return View(model);- }-- [HttpPost]- [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]- [PermissionAuthorizeAction(PermissionActionName.Create)]- public async Task<IActionResult> Create(ContactAttributeStoreModel model, bool continueEditing)- {- if (ModelState.IsValid)- {- model.Stores = [CurrentStoreId];- var contactAttribute = await _contactAttributeViewModelService.InsertContactAttributeModel(model);- Success(_translationService.GetResource("Admin.Catalog.Attributes.ContactAttributes.Added"));- return continueEditing- ? RedirectToAction("Edit", new { id = contactAttribute.Id })- : RedirectToAction("List");- }-- await _contactAttributeViewModelService.PrepareConditionAttributes(model, null);- return View(model);- }-- [PermissionAuthorizeAction(PermissionActionName.Preview)]- public async Task<IActionResult> Edit(string id)- {- var contactAttribute = await _contactAttributeService.GetContactAttributeById(id);- if (contactAttribute == null || !IsVisibleToStore(contactAttribute))- return RedirectToAction("List");-- var model = contactAttribute.MapTo<ContactAttribute, ContactAttributeStoreModel>();- model.IsReadOnly = !contactAttribute.AccessToEntityByStore(CurrentStoreId);- await AddLocales(_languageService, model.Locales, (locale, languageId) =>- {- locale.Name = contactAttribute.GetTranslation(x => x.Name, languageId, false);- locale.TextPrompt = contactAttribute.GetTranslation(x => x.TextPrompt, languageId, false);- });- await _contactAttributeViewModelService.PrepareConditionAttributes(model, contactAttribute);-- return View(model);- }-- [HttpPost]- [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> Edit(ContactAttributeModel model, bool continueEditing)- {- var contactAttribute = await _contactAttributeService.GetContactAttributeById(model.Id);- if (contactAttribute == null)- return RedirectToAction("List");-- if (!contactAttribute.AccessToEntityByStore(CurrentStoreId))- return RedirectToAction("List");-- if (ModelState.IsValid)- {- model.Stores = [CurrentStoreId];- contactAttribute = await _contactAttributeViewModelService.UpdateContactAttributeModel(contactAttribute, model);- Success(_translationService.GetResource("Admin.Catalog.Attributes.ContactAttributes.Updated"));- if (continueEditing)- {- await SaveSelectedTabIndex();- return RedirectToAction("Edit", new { id = contactAttribute.Id });- }-- return RedirectToAction("List");- }-- var storeModel = contactAttribute.MapTo<ContactAttribute, ContactAttributeStoreModel>();- storeModel.IsReadOnly = false;- await _contactAttributeViewModelService.PrepareConditionAttributes(storeModel, contactAttribute);- return View(storeModel);- }-- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Delete)]- public async Task<IActionResult> Delete(string id)- {- var contactAttribute = await _contactAttributeService.GetContactAttributeById(id);- if (contactAttribute == null)- return RedirectToAction("List");-- if (!contactAttribute.AccessToEntityByStore(CurrentStoreId))- return RedirectToAction("Edit", new { id });-- if (ModelState.IsValid)- {- await _contactAttributeService.DeleteContactAttribute(contactAttribute);- Success(_translationService.GetResource("Admin.Catalog.Attributes.ContactAttributes.Deleted"));- return RedirectToAction("List");- }-- Error(ModelState);- return RedirectToAction("Edit", new { id });- }-- #endregion-- #region Contact attribute values-- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Preview)]- public async Task<IActionResult> ValueList(string contactAttributeId, DataSourceRequest command)- {- var contactAttribute = await _contactAttributeService.GetContactAttributeById(contactAttributeId);- if (contactAttribute == null || !IsVisibleToStore(contactAttribute))- return new JsonResult(new DataSourceResult { Errors = "Access denied" });-- var values = contactAttribute.ContactAttributeValues;- var gridModel = new DataSourceResult {- Data = values.Select(x => new ContactAttributeValueModel {- Id = x.Id,- ContactAttributeId = x.ContactAttributeId,- Name = contactAttribute.AttributeControlType != AttributeControlType.ColorSquares- ? x.Name- : $"{x.Name} - {x.ColorSquaresRgb}",- ColorSquaresRgb = x.ColorSquaresRgb,- IsPreSelected = x.IsPreSelected,- DisplayOrder = x.DisplayOrder- }),- Total = values.Count- };- return Json(gridModel);- }-- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> ValueCreatePopup(string contactAttributeId)- {- var contactAttribute = await _contactAttributeService.GetContactAttributeById(contactAttributeId);- if (contactAttribute == null || !contactAttribute.AccessToEntityByStore(CurrentStoreId))- return RedirectToAction("List");-- var model = _contactAttributeViewModelService.PrepareContactAttributeValueModel(contactAttribute);- await AddLocales(_languageService, model.Locales);- return View(model);- }-- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> ValueCreatePopup(ContactAttributeValueModel model)- {- var contactAttribute = await _contactAttributeService.GetContactAttributeById(model.ContactAttributeId);- if (contactAttribute == null || !contactAttribute.AccessToEntityByStore(CurrentStoreId))- return RedirectToAction("List");-- if (ModelState.IsValid)- {- await _contactAttributeViewModelService.InsertContactAttributeValueModel(contactAttribute, model);- return Content("");- }-- return View(model);- }-- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> ValueEditPopup(string id, string contactAttributeId)- {- var contactAttribute = await _contactAttributeService.GetContactAttributeById(contactAttributeId);- if (contactAttribute == null || !contactAttribute.AccessToEntityByStore(CurrentStoreId))- return RedirectToAction("List");-- var cav = contactAttribute.ContactAttributeValues.FirstOrDefault(x => x.Id == id);- if (cav == null)- return RedirectToAction("List");-- var model = _contactAttributeViewModelService.PrepareContactAttributeValueModel(contactAttribute, cav);- await AddLocales(_languageService, model.Locales, (locale, languageId) =>- {- locale.Name = cav.GetTranslation(x => x.Name, languageId, false);- });-- return View(model);- }-- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> ValueEditPopup(ContactAttributeValueModel model)- {- var contactAttribute = await _contactAttributeService.GetContactAttributeById(model.ContactAttributeId);- if (contactAttribute == null || !contactAttribute.AccessToEntityByStore(CurrentStoreId))- return RedirectToAction("List");-- var cav = contactAttribute.ContactAttributeValues.FirstOrDefault(x => x.Id == model.Id);- if (cav == null)- return RedirectToAction("List");-- if (ModelState.IsValid)- {- await _contactAttributeViewModelService.UpdateContactAttributeValueModel(contactAttribute, cav, model);- return Content("");- }-- return View(model);- }-- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> ValueDelete(string id, string contactAttributeId)- {- var contactAttribute = await _contactAttributeService.GetContactAttributeById(contactAttributeId);- if (contactAttribute == null || !contactAttribute.AccessToEntityByStore(CurrentStoreId))- return new JsonResult(new DataSourceResult { Errors = "Access denied" });-- var cav = contactAttribute.ContactAttributeValues.FirstOrDefault(x => x.Id == id);- if (cav == null)- throw new ArgumentException("No contact attribute value found with the specified id");-- if (ModelState.IsValid)- {- contactAttribute.ContactAttributeValues.Remove(cav);- await _contactAttributeService.UpdateContactAttribute(contactAttribute);- return new JsonResult("");- }-- return ErrorForKendoGridJson(ModelState);- }-- #endregion-}+// Reduced to a thin subclass of BaseContactAttributeController (ARCH-001 ContactAttribute consolidation). All+// regions of behavior live in the shared base; this class only supplies Store's DI wiring and the attributes+// that used to arrive transitively via BaseStoreController. Same pattern as ProductController (see that file).+[AutoValidateAntiforgeryToken]+[Area(Constants.AreaStore)]+[AuthorizeStore]+[AuthorizeMenu]+public class ContactAttributeController(+ IContactAttributeViewModelService contactAttributeViewModelService,+ IContactAttributeService contactAttributeService,+ ILanguageService languageService,+ ITranslationService translationService,+ IAdminDataScope<ContactAttribute> scope)+ : BaseContactAttributeController(contactAttributeViewModelService, contactAttributeService,+ languageService, translationService, scope);diff --git a/src/Web/Grand.Web.Store/Controllers/CustomerAttributeController.cs b/src/Web/Grand.Web.Store/Controllers/CustomerAttributeController.csindex b93bc625a..b305047c3 100644--- a/src/Web/Grand.Web.Store/Controllers/CustomerAttributeController.cs+++ b/src/Web/Grand.Web.Store/Controllers/CustomerAttributeController.cs@@ -1,294 +1,34 @@-using Grand.Business.Core.Extensions;using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Business.Core.Interfaces.Customers;using Grand.Domain.Customers;using Grand.Domain.Permissions;-using Grand.Infrastructure;-using Grand.Infrastructure.Mapper;-using Grand.Web.AdminShared.Extensions;+using Grand.Web.AdminShared.Controllers;using Grand.Web.AdminShared.Interfaces;using Grand.Web.AdminShared.Models.Customers;-using Grand.Web.Store.Models.Customers;-using Grand.Web.Common.DataSource;using Grand.Web.Common.Filters;+using Grand.Web.Common.Localization;using Grand.Web.Common.Security.Authorization;+using Grand.Web.Store.Extensions;using Microsoft.AspNetCore.Mvc;namespace Grand.Web.Store.Controllers;+[AutoValidateAntiforgeryToken]+[Area(Constants.AreaStore)]+[AuthorizeStore]+[AuthorizeMenu][PermissionAuthorize(PermissionSystemName.CustomerAttributes)]-public class CustomerAttributeController : BaseStoreController+public class CustomerAttributeController(+ ICustomerAttributeService customerAttributeService,+ ICustomerAttributeViewModelService customerAttributeViewModelService,+ ILanguageService languageService,+ ITranslationService translationService,+ IAdminDataScope<CustomerAttribute> scope)+ : BaseCustomerAttributeController(customerAttributeService, customerAttributeViewModelService,+ languageService, translationService, scope){- private readonly ICustomerAttributeViewModelService _customerAttributeViewModelService;- private readonly ICustomerAttributeService _customerAttributeService;- private readonly ILanguageService _languageService;- private readonly ITranslationService _translationService;- private readonly IContextAccessor _contextAccessor;-- public CustomerAttributeController(- ICustomerAttributeViewModelService customerAttributeViewModelService,- ICustomerAttributeService customerAttributeService,- ILanguageService languageService,- ITranslationService translationService,- IContextAccessor contextAccessor)- {- _customerAttributeViewModelService = customerAttributeViewModelService;- _customerAttributeService = customerAttributeService;- _languageService = languageService;- _translationService = translationService;- _contextAccessor = contextAccessor;- }-- private string CurrentStoreId => _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId;-- private bool IsVisibleToStore(CustomerAttribute attr) =>- !attr.LimitedToStores || attr.Stores.Contains(CurrentStoreId);-- #region Customer attributes-- public IActionResult Index()- {- return RedirectToAction("List");- }-- public IActionResult List()- {- return View();- }-- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.List)]- public async Task<IActionResult> List(DataSourceRequest command)- {- var storeId = CurrentStoreId;- var customerAttributes = (await _customerAttributeViewModelService.PrepareCustomerAttributes())- .Where(x => x.Stores == null || x.Stores.Length == 0 || x.Stores.Contains(storeId))- .ToList();- var gridModel = new DataSourceResult {- Data = customerAttributes.Select(x => new {- x.Id,- x.Name,- x.AttributeControlTypeName,- x.IsRequired,- x.DisplayOrder,- IsGlobalAttribute = !(x.Stores is { Length: 1 } && x.Stores.Contains(storeId))- }).ToList(),- Total = customerAttributes.Count- };- return Json(gridModel);- }-- [PermissionAuthorizeAction(PermissionActionName.Create)]- public async Task<IActionResult> Create()- {- var model = new CustomerAttributeStoreModel();- await AddLocales(_languageService, model.Locales);- return View(model);- }-- [HttpPost]- [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]- [PermissionAuthorizeAction(PermissionActionName.Create)]- public async Task<IActionResult> Create(CustomerAttributeStoreModel model, bool continueEditing)- {- if (ModelState.IsValid)- {- model.Stores = [CurrentStoreId];- var customerAttribute = await _customerAttributeViewModelService.InsertCustomerAttributeModel(model);- Success(_translationService.GetResource("Admin.Customers.CustomerAttributes.Added"));- return continueEditing- ? RedirectToAction("Edit", new { id = customerAttribute.Id })- : RedirectToAction("List");- }-- return View(model);- }-- [PermissionAuthorizeAction(PermissionActionName.Preview)]- public async Task<IActionResult> Edit(string id)- {- var customerAttribute = await _customerAttributeService.GetCustomerAttributeById(id);- if (customerAttribute == null || !IsVisibleToStore(customerAttribute))- return RedirectToAction("List");-- var model = customerAttribute.MapTo<CustomerAttribute, CustomerAttributeStoreModel>();- model.IsGlobalAttribute = !customerAttribute.AccessToEntityByStore(CurrentStoreId);- await AddLocales(_languageService, model.Locales, (locale, languageId) =>- {- locale.Name = customerAttribute.GetTranslation(x => x.Name, languageId, false);- });-- return View(model);- }-- [HttpPost]- [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> Edit(CustomerAttributeModel model, bool continueEditing)- {- var customerAttribute = await _customerAttributeService.GetCustomerAttributeById(model.Id);- if (customerAttribute == null)- return RedirectToAction("List");-- if (!customerAttribute.AccessToEntityByStore(CurrentStoreId))- return RedirectToAction("List");-- if (ModelState.IsValid)- {- model.Stores = [CurrentStoreId];- customerAttribute =- await _customerAttributeViewModelService.UpdateCustomerAttributeModel(model, customerAttribute);- Success(_translationService.GetResource("Admin.Customers.CustomerAttributes.Updated"));- if (continueEditing)- {- await SaveSelectedTabIndex();- return RedirectToAction("Edit", new { id = customerAttribute.Id });- }-- return RedirectToAction("List");- }-- var storeModel = customerAttribute.MapTo<CustomerAttribute, CustomerAttributeStoreModel>();- storeModel.IsGlobalAttribute = false;- await AddLocales(_languageService, storeModel.Locales, (locale, languageId) =>- {- locale.Name = customerAttribute.GetTranslation(x => x.Name, languageId, false);- });- return View(storeModel);- }-- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Delete)]- public async Task<IActionResult> Delete(string id)- {- var customerAttribute = await _customerAttributeService.GetCustomerAttributeById(id);- if (customerAttribute == null)- return RedirectToAction("List");-- if (!customerAttribute.AccessToEntityByStore(CurrentStoreId))- return RedirectToAction("Edit", new { id });-- if (ModelState.IsValid)- {- await _customerAttributeViewModelService.DeleteCustomerAttribute(id);- Success(_translationService.GetResource("Admin.Customers.CustomerAttributes.Deleted"));- return RedirectToAction("List");- }-- Error(ModelState);- return RedirectToAction("Edit", new { id });- }-- #endregion-- #region Customer attribute values-- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Preview)]- public async Task<IActionResult> ValueList(string customerAttributeId, DataSourceRequest command)- {- var customerAttribute = await _customerAttributeService.GetCustomerAttributeById(customerAttributeId);- if (customerAttribute == null || !IsVisibleToStore(customerAttribute))- return new JsonResult(new DataSourceResult { Errors = "Access denied" });-- var values = await _customerAttributeViewModelService.PrepareCustomerAttributeValues(customerAttributeId);- var gridModel = new DataSourceResult {- Data = values.ToList(),- Total = values.Count()- };- return Json(gridModel);- }-[PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> ValueCreatePopup(string customerAttributeId)- {- var customerAttribute = await _customerAttributeService.GetCustomerAttributeById(customerAttributeId);- if (customerAttribute == null || !customerAttribute.AccessToEntityByStore(CurrentStoreId))- return RedirectToAction("List");-- var model = _customerAttributeViewModelService.PrepareCustomerAttributeValueModel(customerAttributeId);- await AddLocales(_languageService, model.Locales);- return View(model);- }-- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> ValueCreatePopup(CustomerAttributeValueModel model)- {- var customerAttribute = await _customerAttributeService.GetCustomerAttributeById(model.CustomerAttributeId);- if (customerAttribute == null || !customerAttribute.AccessToEntityByStore(CurrentStoreId))- return RedirectToAction("List");-- if (ModelState.IsValid)- {- await _customerAttributeViewModelService.InsertCustomerAttributeValueModel(model);- return Content("");- }-- return View(model);- }-- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> ValueEditPopup(string id, string customerAttributeId)- {- var customerAttribute = await _customerAttributeService.GetCustomerAttributeById(customerAttributeId);- if (customerAttribute == null || !customerAttribute.AccessToEntityByStore(CurrentStoreId))- return RedirectToAction("List");-- var cav = customerAttribute.CustomerAttributeValues.FirstOrDefault(x => x.Id == id);- if (cav == null)- return RedirectToAction("List");-- var model = _customerAttributeViewModelService.PrepareCustomerAttributeValueModel(cav);- await AddLocales(_languageService, model.Locales, (locale, languageId) =>- {- locale.Name = cav.GetTranslation(x => x.Name, languageId, false);- });-- return View(model);- }-- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> ValueEditPopup(CustomerAttributeValueModel model)- {- var customerAttribute = await _customerAttributeService.GetCustomerAttributeById(model.CustomerAttributeId);- if (customerAttribute == null || !customerAttribute.AccessToEntityByStore(CurrentStoreId))- return RedirectToAction("List");-- var cav = customerAttribute.CustomerAttributeValues.FirstOrDefault(x => x.Id == model.Id);- if (cav == null)- return RedirectToAction("List");-- if (ModelState.IsValid)- {- await _customerAttributeViewModelService.UpdateCustomerAttributeValueModel(model, cav);- return Content("");- }-- return View(model);- }-- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> ValueDelete(CustomerAttributeValueModel model)- {- var customerAttribute = await _customerAttributeService.GetCustomerAttributeById(model.CustomerAttributeId);- if (customerAttribute == null || !customerAttribute.AccessToEntityByStore(CurrentStoreId))- return new JsonResult(new DataSourceResult { Errors = "Access denied" });-- if (customerAttribute.CustomerAttributeValues.All(x => x.Id != model.Id))- return new JsonResult(new DataSourceResult- { Errors = "No customer attribute value found with the specified id" });-- if (ModelState.IsValid)- {- await _customerAttributeViewModelService.DeleteCustomerAttributeValue(model);- return new JsonResult("");- }-- return ErrorForKendoGridJson(ModelState);- }-- #endregion+ public override async Task<IActionResult> ValueEditPopup(string id, string customerAttributeId) =>+ await base.ValueEditPopup(id, customerAttributeId);}+diff --git a/src/Web/Grand.Web.Store/Controllers/ProductAttributeController.cs b/src/Web/Grand.Web.Store/Controllers/ProductAttributeController.csindex c12259ede..874330631 100644--- a/src/Web/Grand.Web.Store/Controllers/ProductAttributeController.cs+++ b/src/Web/Grand.Web.Store/Controllers/ProductAttributeController.cs@@ -1,413 +1,31 @@-using Grand.Business.Core.Extensions;-using Grand.Business.Core.Interfaces.Catalog.Products;+using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Domain.Catalog;-using Grand.Domain.Permissions;using Grand.Domain.Seo;-using Grand.Infrastructure;-using Grand.Web.AdminShared.Extensions;-using Grand.Web.AdminShared.Extensions.Mapping;-using Grand.Web.AdminShared.Models.Catalog;-using Grand.Web.Common.DataSource;+using Grand.Web.AdminShared.Controllers;+using Grand.Web.AdminShared.Interfaces;using Grand.Web.Common.Filters;-using Grand.Web.Common.Security.Authorization;+using Grand.Web.Store.Extensions;using Microsoft.AspNetCore.Mvc;namespace Grand.Web.Store.Controllers;-[PermissionAuthorize(PermissionSystemName.ProductAttributes)]-public class ProductAttributeController : BaseStoreController-{- #region Constructors-- public ProductAttributeController(- IProductService productService,- IProductAttributeService productAttributeService,- ILanguageService languageService,- ITranslationService translationService,- IContextAccessor contextAccessor,- SeoSettings seoSettings)- {- _productService = productService;- _productAttributeService = productAttributeService;- _languageService = languageService;- _translationService = translationService;- _contextAccessor = contextAccessor;- _seoSettings = seoSettings;- }-- #endregion-- #region Fields-- private readonly IProductService _productService;- private readonly IProductAttributeService _productAttributeService;- private readonly ILanguageService _languageService;- private readonly ITranslationService _translationService;- private readonly IContextAccessor _contextAccessor;- private readonly SeoSettings _seoSettings;-- #endregion Fields-- #region Helper Methods-- /// <summary>- /// Checks access permissions for a product attribute and handles warnings- /// </summary>- /// <param name="productAttribute">Product attribute to check</param>- /// <returns>True if access is allowed, false if access should be denied</returns>- private bool CheckAccessPermission(ProductAttribute productAttribute)- {- if (productAttribute == null)- return false;-- if (!productAttribute.LimitedToStores || (productAttribute.LimitedToStores &&- productAttribute.Stores.Contains(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId) &&- productAttribute.Stores.Count > 1))- {- Warning(_translationService.GetResource("admin.Catalog.attributes.productattributes.permissions"));- return true;- }-- return productAttribute.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId);- }-- #endregion-- #region Methods-- #region Attribute list / create / edit / delete-- //list- public IActionResult Index()- {- return RedirectToAction("List");- }-- public IActionResult List()- {- return View();- }-- [PermissionAuthorizeAction(PermissionActionName.List)]- [HttpPost]- public async Task<IActionResult> List(DataSourceRequest command)- {- var productAttributes = await _productAttributeService- .GetAllProductAttributes(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId, command.Page - 1, command.PageSize);- var gridModel = new DataSourceResult {- Data = productAttributes.Select(x => x.ToModel()),- Total = productAttributes.TotalCount- };-- return Json(gridModel);- }-- //create- [PermissionAuthorizeAction(PermissionActionName.Create)]- public async Task<IActionResult> Create()- {- var model = new ProductAttributeModel();- //locales- await AddLocales(_languageService, model.Locales);- return View(model);- }-- [PermissionAuthorizeAction(PermissionActionName.Create)]- [HttpPost]- [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]- public async Task<IActionResult> Create(ProductAttributeModel model, bool continueEditing)- {- if (ModelState.IsValid)- {- model.Stores = [_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId];-- var productAttribute = model.ToEntity();- productAttribute.SeName = SeoExtensions.GetSeName(- string.IsNullOrEmpty(productAttribute.SeName) ? productAttribute.Name : productAttribute.SeName,- _seoSettings.ConvertNonWesternChars, _seoSettings.AllowUnicodeCharsInUrls,- _seoSettings.SeoCharConversion);-- await _productAttributeService.InsertProductAttribute(productAttribute);-- Success(_translationService.GetResource("Admin.Catalog.Attributes.ProductAttributes.Added"));- return continueEditing- ? RedirectToAction("Edit", new { id = productAttribute.Id })- : RedirectToAction("List");- }-- //If we got this far, something failed, redisplay form- return View(model);- }-- //edit- [PermissionAuthorizeAction(PermissionActionName.Preview)]- public async Task<IActionResult> Edit(string id)- {- var productAttribute = await _productAttributeService.GetProductAttributeById(id);- if (productAttribute == null)- //No product attribute found with the specified id- return RedirectToAction("List");-- if (!CheckAccessPermission(productAttribute))- return RedirectToAction("List");-- var model = productAttribute.ToModel();- //locales- await AddLocales(_languageService, model.Locales, (locale, languageId) =>- {- locale.Name = productAttribute.GetTranslation(x => x.Name, languageId, false);- locale.Description = productAttribute.GetTranslation(x => x.Description, languageId, false);- });-- return View(model);- }-- [PermissionAuthorizeAction(PermissionActionName.Edit)]- [HttpPost]- [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]- public async Task<IActionResult> Edit(ProductAttributeModel model, bool continueEditing)- {- var productAttribute = await _productAttributeService.GetProductAttributeById(model.Id);- if (productAttribute == null)- //No product attribute found with the specified id- return RedirectToAction("List");-- if (!productAttribute.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))- return RedirectToAction("Edit", new { id = productAttribute.Id });-- if (ModelState.IsValid)- {- model.Stores = [_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId];- productAttribute = model.ToEntity(productAttribute);- productAttribute.SeName = SeoExtensions.GetSeName(- string.IsNullOrEmpty(productAttribute.SeName) ? productAttribute.Name : productAttribute.SeName,- _seoSettings.ConvertNonWesternChars, _seoSettings.AllowUnicodeCharsInUrls,- _seoSettings.SeoCharConversion);-- await _productAttributeService.UpdateProductAttribute(productAttribute);-- Success(_translationService.GetResource("Admin.Catalog.Attributes.ProductAttributes.Updated"));- if (continueEditing)- {- //selected tab- await SaveSelectedTabIndex();-- return RedirectToAction("Edit", new { id = productAttribute.Id });- }-- return RedirectToAction("List");- }-- //If we got this far, something failed, redisplay form- // locales- await AddLocales(_languageService, model.Locales, (locale, languageId) =>- {- locale.Name = productAttribute.GetTranslation(x => x.Name, languageId, false);- locale.Description = productAttribute.GetTranslation(x => x.Description, languageId, false);- });-- return View(model);- }-- //delete- [PermissionAuthorizeAction(PermissionActionName.Delete)]- [HttpPost]- public async Task<IActionResult> Delete(string id)- {- var productAttribute = await _productAttributeService.GetProductAttributeById(id);- if (productAttribute == null)- //No product attribute found with the specified id- return RedirectToAction("List");-- if (!productAttribute.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))- return RedirectToAction("List");-- if (ModelState.IsValid)- {- await _productAttributeService.DeleteProductAttribute(productAttribute);- Success(_translationService.GetResource("Admin.Catalog.Attributes.ProductAttributes.Deleted"));- return RedirectToAction("List");- }-- Error(ModelState);- return RedirectToAction("Edit", new { id = productAttribute.Id });- }-- #endregion-- #region Used by products-- //used by products- [PermissionAuthorizeAction(PermissionActionName.Preview)]- [HttpPost]- public async Task<IActionResult> UsedByProducts(DataSourceRequest command, string productAttributeId)- {- var productAttribute = await _productAttributeService.GetProductAttributeById(productAttributeId);-- if (!CheckAccessPermission(productAttribute))- return RedirectToAction("List");-- var orders = await _productService.GetProductsByProductAttributeId(- productAttributeId,- _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId,- command.Page - 1,- command.PageSize);-- var gridModel = new DataSourceResult {- Data = orders.Select(x => new ProductAttributeModel.UsedByProductModel {- Id = x.Id,- ProductName = x.Name,- Published = x.Published- }),- Total = orders.TotalCount- };- return Json(gridModel);- }-- #endregion-- #region Predefined values-- [PermissionAuthorizeAction(PermissionActionName.Preview)]- [HttpPost]- public async Task<IActionResult> PredefinedProductAttributeValueList(string productAttributeId,- DataSourceRequest command)- {- var productAttribute = await _productAttributeService.GetProductAttributeById(productAttributeId);-- if (!CheckAccessPermission(productAttribute))- return View("AccessDenied", _translationService.GetResource("admin.Catalog.attributes.productattributes.permissions"));-- var values = productAttribute.PredefinedProductAttributeValues;- var gridModel = new DataSourceResult {- Data = values.Select(x => x.ToModel()),- Total = values.Count- };-- return Json(gridModel);- }-- //create- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> PredefinedProductAttributeValueCreatePopup(string productAttributeId)- {- var productAttribute = await _productAttributeService.GetProductAttributeById(productAttributeId);- if (productAttribute == null)- throw new ArgumentException("No product attribute found with the specified id");-- if (!productAttribute.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))- return View("AccessDenied", _translationService.GetResource("admin.Catalog.attributes.productattributes.permissions"));-- var model = new PredefinedProductAttributeValueModel {- ProductAttributeId = productAttributeId- };-- //locales- await AddLocales(_languageService, model.Locales);-- return View(model);- }-- [PermissionAuthorizeAction(PermissionActionName.Edit)]- [HttpPost]- public async Task<IActionResult> PredefinedProductAttributeValueCreatePopup(- PredefinedProductAttributeValueModel model)- {- var productAttribute = await _productAttributeService.GetProductAttributeById(model.ProductAttributeId);- if (productAttribute == null)- throw new ArgumentException("No product attribute found with the specified id");-- if (!productAttribute.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))- return View("AccessDenied", _translationService.GetResource("admin.Catalog.attributes.productattributes.permissions"));-- if (ModelState.IsValid)- {- var ppav = model.ToEntity();- productAttribute.PredefinedProductAttributeValues.Add(ppav);- await _productAttributeService.UpdateProductAttribute(productAttribute);- return Content("");- }-- //If we got this far, something failed, redisplay form- return View(model);- }-- //edit- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> PredefinedProductAttributeValueEditPopup(string id, string productAttributeId)- {- var productAttribute = await _productAttributeService.GetProductAttributeById(productAttributeId);-- if (!CheckAccessPermission(productAttribute))- return View("AccessDenied", _translationService.GetResource("admin.Catalog.attributes.productattributes.permissions"));-- var ppav = productAttribute.PredefinedProductAttributeValues.FirstOrDefault(x => x.Id == id);- if (ppav == null)- throw new ArgumentException("No product attribute value found with the specified id");-- var model = ppav.ToModel();- //locales- await AddLocales(_languageService, model.Locales, (locale, languageId) =>- {- locale.Name = ppav.GetTranslation(x => x.Name, languageId, false);- });- return View(model);- }-- [PermissionAuthorizeAction(PermissionActionName.Edit)]- [HttpPost]- public async Task<IActionResult> PredefinedProductAttributeValueEditPopup(- PredefinedProductAttributeValueModel model)- {- var productAttribute = await _productAttributeService.GetProductAttributeById(model.ProductAttributeId);-- if (!productAttribute.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))- return View("AccessDenied", _translationService.GetResource("admin.Catalog.attributes.productattributes.permissions"));-- var ppav = productAttribute.PredefinedProductAttributeValues.FirstOrDefault(x => x.Id == model.Id);- if (ppav == null)- throw new ArgumentException("No product attribute value found with the specified id");-- if (ModelState.IsValid)- {- ppav = model.ToEntity(ppav);- await _productAttributeService.UpdateProductAttribute(productAttribute);- return Content("");- }-- //If we got this far, something failed, redisplay form- return View(model);- }-- //delete- [PermissionAuthorizeAction(PermissionActionName.Edit)]- [HttpPost]- public async Task<IActionResult> PredefinedProductAttributeValueDelete(string id)- {- var productAttributes = await _productAttributeService.GetAllProductAttributes(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId);- var productAttribute = productAttributes.FirstOrDefault(x => x.PredefinedProductAttributeValues.Any(p => p.Id == id));-- if (productAttribute == null)- throw new ArgumentException("No product attribute found with the specified id");-- if (!productAttribute.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))- return View("AccessDenied", _translationService.GetResource("admin.Catalog.attributes.productattributes.permissions"));-- if (ModelState.IsValid)- {- var ppav = productAttribute.PredefinedProductAttributeValues.FirstOrDefault(x => x.Id == id);- if (ppav == null)- throw new ArgumentException("No predefined product attribute value found with the specified id");- productAttribute.PredefinedProductAttributeValues.Remove(ppav);- await _productAttributeService.UpdateProductAttribute(productAttribute);- return new JsonResult("");- }-- return ErrorForKendoGridJson(ModelState);- }-- #endregion-- #endregion-}\ No newline at end of file+// Reduced to a thin subclass of BaseProductAttributeController (ARCH-001 ProductAttribute consolidation). All+// regions of behavior live in the shared base; this class only supplies Store's DI wiring plus the+// attributes that used to arrive transitively via BaseStoreController - BaseProductAttributeController+// 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.+[AuthorizeStore]+[AutoValidateAntiforgeryToken]+[Area(Constants.AreaStore)]+[AuthorizeMenu]+public class ProductAttributeController(+ IProductService productService,+ IProductAttributeService productAttributeService,+ ILanguageService languageService,+ ITranslationService translationService,+ SeoSettings seoSettings,+ IAdminDataScope<ProductAttribute> scope)+ : BaseProductAttributeController(productService, productAttributeService, languageService,+ translationService, seoSettings, scope);\ No newline at end of filediff --git a/src/Web/Grand.Web.Store/Controllers/SpecificationAttributeController.cs b/src/Web/Grand.Web.Store/Controllers/SpecificationAttributeController.csindex 6f619571d..007002174 100644--- a/src/Web/Grand.Web.Store/Controllers/SpecificationAttributeController.cs+++ b/src/Web/Grand.Web.Store/Controllers/SpecificationAttributeController.cs@@ -1,455 +1,27 @@-using Grand.Business.Core.Extensions;-using Grand.Business.Core.Interfaces.Catalog.Products;+using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Domain.Catalog;using Grand.Domain.Permissions;using Grand.Domain.Seo;-using Grand.Infrastructure;-using Grand.Web.AdminShared.Extensions;-using Grand.Web.AdminShared.Extensions.Mapping;-using Grand.Web.AdminShared.Models.Catalog;-using Grand.Web.Common.DataSource;+using Grand.Web.AdminShared.Controllers;+using Grand.Web.AdminShared.Interfaces;using Grand.Web.Common.Filters;using Grand.Web.Common.Security.Authorization;-using Grand.Web.Store.Controllers;+using Grand.Web.Store.Extensions;using Microsoft.AspNetCore.Mvc;-namespace Grand.Web.Admin.Controllers;--[PermissionAuthorize(PermissionSystemName.SpecificationAttributes)]-public class SpecificationAttributeController : BaseStoreController-{-- #region Fields-- private readonly ISpecificationAttributeService _specificationAttributeService;- private readonly IProductService _productService;- private readonly ILanguageService _languageService;- private readonly ITranslationService _translationService;- private readonly IContextAccessor _contextAccessor;- private readonly SeoSettings _seoSettings;-- #endregion Fields-- #region Constructors-- public SpecificationAttributeController(- ISpecificationAttributeService specificationAttributeService,- ILanguageService languageService,- ITranslationService translationService,- IContextAccessor contextAccessor,- IProductService productService,- SeoSettings seoSettings)- {- _specificationAttributeService = specificationAttributeService;- _languageService = languageService;- _translationService = translationService;- _contextAccessor = contextAccessor;- _productService = productService;- _seoSettings = seoSettings;- }-- #endregion-- #region Used by products-- //used by products- [PermissionAuthorizeAction(PermissionActionName.Preview)]- [HttpPost]- public async Task<IActionResult> UsedByProducts(DataSourceRequest command, string specificationAttributeId)- {- var specification = await _specificationAttributeService.GetSpecificationAttributeById(specificationAttributeId);- if (specification == null)- throw new ArgumentException("No specification found with the specified id");-- if (!CheckAccessPermission(specification))- return RedirectToAction("List");-- var searchStoreId = _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId;-- var specificationProducts = new List<SpecificationAttributeModel.UsedByProductModel>();- var total = 0;-- var searchspecificationOptions = specification.SpecificationAttributeOptions.Select(x => x.Id).ToList();- if (searchspecificationOptions.Any())- {- var products = (await _productService.SearchProducts(- storeId: searchStoreId,- specificationOptions: searchspecificationOptions,- pageIndex: command.Page - 1,- pageSize: command.PageSize,- showHidden: true- )).products;-- total = products.TotalCount;-- foreach (var item in products)- {- var specOption = item.ProductSpecificationAttributes.FirstOrDefault(x => x.SpecificationAttributeId == specificationAttributeId);- specificationProducts.Add(new SpecificationAttributeModel.UsedByProductModel {- Id = item.Id,- ProductName = item.Name,- OptionName = specification.SpecificationAttributeOptions- .FirstOrDefault(x => x.Id == specOption?.SpecificationAttributeOptionId)?.Name,- Published = item.Published- });- }- }-- var gridModel = new DataSourceResult {- Data = specificationProducts,- Total = total- };- return Json(gridModel);- }-- #endregion-- #region Helper Methods-- /// <summary>- /// Checks access permissions for a specification attribute and handles warnings- /// </summary>- /// <param name="specificationAttribute"></param>- /// <returns>True if access is allowed, false if access should be denied</returns>- private bool CheckAccessPermission(SpecificationAttribute specificationAttribute)- {- if (specificationAttribute == null)- return false;-- if (!specificationAttribute.LimitedToStores || (specificationAttribute.LimitedToStores &&- specificationAttribute.Stores.Contains(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId) &&- specificationAttribute.Stores.Count > 1))- {- Warning(_translationService.GetResource("admin.catalog.attributes.specificationattributes.permissions"));- return true;- }-- return specificationAttribute.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId);- }-- #endregion-- #region Specification attributes-- //list- public IActionResult Index()- {- return RedirectToAction("List");- }-- public IActionResult List()- {- return View();- }-- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.List)]- public async Task<IActionResult> List(DataSourceRequest command)- {- var specificationAttributes = await _specificationAttributeService- .GetSpecificationAttributes(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId, command.Page - 1, command.PageSize);- var gridModel = new DataSourceResult {- Data = specificationAttributes.Select(x => x.ToModel()),- Total = specificationAttributes.TotalCount- };-- return Json(gridModel);- }-- //create- [PermissionAuthorizeAction(PermissionActionName.Create)]- public async Task<IActionResult> Create()- {- var model = new SpecificationAttributeModel();- //locales- await AddLocales(_languageService, model.Locales);-- return View(model);- }-- [HttpPost]- [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]- [PermissionAuthorizeAction(PermissionActionName.Create)]- public async Task<IActionResult> Create(SpecificationAttributeModel model, bool continueEditing)- {- if (ModelState.IsValid)- {- model.Stores = [_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId];-- var specificationAttribute = model.ToEntity();- specificationAttribute.SeName = SeoExtensions.GetSeName(- string.IsNullOrEmpty(specificationAttribute.SeName)- ? specificationAttribute.Name- : specificationAttribute.SeName, _seoSettings.ConvertNonWesternChars,- _seoSettings.AllowUnicodeCharsInUrls, _seoSettings.SeoCharConversion);-- await _specificationAttributeService.InsertSpecificationAttribute(specificationAttribute);-- Success(_translationService.GetResource("Admin.Catalog.Attributes.SpecificationAttributes.Added"));- return continueEditing- ? RedirectToAction("Edit", new { id = specificationAttribute.Id })- : RedirectToAction("List");- }-- //If we got this far, something failed, redisplay form- return View(model);- }-- //edit- [PermissionAuthorizeAction(PermissionActionName.Preview)]- public async Task<IActionResult> Edit(string id)- {- var specificationAttribute = await _specificationAttributeService.GetSpecificationAttributeById(id);- if (specificationAttribute == null)- //No specification attribute found with the specified id- return RedirectToAction("List");-- if (!CheckAccessPermission(specificationAttribute))- return RedirectToAction("List");-- var model = specificationAttribute.ToModel();- //locales- await AddLocales(_languageService, model.Locales, (locale, languageId) =>- {- locale.Name = specificationAttribute.GetTranslation(x => x.Name, languageId, false);- });-- return View(model);- }-- [HttpPost]- [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> Edit(SpecificationAttributeModel model, bool continueEditing)- {- var specificationAttribute = await _specificationAttributeService.GetSpecificationAttributeById(model.Id);- if (specificationAttribute == null)- //No specification attribute found with the specified id- return RedirectToAction("List");-- if (!specificationAttribute.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))- return RedirectToAction("List");-- if (ModelState.IsValid)- {- model.Stores = [_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId];-- specificationAttribute = model.ToEntity(specificationAttribute);- specificationAttribute.SeName = SeoExtensions.GetSeName(- string.IsNullOrEmpty(specificationAttribute.SeName)- ? specificationAttribute.Name- : specificationAttribute.SeName, _seoSettings.ConvertNonWesternChars,- _seoSettings.AllowUnicodeCharsInUrls, _seoSettings.SeoCharConversion);-- await _specificationAttributeService.UpdateSpecificationAttribute(specificationAttribute);-- Success(_translationService.GetResource("Admin.Catalog.Attributes.SpecificationAttributes.Updated"));-- if (continueEditing)- {- //selected tab- await SaveSelectedTabIndex();-- return RedirectToAction("Edit", new { id = specificationAttribute.Id });- }-- return RedirectToAction("List");- }-- //If we got this far, something failed, redisplay form- //locales- await AddLocales(_languageService, model.Locales, (locale, languageId) =>- {- locale.Name = specificationAttribute.GetTranslation(x => x.Name, languageId, false);- });- return View(model);- }-- //delete- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Delete)]- public async Task<IActionResult> Delete(string id)- {- var specificationAttribute = await _specificationAttributeService.GetSpecificationAttributeById(id);- if (specificationAttribute == null)- //No specification attribute found with the specified id- return RedirectToAction("List");-- if (!specificationAttribute.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))- return RedirectToAction("List");-- if (ModelState.IsValid)- {- await _specificationAttributeService.DeleteSpecificationAttribute(specificationAttribute);-- Success(_translationService.GetResource("Admin.Catalog.Attributes.SpecificationAttributes.Deleted"));- return RedirectToAction("List");- }-- Error(ModelState);- return RedirectToAction("Edit", new { id = specificationAttribute.Id });- }-- #endregion-- #region Specification attribute options-- //list- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Preview)]- public async Task<IActionResult> OptionList(string specificationAttributeId, DataSourceRequest command)- {- var specificationAttribute = await _specificationAttributeService.GetSpecificationAttributeById(specificationAttributeId);-- if (!CheckAccessPermission(specificationAttribute))- return Json("");-- var options = specificationAttribute.SpecificationAttributeOptions.OrderBy(x => x.DisplayOrder);-- var gridModel = new DataSourceResult {- Data = options.Select(x =>- {- var model = x.ToModel();- //in order to save performance to do not check whether a product is deleted, etc- model.NumberOfAssociatedProducts = _specificationAttributeService- .GetProductSpecificationAttributeCount("", x.Id);- return model;- }),- Total = options.Count()- };-- return Json(gridModel);- }-- //create- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> OptionCreatePopup(string specificationAttributeId)- {- var model = new SpecificationAttributeOptionModel {- SpecificationAttributeId = specificationAttributeId- };- //locales- await AddLocales(_languageService, model.Locales);- return View(model);- }-- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> OptionCreatePopup(SpecificationAttributeOptionModel model)- {- var specificationAttribute = await _specificationAttributeService.GetSpecificationAttributeById(model.SpecificationAttributeId);- if (specificationAttribute == null)- //No specification attribute found with the specified id- return RedirectToAction("List");-- if (!specificationAttribute.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))- return View("AccessDenied", _translationService.GetResource("admin.catalog.attributes.specificationattributes.permissions"));-- if (ModelState.IsValid)- {- var sao = model.ToEntity();- sao.SeName = SeoExtensions.GetSeName(string.IsNullOrEmpty(sao.SeName) ? sao.Name : sao.SeName,- _seoSettings.ConvertNonWesternChars, _seoSettings.AllowUnicodeCharsInUrls,- _seoSettings.SeoCharConversion);- //clear "Color" values if it's disabled- if (!model.EnableColorSquaresRgb)- sao.ColorSquaresRgb = null;-- specificationAttribute.SpecificationAttributeOptions.Add(sao);- await _specificationAttributeService.UpdateSpecificationAttribute(specificationAttribute);- return Content("");- }-- //If we got this far, something failed, redisplay form- return View(model);- }-- //edit- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> OptionEditPopup(string id)- {- var specificationAttribute = await _specificationAttributeService.GetSpecificationAttributeByOptionId(id);- if (specificationAttribute == null)- //No specification attribute found with the specified id- return RedirectToAction("List");-- var sao = specificationAttribute.SpecificationAttributeOptions.FirstOrDefault(x => x.Id == id);-- if (!CheckAccessPermission(specificationAttribute))- return View("AccessDenied", _translationService.GetResource("admin.catalog.attributes.specificationattributes.permissions"));-- if (sao == null)- //No specification attribute option found with the specified id- return RedirectToAction("List");-- var model = sao.ToModel();- model.EnableColorSquaresRgb = !string.IsNullOrEmpty(sao.ColorSquaresRgb);- //locales- await AddLocales(_languageService, model.Locales, (locale, languageId) =>- {- locale.Name = sao.GetTranslation(x => x.Name, languageId, false);- });-- return View(model);- }-- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> OptionEditPopup(SpecificationAttributeOptionModel model)- {- var specificationAttribute = await _specificationAttributeService.GetSpecificationAttributeByOptionId(model.Id);-- if (!specificationAttribute.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))- return View("AccessDenied", _translationService.GetResource("admin.catalog.attributes.specificationattributes.permissions"));-- var sao = specificationAttribute.SpecificationAttributeOptions.FirstOrDefault(x => x.Id == model.Id);- if (sao == null)- //No specification attribute option found with the specified id- return RedirectToAction("List");-- if (ModelState.IsValid)- {- sao = model.ToEntity(sao);- sao.SeName = SeoExtensions.GetSeName(string.IsNullOrEmpty(sao.SeName) ? sao.Name : sao.SeName,- _seoSettings.ConvertNonWesternChars, _seoSettings.AllowUnicodeCharsInUrls,- _seoSettings.SeoCharConversion);-- //clear "Color" values if it's disabled- if (!model.EnableColorSquaresRgb)- sao.ColorSquaresRgb = null;-- await _specificationAttributeService.UpdateSpecificationAttribute(specificationAttribute);- return Content("");- }-- //If we got this far, something failed, redisplay form- return View(model);- }-- //delete- [HttpPost]- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> OptionDelete(string id)- {- if (ModelState.IsValid)- {- var specificationAttribute = await _specificationAttributeService.GetSpecificationAttributeByOptionId(id);-- if (!specificationAttribute.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))- return View("AccessDenied", _translationService.GetResource("admin.catalog.attributes.specificationattributes.permissions"));-- var sao = specificationAttribute.SpecificationAttributeOptions.FirstOrDefault(x => x.Id == id);- if (sao == null)- throw new ArgumentException("No specification attribute option found with the specified id");-- await _specificationAttributeService.DeleteSpecificationAttributeOption(sao);-- return new JsonResult("");- }-- return ErrorForKendoGridJson(ModelState);- }-- #endregion-}\ No newline at end of file+namespace Grand.Web.Store.Controllers;++[Area(Constants.AreaStore)]+[AuthorizeStore]+[AutoValidateAntiforgeryToken]+[AuthorizeMenu]+public class SpecificationAttributeController(+ ISpecificationAttributeService specificationAttributeService,+ ILanguageService languageService,+ ITranslationService translationService,+ IProductService productService,+ SeoSettings seoSettings,+ IAdminDataScope<SpecificationAttribute> scope)+ : BaseSpecificationAttributeController(specificationAttributeService, languageService,+ translationService, productService, seoSettings, scope);\ No newline at end of filediff --git a/src/Web/Grand.Web.Store/Mapper/AddressAttributeStoreProfile.cs b/src/Web/Grand.Web.Store/Mapper/AddressAttributeStoreProfile.csdeleted file mode 100644index d1ead6dff..000000000--- a/src/Web/Grand.Web.Store/Mapper/AddressAttributeStoreProfile.cs+++ /dev/null@@ -1,19 +0,0 @@-using Grand.Domain.Common;-using Grand.Infrastructure.Mapper;-using Grand.Mapping;-using Grand.Web.Store.Models.Common;--namespace Grand.Web.Store.Mapper;--public class AddressAttributeStoreProfile : Profile, IAutoMapperProfile-{- public AddressAttributeStoreProfile()- {- CreateMap<AddressAttribute, AddressAttributeStoreModel>()- .ForMember(dest => dest.Locales, mo => mo.Ignore())- .ForMember(dest => dest.AttributeControlTypeName, mo => mo.Ignore())- .ForMember(dest => dest.IsGlobalAttribute, mo => mo.Ignore());- }-- public int Order => 0;-}diff --git a/src/Web/Grand.Web.Store/Mapper/ContactAttributeStoreProfile.cs b/src/Web/Grand.Web.Store/Mapper/ContactAttributeStoreProfile.csdeleted file mode 100644index 60271f118..000000000--- a/src/Web/Grand.Web.Store/Mapper/ContactAttributeStoreProfile.cs+++ /dev/null@@ -1,21 +0,0 @@-using Grand.Domain.Messages;-using Grand.Infrastructure.Mapper;-using Grand.Mapping;-using Grand.Web.Store.Models.Messages;--namespace Grand.Web.Store.Mapper;--public class ContactAttributeStoreProfile : Profile, IAutoMapperProfile-{- public ContactAttributeStoreProfile()- {- CreateMap<ContactAttribute, ContactAttributeStoreModel>()- .ForMember(dest => dest.Locales, mo => mo.Ignore())- .ForMember(dest => dest.AttributeControlTypeName, mo => mo.Ignore())- .ForMember(dest => dest.ConditionAllowed, mo => mo.Ignore())- .ForMember(dest => dest.ConditionModel, mo => mo.Ignore())- .ForMember(dest => dest.IsReadOnly, mo => mo.Ignore());- }-- public int Order => 0;-}diff --git a/src/Web/Grand.Web.Store/Mapper/CustomerAttributeStoreProfile.cs b/src/Web/Grand.Web.Store/Mapper/CustomerAttributeStoreProfile.csdeleted file mode 100644index 8300b3e95..000000000--- a/src/Web/Grand.Web.Store/Mapper/CustomerAttributeStoreProfile.cs+++ /dev/null@@ -1,19 +0,0 @@-using Grand.Domain.Customers;-using Grand.Infrastructure.Mapper;-using Grand.Mapping;-using Grand.Web.Store.Models.Customers;--namespace Grand.Web.Store.Mapper;--public class CustomerAttributeStoreProfile : Profile, IAutoMapperProfile-{- public CustomerAttributeStoreProfile()- {- CreateMap<CustomerAttribute, CustomerAttributeStoreModel>()- .ForMember(dest => dest.Locales, mo => mo.Ignore())- .ForMember(dest => dest.AttributeControlTypeName, mo => mo.Ignore())- .ForMember(dest => dest.IsGlobalAttribute, mo => mo.Ignore());- }-- public int Order => 0;-}diff --git a/src/Web/Grand.Web.Store/Models/Common/AddressAttributeStoreModel.cs b/src/Web/Grand.Web.Store/Models/Common/AddressAttributeStoreModel.csdeleted file mode 100644index 67799d7ed..000000000--- a/src/Web/Grand.Web.Store/Models/Common/AddressAttributeStoreModel.cs+++ /dev/null@@ -1,8 +0,0 @@-using Grand.Web.AdminShared.Models.Common;--namespace Grand.Web.Store.Models.Common;--public class AddressAttributeStoreModel : AddressAttributeModel-{- public bool IsGlobalAttribute { get; set; }-}diff --git a/src/Web/Grand.Web.Store/Models/Customers/CustomerAttributeStoreModel.cs b/src/Web/Grand.Web.Store/Models/Customers/CustomerAttributeStoreModel.csdeleted file mode 100644index 5ba547754..000000000--- a/src/Web/Grand.Web.Store/Models/Customers/CustomerAttributeStoreModel.cs+++ /dev/null@@ -1,8 +0,0 @@-using Grand.Web.AdminShared.Models.Customers;--namespace Grand.Web.Store.Models.Customers;--public class CustomerAttributeStoreModel : CustomerAttributeModel-{- public bool IsGlobalAttribute { get; set; }-}diff --git a/src/Web/Grand.Web.Store/Models/Messages/ContactAttributeStoreModel.cs b/src/Web/Grand.Web.Store/Models/Messages/ContactAttributeStoreModel.csdeleted file mode 100644index 3802cd555..000000000--- a/src/Web/Grand.Web.Store/Models/Messages/ContactAttributeStoreModel.cs+++ /dev/null@@ -1,8 +0,0 @@-using Grand.Web.AdminShared.Models.Messages;--namespace Grand.Web.Store.Models.Messages;--public class ContactAttributeStoreModel : ContactAttributeModel-{- public bool IsReadOnly { get; set; }-}diff --git a/src/Web/Grand.Web.Store/Validators/AddressAttributeStoreValidator.cs b/src/Web/Grand.Web.Store/Validators/AddressAttributeStoreValidator.csdeleted file mode 100644index e37cdd198..000000000--- a/src/Web/Grand.Web.Store/Validators/AddressAttributeStoreValidator.cs+++ /dev/null@@ -1,17 +0,0 @@-using FluentValidation;-using Grand.Infrastructure.Validators;-using Grand.Web.AdminShared.Models.Common;-using Grand.Web.Store.Models.Common;--namespace Grand.Web.Store.Validators;--public class AddressAttributeStoreValidator : BaseGrandValidator<AddressAttributeStoreModel>-{- public AddressAttributeStoreValidator(- IEnumerable<IValidatorConsumer<AddressAttributeStoreModel>> validators,- IValidator<AddressAttributeModel> baseValidator)- : base(validators)- {- Include(baseValidator);- }-}diff --git a/src/Web/Grand.Web.Store/Validators/ContactAttributeStoreValidator.cs b/src/Web/Grand.Web.Store/Validators/ContactAttributeStoreValidator.csdeleted file mode 100644index ec15f2f6c..000000000--- a/src/Web/Grand.Web.Store/Validators/ContactAttributeStoreValidator.cs+++ /dev/null@@ -1,17 +0,0 @@-using FluentValidation;-using Grand.Infrastructure.Validators;-using Grand.Web.AdminShared.Models.Messages;-using Grand.Web.Store.Models.Messages;--namespace Grand.Web.Store.Validators;--public class ContactAttributeStoreValidator : BaseGrandValidator<ContactAttributeStoreModel>-{- public ContactAttributeStoreValidator(- IEnumerable<IValidatorConsumer<ContactAttributeStoreModel>> validators,- IValidator<ContactAttributeModel> baseValidator)- : base(validators)- {- Include(baseValidator);- }-}diff --git a/src/Web/Grand.Web.Store/Validators/CustomerAttributeStoreValidator.cs b/src/Web/Grand.Web.Store/Validators/CustomerAttributeStoreValidator.csdeleted file mode 100644index 49dd0d035..000000000--- a/src/Web/Grand.Web.Store/Validators/CustomerAttributeStoreValidator.cs+++ /dev/null@@ -1,17 +0,0 @@-using FluentValidation;-using Grand.Infrastructure.Validators;-using Grand.Web.AdminShared.Models.Customers;-using Grand.Web.Store.Models.Customers;--namespace Grand.Web.Store.Validators;--public class CustomerAttributeStoreValidator : BaseGrandValidator<CustomerAttributeStoreModel>-{- public CustomerAttributeStoreValidator(- IEnumerable<IValidatorConsumer<CustomerAttributeStoreModel>> validators,- IValidator<CustomerAttributeModel> baseValidator)- : base(validators)- {- Include(baseValidator);- }-}