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
Grand.Web.Store - Product attributes/Product specifications per store (#604)
Krzysztof Pajake56b544e9117
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeService.cs b/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeService.csindex ab8f29772..b7a10952d 100644--- a/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeService.cs+++ b/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeService.cs@@ -4,6 +4,7 @@ using Grand.Domain;using Grand.Domain.Catalog;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;+using Grand.Infrastructure.Configuration;using Grand.Infrastructure.Extensions;using MediatR;@@ -42,7 +43,7 @@ public class ProductAttributeService : IProductAttributeServiceprivate readonly IRepository<Product> _productRepository;private readonly IMediator _mediator;private readonly ICacheBase _cacheBase;-+#endregion#region Methods@@ -52,20 +53,31 @@ public class ProductAttributeService : IProductAttributeService/// <summary>/// Gets all product attributes/// </summary>+ /// <param name="storeId">Store ident</param>/// <param name="pageIndex">Page index</param>/// <param name="pageSize">Page size</param>/// <returns>Product attributes</returns>- public virtual async Task<IPagedList<ProductAttribute>> GetAllProductAttributes(int pageIndex = 0,+ public virtual async Task<IPagedList<ProductAttribute>> GetAllProductAttributes(string storeId = "", int pageIndex = 0,int pageSize = int.MaxValue){- var key = string.Format(CacheKey.PRODUCTATTRIBUTES_ALL_KEY, pageIndex, pageSize);+ var key = string.Format(CacheKey.PRODUCTATTRIBUTES_ALL_KEY, storeId, pageIndex, pageSize);return await _cacheBase.GetAsync(key, () =>{var query = from pa in _productAttributeRepository.Table- orderby pa.Nameselect pa;++ if (!string.IsNullOrEmpty(storeId))+ //Limited to stores rules+ query = from p in query+ where !p.LimitedToStores || p.Stores.Contains(storeId)+ select p;++ query = query.OrderBy(pa => pa.Name);+return Task.FromResult(new PagedList<ProductAttribute>(query, pageIndex, pageSize));});++}/// <summary>diff --git a/src/Business/Grand.Business.Catalog/Services/Products/ProductService.cs b/src/Business/Grand.Business.Catalog/Services/Products/ProductService.csindex d321cd1a7..5d611eea8 100644--- a/src/Business/Grand.Business.Catalog/Services/Products/ProductService.cs+++ b/src/Business/Grand.Business.Catalog/Services/Products/ProductService.cs@@ -150,8 +150,8 @@ public class ProductService : IProductServiceint pageSize = int.MaxValue){var query = from c in _productRepository.Table- where c.AppliedDiscounts.Any(x => x == discountId)- select c;+ where c.AppliedDiscounts.Any(x => x == discountId)+ select c;return await PagedList<Product>.Create(query, pageIndex, pageSize);}@@ -422,7 +422,7 @@ public class ProductService : IProductServicecategoryIds.Remove("");var query = from p in _productRepository.Table- select p;+ select p;query = query.Where(p => p.Published && p.VisibleIndividually);@@ -435,15 +435,15 @@ public class ProductService : IProductService//ACL (access control list)var allowedCustomerGroupsIds = customer.GetCustomerGroupIds();query = from p in query- where !p.LimitedToGroups || allowedCustomerGroupsIds.Any(x => p.CustomerGroups.Contains(x))- select p;+ where !p.LimitedToGroups || allowedCustomerGroupsIds.Any(x => p.CustomerGroups.Contains(x))+ select p;}if (!string.IsNullOrEmpty(storeId) && !ignoreStore)//Limited to stores rulesquery = from p in query- where !p.LimitedToStores || p.Stores.Contains(storeId)- select p;+ where !p.LimitedToStores || p.Stores.Contains(storeId)+ select p;return Convert.ToInt32(query.Count());}@@ -561,15 +561,20 @@ public class ProductService : IProductService/// Gets products by product attribute/// </summary>/// <param name="productAttributeId">Product attribute identifier</param>+ /// <param name="storeId">Store ident</param>/// <param name="pageIndex">Page index</param>/// <param name="pageSize">Page size</param>/// <returns>Products</returns>- public virtual async Task<IPagedList<Product>> GetProductsByProductAttributeId(string productAttributeId,+ public virtual async Task<IPagedList<Product>> GetProductsByProductAttributeId(string productAttributeId, string storeId = "",int pageIndex = 0, int pageSize = int.MaxValue){var query = from p in _productRepository.Table- select p;+ select p;query = query.Where(x => x.ProductAttributeMappings.Any(y => y.ProductAttributeId == productAttributeId));++ if (!string.IsNullOrEmpty(storeId))+ query = query.Where(x => x.LimitedToStores || x.Stores.Contains(storeId));+query = query.OrderBy(x => x.Name);return await PagedList<Product>.Create(query, pageIndex, pageSize);@@ -587,7 +592,7 @@ public class ProductService : IProductServicestring storeId = "", string vendorId = "", bool showHidden = false){var query = from p in _productRepository.Table- select p;+ select p;query = query.Where(p => p.ParentGroupedProductId == parentGroupedProductId);diff --git a/src/Business/Grand.Business.Catalog/Services/Products/SpecificationAttributeService.cs b/src/Business/Grand.Business.Catalog/Services/Products/SpecificationAttributeService.csindex 256b0ac09..a185e1a20 100644--- a/src/Business/Grand.Business.Catalog/Services/Products/SpecificationAttributeService.cs+++ b/src/Business/Grand.Business.Catalog/Services/Products/SpecificationAttributeService.cs@@ -4,6 +4,7 @@ using Grand.Domain;using Grand.Domain.Catalog;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;+using Grand.Infrastructure.Configuration;using Grand.Infrastructure.Extensions;using MediatR;@@ -79,15 +80,24 @@ public class SpecificationAttributeService : ISpecificationAttributeService/// <summary>/// Gets specification attributes/// </summary>+ /// <param name="storeId">Store ident</param>/// <param name="pageIndex">Page index</param>/// <param name="pageSize">Page size</param>/// <returns>Specification attributes</returns>- public virtual async Task<IPagedList<SpecificationAttribute>> GetSpecificationAttributes(int pageIndex = 0,+ public virtual async Task<IPagedList<SpecificationAttribute>> GetSpecificationAttributes(string storeId = "", int pageIndex = 0,int pageSize = int.MaxValue){var query = from sa in _specificationAttributeRepository.Table- orderby sa.DisplayOrder- select sa;+ select sa;++ if (!string.IsNullOrEmpty(storeId))+ //Limited to stores rules+ query = from p in query+ where !p.LimitedToStores || p.Stores.Contains(storeId)+ select p;++ query = query.OrderBy(sa => sa.DisplayOrder).ThenBy(sa => sa.Name);+return await PagedList<SpecificationAttribute>.Create(query, pageIndex, pageSize);}diff --git a/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IProductAttributeService.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IProductAttributeService.csindex 7d8ac1bbf..4d5518b24 100644--- a/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IProductAttributeService.cs+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IProductAttributeService.cs@@ -19,10 +19,11 @@ public interface IProductAttributeService/// <summary>/// Gets all product attributes/// </summary>+ /// <param name="storeId">Store ident</param>/// <param name="pageIndex">Page index</param>/// <param name="pageSize">Page size</param>/// <returns>Product attributes</returns>- Task<IPagedList<ProductAttribute>> GetAllProductAttributes(int pageIndex = 0, int pageSize = int.MaxValue);+ Task<IPagedList<ProductAttribute>> GetAllProductAttributes(string storeId = "", int pageIndex = 0, int pageSize = int.MaxValue);/// <summary>/// Gets a product attributediff --git a/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IProductService.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IProductService.csindex 4fa7663af..d76f1c8f1 100644--- a/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IProductService.cs+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IProductService.cs@@ -190,10 +190,11 @@ public interface IProductService/// Gets products by product attribute/// </summary>/// <param name="productAttributeId">Product attribute identifier</param>+ /// <param name="storeId">Store ident</param>/// <param name="pageIndex">Page index</param>/// <param name="pageSize">Page size</param>/// <returns>Products</returns>- Task<IPagedList<Product>> GetProductsByProductAttributeId(string productAttributeId,+ Task<IPagedList<Product>> GetProductsByProductAttributeId(string productAttributeId, string storeId = "",int pageIndex = 0, int pageSize = int.MaxValue);/// <summary>diff --git a/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/ISpecificationAttributeService.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/ISpecificationAttributeService.csindex a7b43632e..ab06990aa 100644--- a/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/ISpecificationAttributeService.cs+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/ISpecificationAttributeService.cs@@ -27,10 +27,11 @@ public interface ISpecificationAttributeService/// <summary>/// Gets specification attributes/// </summary>+ /// <param name="storeId">Store ident</param>/// <param name="pageIndex">Page index</param>/// <param name="pageSize">Page size</param>/// <returns>Specification attributes</returns>- Task<IPagedList<SpecificationAttribute>> GetSpecificationAttributes(int pageIndex = 0, int pageSize = int.MaxValue);+ Task<IPagedList<SpecificationAttribute>> GetSpecificationAttributes(string storeId = "", int pageIndex = 0, int pageSize = int.MaxValue);/// <summary>/// Inserts a specification attributediff --git a/src/Core/Grand.Infrastructure/Caching/Constants/ProductAttributeCacheKey.cs b/src/Core/Grand.Infrastructure/Caching/Constants/ProductAttributeCacheKey.csindex ecfba0699..9a8a07add 100644--- a/src/Core/Grand.Infrastructure/Caching/Constants/ProductAttributeCacheKey.cs+++ b/src/Core/Grand.Infrastructure/Caching/Constants/ProductAttributeCacheKey.cs@@ -6,10 +6,11 @@ public static partial class CacheKey/// Key for caching/// </summary>/// <remarks>- /// {0} : page index- /// {1} : page size+ /// {0} : store ID+ /// {1} : page index+ /// {2} : page size/// </remarks>- public static string PRODUCTATTRIBUTES_ALL_KEY => "Grand.productattribute.all-{0}-{1}";+ public static string PRODUCTATTRIBUTES_ALL_KEY => "Grand.productattribute.all-{0}-{1}-{2}";/// <summary>/// Key for cachingdiff --git a/src/Modules/Grand.Module.Installer/Extensions/PermissionExtensions.cs b/src/Modules/Grand.Module.Installer/Extensions/PermissionExtensions.csindex 9bf265a8a..e4a6d1e4f 100644--- a/src/Modules/Grand.Module.Installer/Extensions/PermissionExtensions.cs+++ b/src/Modules/Grand.Module.Installer/Extensions/PermissionExtensions.cs@@ -199,6 +199,8 @@ public static class PermissionExtensionsPermissions = [StandardPermission.ManageAccessStoreManagerPanel,StandardPermission.ManageProducts,+ StandardPermission.ManageProductAttributes,+ StandardPermission.ManageSpecificationAttributes,StandardPermission.ManageFiles,StandardPermission.ManagePictures,StandardPermission.ManageCategories,diff --git a/src/Web/Grand.Web.Admin/Controllers/ProductAttributeController.cs b/src/Web/Grand.Web.Admin/Controllers/ProductAttributeController.csindex 20263e7ec..93bcf5f4b 100644--- a/src/Web/Grand.Web.Admin/Controllers/ProductAttributeController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/ProductAttributeController.cs@@ -1,6 +1,5 @@using Grand.Business.Core.Extensions;using Grand.Business.Core.Interfaces.Catalog.Products;-using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Domain.Permissions;using Grand.Domain.Seo;@@ -25,7 +24,6 @@ public class ProductAttributeController : BaseAdminControllerILanguageService languageService,ITranslationService translationService,IContextAccessor contextAccessor,- IGroupService groupService,SeoSettings seoSettings){_productService = productService;@@ -33,7 +31,6 @@ public class ProductAttributeController : BaseAdminController_languageService = languageService;_translationService = translationService;_contextAccessor = contextAccessor;- _groupService = groupService;_seoSettings = seoSettings;}@@ -46,7 +43,6 @@ public class ProductAttributeController : BaseAdminControllerprivate readonly ILanguageService _languageService;private readonly ITranslationService _translationService;private readonly IContextAccessor _contextAccessor;- private readonly IGroupService _groupService;private readonly SeoSettings _seoSettings;#endregion Fields@@ -70,8 +66,7 @@ public class ProductAttributeController : BaseAdminController[HttpPost]public async Task<IActionResult> List(DataSourceRequest command){- var productAttributes = await _productAttributeService- .GetAllProductAttributes(command.Page - 1, command.PageSize);+ 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@@ -102,8 +97,6 @@ public class ProductAttributeController : BaseAdminControllerstring.IsNullOrEmpty(productAttribute.SeName) ? productAttribute.Name : productAttribute.SeName,_seoSettings.ConvertNonWesternChars, _seoSettings.AllowUnicodeCharsInUrls,_seoSettings.SeoCharConversion);- if (await _groupService.IsStoreManager(_contextAccessor.WorkContext.CurrentCustomer))- model.Stores = [_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId];await _productAttributeService.InsertProductAttribute(productAttribute);@@ -154,8 +147,7 @@ public class ProductAttributeController : BaseAdminControllerstring.IsNullOrEmpty(productAttribute.SeName) ? productAttribute.Name : productAttribute.SeName,_seoSettings.ConvertNonWesternChars, _seoSettings.AllowUnicodeCharsInUrls,_seoSettings.SeoCharConversion);- if (await _groupService.IsStoreManager(_contextAccessor.WorkContext.CurrentCustomer))- model.Stores = [_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId];+await _productAttributeService.UpdateProductAttribute(productAttribute);Success(_translationService.GetResource("Admin.Catalog.Attributes.ProductAttributes.Updated"));@@ -212,6 +204,7 @@ public class ProductAttributeController : BaseAdminController{var orders = await _productService.GetProductsByProductAttributeId(productAttributeId,+ "",command.Page - 1,command.PageSize);var gridModel = new DataSourceResult {diff --git a/src/Web/Grand.Web.Admin/Controllers/SpecificationAttributeController.cs b/src/Web/Grand.Web.Admin/Controllers/SpecificationAttributeController.csindex fcb7bc88c..e72ef752d 100644--- a/src/Web/Grand.Web.Admin/Controllers/SpecificationAttributeController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/SpecificationAttributeController.cs@@ -1,6 +1,5 @@using Grand.Business.Core.Extensions;using Grand.Business.Core.Interfaces.Catalog.Products;-using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Domain.Permissions;using Grand.Domain.Seo;@@ -24,7 +23,6 @@ public class SpecificationAttributeController : BaseAdminControllerILanguageService languageService,ITranslationService translationService,IContextAccessor contextAccessor,- IGroupService groupService,IProductService productService,SeoSettings seoSettings){@@ -32,7 +30,6 @@ public class SpecificationAttributeController : BaseAdminController_languageService = languageService;_translationService = translationService;_contextAccessor = contextAccessor;- _groupService = groupService;_productService = productService;_seoSettings = seoSettings;}@@ -53,10 +50,6 @@ public class SpecificationAttributeController : BaseAdminControllervar searchStoreId = string.Empty;- //limit for store manager- if (!string.IsNullOrEmpty(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))- searchStoreId = _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId;-var specificationProducts = new List<SpecificationAttributeModel.UsedByProductModel>();var total = 0;@@ -104,7 +97,6 @@ public class SpecificationAttributeController : BaseAdminControllerprivate readonly ILanguageService _languageService;private readonly ITranslationService _translationService;private readonly IContextAccessor _contextAccessor;- private readonly IGroupService _groupService;private readonly SeoSettings _seoSettings;#endregion Fields@@ -126,8 +118,7 @@ public class SpecificationAttributeController : BaseAdminController[PermissionAuthorizeAction(PermissionActionName.List)]public async Task<IActionResult> List(DataSourceRequest command){- var specificationAttributes = await _specificationAttributeService- .GetSpecificationAttributes(command.Page - 1, command.PageSize);+ 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@@ -160,8 +151,7 @@ public class SpecificationAttributeController : BaseAdminController? specificationAttribute.Name: specificationAttribute.SeName, _seoSettings.ConvertNonWesternChars,_seoSettings.AllowUnicodeCharsInUrls, _seoSettings.SeoCharConversion);- if (await _groupService.IsStoreManager(_contextAccessor.WorkContext.CurrentCustomer))- model.Stores = [_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId];+await _specificationAttributeService.InsertSpecificationAttribute(specificationAttribute);Success(_translationService.GetResource("Admin.Catalog.Attributes.SpecificationAttributes.Added"));@@ -211,8 +201,7 @@ public class SpecificationAttributeController : BaseAdminController? specificationAttribute.Name: specificationAttribute.SeName, _seoSettings.ConvertNonWesternChars,_seoSettings.AllowUnicodeCharsInUrls, _seoSettings.SeoCharConversion);- if (await _groupService.IsStoreManager(_contextAccessor.WorkContext.CurrentCustomer))- model.Stores = [_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId];+await _specificationAttributeService.UpdateSpecificationAttribute(specificationAttribute);Success(_translationService.GetResource("Admin.Catalog.Attributes.SpecificationAttributes.Updated"));diff --git a/src/Web/Grand.Web.AdminShared/Services/ProductViewModelService.cs b/src/Web/Grand.Web.AdminShared/Services/ProductViewModelService.csindex 900dd132d..9e75ecc3a 100644--- a/src/Web/Grand.Web.AdminShared/Services/ProductViewModelService.cs+++ b/src/Web/Grand.Web.AdminShared/Services/ProductViewModelService.cs@@ -278,7 +278,7 @@ public class ProductViewModelService(model.AutoAddRequiredProducts = product.AutoAddRequiredProducts;//product attributes- foreach (var productAttribute in await productAttributeService.GetAllProductAttributes())+ foreach (var productAttribute in await productAttributeService.GetAllProductAttributes(contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))model.AvailableProductAttributes.Add(new SelectListItem {Text = productAttribute.Name,Value = productAttribute.Id@@ -1372,7 +1372,7 @@ public class ProductViewModelService(var model = new ProductModel.ProductAttributeMappingModel {ProductId = product.Id};- foreach (var attribute in await productAttributeService.GetAllProductAttributes())+ foreach (var attribute in await productAttributeService.GetAllProductAttributes(contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))model.AvailableProductAttribute.Add(new SelectListItem {Value = attribute.Id,Text = attribute.Name@@ -1384,7 +1384,7 @@ public class ProductViewModelService(Product product, ProductAttributeMapping productAttributeMapping){var model = productAttributeMapping.ToModel();- foreach (var attribute in await productAttributeService.GetAllProductAttributes())+ foreach (var attribute in await productAttributeService.GetAllProductAttributes(contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))model.AvailableProductAttribute.Add(new SelectListItem {Value = attribute.Id,Text = attribute.Name,@@ -1396,7 +1396,7 @@ public class ProductViewModelService(public virtual async Task<ProductModel.ProductAttributeMappingModel> PrepareProductAttributeMappingModel(ProductModel.ProductAttributeMappingModel model){- foreach (var attribute in await productAttributeService.GetAllProductAttributes())+ foreach (var attribute in await productAttributeService.GetAllProductAttributes(contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))model.AvailableProductAttribute.Add(new SelectListItem {Value = attribute.Id,Text = attribute.Namediff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Create.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Create.cshtmlnew file mode 100644index 000000000..c624f9e89--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Create.cshtml@@ -0,0 +1,37 @@+@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/Edit.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Edit.cshtmlnew file mode 100644index 000000000..5e5daeec9--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Edit.cshtml@@ -0,0 +1,41 @@+@model ProductAttributeModel+@{+ //page title+ ViewBag.Title = Loc["Admin.Catalog.Attributes.ProductAttributes.EditAttributeDetails"];+}+<form asp-area="@Constants.AreaStore" 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.Store/Areas/Store/Views/ProductAttribute/List.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/List.cshtmlnew file mode 100644index 000000000..95c4e5726--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/List.cshtml@@ -0,0 +1,77 @@+@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.cshtmlnew file mode 100644index 000000000..9539f3658--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/CreateOrUpdate.TabInfo.cshtml@@ -0,0 +1,47 @@+@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.TabPredefinedValues.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/CreateOrUpdate.TabPredefinedValues.cshtmlnew file mode 100644index 000000000..5328da963--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/CreateOrUpdate.TabPredefinedValues.cshtml@@ -0,0 +1,144 @@+@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.AreaStore }))" 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.AreaStore }))",+ type: "POST",+ dataType: "json",+ data: addAntiForgeryToken+ },+ destroy: {+ url: "@Html.Raw(Url.Action("PredefinedProductAttributeValueDelete", "ProductAttribute", new { area = Constants.AreaStore }))",+ 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.AreaStore })/#=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.Store/Areas/Store/Views/ProductAttribute/Partials/CreateOrUpdate.TabUsedByProducts.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/CreateOrUpdate.TabUsedByProducts.cshtmlnew file mode 100644index 000000000..245be339f--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/CreateOrUpdate.TabUsedByProducts.cshtml@@ -0,0 +1,63 @@+@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/CreateOrUpdate.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/CreateOrUpdate.cshtmlnew file mode 100644index 000000000..44465c653--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/CreateOrUpdate.cshtml@@ -0,0 +1,40 @@+@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.Store/Areas/Store/Views/ProductAttribute/Partials/CreateOrUpdatePredefinedProductAttributeValue.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/CreateOrUpdatePredefinedProductAttributeValue.cshtmlnew file mode 100644index 000000000..b004b7240--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/Partials/CreateOrUpdatePredefinedProductAttributeValue.cshtml@@ -0,0 +1,86 @@+@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.Store/Areas/Store/Views/ProductAttribute/PredefinedProductAttributeValueCreatePopup.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/PredefinedProductAttributeValueCreatePopup.cshtmlnew file mode 100644index 000000000..c922648da--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/PredefinedProductAttributeValueCreatePopup.cshtml@@ -0,0 +1,52 @@+@model PredefinedProductAttributeValueModel+@{+ Layout = "";+}+<form id="PredefinedProductAttributeValueCreatePopup" asp-area="@Constants.AreaStore" 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.Store/Areas/Store/Views/ProductAttribute/PredefinedProductAttributeValueEditPopup.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/PredefinedProductAttributeValueEditPopup.cshtmlnew file mode 100644index 000000000..2ea2ba46b--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductAttribute/PredefinedProductAttributeValueEditPopup.cshtml@@ -0,0 +1,53 @@+@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/Shared/AccessDenied.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Shared/AccessDenied.cshtmlnew file mode 100644index 000000000..a427c8113--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Shared/AccessDenied.cshtml@@ -0,0 +1,24 @@+@model string+@{+ Layout = "";+}++<div class="modal-access-denied">+ <div class="row">+ <div class="col-md-12">+ <div class="x_panel light form-fit">+ <div class="x_title">+ <div class="caption level-caption">+ <i class="fa fa-exclamation-triangle"></i>+ @Loc["Admin.AccessDenied.Title"]+ </div>+ </div>+ <div class="x_content form">+ <div class="note note-danger">+ @(string.IsNullOrEmpty(Model) ? Loc["Admin.AccessDenied.Description"] : Model)+ </div>+ </div>+ </div>+ </div>+ </div>+</div>\ 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.cshtmlnew file mode 100644index 000000000..2c1640e14--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Create.cshtml@@ -0,0 +1,37 @@+@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/Edit.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Edit.cshtmlnew file mode 100644index 000000000..ee1cd1b15--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Edit.cshtml@@ -0,0 +1,42 @@+@model SpecificationAttributeModel+@{+ //page title+ ViewBag.Title = Loc["Admin.Catalog.Attributes.SpecificationAttributes.EditAttributeDetails"];+}++<form asp-area="@Constants.AreaStore" 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.Store/Areas/Store/Views/SpecificationAttribute/List.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/List.cshtmlnew file mode 100644index 000000000..2f31c98bf--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/List.cshtml@@ -0,0 +1,86 @@+@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.cshtmlnew file mode 100644index 000000000..f8124efd3--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/OptionCreatePopup.cshtml@@ -0,0 +1,57 @@+@{+ 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/OptionEditPopup.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/OptionEditPopup.cshtmlnew file mode 100644index 000000000..3ffb92caa--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/OptionEditPopup.cshtml@@ -0,0 +1,58 @@+@{+ Layout = "";+}+@model SpecificationAttributeOptionModel+@{+ //page title+ ViewBag.Title = Loc["Admin.Catalog.Attributes.SpecificationAttributes.Options.EditOptionDetails"];+}+<form asp-area="@Constants.AreaStore" 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.Store/Areas/Store/Views/SpecificationAttribute/Partials/CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/CreateOrUpdate.TabInfo.cshtmlnew file mode 100644index 000000000..80a74e56c--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/CreateOrUpdate.TabInfo.cshtml@@ -0,0 +1,51 @@+@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.cshtmlnew file mode 100644index 000000000..72cdbf50d--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/CreateOrUpdate.TabOptions.cshtml@@ -0,0 +1,132 @@+@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.cshtmlnew file mode 100644index 000000000..02dabd36d--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/CreateOrUpdate.TabUsedByProducts.cshtml@@ -0,0 +1,68 @@+@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.cshtmlnew file mode 100644index 000000000..a7d55faa8--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/CreateOrUpdate.cshtml@@ -0,0 +1,40 @@+@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/CreateOrUpdateOption.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/CreateOrUpdateOption.cshtmlnew file mode 100644index 000000000..702b1ecbb--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/SpecificationAttribute/Partials/CreateOrUpdateOption.cshtml@@ -0,0 +1,103 @@+@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.Store/Controllers/CategoryController.cs b/src/Web/Grand.Web.Store/Controllers/CategoryController.csindex 1c968a635..f67ed0255 100644--- a/src/Web/Grand.Web.Store/Controllers/CategoryController.cs+++ b/src/Web/Grand.Web.Store/Controllers/CategoryController.cs@@ -1,8 +1,6 @@using Grand.Business.Core.Extensions;using Grand.Business.Core.Interfaces.Catalog.Categories;-using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Interfaces.Common.Localization;-using Grand.Domain.Catalog;using Grand.Domain.Permissions;using Grand.Infrastructure;using Grand.Web.AdminShared.Extensions;@@ -28,7 +26,6 @@ public class CategoryController : BaseStoreControllerILanguageService languageService,ITranslationService translationService,IContextAccessor contextAccessor,- IGroupService groupService,IPictureViewModelService pictureViewModelService){_categoryService = categoryService;@@ -36,26 +33,11 @@ public class CategoryController : BaseStoreController_languageService = languageService;_translationService = translationService;_contextAccessor = contextAccessor;- _groupService = groupService;_pictureViewModelService = pictureViewModelService;}#endregion- #region Utilities-- protected async Task<(bool allow, string message)> CheckAccessToCategory(Category category)- {- if (category == null) return (false, "Category not exists");- if (await _groupService.IsStoreManager(_contextAccessor.WorkContext.CurrentCustomer))- if (!(!category.LimitedToStores || (category.Stores.Contains(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId) &&- category.LimitedToStores)))- return (false, "This is not your category");- return (true, null);- }-- #endregion-#region Fieldsprivate readonly ICategoryService _categoryService;@@ -63,7 +45,6 @@ public class CategoryController : BaseStoreControllerprivate readonly ILanguageService _languageService;private readonly ITranslationService _translationService;private readonly IContextAccessor _contextAccessor;- private readonly IGroupService _groupService;private readonly IPictureViewModelService _pictureViewModelService;#endregion@@ -279,6 +260,7 @@ public class CategoryController : BaseStoreControllerpublic async Task<IActionResult> ProductList(DataSourceRequest command, string categoryId){var category = await _categoryService.GetCategoryById(categoryId);+if (!category.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))return ErrorForKendoGridJson("This is not your category");diff --git a/src/Web/Grand.Web.Store/Controllers/ProductAttributeController.cs b/src/Web/Grand.Web.Store/Controllers/ProductAttributeController.csnew file mode 100644index 000000000..c12259ede--- /dev/null+++ b/src/Web/Grand.Web.Store/Controllers/ProductAttributeController.cs@@ -0,0 +1,413 @@+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.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.Common.Filters;+using Grand.Web.Common.Security.Authorization;+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 filediff --git a/src/Web/Grand.Web.Store/Controllers/ProductController.cs b/src/Web/Grand.Web.Store/Controllers/ProductController.csindex ad8ad745b..02d532b6a 100644--- a/src/Web/Grand.Web.Store/Controllers/ProductController.cs+++ b/src/Web/Grand.Web.Store/Controllers/ProductController.cs@@ -1317,7 +1317,7 @@ public class ProductController : BaseStoreControllerISpecificationAttributeService specificationAttributeService){var availableSpecificationAttributes = new List<SelectListItem>();- foreach (var sa in await specificationAttributeService.GetSpecificationAttributes())+ foreach (var sa in await specificationAttributeService.GetSpecificationAttributes(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))availableSpecificationAttributes.Add(new SelectListItem {Text = sa.Name,Value = sa.Iddiff --git a/src/Web/Grand.Web.Store/Controllers/SpecificationAttributeController.cs b/src/Web/Grand.Web.Store/Controllers/SpecificationAttributeController.csnew file mode 100644index 000000000..6f619571d--- /dev/null+++ b/src/Web/Grand.Web.Store/Controllers/SpecificationAttributeController.cs@@ -0,0 +1,455 @@+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.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.Common.Filters;+using Grand.Web.Common.Security.Authorization;+using Grand.Web.Store.Controllers;+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 filediff --git a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xmlindex 4f8c27afa..da1c65d7c 100644Binary files a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml and b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml differ