Add new field to the product specification (product collection) - Custom Name

KrzysztofPajak · KrzysztofPajak · commit b695315db52f · 2021-10-14T16:36:28.000+02:00
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductSpecificationCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductSpecificationCommandHandler.cs
@@ -29,6 +29,7 @@ public async Task<bool> Handle(AddProductSpecificationCommand request, Cancellat
                 AttributeTypeId = 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.cs
@@ -33,6 +33,7 @@ public async Task<bool> Handle(UpdateProductSpecificationCommand request, Cancel
                 }
                 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.cs
@@ -7,6 +7,7 @@ public partial class ProductSpecificationAttributeDto : BaseApiEntityModel
     {
         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.cs
@@ -21,6 +21,11 @@ public partial class ProductSpecificationAttribute : SubBaseEntity
         /// </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.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.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.cs
@@ -474,6 +474,9 @@ public AddProductSpecificationAttributeModel()
             [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.cs
@@ -2797,8 +2797,10 @@ public virtual async Task<IList<ProductSpecificationAttributeModel>> PrepareProd
                     AttributeTypeName = 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 @@ public virtual async Task InsertProductSpecificationAttributeModel(ProductModel.
                 model.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.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.cs
@@ -32,7 +32,9 @@ public async Task<IList<ProductSpecificationModel>> Handle(GetProductSpecificati
             var 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)
                 {

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ public async Task<bool> Handle(UpdateProductSpecificationCommand request, Cancel`
`33`	`33`	`}`
`34`	`34`	`else`
`35`	`35`	`{`
	`36`	`+ psa.CustomName = request.Model.CustomName;`
`36`	`37`	`psa.CustomValue = request.Model.CustomValue;`
`37`	`38`	`}`
`38`	`39`	`psa.SpecificationAttributeId = request.Model.SpecificationAttributeId;`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ public partial class ProductSpecificationAttributeDto : BaseApiEntityModel`
`7`	`7`	`{`
`8`	`8`	`public string SpecificationAttributeId { get; set; }`
`9`	`9`	`public string SpecificationAttributeOptionId { get; set; }`
	`10`	`+ public string CustomName { get; set; }`
`10`	`11`	`public string CustomValue { get; set; }`
`11`	`12`	`public bool AllowFiltering { get; set; }`
`12`	`13`	`public bool ShowOnProductPage { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,9 @@ public async Task<IList<ProductSpecificationModel>> Handle(GetProductSpecificati`
`32`	`32`	`var spa = new List<ProductSpecificationModel>();`
`33`	`33`	`foreach (var item in request.Product.ProductSpecificationAttributes.Where(x => x.ShowOnProductPage).OrderBy(x => x.DisplayOrder))`
`34`	`34`	`{`
`35`		`- var m = new ProductSpecificationModel();`
	`35`	`+ var m = new ProductSpecificationModel {`
	`36`	`+ SpecificationAttributeName = item.CustomName`
	`37`	`+ };`
`36`	`38`
`37`	`39`	`switch (item.AttributeTypeId)`
`38`	`40`	`{`