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 store-scoped contact attribute management to Grand.Web.Store (#710)
Krzysztof Pajak47c9ef2bdb1e
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Create.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Create.cshtmlnew file mode 100644index 000000000..a264a0f50--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Create.cshtml@@ -0,0 +1,35 @@+@model ContactAttributeStoreModel+@{+ ViewBag.Title = Loc["Admin.Catalog.Attributes.ContactAttributes.AddNew"];+}+<form asp-area="@Constants.AreaStore" asp-controller="ContactAttribute" asp-action="Create" method="post" id="contactattribute-form">++ <div class="row">+ <div class="col-md-12">+ <div class="x_panel light form-fit">+ <div class="x_title">+ <div class="caption">+ <i class="fa fa-list-alt"></i>+ @Loc["Admin.Catalog.Attributes.ContactAttributes.AddNew"]+ <small>+ <i class="fa fa-arrow-circle-left"></i>@Html.ActionLink(Loc["Admin.Catalog.Attributes.ContactAttributes.BackToList"], "List")+ </small>+ </div>+ <div class="actions">+ <div class="btn-group btn-group-devided">+ <button class="btn btn-success" type="submit" name="save">+ <i class="fa fa-check"></i> @Loc["Admin.Common.Save"]+ </button>+ <button class="btn btn-success" type="submit" name="save-continue">+ <i class="fa fa-check-circle"></i> @Loc["Admin.Common.SaveContinue"]+ </button>+ </div>+ </div>+ </div>+ <div class="x_content form">+ <partial name="Partials/CreateOrUpdate" model="Model"/>+ </div>+ </div>+ </div>+ </div>+</form>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Edit.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Edit.cshtmlnew file mode 100644index 000000000..c6869cd1f--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Edit.cshtml@@ -0,0 +1,54 @@+@model ContactAttributeStoreModel+@{+ var isReadOnly = Model.IsReadOnly;+ ViewBag.Title = Loc["Admin.Catalog.Attributes.ContactAttributes.EditAttributeDetails"];+}+<form asp-area="@Constants.AreaStore" asp-controller="ContactAttribute" asp-action="Edit" method="post" id="contactattribute-form">++ <div class="row">+ <div class="col-md-12">+ <div class="x_panel light form-fit">+ <div class="x_title">+ <div class="caption">+ <i class="fa fa-list-alt"></i>+ @Loc["Admin.Catalog.Attributes.ContactAttributes.EditAttributeDetails"] - @Model.Name+ <small>+ <i class="fa fa-arrow-circle-left"></i>@Html.ActionLink(Loc["Admin.Catalog.Attributes.ContactAttributes.BackToList"], "List")+ </small>+ </div>+ @if (!isReadOnly)+ {+ <div class="actions">+ <div class="btn-group btn-group-devided util-btn-margin-bottom-5">+ <button class="btn btn-success" type="submit" name="save">+ <i class="fa fa-check"></i> @Loc["Admin.Common.Save"]+ </button>+ <button class="btn btn-success" type="submit" name="save-continue">+ <i class="fa fa-check-circle"></i> @Loc["Admin.Common.SaveContinue"]+ </button>+ <span id="contactattribute-delete" class="btn red">+ <i class="fa fa-trash-o"></i> @Loc["Admin.Common.Delete"]+ </span>+ </div>+ </div>+ }+ else+ {+ <div class="actions">+ <div class="alert alert-info mb-0 py-2">+ <i class="fa fa-info-circle"></i> @Loc["Admin.Catalog.Attributes.ContactAttributes.GlobalReadOnly"]+ </div>+ </div>+ }+ </div>+ <div class="x_content form">+ <partial name="Partials/CreateOrUpdate" model="Model"/>+ </div>+ </div>+ </div>+ </div>+</form>+@if (!isReadOnly)+{+ <admin-delete-confirmation button-id="contactattribute-delete"/>+}diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/List.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/List.cshtmlnew file mode 100644index 000000000..eb9bdf14b--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/List.cshtml@@ -0,0 +1,97 @@+@{+ ViewBag.Title = Loc["Admin.Catalog.Attributes.ContactAttributes"];+}++<div class="row">+ <div class="col-md-12">+ <div class="x_panel light form-fit">+ <div class="x_title">+ <div class="caption">+ <i class="fa fa-list-alt"></i>+ @Loc["Admin.Catalog.Attributes.ContactAttributes"]+ </div>+ <div class="actions btn-group btn-group-devided">+ <a href="@Url.Action("Create", new { area = Constants.AreaStore })" class="btn green">+ <i class="fa fa-plus"></i><span class="d-none d-sm-inline"> @Loc["Admin.Common.AddNew"] </span>+ </a>+ </div>+ </div>+ <div class="x_content form">+ <div class="form-horizontal">+ <div class="form-body">+ <div class="x_content">+ <div id="contactattributes-grid"></div>+ </div>+ </div>+ </div>+ </div>+ </div>+ </div>+</div>++<script>+ $(document).ready(function () {+ $("#contactattributes-grid").kendoGrid({+ dataSource: {+ transport: {+ read: {+ url: "@Html.Raw(Url.Action("List", "ContactAttribute", new { area = Constants.AreaStore }))",+ type: "POST",+ dataType: "json",+ data: addAntiForgeryToken+ }+ },+ schema: {+ data: "Data",+ total: "Total",+ errors: "Errors"+ },+ error: function(e) {+ display_kendoui_grid_error(e);+ this.cancelChanges();+ },+ serverPaging: true,+ serverFiltering: true,+ serverSorting: true+ },+ pageable: {+ refresh: true,+ numeric: false,+ previousNext: false,+ info: false+ },+ scrollable: false,+ columns: [{+ field: "Name",+ title: "@Loc["Admin.Catalog.Attributes.ContactAttributes.Fields.Name"]",+ template: '<a class="k-link" href="Edit/#=Id#">#=kendo.htmlEncode(Name)#</a>'+ }, {+ field: "AttributeControlTypeName",+ title: "@Loc["Admin.Catalog.Attributes.ContactAttributes.Fields.AttributeControlType"]",+ headerAttributes: { style: "text-align:center" },+ attributes: { style: "text-align:center" },+ width: 200,+ minScreenWidth: 750+ }, {+ field: "IsRequired",+ title: "@Loc["Admin.Catalog.Attributes.ContactAttributes.Fields.IsRequired"]",+ width: 100,+ headerAttributes: { style: "text-align:center" },+ attributes: { style: "text-align:center" },+ template: '# if(IsRequired) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'+ }, {+ field: "DisplayOrder",+ title: "@Loc["Admin.Catalog.Attributes.ContactAttributes.Fields.DisplayOrder"]",+ width: 100,+ minScreenWidth: 750+ }, {+ field: "IsReadOnly",+ title: "@Loc["Admin.Common.View"]",+ width: 120,+ headerAttributes: { style: "text-align:center" },+ attributes: { style: "text-align:center" },+ template: '# if(IsReadOnly) {# <span class="badge badge-secondary">@Loc["Admin.Common.View"]</span> #} else {# <span class="badge badge-success">@Loc["Admin.Common.Edit"]</span> #} #'+ }]+ });+ });+</script>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/CreateOrUpdate.TabCondition.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/CreateOrUpdate.TabCondition.cshtmlnew file mode 100644index 000000000..0847b9bab--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/CreateOrUpdate.TabCondition.cshtml@@ -0,0 +1,121 @@+@model ContactAttributeModel+@{+ if (!string.IsNullOrEmpty(Model.Id))+ {+ <script>+ $(document).ready(function () {+ $("#@Html.IdFor(model => model.ConditionModel.EnableCondition)").click(toggleEnableCondition);+ toggleEnableCondition();+ });++ function toggleEnableCondition() {+ if ($('#@Html.IdFor(model => model.ConditionModel.EnableCondition)').is(':checked')) {+ $('#pnlAttributes').show();+ } else {+ $('#pnlAttributes').hide();+ }+ }+ </script>++ <div class="form-horizontal">+ <div class="form-body">+ <div class="form-group">+ <admin-label asp-for="ConditionModel.EnableCondition"/>+ <div class="col-md-9 col-sm-9">+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">+ <admin-input asp-for="ConditionModel.EnableCondition"/>+ <div class="control__indicator"></div>+ </label>+ <span asp-validation-for="ConditionModel.EnableCondition"></span>+ </div>+ </div>+ </div>+ </div>+ <div id="pnlAttributes">+ @if (Model.ConditionModel.ConditionAttributes.Count > 0)+ {+ <div class="form-horizontal">+ <div class="form-body">+ <div class="form-group">+ <admin-label asp-for="ConditionModel.SelectedAttributeId"/>+ <div class="col-md-9 col-sm-9">+ <admin-select asp-for="ConditionModel.SelectedAttributeId" asp-items="Model.ConditionModel.ConditionAttributes.Select(x => new SelectListItem { Text = x.Name, Value = x.Id.ToString() })"/>+ <script>+ $(document).ready(function() {+ $("#@Html.IdFor(model => model.ConditionModel.SelectedAttributeId)").change(toggleConditionAttributes);+ toggleConditionAttributes();+ });+ function toggleConditionAttributes() {+ var selectedContactAttributeId = $("#@Html.IdFor(model => model.ConditionModel.SelectedAttributeId)").val();+ $('[id^="pnl_attribute_values_"]').hide();+ $('#pnl_attribute_values_' + selectedContactAttributeId).show();+ }+ </script>+ </div>+ </div>+ <div class="form-group">+ <label class="control-label col-md-3"></label>+ <div class="col-md-9 col-sm-9">+ @for (var i = 0; i < Model.ConditionModel.ConditionAttributes.Count; i++)+ {+ <input type="hidden" asp-for="@Model.ConditionModel.ConditionAttributes[i].Id"/>+ <div id="@($"pnl_attribute_values_{Model.ConditionModel.ConditionAttributes[i].Id}")">+ @switch (Model.ConditionModel.ConditionAttributes[i].AttributeControlType)+ {+ case AttributeControlType.DropdownList:+ <admin-select asp-for="@Model.ConditionModel.ConditionAttributes[i].SelectedValueId" asp-items="Model.ConditionModel.ConditionAttributes[i].Values"/>+ break;+ case AttributeControlType.RadioList:+ case AttributeControlType.ColorSquares:+ case AttributeControlType.ImageSquares:+ foreach (var value in Model.ConditionModel.ConditionAttributes[i].Values)+ {+ <div>+ <input type="radio" asp-for="@Model.ConditionModel.ConditionAttributes[i].SelectedValueId" value="@value.Value" checked="@value.Selected"/>+ <label class="control-label">@value.Text</label>+ </div>+ }+ break;+ case AttributeControlType.Checkboxes:+ for (var j = 0; j < Model.ConditionModel.ConditionAttributes[i].Values.Count; j++)+ {+ <div>+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">+ <input type="hidden" asp-for="@Model.ConditionModel.ConditionAttributes[i].Values[j].Value"/>+ <admin-input asp-for="@Model.ConditionModel.ConditionAttributes[i].Values[j].Selected"/>+ @Model.ConditionModel.ConditionAttributes[i].Values[j].Text+ <div class="control__indicator"></div>+ </label>+ </div>+ }+ break;+ case AttributeControlType.ReadonlyCheckboxes:+ case AttributeControlType.TextBox:+ case AttributeControlType.MultilineTextbox:+ case AttributeControlType.Datepicker:+ case AttributeControlType.FileUpload:+ default:+ break;+ }+ </div>+ }+ </div>+ </div>+ </div>+ </div>+ }+ else+ {+ <div class="note note-info">+ @Loc["Admin.Catalog.Attributes.ContactAttributes.Condition.NoAttributeExists"]+ </div>+ }+ </div>+ }+ else+ {+ <div class="note note-info">+ @Loc["Admin.Catalog.Attributes.ContactAttributes.Condition.SaveBeforeEdit"]+ </div>+ }+}diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/CreateOrUpdate.TabInfo.cshtmlnew file mode 100644index 000000000..37af1ffa3--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/CreateOrUpdate.TabInfo.cshtml@@ -0,0 +1,162 @@+@using Microsoft.AspNetCore.Mvc.Razor+@model ContactAttributeStoreModel+@{+ var isReadOnly = Model.IsReadOnly;+}++<script>+ $(document).ready(function () {+ $("#@Html.IdFor(model => model.AttributeControlTypeId)").change(toggleAttributeControlType);+ toggleAttributeControlType();+ });++ function toggleAttributeControlType() {+ var selectedAttributeControlTypeId = $("#@Html.IdFor(model => model.AttributeControlTypeId)").val();+ if (selectedAttributeControlTypeId == @(((int)AttributeControlType.TextBox).ToString())) {+ $('#pnlValidationMinLength').show();+ $('#pnlValidationMaxLength').show();+ $('#pnlValidationFileMaximumSize').hide();+ $('#pnlValidationFileAllowedExtensions').hide();+ $('#pnlDefaultValue').show();+ $('#tab-contactAttributesValues').hide();+ } else if (selectedAttributeControlTypeId == @(((int)AttributeControlType.MultilineTextbox).ToString())) {+ $('#pnlValidationMinLength').show();+ $('#pnlValidationMaxLength').show();+ $('#pnlValidationFileMaximumSize').hide();+ $('#pnlValidationFileAllowedExtensions').hide();+ $('#pnlDefaultValue').show();+ $('#tab-contactAttributesValues').hide();+ } else if (selectedAttributeControlTypeId == @(((int)AttributeControlType.FileUpload).ToString())) {+ $('#pnlValidationMinLength').hide();+ $('#pnlValidationMaxLength').hide();+ $('#pnlValidationFileMaximumSize').show();+ $('#pnlValidationFileAllowedExtensions').show();+ $('#pnlDefaultValue').hide();+ $('#tab-contactAttributesValues').hide();+ } else if (selectedAttributeControlTypeId == @(((int)AttributeControlType.Checkboxes).ToString()) ||+ selectedAttributeControlTypeId == @(((int)AttributeControlType.ReadonlyCheckboxes).ToString()) ||+ selectedAttributeControlTypeId == @(((int)AttributeControlType.RadioList).ToString()) ||+ selectedAttributeControlTypeId == @(((int)AttributeControlType.ColorSquares).ToString()) ||+ selectedAttributeControlTypeId == @(((int)AttributeControlType.DropdownList).ToString())) {+ $('#pnlValidationMinLength').hide();+ $('#pnlValidationMaxLength').hide();+ $('#pnlValidationFileMaximumSize').hide();+ $('#pnlValidationFileAllowedExtensions').hide();+ $('#pnlDefaultValue').hide();+ $('#tab-contactAttributesValues').show();+ } else {+ $('#pnlValidationMinLength').hide();+ $('#pnlValidationMaxLength').hide();+ $('#pnlValidationFileMaximumSize').hide();+ $('#pnlValidationFileAllowedExtensions').hide();+ $('#pnlDefaultValue').hide();+ $('#tab-contactAttributesValues').hide();+ }+ }+</script>++@{+ 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" disabled="@isReadOnly"/>+ <span asp-validation-for="@Model.Locales[item].Name"></span>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="@Model.Locales[item].TextPrompt"/>+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="@Model.Locales[item].TextPrompt" disabled="@isReadOnly"/>+ <span asp-validation-for="@Model.Locales[item].TextPrompt"></span>+ </div>+ </div>+ <input type="hidden" asp-for="@Model.Locales[item].LanguageId"/>+ </div>;+}++<div class="form-horizontal">+ <localized-editor localized-template="@template" name="contactattribute-localized" language-ids="@Model.Locales.Select(c => c.LanguageId).ToList()">+ <div class="form-body">+ <div class="form-group">+ <admin-label asp-for="Name"/>+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="Name" disabled="@isReadOnly"/>+ <span asp-validation-for="Name"></span>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="TextPrompt"/>+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="TextPrompt" disabled="@isReadOnly"/>+ <span asp-validation-for="TextPrompt"></span>+ </div>+ </div>+ </div>+ </localized-editor>+ <div class="form-body">+ <div class="form-group">+ <admin-label asp-for="IsRequired"/>+ <div class="col-md-9 col-sm-9">+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">+ <admin-input asp-for="IsRequired" disabled="@isReadOnly"/>+ <div class="control__indicator"></div>+ </label>+ <span asp-validation-for="IsRequired"></span>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="AttributeControlTypeId"/>+ <div class="col-md-9 col-sm-9">+ @{+ var attributeControlTypes = EnumTranslationService.ToSelectList(((AttributeControlType)Model.AttributeControlTypeId), valuesToExclude: [(int)AttributeControlType.ImageSquares, (int)AttributeControlType.Hidden]);+ }+ <admin-select asp-for="AttributeControlTypeId" asp-items="attributeControlTypes" disabled="@isReadOnly"/>+ <span asp-validation-for="AttributeControlTypeId"></span>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="DisplayOrder"/>+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="DisplayOrder" disabled="@isReadOnly"/>+ <span asp-validation-for="DisplayOrder"></span>+ </div>+ </div>+ <div class="form-group" id="pnlValidationMinLength">+ <admin-label asp-for="ValidationMinLength"/>+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="ValidationMinLength" disabled="@isReadOnly"/>+ <span asp-validation-for="ValidationMinLength"></span>+ </div>+ </div>+ <div class="form-group" id="pnlValidationMaxLength">+ <admin-label asp-for="ValidationMaxLength"/>+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="ValidationMaxLength" disabled="@isReadOnly"/>+ <span asp-validation-for="ValidationMaxLength"></span>+ </div>+ </div>+ <div class="form-group" id="pnlValidationFileAllowedExtensions">+ <admin-label asp-for="ValidationFileAllowedExtensions"/>+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="ValidationFileAllowedExtensions" disabled="@isReadOnly"/>+ <span asp-validation-for="ValidationFileAllowedExtensions"></span>+ </div>+ </div>+ <div id="pnlValidationFileMaximumSize">+ <admin-label asp-for="ValidationFileMaximumSize"/>+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="ValidationFileMaximumSize" disabled="@isReadOnly"/>+ <span asp-validation-for="ValidationFileMaximumSize"></span>+ </div>+ </div>+ <div class="form-group" id="pnlDefaultValue">+ <admin-label asp-for="DefaultValue"/>+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="DefaultValue" disabled="@isReadOnly"/>+ <span asp-validation-for="DefaultValue"></span>+ </div>+ </div>+ </div>+</div>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/CreateOrUpdate.TabValues.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/CreateOrUpdate.TabValues.cshtmlnew file mode 100644index 000000000..d23abf0dd--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/CreateOrUpdate.TabValues.cshtml@@ -0,0 +1,182 @@+@model ContactAttributeStoreModel+@{+ var isReadOnly = Model.IsReadOnly;++ if (!string.IsNullOrEmpty(Model.Id))+ {+ <div class="panel panel-default">+ <div class="panel-body">+ <div id="contactattributevalues-grid"></div>+ </div>+ @if (!isReadOnly)+ {+ <div class="panel-footer">+ <a id="btnAddNewValue" href="@(Url.Action("ValueCreatePopup", "ContactAttribute", new { contactAttributeId = Model.Id, area = Constants.AreaStore }))" class="k-button"><i class="fa fa-plus"></i> @Loc["Admin.Catalog.Attributes.ContactAttributes.Values.AddNew"]</a>+ <input type="submit" id="btnRefresh" style="display: none"/>+ </div>+ }+ else+ {+ <input type="submit" id="btnRefresh" style="display: none"/>+ }+ </div>++ if (!isReadOnly)+ {+ <script>+ $(document).ready(function () {+ $('#btnAddNewValue').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ midClick: true,+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });++ $("#contactattributevalues-grid").kendoGrid({+ dataBound: function () {+ $('.editvalue').magnificPopup({+ type: 'ajax',+ settings: { cache: false, async: false },+ midClick: true,+ callbacks: {+ parseAjax: function (mfpResponse) {+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);+ },+ ajaxContentAdded: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ },+ dataSource: {+ transport: {+ read: {+ url: "@Html.Raw(Url.Action("ValueList", "ContactAttribute", new { contactAttributeId = Model.Id, area = Constants.AreaStore }))",+ type: "POST",+ dataType: "json",+ data: addAntiForgeryToken+ },+ destroy: {+ url: "@Html.Raw(Url.Action("ValueDelete", "ContactAttribute", 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);+ this.cancelChanges();+ },+ serverPaging: true,+ serverFiltering: true,+ serverSorting: true+ },+ pageable: { refresh: true, numeric: false, previousNext: false, info: false },+ editable: { confirmation: true, mode: "inline" },+ scrollable: false,+ columns: [{+ field: "Name",+ title: "@Loc["Admin.Catalog.Attributes.ContactAttributes.Values.Fields.Name"]",+ template: "<a class='k-link editvalue' href=\"@Url.Action("ValueEditPopup", "ContactAttribute", new { area = Constants.AreaStore })/#=Id#[email protected]\">#=kendo.htmlEncode(Name)#</a>"+ }, {+ field: "IsPreSelected",+ title: "@Loc["Admin.Catalog.Attributes.ContactAttributes.Values.Fields.IsPreSelected"]",+ width: 100,+ minScreenWidth: 500,+ headerAttributes: { style: "text-align:center" },+ attributes: { style: "text-align:center" },+ template: '# if(IsPreSelected) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'+ }, {+ field: "DisplayOrder",+ title: "@Loc["Admin.Catalog.Attributes.ContactAttributes.Values.Fields.DisplayOrder"]",+ headerAttributes: { style: "text-align:center" },+ attributes: { style: "text-align:center" },+ width: 100+ }, {+ command: { name: "destroy", text: "@Loc["Admin.Common.Delete"]" },+ title: "@Loc["Admin.Common.Delete"]",+ width: 100+ }]+ });++ $('#btnRefresh').click(function () {+ var grid = $("#contactattributevalues-grid").data('kendoGrid');+ grid.dataSource.read();+ return false;+ });+ });+ </script>+ }+ else+ {+ <script>+ $(document).ready(function () {+ $("#contactattributevalues-grid").kendoGrid({+ dataSource: {+ transport: {+ read: {+ url: "@Html.Raw(Url.Action("ValueList", "ContactAttribute", new { contactAttributeId = Model.Id, 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);+ this.cancelChanges();+ },+ serverPaging: true,+ serverFiltering: true,+ serverSorting: true+ },+ pageable: { refresh: true, numeric: false, previousNext: false, info: false },+ scrollable: false,+ columns: [{+ field: "Name",+ title: "@Loc["Admin.Catalog.Attributes.ContactAttributes.Values.Fields.Name"]"+ }, {+ field: "IsPreSelected",+ title: "@Loc["Admin.Catalog.Attributes.ContactAttributes.Values.Fields.IsPreSelected"]",+ width: 100,+ minScreenWidth: 500,+ headerAttributes: { style: "text-align:center" },+ attributes: { style: "text-align:center" },+ template: '# if(IsPreSelected) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'+ }, {+ field: "DisplayOrder",+ title: "@Loc["Admin.Catalog.Attributes.ContactAttributes.Values.Fields.DisplayOrder"]",+ headerAttributes: { style: "text-align:center" },+ attributes: { style: "text-align:center" },+ width: 100+ }]+ });+ });+ </script>+ }+ }+ else+ {+ <div class="note note-info">+ @Loc["Admin.Catalog.Attributes.ContactAttributes.Values.SaveBeforeEdit"]+ </div>+ }+}diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/CreateOrUpdate.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/CreateOrUpdate.cshtmlnew file mode 100644index 000000000..fec15355a--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/CreateOrUpdate.cshtml@@ -0,0 +1,36 @@+@model ContactAttributeStoreModel+@{+ var isReadOnly = Model.IsReadOnly;+}++<div asp-validation-summary="All"></div>+<input asp-for="Id" type="hidden"/>++<admin-tabstrip name="contactattribute-edit">+ <items>+ <tabstrip-item text="@Loc["Admin.Catalog.Attributes.ContactAttributes.Info"]" tab-index="0">+ <content>+ <div>+ <partial name="Partials/CreateOrUpdate.TabInfo" model="Model"/>+ </div>+ </content>+ </tabstrip-item>+ <tabstrip-item text="@Loc["Admin.Catalog.Attributes.ContactAttributes.Values"]" tab-index="1" id="tab-contactAttributesValues">+ <content>+ <div>+ <partial name="Partials/CreateOrUpdate.TabValues" model="Model"/>+ </div>+ </content>+ </tabstrip-item>+ @if (!isReadOnly && Model.ConditionAllowed)+ {+ <tabstrip-item text="@Loc["Admin.Catalog.Attributes.ContactAttributes.Condition"]" tab-index="2">+ <content>+ <div>+ <partial name="Partials/CreateOrUpdate.TabCondition" model="Model"/>+ </div>+ </content>+ </tabstrip-item>+ }+ </items>+</admin-tabstrip>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/CreateOrUpdateValue.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/CreateOrUpdateValue.cshtmlnew file mode 100644index 000000000..1791f901a--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/Partials/CreateOrUpdateValue.cshtml@@ -0,0 +1,81 @@+@using Microsoft.AspNetCore.Mvc.Razor+@using SharedUIConstants = Grand.SharedUIResources.Constants+@model ContactAttributeValueModel++<link rel="stylesheet" type="text/css" asp-src="@(SharedUIConstants.WwwRoot)/administration/farbtastic/farbtastic.css"/>+<script asp-location="Footer" asp-src="@(SharedUIConstants.WwwRoot)/administration/farbtastic/farbtastic.js"></script>++<div asp-validation-summary="All"></div>+<input asp-for="Id" type="hidden"/>+<input asp-for="ContactAttributeId" type="hidden"/>+<input asp-for="DisplayColorSquaresRgb" type="hidden"/>++@{+ Func<int, HelperResult>+ template = @<div class="form-body">+ <div class="form-group">+ <admin-label asp-for="@Model.Locales[item].Name" class="col-sm-3 control-label"/>+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="@Model.Locales[item].Name"/>+ <span asp-validation-for="@Model.Locales[item].Name"></span>+ </div>+ </div>+ <input type="hidden" asp-for="@Model.Locales[item].LanguageId"/>+ </div>;+}++<div class="form-horizontal">+ <localized-editor localized-template="@template" name="contactattributevalue-localized" language-ids="@Model.Locales.Select(c => c.LanguageId).ToList()">+ <div class="form-body">+ <div class="form-group">+ <admin-label asp-for="Name" class="col-sm-3 control-label"/>+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="Name"/>+ <span asp-validation-for="Name"></span>+ </div>+ </div>+ </div>+ </localized-editor>+ <div class="form-body">+ @if (Model.DisplayColorSquaresRgb)+ {+ <div class="form-group">+ <admin-label asp-for="ColorSquaresRgb" class="col-sm-3 control-label"/>+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="ColorSquaresRgb"/>+ <div id="color-picker"></div>+ <script type="text/javascript">+ $(document).ready(function(){+ $('#color-picker').farbtastic('#@Html.IdFor(model => model.ColorSquaresRgb)');+ });+ </script>+ <span asp-validation-for="ColorSquaresRgb"></span>+ </div>+ </div>+ }+ <div class="form-group">+ <admin-label asp-for="IsPreSelected" class="col-sm-3 control-label"/>+ <div class="col-md-9 col-sm-9">+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">+ <admin-input asp-for="IsPreSelected"/>+ <div class="control__indicator"></div>+ </label>+ <span asp-validation-for="IsPreSelected"></span>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="DisplayOrder" class="col-sm-3 control-label"/>+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="DisplayOrder"/>+ <span asp-validation-for="DisplayOrder"></span>+ </div>+ </div>+ <div class="form-group">+ <div class="offset-sm-3 offset-md-3 col-md-9 col-sm-9">+ <button class="btn btn-success" type="submit" name="save">+ <i class="fa fa-check"></i> @Loc["Admin.Common.Save"]+ </button>+ </div>+ </div>+ </div>+</div>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/ValueCreatePopup.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/ValueCreatePopup.cshtmlnew file mode 100644index 000000000..29d83ebb4--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/ValueCreatePopup.cshtml@@ -0,0 +1,54 @@+@using Grand.Web.Common.Extensions+@model ContactAttributeValueModel+@{+ Layout = "";+}+<form id="ValueCreatePopup" asp-area="@Constants.AreaStore" asp-controller="ContactAttribute" asp-action="ValueCreatePopup"+ asp-route-contactAttributeId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["contactAttributeId"])">+ <div class="row">+ <div class="col-md-12">+ <div class="x_panel light form-fit">+ <div class="x_title">+ <div class="caption">+ <i class="fa fa-list-alt"></i>+ @Loc["Admin.Catalog.Attributes.ContactAttributes.Values.AddNew"]+ </div>+ </div>+ <div class="x_content form">+ <partial name="Partials/CreateOrUpdateValue" model="Model"/>+ </div>+ </div>+ </div>+ </div>+ <script>+ var mfp = $.magnificPopup.instance;+ $("#ValueCreatePopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ $('#btnRefresh').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });+ </script>+</form>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/ValueEditPopup.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/ValueEditPopup.cshtmlnew file mode 100644index 000000000..dbe02b891--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ContactAttribute/ValueEditPopup.cshtml@@ -0,0 +1,54 @@+@using Grand.Web.Common.Extensions+@model ContactAttributeValueModel+@{+ Layout = "";+}+<form id="ValueEditPopup" asp-area="@Constants.AreaStore" asp-controller="ContactAttribute" asp-action="ValueEditPopup"+ asp-route-contactAttributeId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["contactAttributeId"])">+ <div class="row">+ <div class="col-md-12">+ <div class="x_panel light form-fit">+ <div class="x_title">+ <div class="caption">+ <i class="fa fa-list-alt"></i>+ @Loc["Admin.Catalog.Attributes.ContactAttributes.Values.EditValueDetails"]+ </div>+ </div>+ <div class="x_content form">+ <partial name="Partials/CreateOrUpdateValue" model="Model"/>+ </div>+ </div>+ </div>+ </div>+ <script>+ var mfp = $.magnificPopup.instance;+ $("#ValueEditPopup").submit(function (e) {+ e.preventDefault();+ var form = $(this);+ var url = form.attr('action');+ $.ajax({+ type: "POST",+ url: url,+ data: form.serialize(),+ success: function (data) {+ if (data == "") {+ mfp.close();+ $('#btnRefresh').click();+ } else {+ $.magnificPopup.open({+ items: {+ src: data,+ type: 'inline'+ },+ callbacks: {+ open: function () {+ $('.mfp-wrap').removeAttr('tabindex');+ }+ }+ });+ }+ }+ });+ });+ </script>+</form>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/_ViewImports.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/_ViewImports.cshtmlindex d330949c8..f9058e898 100644--- a/src/Web/Grand.Web.Store/Areas/Store/Views/_ViewImports.cshtml+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/_ViewImports.cshtml@@ -36,6 +36,7 @@@using Grand.Web.AdminShared.Models.Settings@using Grand.Web.AdminShared.Models.Shipping@using Grand.Web.AdminShared.Models.Discounts+@using Grand.Web.Store.Models.Messages@inject LocService Loc@inject IEnumTranslationService EnumTranslationService\ No newline at end of filediff --git a/src/Web/Grand.Web.Store/Controllers/ContactAttributeController.cs b/src/Web/Grand.Web.Store/Controllers/ContactAttributeController.csnew file mode 100644index 000000000..a801c9f64--- /dev/null+++ b/src/Web/Grand.Web.Store/Controllers/ContactAttributeController.cs@@ -0,0 +1,304 @@+using Grand.Business.Core.Extensions;+using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Business.Core.Interfaces.Marketing.Contacts;+using Grand.Domain.Messages;+using Grand.Domain.Permissions;+using Grand.Domain.Catalog;+using Grand.Infrastructure;+using Grand.Infrastructure.Mapper;+using Grand.Web.AdminShared.Extensions;+using Grand.Web.AdminShared.Extensions.Mapping;+using Grand.Web.AdminShared.Interfaces;+using Grand.Web.AdminShared.Models.Messages;+using Grand.Web.Store.Models.Messages;+using Grand.Web.Common.DataSource;+using Grand.Web.Common.Filters;+using Grand.Web.Common.Security.Authorization;+using Microsoft.AspNetCore.Mvc;++namespace Grand.Web.Store.Controllers;++[PermissionAuthorize(PermissionSystemName.ContactAttributes)]+public class ContactAttributeController : BaseStoreController+{+ private readonly IContactAttributeViewModelService _contactAttributeViewModelService;+ private readonly IContactAttributeService _contactAttributeService;+ private readonly ILanguageService _languageService;+ private readonly ITranslationService _translationService;+ private readonly IContextAccessor _contextAccessor;++ public ContactAttributeController(+ IContactAttributeViewModelService contactAttributeViewModelService,+ IContactAttributeService contactAttributeService,+ ILanguageService languageService,+ ITranslationService translationService,+ IContextAccessor contextAccessor)+ {+ _contactAttributeViewModelService = contactAttributeViewModelService;+ _contactAttributeService = contactAttributeService;+ _languageService = languageService;+ _translationService = translationService;+ _contextAccessor = contextAccessor;+ }++ private string CurrentStoreId => _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId;++ private bool IsVisibleToStore(ContactAttribute attr) =>+ !attr.LimitedToStores || attr.Stores.Contains(CurrentStoreId);++ #region Contact attributes++ public IActionResult Index()+ {+ return RedirectToAction("List");+ }++ public IActionResult List()+ {+ return View();+ }++ [HttpPost]+ [PermissionAuthorizeAction(PermissionActionName.List)]+ public async Task<IActionResult> List(DataSourceRequest command)+ {+ var contactAttributes = await _contactAttributeViewModelService.PrepareContactAttributeListModel();+ var storeId = CurrentStoreId;+ var gridModel = new DataSourceResult {+ Data = contactAttributes.Select(x => new {+ x.Id,+ x.Name,+ x.AttributeControlTypeName,+ x.IsRequired,+ x.DisplayOrder,+ IsReadOnly = !(x.Stores != null && x.Stores.Length == 1 && x.Stores.Contains(storeId))+ }).ToList(),+ Total = contactAttributes.Count()+ };+ return Json(gridModel);+ }++ [PermissionAuthorizeAction(PermissionActionName.Create)]+ public async Task<IActionResult> Create()+ {+ var model = new ContactAttributeStoreModel();+ await AddLocales(_languageService, model.Locales);+ await _contactAttributeViewModelService.PrepareConditionAttributes(model, null);+ return View(model);+ }++ [HttpPost]+ [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]+ [PermissionAuthorizeAction(PermissionActionName.Create)]+ public async Task<IActionResult> Create(ContactAttributeStoreModel model, bool continueEditing)+ {+ if (ModelState.IsValid)+ {+ model.Stores = [CurrentStoreId];+ var contactAttribute = await _contactAttributeViewModelService.InsertContactAttributeModel(model);+ Success(_translationService.GetResource("Admin.Catalog.Attributes.ContactAttributes.Added"));+ return continueEditing+ ? RedirectToAction("Edit", new { id = contactAttribute.Id })+ : RedirectToAction("List");+ }++ await _contactAttributeViewModelService.PrepareConditionAttributes(model, null);+ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Preview)]+ public async Task<IActionResult> Edit(string id)+ {+ var contactAttribute = await _contactAttributeService.GetContactAttributeById(id);+ if (contactAttribute == null || !IsVisibleToStore(contactAttribute))+ return RedirectToAction("List");++ var model = contactAttribute.MapTo<ContactAttribute, ContactAttributeStoreModel>();+ model.IsReadOnly = !contactAttribute.AccessToEntityByStore(CurrentStoreId);+ await AddLocales(_languageService, model.Locales, (locale, languageId) =>+ {+ locale.Name = contactAttribute.GetTranslation(x => x.Name, languageId, false);+ locale.TextPrompt = contactAttribute.GetTranslation(x => x.TextPrompt, languageId, false);+ });+ await _contactAttributeViewModelService.PrepareConditionAttributes(model, contactAttribute);++ return View(model);+ }++ [HttpPost]+ [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]+ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public async Task<IActionResult> Edit(ContactAttributeModel model, bool continueEditing)+ {+ var contactAttribute = await _contactAttributeService.GetContactAttributeById(model.Id);+ if (contactAttribute == null)+ return RedirectToAction("List");++ if (!contactAttribute.AccessToEntityByStore(CurrentStoreId))+ return RedirectToAction("List");++ if (ModelState.IsValid)+ {+ model.Stores = [CurrentStoreId];+ contactAttribute = await _contactAttributeViewModelService.UpdateContactAttributeModel(contactAttribute, model);+ Success(_translationService.GetResource("Admin.Catalog.Attributes.ContactAttributes.Updated"));+ if (continueEditing)+ {+ await SaveSelectedTabIndex();+ return RedirectToAction("Edit", new { id = contactAttribute.Id });+ }++ return RedirectToAction("List");+ }++ var storeModel = contactAttribute.MapTo<ContactAttribute, ContactAttributeStoreModel>();+ storeModel.IsReadOnly = false;+ await _contactAttributeViewModelService.PrepareConditionAttributes(storeModel, contactAttribute);+ return View(storeModel);+ }++ [HttpPost]+ [PermissionAuthorizeAction(PermissionActionName.Delete)]+ public async Task<IActionResult> Delete(string id)+ {+ var contactAttribute = await _contactAttributeService.GetContactAttributeById(id);+ if (contactAttribute == null)+ return RedirectToAction("List");++ if (!contactAttribute.AccessToEntityByStore(CurrentStoreId))+ return RedirectToAction("Edit", new { id });++ if (ModelState.IsValid)+ {+ await _contactAttributeService.DeleteContactAttribute(contactAttribute);+ Success(_translationService.GetResource("Admin.Catalog.Attributes.ContactAttributes.Deleted"));+ return RedirectToAction("List");+ }++ Error(ModelState);+ return RedirectToAction("Edit", new { id });+ }++ #endregion++ #region Contact attribute values++ [HttpPost]+ [PermissionAuthorizeAction(PermissionActionName.Preview)]+ public async Task<IActionResult> ValueList(string contactAttributeId, DataSourceRequest command)+ {+ var contactAttribute = await _contactAttributeService.GetContactAttributeById(contactAttributeId);+ if (contactAttribute == null || !IsVisibleToStore(contactAttribute))+ return new JsonResult(new DataSourceResult { Errors = "Access denied" });++ var values = contactAttribute.ContactAttributeValues;+ var gridModel = new DataSourceResult {+ Data = values.Select(x => new ContactAttributeValueModel {+ Id = x.Id,+ ContactAttributeId = x.ContactAttributeId,+ Name = contactAttribute.AttributeControlType != AttributeControlType.ColorSquares+ ? x.Name+ : $"{x.Name} - {x.ColorSquaresRgb}",+ ColorSquaresRgb = x.ColorSquaresRgb,+ IsPreSelected = x.IsPreSelected,+ DisplayOrder = x.DisplayOrder+ }),+ Total = values.Count+ };+ return Json(gridModel);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public async Task<IActionResult> ValueCreatePopup(string contactAttributeId)+ {+ var contactAttribute = await _contactAttributeService.GetContactAttributeById(contactAttributeId);+ if (contactAttribute == null || !contactAttribute.AccessToEntityByStore(CurrentStoreId))+ return RedirectToAction("List");++ var model = _contactAttributeViewModelService.PrepareContactAttributeValueModel(contactAttribute);+ await AddLocales(_languageService, model.Locales);+ return View(model);+ }++ [HttpPost]+ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public async Task<IActionResult> ValueCreatePopup(ContactAttributeValueModel model)+ {+ var contactAttribute = await _contactAttributeService.GetContactAttributeById(model.ContactAttributeId);+ if (contactAttribute == null || !contactAttribute.AccessToEntityByStore(CurrentStoreId))+ return RedirectToAction("List");++ if (ModelState.IsValid)+ {+ await _contactAttributeViewModelService.InsertContactAttributeValueModel(contactAttribute, model);+ return Content("");+ }++ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public async Task<IActionResult> ValueEditPopup(string id, string contactAttributeId)+ {+ var contactAttribute = await _contactAttributeService.GetContactAttributeById(contactAttributeId);+ if (contactAttribute == null || !contactAttribute.AccessToEntityByStore(CurrentStoreId))+ return RedirectToAction("List");++ var cav = contactAttribute.ContactAttributeValues.FirstOrDefault(x => x.Id == id);+ if (cav == null)+ return RedirectToAction("List");++ var model = _contactAttributeViewModelService.PrepareContactAttributeValueModel(contactAttribute, cav);+ await AddLocales(_languageService, model.Locales, (locale, languageId) =>+ {+ locale.Name = cav.GetTranslation(x => x.Name, languageId, false);+ });++ return View(model);+ }++ [HttpPost]+ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public async Task<IActionResult> ValueEditPopup(ContactAttributeValueModel model)+ {+ var contactAttribute = await _contactAttributeService.GetContactAttributeById(model.ContactAttributeId);+ if (contactAttribute == null || !contactAttribute.AccessToEntityByStore(CurrentStoreId))+ return RedirectToAction("List");++ var cav = contactAttribute.ContactAttributeValues.FirstOrDefault(x => x.Id == model.Id);+ if (cav == null)+ return RedirectToAction("List");++ if (ModelState.IsValid)+ {+ await _contactAttributeViewModelService.UpdateContactAttributeValueModel(contactAttribute, cav, model);+ return Content("");+ }++ return View(model);+ }++ [HttpPost]+ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public async Task<IActionResult> ValueDelete(string id, string contactAttributeId)+ {+ var contactAttribute = await _contactAttributeService.GetContactAttributeById(contactAttributeId);+ if (contactAttribute == null || !contactAttribute.AccessToEntityByStore(CurrentStoreId))+ return new JsonResult(new DataSourceResult { Errors = "Access denied" });++ var cav = contactAttribute.ContactAttributeValues.FirstOrDefault(x => x.Id == id);+ if (cav == null)+ throw new ArgumentException("No contact attribute value found with the specified id");++ if (ModelState.IsValid)+ {+ contactAttribute.ContactAttributeValues.Remove(cav);+ await _contactAttributeService.UpdateContactAttribute(contactAttribute);+ return new JsonResult("");+ }++ return ErrorForKendoGridJson(ModelState);+ }++ #endregion+}diff --git a/src/Web/Grand.Web.Store/Mapper/ContactAttributeStoreProfile.cs b/src/Web/Grand.Web.Store/Mapper/ContactAttributeStoreProfile.csnew file mode 100644index 000000000..60271f118--- /dev/null+++ b/src/Web/Grand.Web.Store/Mapper/ContactAttributeStoreProfile.cs@@ -0,0 +1,21 @@+using Grand.Domain.Messages;+using Grand.Infrastructure.Mapper;+using Grand.Mapping;+using Grand.Web.Store.Models.Messages;++namespace Grand.Web.Store.Mapper;++public class ContactAttributeStoreProfile : Profile, IAutoMapperProfile+{+ public ContactAttributeStoreProfile()+ {+ CreateMap<ContactAttribute, ContactAttributeStoreModel>()+ .ForMember(dest => dest.Locales, mo => mo.Ignore())+ .ForMember(dest => dest.AttributeControlTypeName, mo => mo.Ignore())+ .ForMember(dest => dest.ConditionAllowed, mo => mo.Ignore())+ .ForMember(dest => dest.ConditionModel, mo => mo.Ignore())+ .ForMember(dest => dest.IsReadOnly, mo => mo.Ignore());+ }++ public int Order => 0;+}diff --git a/src/Web/Grand.Web.Store/Models/Messages/ContactAttributeStoreModel.cs b/src/Web/Grand.Web.Store/Models/Messages/ContactAttributeStoreModel.csnew file mode 100644index 000000000..3802cd555--- /dev/null+++ b/src/Web/Grand.Web.Store/Models/Messages/ContactAttributeStoreModel.cs@@ -0,0 +1,8 @@+using Grand.Web.AdminShared.Models.Messages;++namespace Grand.Web.Store.Models.Messages;++public class ContactAttributeStoreModel : ContactAttributeModel+{+ public bool IsReadOnly { get; set; }+}diff --git a/src/Web/Grand.Web.Store/Validators/ContactAttributeStoreValidator.cs b/src/Web/Grand.Web.Store/Validators/ContactAttributeStoreValidator.csnew file mode 100644index 000000000..ec15f2f6c--- /dev/null+++ b/src/Web/Grand.Web.Store/Validators/ContactAttributeStoreValidator.cs@@ -0,0 +1,17 @@+using FluentValidation;+using Grand.Infrastructure.Validators;+using Grand.Web.AdminShared.Models.Messages;+using Grand.Web.Store.Models.Messages;++namespace Grand.Web.Store.Validators;++public class ContactAttributeStoreValidator : BaseGrandValidator<ContactAttributeStoreModel>+{+ public ContactAttributeStoreValidator(+ IEnumerable<IValidatorConsumer<ContactAttributeStoreModel>> validators,+ IValidator<ContactAttributeModel> baseValidator)+ : base(validators)+ {+ Include(baseValidator);+ }+}diff --git a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xmlindex c3407ce74..c60e745e3 100644Binary files a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml and b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml differ