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
Add new field to the product specification (product collection) - Custom Name
KrzysztofPajakb695315db52f
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductSpecificationCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductSpecificationCommandHandler.csindex 756e81bb7..fd2c52d53 100644--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductSpecificationCommandHandler.cs+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductSpecificationCommandHandler.cs@@ -29,6 +29,7 @@ namespace Grand.Api.Commands.Models.CatalogAttributeTypeId = request.Model.AttributeTypeId,SpecificationAttributeOptionId = request.Model.SpecificationAttributeOptionId,SpecificationAttributeId = request.Model.SpecificationAttributeId,+ CustomName = request.Model.CustomName,CustomValue = request.Model.CustomValue,AllowFiltering = request.Model.AllowFiltering,ShowOnProductPage = request.Model.ShowOnProductPage,diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductSpecificationCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductSpecificationCommandHandler.csindex a8c29f0f1..41fb1c9a0 100644--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductSpecificationCommandHandler.cs+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductSpecificationCommandHandler.cs@@ -33,6 +33,7 @@ namespace Grand.Api.Commands.Models.Catalog}else{+ psa.CustomName = request.Model.CustomName;psa.CustomValue = request.Model.CustomValue;}psa.SpecificationAttributeId = request.Model.SpecificationAttributeId;diff --git a/src/API/Grand.Api/DTOs/Catalog/ProductSpecificationAttributeDto.cs b/src/API/Grand.Api/DTOs/Catalog/ProductSpecificationAttributeDto.csindex f1725aef3..824c21e26 100644--- a/src/API/Grand.Api/DTOs/Catalog/ProductSpecificationAttributeDto.cs+++ b/src/API/Grand.Api/DTOs/Catalog/ProductSpecificationAttributeDto.cs@@ -7,6 +7,7 @@ namespace Grand.Api.DTOs.Catalog{public string SpecificationAttributeId { get; set; }public string SpecificationAttributeOptionId { get; set; }+ public string CustomName { get; set; }public string CustomValue { get; set; }public bool AllowFiltering { get; set; }public bool ShowOnProductPage { get; set; }diff --git a/src/Core/Grand.Domain/Catalog/ProductSpecificationAttribute.cs b/src/Core/Grand.Domain/Catalog/ProductSpecificationAttribute.csindex 4b8b0615b..c9c64c74e 100644--- a/src/Core/Grand.Domain/Catalog/ProductSpecificationAttribute.cs+++ b/src/Core/Grand.Domain/Catalog/ProductSpecificationAttribute.cs@@ -21,6 +21,11 @@ namespace Grand.Domain.Catalog/// </summary>public string SpecificationAttributeOptionId { get; set; }+ /// <summary>+ /// Gets or sets the custom name+ /// </summary>+ public string CustomName { get; set; }+/// <summary>/// Gets or sets the custom value/// </summary>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductSpecAttrPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductSpecAttrPopup.cshtmlindex 21b156f0e..251dc5b69 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductSpecAttrPopup.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductSpecAttrPopup.cshtml@@ -8,7 +8,6 @@asp-route-ProductId="@Context.Request.Query["ProductId"]"asp-route-Id="@Context.Request.Query["Id"]">-<div asp-validation-summary="All"></div><input asp-for="ProductId" type="hidden" /><input asp-for="Id" type="hidden" />@@ -53,6 +52,13 @@<span asp-validation-for="SpecificationAttributeOptionId"></span></div></div>+ <div class="form-group" id="pnlCustomName">+ <admin-label asp-for="CustomName" />+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="CustomName" />+ <span asp-validation-for="CustomName"></span>+ </div>+ </div><div class="form-group" id="pnlCustomValue"><admin-label asp-for="CustomValue" /><div class="col-md-9 col-sm-9">@@ -140,8 +146,12 @@success: function (data) {var ddlSpecOptions = $("#@Html.IdFor(model => model.SpecificationAttributeOptionId)");ddlSpecOptions.html('');- $.each(data, function(id, option) {- ddlSpecOptions.append($('<option></option>').val(option.id).html(kendo.htmlEncode(option.name)));+ $.each(data, function (id, option) {+ var selected = '';+ if ('@Model.SpecificationAttributeOptionId' == option.id) {+ selected = ' selected '+ }+ ddlSpecOptions.append($('<option ' + selected+'></option>').val(option.id).html(kendo.htmlEncode(option.name)));});},error: function(xhr, ajaxOptions, thrownError) {@@ -162,20 +172,24 @@if (selectedTypeId == @(((int)SpecificationAttributeType.Option).ToString())) {$('#pnlSpecificationAttributeOptionId').show();$('#pnlCustomValue').hide();+ $('#pnlCustomName').hide();$('#disableOnCustom').show();$('#pnlAllowFiltering').show();} else if (selectedTypeId == @(((int)SpecificationAttributeType.CustomText).ToString())) {$('#pnlSpecificationAttributeOptionId').hide();+ $('#pnlCustomName').show();$('#pnlCustomValue').show();$('#disableOnCustom').hide();$('#pnlAllowFiltering').hide();} else if (selectedTypeId == @(((int)SpecificationAttributeType.CustomHtmlText).ToString())) {$('#pnlSpecificationAttributeOptionId').hide();+ $('#pnlCustomName').show();$('#pnlCustomValue').show();$('#disableOnCustom').hide();$('#pnlAllowFiltering').hide();} else if (selectedTypeId == @(((int)SpecificationAttributeType.Hyperlink).ToString())) {$('#pnlSpecificationAttributeOptionId').hide();+ $('#pnlCustomName').show();$('#pnlCustomValue').show();$('#disableOnCustom').hide();$('#pnlAllowFiltering').hide();diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdate.SpecificationAttributes.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdate.SpecificationAttributes.cshtmlindex 00bf5bbf6..99eef1704 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdate.SpecificationAttributes.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdate.SpecificationAttributes.cshtml@@ -112,7 +112,7 @@field: "ValueRaw",encoded: false,title: "@Loc["Admin.Catalog.Products.SpecificationAttributes.Fields.Value"]",- template: "# if(AttributeTypeId != 0) {# <a class='k-link btnMagnificPopup' href='@Url.Action("ProductSpecAttrPopup", "Product", new { area = Constants.AreaAdmin })/?productId=@(Model.Id)&id=#=Id#'>#=ValueRaw#</a> #} else {# <a class='k-link btnMagnificPopup' href='@Url.Action("ProductSpecAttrPopup", "Product", new { area = Constants.AreaAdmin })/?productId=@(Model.Id)&id=#=Id#'>#=AttributeName# : #=ValueRaw#</a> #} #"+ template: "<a class='k-link btnMagnificPopup' href='@Url.Action("ProductSpecAttrPopup", "Product", new { area = Constants.AreaAdmin })/?productId=@(Model.Id)&id=#=Id#'>#=kendo.htmlEncode(AttributeName)# : #=ValueRaw# </a>"}, {field: "AllowFiltering",title: "@Loc["Admin.Catalog.Products.SpecificationAttributes.Fields.AllowFiltering"]",diff --git a/src/Web/Grand.Web.Admin/Models/Catalog/ProductModel.cs b/src/Web/Grand.Web.Admin/Models/Catalog/ProductModel.csindex 7505dc7b3..671f6fab9 100644--- a/src/Web/Grand.Web.Admin/Models/Catalog/ProductModel.cs+++ b/src/Web/Grand.Web.Admin/Models/Catalog/ProductModel.cs@@ -474,6 +474,9 @@ namespace Grand.Web.Admin.Models.Catalog[GrandResourceDisplayName("Admin.Catalog.Products.SpecificationAttributes.Fields.SpecificationAttributeOption")]public string SpecificationAttributeOptionId { get; set; }+ [GrandResourceDisplayName("Admin.Catalog.Products.SpecificationAttributes.Fields.CustomName")]+ public string CustomName { get; set; }+[GrandResourceDisplayName("Admin.Catalog.Products.SpecificationAttributes.Fields.CustomValue")]public string CustomValue { get; set; }diff --git a/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs b/src/Web/Grand.Web.Admin/Services/ProductViewModelService.csindex 0f0595079..7d8d155b3 100644--- a/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs@@ -2797,8 +2797,10 @@ namespace Grand.Web.Admin.ServicesAttributeTypeName = x.AttributeTypeId.GetTranslationEnum(_translationService, _workContext),AllowFiltering = x.AllowFiltering,ShowOnProductPage = x.ShowOnProductPage,- DisplayOrder = x.DisplayOrder+ DisplayOrder = x.DisplayOrder,+ AttributeName = x.CustomName};+switch (x.AttributeTypeId){case SpecificationAttributeType.Option:@@ -2835,16 +2837,7 @@ namespace Grand.Web.Admin.Servicesmodel.AllowFiltering = false;model.SpecificationAttributeOptionId = null;}-- var psa = new ProductSpecificationAttribute {- AttributeTypeId = model.AttributeTypeId,- SpecificationAttributeOptionId = model.SpecificationAttributeOptionId,- SpecificationAttributeId = model.SpecificationAttributeId,- CustomValue = model.CustomValue,- AllowFiltering = model.AllowFiltering,- ShowOnProductPage = model.ShowOnProductPage,- DisplayOrder = model.DisplayOrder,- };+ var psa = model.ToEntity();await _specificationAttributeService.InsertProductSpecificationAttribute(psa, product.Id);product.ProductSpecificationAttributes.Add(psa);diff --git a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xmlindex c8faefb37..bb5a0b251 100644--- a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml+++ b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml@@ -3699,6 +3699,9 @@<Resource Name="Admin.Catalog.Products.SpecificationAttributes.Fields.AttributeType"><Value>Attribute type</Value></Resource>+ <Resource Name="Admin.Catalog.Products.SpecificationAttributes.Fields.CustomName">+ <Value>Name</Value>+ </Resource><Resource Name="Admin.Catalog.Products.SpecificationAttributes.Fields.CustomValue"><Value>Value</Value></Resource>diff --git a/src/Web/Grand.Web/Features/Handlers/Products/GetProductSpecificationHandler.cs b/src/Web/Grand.Web/Features/Handlers/Products/GetProductSpecificationHandler.csindex 2461e9652..77f833afc 100644--- a/src/Web/Grand.Web/Features/Handlers/Products/GetProductSpecificationHandler.cs+++ b/src/Web/Grand.Web/Features/Handlers/Products/GetProductSpecificationHandler.cs@@ -32,7 +32,9 @@ namespace Grand.Web.Features.Handlers.Productsvar spa = new List<ProductSpecificationModel>();foreach (var item in request.Product.ProductSpecificationAttributes.Where(x => x.ShowOnProductPage).OrderBy(x => x.DisplayOrder)){- var m = new ProductSpecificationModel();+ var m = new ProductSpecificationModel {+ SpecificationAttributeName = item.CustomName+ };switch (item.AttributeTypeId){