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
Admin panel - Improve UX - product specification
KrzysztofPajak4cb887bb0ca0
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.cshtmlnew file mode 100644index 000000000..21b156f0e--- /dev/null+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductSpecAttrPopup.cshtml@@ -0,0 +1,185 @@+@model ProductModel.AddProductSpecificationAttributeModel+@{+ Layout = "";+}+<form id="ProductSpecificationPopup" asp-area="@Constants.AreaAdmin"+ asp-controller="Product" asp-action="ProductSpecAttrPopup"+ enctype="multipart/form-data" method="post"+ 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" />++ <div class="row">+ <div class="col-md-12">+ <div class="x_panel light form-fit">+ <div class="x_title">+ <div class="caption">+ <i class="fa fa-cubes"></i>+ @if (string.IsNullOrEmpty(Model.Id))+ {+ <text> @Loc["Admin.Catalog.Products.SpecificationAttributes.AddNew"]</text>+ }+ else+ {+ <text>@Loc["Admin.Catalog.Products.SpecificationAttributes.Edit"]</text>+ }+ </div>+ </div>+ <div class="x_content form">+ <div class="form-horizontal">+ <div class="form-body">+ <div class="form-group">+ <admin-label asp-for="AttributeTypeId" />+ <div class="col-md-9 col-sm-9">+ <admin-select asp-for="AttributeTypeId" asp-items="((SpecificationAttributeType)Model.AttributeTypeId).ToSelectList(Context)" />+ <span asp-validation-for="AttributeTypeId"></span>+ </div>+ </div>+ <div class="form-group" id="disableOnCustom">+ <admin-label asp-for="SpecificationAttributeId" />+ <div class="col-md-9 col-sm-9">+ <admin-select asp-for="SpecificationAttributeId" asp-items="Model.AvailableAttributes" />+ <span asp-validation-for="SpecificationAttributeId"></span>+ </div>+ </div>+ <div class="form-group" id="pnlSpecificationAttributeOptionId">+ <admin-label asp-for="SpecificationAttributeOptionId" />+ <div class="col-md-9 col-sm-9">+ <admin-select asp-for="SpecificationAttributeOptionId" asp-items="Model.AvailableOptions" />+ <span asp-validation-for="SpecificationAttributeOptionId"></span>+ </div>+ </div>+ <div class="form-group" id="pnlCustomValue">+ <admin-label asp-for="CustomValue" />+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="CustomValue" />+ <span asp-validation-for="CustomValue"></span>+ </div>+ </div>+ <div class="form-group" id="pnlAllowFiltering">+ <admin-label asp-for="AllowFiltering" />+ <div class="col-md-9 col-sm-9">+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">+ <admin-input asp-for="AllowFiltering" />+ <div class="control__indicator"></div>+ </label>+ <span asp-validation-for="AllowFiltering"></span>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="ShowOnProductPage" />+ <div class="col-md-9 col-sm-9">+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">+ <admin-input asp-for="ShowOnProductPage" />+ <div class="control__indicator"></div>+ </label>+ <span asp-validation-for="ShowOnProductPage"></span>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="DisplayOrder" />+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="DisplayOrder" />+ <span asp-validation-for="DisplayOrder"></span>+ </div>+ </div>+ <div class="form-group">+ <div class="offset-sm-3 offset-md-3 col-md-9 col-sm-9">+ <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>+ </div>+ </div>+ </div>+ </div>+ </div>+ </div>+ </div>+ </div>++ <script>+ var mfp = $.magnificPopup.instance;+ $("#ProductSpecificationPopup").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();+ $('#btnRefreshProductSpec').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });++ $("#@Html.IdFor(model => model.SpecificationAttributeId)").change(function() {+ var selectedAttributeId = $(this).val();+ $.ajax({+ cache: false,+ type: "GET",+ url: "@(Url.Action("GetOptionsByAttributeId", "Product", new { area = Constants.AreaAdmin }))",+ data: { "attributeId": selectedAttributeId },+ 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)));+ });+ },+ error: function(xhr, ajaxOptions, thrownError) {+ alert('Failed to retrieve specification options.');+ }+ });+ });++ $(document).ready(function() {+ $("#@Html.IdFor(model => model.AttributeTypeId)").change(toggleAttributeType);+ $("#@Html.IdFor(model => model.SpecificationAttributeId)").change();+ toggleAttributeType();+ });+++ function toggleAttributeType() {+ var selectedTypeId = $("#@Html.IdFor(model => model.AttributeTypeId)").val();+ if (selectedTypeId == @(((int)SpecificationAttributeType.Option).ToString())) {+ $('#pnlSpecificationAttributeOptionId').show();+ $('#pnlCustomValue').hide();+ $('#disableOnCustom').show();+ $('#pnlAllowFiltering').show();+ } else if (selectedTypeId == @(((int)SpecificationAttributeType.CustomText).ToString())) {+ $('#pnlSpecificationAttributeOptionId').hide();+ $('#pnlCustomValue').show();+ $('#disableOnCustom').hide();+ $('#pnlAllowFiltering').hide();+ } else if (selectedTypeId == @(((int)SpecificationAttributeType.CustomHtmlText).ToString())) {+ $('#pnlSpecificationAttributeOptionId').hide();+ $('#pnlCustomValue').show();+ $('#disableOnCustom').hide();+ $('#pnlAllowFiltering').hide();+ } else if (selectedTypeId == @(((int)SpecificationAttributeType.Hyperlink).ToString())) {+ $('#pnlSpecificationAttributeOptionId').hide();+ $('#pnlCustomValue').show();+ $('#disableOnCustom').hide();+ $('#pnlAllowFiltering').hide();+ }+ }+ </script>+</form>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdate.ProductAttributes.TabAttributes.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdate.ProductAttributes.TabAttributes.cshtmlindex 6f5a0bcfe..99530a9fd 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdate.ProductAttributes.TabAttributes.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdate.ProductAttributes.TabAttributes.cshtml@@ -7,7 +7,7 @@</div><vc:admin-widget widget-zone="product_details_product_attributes_bottom" additional-data="Model" /><div class="panel-footer">- <a id="btnAddNewAttributes" href="@(Url.Action("ProductAttributeMappingPopup", "Product", new { productId = Model.Id, btnId = "btnRefreshProductAttributes", formId = "product-form", area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Catalog.Products.ProductAttributes.AddNew"]</a>+ <a id="btnAddNewAttributes" href="@(Url.Action("ProductAttributeMappingPopup", "Product", new { productId = Model.Id, area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Catalog.Products.ProductAttributes.AddNew"]</a></div></div>@@ -129,7 +129,7 @@field: "ProductAttributeId",title: "@Loc["Admin.Catalog.Products.ProductAttributes.Attributes.Fields.Attribute"]",width: 190,- template: "<a class='k-link btnMagnificPopup' href='@Url.Action("ProductAttributeMappingPopup", "Product", new { area = Constants.AreaAdmin })/?productId=@(Model.Id)&productAttributeMappingId=#=Id#&btnId=btnRefreshProductAttributes&formId=product-form'>#=kendo.htmlEncode(ProductAttribute)#<br /></a>"+ template: "<a class='k-link btnMagnificPopup' href='@Url.Action("ProductAttributeMappingPopup", "Product", new { area = Constants.AreaAdmin })/?productId=@(Model.Id)&productAttributeMappingId=#=Id#'>#=kendo.htmlEncode(ProductAttribute)#<br /></a>"}, {field: "TextPrompt",title: "@Loc["Admin.Catalog.Products.ProductAttributes.Attributes.Fields.TextPrompt"]",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 8804f549c..00bf5bbf6 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@@ -1,357 +1,153 @@-@using Grand.Domain.Catalog-@model ProductModel+@model ProductModel@if (!String.IsNullOrEmpty(Model.Id)){- /*hide "add spec" table if no attributes are defined*/- if (Model.AddSpecificationAttributeModel.AvailableAttributes.Count > 0)- {- <div class="panel panel-default">- <vc:admin-widget widget-zone="product_details_specification_attribute_details_top" additional-data="Model" />- <div class="panel-body">- <div id="specificationattributes-grid"></div>- </div>- <vc:admin-widget widget-zone="product_details_specification_attribute_details_bottom" additional-data="Model" />+ <div class="panel panel-default">+ <vc:admin-widget widget-zone="product_details_specification_attribute_details_top" additional-data="Model" />+ <div class="panel-body">+ <div id="specificationattributes-grid"></div></div>- <script>- $(document).ready(function() {- $("#specificationattributes-grid").kendoGrid({- dataSource: {- transport: {- read: {- url: "@Html.Raw(Url.Action("ProductSpecAttrList", "Product", new { productId = Model.Id, area = Constants.AreaAdmin }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- },- update: {- url: "@Html.Raw(Url.Action("ProductSpecAttrUpdate", "Product", new { area = Constants.AreaAdmin }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- },- destroy: {- url: "@Html.Raw(Url.Action("ProductSpecAttrDelete", "Product", new { area = Constants.AreaAdmin }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- }- },- schema: {- data: "Data",- total: "Total",- errors: "Errors",- model: {- id: "Id",- fields: {- AttributeTypeName: { editable: false, type: "string" },- AttributeName: { editable: false, type: "string" },- ValueRaw: { editable: true, type: "string" },- AllowFiltering: { editable: true, type: "boolean" },- ShowOnProductPage: { editable: true, type: "boolean" },- DisplayOrder: { editable: true, type: "number" },- Id: { editable: false, type: "string" }- }- }- },- requestEnd: function(e) {- if (e.type == "update") {- this.read();- }- },- error: function(e) {- display_kendoui_grid_error(e);- // Cancel the changes- this.cancelChanges();- },- serverPaging: true,- serverFiltering: true,- serverSorting: true- },- autoBind: false,- pageable: {- refresh: true,- numeric: false,- previousNext: false,- info: false- },- editable: {- confirmation: true,- mode: "inline"- },- scrollable: false,- columns: [{- field: "AttributeTypeName",- title: "@Loc["Admin.Catalog.Products.SpecificationAttributes.Fields.AttributeType"]",- width: 100- },{- field: "AttributeName",- title: "@Loc["Admin.Catalog.Products.SpecificationAttributes.Fields.SpecificationAttribute"]",- width: 100- }, {- field: "ValueRaw",- title: "@Loc["Admin.Catalog.Products.SpecificationAttributes.Fields.Value"]",- width: 150,- encoded: false,- editor: function setDropDownEditor(container, options) {- if (options.model.AttributeTypeId == @((int)SpecificationAttributeType.Option)) {- var dropDownList = $('<input required data-text-field="Name" data-value-field="Id" data-bind="value:SpecificationAttributeOptionId"/>')- .appendTo(container).kendoDropDownList().data("kendoDropDownList");- $.ajax({- type: "GET",- url: "@(Url.Action("GetOptionsByAttributeId", "Product", new { area = Constants.AreaAdmin }))",- data: { "attributeId": options.model.AttributeId },- success: function (data) {- var availableOptions = [];- $.each(data, function(id, option) {- availableOptions.push({ Id: option.id, Name: option.name });- });- dropDownList.setDataSource(availableOptions);- dropDownList.select(function(item) {- return item.Id === options.model.SpecificationAttributeOptionId;- });- }- });- }- else- {- var input = $("<input/>");- input.attr("name", options.field);- input.appendTo(container);- }+ <vc:admin-widget widget-zone="product_details_specification_attribute_details_bottom" additional-data="Model" />+ <div class="panel-footer">+ <a id="btnAddNewSpecification" href="@(Url.Action("ProductSpecAttrPopup", "Product", new { productId = Model.Id, area = Constants.AreaAdmin }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Catalog.Products.SpecificationAttributes.AddButton"]</a>+ </div>+ </div>- }- }, {- field: "AllowFiltering",- title: "@Loc["Admin.Catalog.Products.SpecificationAttributes.Fields.AllowFiltering"]",- width: 80,- headerAttributes: { style: "text-align:center" },- attributes: { style: "text-align:center" },- template: '# if(AllowFiltering) {# <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: "ShowOnProductPage",- title: "@Loc["Admin.Catalog.Products.SpecificationAttributes.Fields.ShowOnProductPage"]",- width: 90,- headerAttributes: { style: "text-align:center" },- attributes: { style: "text-align:center" },- template: '# if(ShowOnProductPage) {# <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.Products.SpecificationAttributes.Fields.DisplayOrder"]",- width: 100,- minScreenWidth: 500,- headerAttributes: { style: "text-align:center" },- attributes: { style: "text-align:center" },- //integer format- format: "{0:0}"- }, {- command: [- {- name: "edit",- text: {- edit: "@Loc["Admin.Common.Edit"]",- update: "@Loc["Admin.Common.Update"]",- cancel: "@Loc["Admin.Common.Cancel"]"- }- }, {- name: "destroy",- text: "@Loc["Admin.Common.Delete"]"- }- ],- width: 200- }- ],- edit: function(e) {- if (e.model.AttributeTypeId != @((int)SpecificationAttributeType.Option)) {- e.container.find("input[name=AllowFiltering]").attr("disabled", true);- }- }- });- });- </script>+ <script>+ $(document).ready(function () {- <p>- <strong>@Loc["Admin.Catalog.Products.SpecificationAttributes.AddNew"]</strong>- </p>- <script>- $(document).ready(function() {- $("#@Html.IdFor(model => model.AddSpecificationAttributeModel.SpecificationAttributeId)").change(function() {- var selectedAttributeId = $(this).val();- $.ajax({- cache: false,- type: "GET",- url: "@(Url.Action("GetOptionsByAttributeId", "Product", new { area = Constants.AreaAdmin }))",- data: { "attributeId": selectedAttributeId },- success: function(data) {- var ddlSpecOptions = $("#@Html.IdFor(model => model.AddSpecificationAttributeModel.SpecificationAttributeOptionId)");- ddlSpecOptions.html('');- $.each(data, function(id, option) {- ddlSpecOptions.append($('<option></option>').val(option.id).html(kendo.htmlEncode(option.name)));- });+ $('#btnAddNewSpecification').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);},- error: function(xhr, ajaxOptions, thrownError) {- alert('Failed to retrieve specification options.');+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');}- });+ }});- });-- $(document).ready(function() {- $('#addProductSpec').click(function() {- var attributeTypeId = $("#@Html.IdFor(model => model.AddSpecificationAttributeModel.AttributeTypeId)").val();- var specificationAttributeId = $("#@Html.IdFor(model => model.AddSpecificationAttributeModel.SpecificationAttributeId)").val();- var specificationAttributeOptionId = $("#@Html.IdFor(model => model.AddSpecificationAttributeModel.SpecificationAttributeOptionId)").val();- var customValue = $("#@Html.IdFor(model => model.AddSpecificationAttributeModel.CustomValue)").val();- var allowFiltering = $("#@Html.IdFor(model => model.AddSpecificationAttributeModel.AllowFiltering)").is(':checked');- var showOnProductPage = $("#@Html.IdFor(model => model.AddSpecificationAttributeModel.ShowOnProductPage)").is(':checked');- var displayOrder = $("#@Html.IdFor(model => model.AddSpecificationAttributeModel.DisplayOrder)").val();-- if (specificationAttributeOptionId === null && attributeTypeId == @(((int) SpecificationAttributeType.Option).ToString())) {- //option- alert('Select specification attribute option');- } else {- $('#addProductSpec').attr('disabled', true);- var postData = {- attributeTypeId: attributeTypeId,- specificationAttributeId: specificationAttributeId,- specificationAttributeOptionId: specificationAttributeOptionId,- customValue: customValue,- allowFiltering: allowFiltering,- showOnProductPage: showOnProductPage,- displayOrder: displayOrder,- productId: '@(Model.Id)'- };- addAntiForgeryToken(postData);-- $.ajax({- cache: false,- type: "POST",- url: "@(Url.Action("ProductSpecificationAttributeAdd", "Product", new { area = Constants.AreaAdmin }))",- data: postData,- success: function(data) {- var grid = $("#specificationattributes-grid").data('kendoGrid');- grid.dataSource.read();- $('#addProductSpec').attr('disabled', false);+ $("#specificationattributes-grid").kendoGrid({+ dataSource: {+ transport: {+ read: {+ url: "@Html.Raw(Url.Action("ProductSpecAttrList", "Product", new { productId = Model.Id, area = Constants.AreaAdmin }))",+ type: "POST",+ dataType: "json",+ data: addAntiForgeryToken},- error: function(xhr, ajaxOptions, thrownError) {- alert('Failed to add specification attribute.');- $('#addProductSpec').attr('disabled', false);+ destroy: {+ url: "@Html.Raw(Url.Action("ProductSpecAttrDelete", "Product", new { area = Constants.AreaAdmin }))",+ type: "POST",+ dataType: "json",+ data: addAntiForgeryToken+ }+ },+ schema: {+ data: "Data",+ total: "Total",+ errors: "Errors",+ model: {+ id: "Id",+ fields: {+ AttributeTypeName: { editable: false, type: "string" },+ AttributeTypeId: { editable: false, type: "int" },+ AttributeName: { editable: false, type: "string" },+ ValueRaw: { editable: false, type: "string" },+ AllowFiltering: { editable: false, type: "boolean" },+ ShowOnProductPage: { editable: false, type: "boolean" },+ DisplayOrder: { editable: false, type: "number" },+ Id: { editable: false, type: "string" }+ }+ }+ },+ requestEnd: function (e) {+ if (e.type == "create" || e.type == "update") {+ this.read();+ }+ },+ error: function(e) {+ display_kendoui_grid_error(e);+ // Cancel the changes+ this.cancelChanges();+ },+ serverPaging: true,+ serverFiltering: true,+ serverSorting: true+ },+ autoBind: false,+ dataBound: function () {+ var data = this.dataSource.data();+ $('.btnMagnificPopup').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }}});- }+ },+ pageable: {+ refresh: true,+ numeric: false,+ previousNext: false,+ info: false+ },+ editable: {+ confirmation: false,+ mode: "inline"+ },+ scrollable: false,+ columns: [{+ field: "AttributeTypeName",+ title: "@Loc["Admin.Catalog.Products.SpecificationAttributes.Fields.AttributeType"]",+ template: "<a class='k-link btnMagnificPopup' href='@Url.Action("ProductSpecAttrPopup", "Product", new { area = Constants.AreaAdmin })/?productId=@(Model.Id)&id=#=Id#'>#=kendo.htmlEncode(AttributeTypeName)#</a>"+ }, {+ 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> #} #"+ }, {+ field: "AllowFiltering",+ title: "@Loc["Admin.Catalog.Products.SpecificationAttributes.Fields.AllowFiltering"]",+ headerAttributes: { style: "text-align:center" },+ attributes: { style: "text-align:center" },+ template: '# if(AllowFiltering) {# <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: "ShowOnProductPage",+ title: "@Loc["Admin.Catalog.Products.SpecificationAttributes.Fields.ShowOnProductPage"]",+ headerAttributes: { style: "text-align:center" },+ attributes: { style: "text-align:center" },+ template: '# if(ShowOnProductPage) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'+ }, {+ command: [+ {+ name: "destroy",+ text: "@Loc["Admin.Common.Delete"]"+ }+ ]+ }]+ });+ });+ </script>+ <input type="submit" id="btnRefreshProductSpec" style="display: none" />+ <script>+ $(document).ready(function () {+ $('#btnRefreshProductSpec').click(function () {+ //refresh grid+ var grid = $("#specificationattributes-grid").data('kendoGrid');+ grid.dataSource.read();+ //return false to don't reload a page+ return false;});});--- $(document).ready(function() {- $("#@Html.IdFor(model => model.AddSpecificationAttributeModel.AttributeTypeId)").change(toggleAttributeType);- $("#@Html.IdFor(model => model.AddSpecificationAttributeModel.SpecificationAttributeId)").change();-- toggleAttributeType();- });-- function toggleAttributeType() {- var selectedTypeId = $("#@Html.IdFor(model => model.AddSpecificationAttributeModel.AttributeTypeId)").val();- if (selectedTypeId == @(((int)SpecificationAttributeType.Option).ToString())) {- $('#pnlSpecificationAttributeOptionId').show();- $('#pnlCustomValue').hide();- $('#disableOnCustom').show();- $('#disableOnCustom select').removeAttr('disabled');- $('#pnlAllowFiltering').show();- } else if (selectedTypeId == @(((int)SpecificationAttributeType.CustomText).ToString())) {- $('#pnlSpecificationAttributeOptionId').hide();- $('#pnlCustomValue').show();- $('#disableOnCustom').hide();- $('#disableOnCustom select').setAttribute('disabled');- $('#pnlAllowFiltering').hide();- } else if (selectedTypeId == @(((int)SpecificationAttributeType.CustomHtmlText).ToString())) {- $('#pnlSpecificationAttributeOptionId').hide();- $('#pnlCustomValue').show();- $('#disableOnCustom').hide();- $('#disableOnCustom select').setAttribute('disabled');- $('#pnlAllowFiltering').hide();- } else if (selectedTypeId == @(((int)SpecificationAttributeType.Hyperlink).ToString())) {- $('#pnlSpecificationAttributeOptionId').hide();- $('#pnlCustomValue').show();- $('#disableOnCustom').hide();- $('#disableOnCustom select').setAttribute('disabled');- $('#pnlAllowFiltering').hide();- }- }- </script>- <div class="form-horizontal">- <div class="form-body">- <div class="form-group">- <admin-label asp-for="AddSpecificationAttributeModel.AttributeTypeId" />- <div class="col-md-9 col-sm-9">- <admin-select asp-for="AddSpecificationAttributeModel.AttributeTypeId" asp-items="((SpecificationAttributeType)Model.AddSpecificationAttributeModel.AttributeTypeId).ToSelectList(Context)" />- <span asp-validation-for="AddSpecificationAttributeModel.AttributeTypeId"></span>- </div>- </div>- <div class="form-group" id="disableOnCustom">- <admin-label asp-for="AddSpecificationAttributeModel.SpecificationAttributeId" />- <div class="col-md-9 col-sm-9">- <admin-select asp-for="AddSpecificationAttributeModel.SpecificationAttributeId" asp-items="Model.AddSpecificationAttributeModel.AvailableAttributes" />- <span asp-validation-for="AddSpecificationAttributeModel.SpecificationAttributeId"></span>- </div>- </div>- <div class="form-group" id="pnlSpecificationAttributeOptionId">- <admin-label asp-for="AddSpecificationAttributeModel.SpecificationAttributeOptionId" />- <div class="col-md-9 col-sm-9">- <admin-select asp-for="AddSpecificationAttributeModel.SpecificationAttributeOptionId" asp-items="Model.AddSpecificationAttributeModel.AvailableOptions" />- <span asp-validation-for="AddSpecificationAttributeModel.SpecificationAttributeOptionId"></span>- </div>- </div>- <div class="form-group" id="pnlCustomValue">- <admin-label asp-for="AddSpecificationAttributeModel.CustomValue" />- <div class="col-md-9 col-sm-9">- <admin-input asp-for="AddSpecificationAttributeModel.CustomValue" />- <span asp-validation-for="AddSpecificationAttributeModel.CustomValue"></span>- </div>- </div>- <div class="form-group" id="pnlAllowFiltering">- <admin-label asp-for="AddSpecificationAttributeModel.AllowFiltering" />- <div class="col-md-9 col-sm-9">- <label class="mt-checkbox mt-checkbox-outline control control-checkbox">- <admin-input asp-for="AddSpecificationAttributeModel.AllowFiltering" />- <div class="control__indicator"></div>- </label>- <span asp-validation-for="AddSpecificationAttributeModel.AllowFiltering"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="AddSpecificationAttributeModel.ShowOnProductPage" />- <div class="col-md-9 col-sm-9">- <label class="mt-checkbox mt-checkbox-outline control control-checkbox">- <admin-input asp-for="AddSpecificationAttributeModel.ShowOnProductPage" />- <div class="control__indicator"></div>- </label>- <span asp-validation-for="AddSpecificationAttributeModel.ShowOnProductPage"></span>- </div>- </div>- <div class="form-group">- <admin-label asp-for="AddSpecificationAttributeModel.DisplayOrder" />- <div class="col-md-9 col-sm-9">- <admin-input asp-for="AddSpecificationAttributeModel.DisplayOrder" />- <span asp-validation-for="AddSpecificationAttributeModel.DisplayOrder"></span>- </div>- </div>- <div class="form-actions">- <div class="offset-md-3 col-md-9 col-sm-9">- <button type="button" id="addProductSpec" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Catalog.Products.SpecificationAttributes.AddButton"]</button>- </div>- </div>- </div>- </div>- }- else- {- <div class="note note-info">- @Loc["Admin.Catalog.Products.SpecificationAttributes.NoAttributes"]- </div>- }+ </script>}else{diff --git a/src/Web/Grand.Web.Admin/Controllers/ProductController.cs b/src/Web/Grand.Web.Admin/Controllers/ProductController.csindex a41e45404..63c93750c 100644--- a/src/Web/Grand.Web.Admin/Controllers/ProductController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/ProductController.cs@@ -26,6 +26,7 @@ using Grand.Web.Common.Security.Authorization;using MediatR;using Microsoft.AspNetCore.Http;using Microsoft.AspNetCore.Mvc;+using Microsoft.AspNetCore.Mvc.Rendering;using System;using System.Collections.Generic;using System.IO;@@ -1363,7 +1364,6 @@ namespace Grand.Web.Admin.Controllersreturn View(model);}-[PermissionAuthorizeAction(PermissionActionName.Edit)][HttpPost]public async Task<IActionResult> ProductPictureDelete(ProductModel.ProductPictureModel model)@@ -1382,8 +1382,8 @@ namespace Grand.Web.Admin.Controllers[AcceptVerbs("GET")]public async Task<IActionResult> GetOptionsByAttributeId(string attributeId, [FromServices] ISpecificationAttributeService specificationAttributeService){- if (String.IsNullOrEmpty(attributeId))- throw new ArgumentNullException("attributeId");+ if (string.IsNullOrEmpty(attributeId))+ return Json("");var options = (await specificationAttributeService.GetSpecificationAttributeById(attributeId)).SpecificationAttributeOptions.OrderBy(x => x.DisplayOrder);var result = (from o in options@@ -1391,22 +1391,6 @@ namespace Grand.Web.Admin.Controllersreturn Json(result);}- [PermissionAuthorizeAction(PermissionActionName.Edit)]- public async Task<IActionResult> ProductSpecificationAttributeAdd(ProductModel.AddProductSpecificationAttributeModel model)- {- if (ModelState.IsValid)- {- var product = await _productService.GetProductById(model.ProductId);- if (product == null)- return Content("Product not exists");-- await _productViewModelService.InsertProductSpecificationAttributeModel(model, product);-- return Json(new { Result = true });- }- return Json(new { Result = false });- }-[PermissionAuthorizeAction(PermissionActionName.Preview)][HttpPost]public async Task<IActionResult> ProductSpecAttrList(DataSourceRequest command, string productId)@@ -1425,9 +1409,40 @@ namespace Grand.Web.Admin.Controllersreturn Json(gridModel);}+ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public async Task<IActionResult> ProductSpecAttrPopup(+ [FromServices] ISpecificationAttributeService specificationAttributeService,+ string productId, string id)+ {+ var product = await _productService.GetProductById(productId);++ var permission = await CheckAccessToProduct(product);+ if (!permission.allow)+ return Content(permission.message);++ var model = new ProductModel.AddProductSpecificationAttributeModel {+ //default specs values+ ShowOnProductPage = true+ };++ if (!string.IsNullOrEmpty(id))+ {+ var specification = product.ProductSpecificationAttributes.FirstOrDefault(x => x.Id == id);+ if (specification != null)+ {+ model = specification.ToModel();+ }+ }+ model.AvailableAttributes = await PrepareAvailableAttributes(specificationAttributeService);++ return View(model);+ }+[PermissionAuthorizeAction(PermissionActionName.Edit)][HttpPost]- public async Task<IActionResult> ProductSpecAttrUpdate(ProductSpecificationAttributeModel model)+ public async Task<IActionResult> ProductSpecAttrPopup(+ [FromServices] ISpecificationAttributeService specificationAttributeService,+ ProductModel.AddProductSpecificationAttributeModel model){if (ModelState.IsValid){@@ -1435,14 +1450,31 @@ namespace Grand.Web.Admin.Controllersif (product == null)return Content("Product not exists");- var psa = product.ProductSpecificationAttributes.Where(x => x.SpecificationAttributeId == model.ProductSpecificationId).Where(x => x.Id == model.Id).FirstOrDefault();+ var psa = product.ProductSpecificationAttributes.Where(x => x.Id == model.Id).FirstOrDefault();if (psa == null)- return Content("No product specification attribute found with the specified id");+ await _productViewModelService.InsertProductSpecificationAttributeModel(model, product);+ else+ await _productViewModelService.UpdateProductSpecificationAttributeModel(product, psa, model);- await _productViewModelService.UpdateProductSpecificationAttributeModel(product, psa, model);return new JsonResult("");}- return ErrorForKendoGridJson(ModelState);++ Error(ModelState);+ model.AvailableAttributes = await PrepareAvailableAttributes(specificationAttributeService);++ return View(model);+ }+ private async Task<List<SelectListItem>> PrepareAvailableAttributes(ISpecificationAttributeService specificationAttributeService)+ {+ var availableSpecificationAttributes = new List<SelectListItem>();+ foreach (var sa in await specificationAttributeService.GetSpecificationAttributes())+ {+ availableSpecificationAttributes.Add(new SelectListItem {+ Text = sa.Name,+ Value = sa.Id.ToString()+ });+ }+ return availableSpecificationAttributes;}[PermissionAuthorizeAction(PermissionActionName.Edit)]@@ -1822,7 +1854,7 @@ namespace Grand.Web.Admin.Controllersvar tierPrice = model.ToEntity(_dateTimeService);await _productService.InsertTierPrice(tierPrice, product.Id);-+return Content("");}elsediff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/ProductSpecificationMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/ProductSpecificationMappingExtensions.csnew file mode 100644index 000000000..d098d34d8--- /dev/null+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/ProductSpecificationMappingExtensions.cs@@ -0,0 +1,30 @@+using Grand.Infrastructure.Mapper;+using Grand.Domain.Catalog;+using Grand.Web.Admin.Models.Catalog;++namespace Grand.Web.Admin.Extensions+{+ public static class ProductSpecificationMappingExtensions+ {+ public static ProductModel.AddProductSpecificationAttributeModel ToModel(this ProductSpecificationAttribute entity)+ {+ return entity.MapTo<ProductSpecificationAttribute, ProductModel.AddProductSpecificationAttributeModel>();+ }++ public static ProductSpecificationAttribute ToEntity(this ProductModel.AddProductSpecificationAttributeModel model)+ {+ return model.MapTo<ProductModel.AddProductSpecificationAttributeModel, ProductSpecificationAttribute>();+ }++ public static ProductSpecificationAttribute ToEntity(this ProductModel.AddProductSpecificationAttributeModel model, ProductSpecificationAttribute destination)+ {+ if(model.AttributeTypeId != SpecificationAttributeType.Option)+ {+ model.SpecificationAttributeId = "";+ model.SpecificationAttributeOptionId = "";+ model.AllowFiltering = false;+ }+ return model.MapTo(destination);+ }+ }+}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Interfaces/IProductViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/IProductViewModelService.csindex 5d82e78df..8a34af59f 100644--- a/src/Web/Grand.Web.Admin/Interfaces/IProductViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Interfaces/IProductViewModelService.cs@@ -101,7 +101,7 @@ namespace Grand.Web.Admin.Interfaces//Product specificationTask<IList<ProductSpecificationAttributeModel>> PrepareProductSpecificationAttributeModel(Product product);Task InsertProductSpecificationAttributeModel(ProductModel.AddProductSpecificationAttributeModel model, Product product);- Task UpdateProductSpecificationAttributeModel(Product product, ProductSpecificationAttribute psa, ProductSpecificationAttributeModel model);+ Task UpdateProductSpecificationAttributeModel(Product product, ProductSpecificationAttribute psa, ProductModel.AddProductSpecificationAttributeModel model);Task DeleteProductSpecificationAttribute(Product product, ProductSpecificationAttribute psa);}}diff --git a/src/Web/Grand.Web.Admin/Mapper/ProductSpecificationProfile.cs b/src/Web/Grand.Web.Admin/Mapper/ProductSpecificationProfile.csnew file mode 100644index 000000000..1f077834a--- /dev/null+++ b/src/Web/Grand.Web.Admin/Mapper/ProductSpecificationProfile.cs@@ -0,0 +1,21 @@+using AutoMapper;+using Grand.Domain.Catalog;+using Grand.Infrastructure.Mapper;+using Grand.Web.Admin.Models.Catalog;++namespace Grand.Web.Admin.Mapper+{+ public class ProductSpecificationProfile : Profile, IAutoMapperProfile+ {+ public ProductSpecificationProfile()+ {+ CreateMap<ProductSpecificationAttribute, ProductModel.AddProductSpecificationAttributeModel>()+ .ForMember(dest => dest.AvailableAttributes, mo => mo.Ignore())+ .ForMember(dest => dest.AvailableOptions, mo => mo.Ignore());+ CreateMap<ProductModel.AddProductSpecificationAttributeModel, ProductSpecificationAttribute>();++ }++ public int Order => 0;+ }+}\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Models/Catalog/ProductModel.cs b/src/Web/Grand.Web.Admin/Models/Catalog/ProductModel.csindex c009cd0ff..e58b60b0e 100644--- a/src/Web/Grand.Web.Admin/Models/Catalog/ProductModel.cs+++ b/src/Web/Grand.Web.Admin/Models/Catalog/ProductModel.cs@@ -465,6 +465,8 @@ namespace Grand.Web.Admin.Models.CatalogAvailableOptions = new List<SelectListItem>();}+ public string Id { get; set; }+[GrandResourceDisplayName("Admin.Catalog.Products.SpecificationAttributes.Fields.SpecificationAttribute")]public string SpecificationAttributeId { get; set; }diff --git a/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs b/src/Web/Grand.Web.Admin/Services/ProductViewModelService.csindex a7651a32d..69348e907 100644--- a/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs+++ b/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs@@ -492,22 +492,6 @@ namespace Grand.Web.Admin.ServicesValue = productAttribute.Id.ToString()});}--- //specification attributes- var availableSpecificationAttributes = new List<SelectListItem>();- foreach (var sa in await _specificationAttributeService.GetSpecificationAttributes())- {- availableSpecificationAttributes.Add(new SelectListItem {- Text = sa.Name,- Value = sa.Id.ToString()- });- }- model.AddSpecificationAttributeModel.AvailableAttributes = availableSpecificationAttributes;-- //default specs values- model.AddSpecificationAttributeModel.ShowOnProductPage = true;-}//copy product@@ -2794,15 +2778,12 @@ namespace Grand.Web.Admin.Servicesvar items = new List<ProductSpecificationAttributeModel>();foreach (var x in product.ProductSpecificationAttributes.OrderBy(x => x.DisplayOrder)){- var specificationAttribute = await _specificationAttributeService.GetSpecificationAttributeById(x.SpecificationAttributeId);var psaModel = new ProductSpecificationAttributeModel {Id = x.Id,AttributeTypeId = (int)x.AttributeTypeId,- ProductSpecificationId = specificationAttribute.Id,AttributeId = x.SpecificationAttributeId,ProductId = product.Id,AttributeTypeName = x.AttributeTypeId.GetTranslationEnum(_translationService, _workContext),- AttributeName = specificationAttribute.Name,AllowFiltering = x.AllowFiltering,ShowOnProductPage = x.ShowOnProductPage,DisplayOrder = x.DisplayOrder@@ -2810,7 +2791,12 @@ namespace Grand.Web.Admin.Servicesswitch (x.AttributeTypeId){case SpecificationAttributeType.Option:- psaModel.ValueRaw = System.Net.WebUtility.HtmlEncode(specificationAttribute.SpecificationAttributeOptions.Where(y => y.Id == x.SpecificationAttributeOptionId).FirstOrDefault()?.Name);+ var specificationAttribute = await _specificationAttributeService.GetSpecificationAttributeById(x.SpecificationAttributeId);+ if (specificationAttribute != null)+ {+ psaModel.AttributeName = specificationAttribute.Name;+ psaModel.ValueRaw = System.Net.WebUtility.HtmlEncode(specificationAttribute.SpecificationAttributeOptions.Where(y => y.Id == x.SpecificationAttributeOptionId).FirstOrDefault()?.Name);+ }psaModel.SpecificationAttributeOptionId = x.SpecificationAttributeOptionId;break;case SpecificationAttributeType.CustomText:@@ -2852,19 +2838,9 @@ namespace Grand.Web.Admin.Servicesawait _specificationAttributeService.InsertProductSpecificationAttribute(psa, product.Id);product.ProductSpecificationAttributes.Add(psa);}- public virtual async Task UpdateProductSpecificationAttributeModel(Product product, ProductSpecificationAttribute psa, ProductSpecificationAttributeModel model)+ public virtual async Task UpdateProductSpecificationAttributeModel(Product product, ProductSpecificationAttribute psa, ProductModel.AddProductSpecificationAttributeModel model){- if (model.AttributeTypeId == (int)SpecificationAttributeType.Option)- {- psa.AllowFiltering = model.AllowFiltering;- psa.SpecificationAttributeOptionId = model.SpecificationAttributeOptionId;- }- else- {- psa.CustomValue = model.ValueRaw;- }- psa.ShowOnProductPage = model.ShowOnProductPage;- psa.DisplayOrder = model.DisplayOrder;+ psa = model.ToEntity(psa);await _specificationAttributeService.UpdateProductSpecificationAttribute(psa, model.ProductId);}public virtual async Task DeleteProductSpecificationAttribute(Product product, ProductSpecificationAttribute psa)diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/AddProductSpecificationAttributeModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/AddProductSpecificationAttributeModelValidator.csindex 6174ace85..ec3212ef4 100644--- a/src/Web/Grand.Web.Admin/Validators/Catalog/AddProductSpecificationAttributeModelValidator.cs+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/AddProductSpecificationAttributeModelValidator.cs@@ -7,6 +7,7 @@ using Grand.Domain.Customers;using Grand.Web.Admin.Extensions;using Grand.Web.Admin.Models.Catalog;using System.Collections.Generic;+using System.Linq;namespace Grand.Web.Admin.Validators.Catalog{@@ -14,7 +15,8 @@ namespace Grand.Web.Admin.Validators.Catalog{public AddProductSpecificationAttributeModelValidator(IEnumerable<IValidatorConsumer<ProductModel.AddProductSpecificationAttributeModel>> validators,- ITranslationService translationService, IProductService productService, IWorkContext workContext)+ ITranslationService translationService, IProductService productService, IWorkContext workContext,+ ISpecificationAttributeService specificationAttributeService): base(validators){if (!string.IsNullOrEmpty(workContext.CurrentCustomer.StaffStoreId))@@ -41,6 +43,31 @@ namespace Grand.Web.Admin.Validators.Catalogreturn true;}).WithMessage(translationService.GetResource("Admin.Catalog.Products.Permisions"));}++ RuleFor(x => x).MustAsync(async (x, y, context) =>+ {+ if (x.AttributeTypeId == Domain.Catalog.SpecificationAttributeType.Option)+ {+ if (string.IsNullOrEmpty(x.SpecificationAttributeId))+ return false;+ if (string.IsNullOrEmpty(x.SpecificationAttributeOptionId))+ return false;++ var specification = await specificationAttributeService.GetSpecificationAttributeById(x.SpecificationAttributeId);+ if (specification == null)+ return false;++ if(specification.SpecificationAttributeOptions.FirstOrDefault(z=>z.Id == x.SpecificationAttributeOptionId) == null)+ return false;++ return true;+ }++ if (string.IsNullOrEmpty(x.CustomValue))+ return false;++ return true;+ }).WithMessage(translationService.GetResource("Admin.Catalog.Products.SpecificationAttributes.Validate"));}}}\ 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 84ee4c2ff..dfac5cf64 100644--- a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml+++ b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml@@ -3676,11 +3676,17 @@<Value>Specification attributes</Value></Resource><Resource Name="Admin.Catalog.Products.SpecificationAttributes.AddButton">- <Value>Add attribute</Value>+ <Value>Add product specification</Value></Resource><Resource Name="Admin.Catalog.Products.SpecificationAttributes.AddNew"><Value>Add a new product specification attribute</Value></Resource>+ <Resource Name="Admin.Catalog.Products.SpecificationAttributes.Edit">+ <Value>Edit a product specification attribute</Value>+ </Resource>+ <Resource Name="Admin.Catalog.Products.SpecificationAttributes.Validate">+ <Value>A product specification attribute is not valid</Value>+ </Resource><Resource Name="Admin.Catalog.Products.SpecificationAttributes.Fields.AllowFiltering"><Value>Allow filtering</Value></Resource>@@ -3708,9 +3714,6 @@<Resource Name="Admin.Catalog.Products.SpecificationAttributes.Fields.Value"><Value>Value</Value></Resource>- <Resource Name="Admin.Catalog.Products.SpecificationAttributes.NoAttributes">- <Value>No specification attributes defined.</Value>- </Resource><Resource Name="Admin.Catalog.Products.SpecificationAttributes.SaveBeforeEdit"><Value>You need to save the product before you can add product specification attributes for this product page.</Value></Resource>diff --git a/src/Web/Grand.Web/Features/Handlers/Products/GetProductSpecificationHandler.cs b/src/Web/Grand.Web/Features/Handlers/Products/GetProductSpecificationHandler.csindex d5577ee11..2461e9652 100644--- a/src/Web/Grand.Web/Features/Handlers/Products/GetProductSpecificationHandler.cs+++ b/src/Web/Grand.Web/Features/Handlers/Products/GetProductSpecificationHandler.cs@@ -32,18 +32,20 @@ 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 specificationAttribute = await _specificationAttributeService.GetSpecificationAttributeById(item.SpecificationAttributeId);- var m = new ProductSpecificationModel {- SpecificationAttributeId = item.SpecificationAttributeId,- SpecificationAttributeName = specificationAttribute.GetTranslation(x => x.Name, request.Language.Id),- ColorSquaresRgb = specificationAttribute.SpecificationAttributeOptions.Where(x => x.Id == item.SpecificationAttributeOptionId).FirstOrDefault() != null ? specificationAttribute.SpecificationAttributeOptions.Where(x => x.Id == item.SpecificationAttributeOptionId).FirstOrDefault().ColorSquaresRgb : "",- UserFields = specificationAttribute.UserFields,- };+ var m = new ProductSpecificationModel();switch (item.AttributeTypeId){case SpecificationAttributeType.Option:- m.ValueRaw = WebUtility.HtmlEncode(specificationAttribute.SpecificationAttributeOptions.Where(x => x.Id == item.SpecificationAttributeOptionId).FirstOrDefault().GetTranslation(x => x.Name, request.Language.Id));+ var specificationAttribute = await _specificationAttributeService.GetSpecificationAttributeById(item.SpecificationAttributeId);+ if (specificationAttribute != null)+ {+ m.SpecificationAttributeId = item.SpecificationAttributeId;+ m.SpecificationAttributeName = specificationAttribute.GetTranslation(x => x.Name, request.Language.Id);+ m.ColorSquaresRgb = specificationAttribute.SpecificationAttributeOptions.Where(x => x.Id == item.SpecificationAttributeOptionId).FirstOrDefault() != null ? specificationAttribute.SpecificationAttributeOptions.Where(x => x.Id == item.SpecificationAttributeOptionId).FirstOrDefault().ColorSquaresRgb : "";+ m.UserFields = specificationAttribute.UserFields;+ m.ValueRaw = WebUtility.HtmlEncode(specificationAttribute.SpecificationAttributeOptions.Where(x => x.Id == item.SpecificationAttributeOptionId).FirstOrDefault().GetTranslation(x => x.Name, request.Language.Id));+ }break;case SpecificationAttributeType.CustomText:m.ValueRaw = WebUtility.HtmlEncode(item.CustomValue);