Skip to content

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.

Add checkout attribute management functionality (by store) #570 (#609)

Krzysztof Pajak9627ae1b43f2
diff --git a/src/Modules/Grand.Module.Installer/Extensions/PermissionExtensions.cs b/src/Modules/Grand.Module.Installer/Extensions/PermissionExtensions.cs
index f998b7cb9..729f88c5b 100644
--- a/src/Modules/Grand.Module.Installer/Extensions/PermissionExtensions.cs
+++ b/src/Modules/Grand.Module.Installer/Extensions/PermissionExtensions.cs
@@ -211,6 +211,7 @@ public static class PermissionExtensions
StandardPermission.ManagePaymentTransactions,
StandardPermission.ManageShipments,
StandardPermission.ManageMerchandiseReturns,
+ StandardPermission.ManageCheckoutAttribute,
StandardPermission.ManageReports
]
},
diff --git a/src/Web/Grand.Web.AdminShared/Interfaces/ICheckoutAttributeViewModelService.cs b/src/Web/Grand.Web.AdminShared/Interfaces/ICheckoutAttributeViewModelService.cs
index fa71218a2..f79ea7052 100644
--- a/src/Web/Grand.Web.AdminShared/Interfaces/ICheckoutAttributeViewModelService.cs
+++ b/src/Web/Grand.Web.AdminShared/Interfaces/ICheckoutAttributeViewModelService.cs
@@ -5,7 +5,7 @@ namespace Grand.Web.AdminShared.Interfaces;
public interface ICheckoutAttributeViewModelService
{
- Task<IEnumerable<CheckoutAttributeModel>> PrepareCheckoutAttributeListModel();
+ Task<IEnumerable<CheckoutAttributeModel>> PrepareCheckoutAttributeListModel(string storeId = "");
Task<IEnumerable<CheckoutAttributeValueModel>> PrepareCheckoutAttributeValuesModel(string checkoutAttributeId);
Task<CheckoutAttributeModel> PrepareCheckoutAttributeModel();
Task<CheckoutAttributeValueModel> PrepareCheckoutAttributeValueModel(string checkoutAttributeId);
diff --git a/src/Web/Grand.Web.AdminShared/Services/CheckoutAttributeViewModelService.cs b/src/Web/Grand.Web.AdminShared/Services/CheckoutAttributeViewModelService.cs
index 8871673e2..da4b224bb 100644
--- a/src/Web/Grand.Web.AdminShared/Services/CheckoutAttributeViewModelService.cs
+++ b/src/Web/Grand.Web.AdminShared/Services/CheckoutAttributeViewModelService.cs
@@ -27,9 +27,9 @@ public class CheckoutAttributeViewModelService(
IEnumTranslationService enumTranslationService)
: ICheckoutAttributeViewModelService
{
- public virtual async Task<IEnumerable<CheckoutAttributeModel>> PrepareCheckoutAttributeListModel()
+ public virtual async Task<IEnumerable<CheckoutAttributeModel>> PrepareCheckoutAttributeListModel(string storeId = "")
{
- var checkoutAttributes = await checkoutAttributeService.GetAllCheckoutAttributes(ignoreAcl: true);
+ var checkoutAttributes = await checkoutAttributeService.GetAllCheckoutAttributes(storeId: storeId, ignoreAcl: true);
return checkoutAttributes.Select((Func<CheckoutAttribute, CheckoutAttributeModel>)(x =>
{
var attributeModel = x.ToModel();
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Create.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Create.cshtml
new file mode 100644
index 000000000..780ee3d3e
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Create.cshtml
@@ -0,0 +1,37 @@
+@model CheckoutAttributeModel
+@{
+ //page title
+ ViewBag.Title = Loc["Admin.Orders.CheckoutAttributes.AddNew"];
+}
+<form asp-area="@Constants.AreaStore" asp-controller="CheckoutAttribute" asp-action="Create" method="post" id="checkoutattribute-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.Orders.CheckoutAttributes.AddNew"]
+ <small>
+ <i class="fa fa-arrow-circle-left"></i>@Html.ActionLink(Loc["Admin.Orders.CheckoutAttributes.BackToList"], "List")
+ </small>
+ </div>
+ <div class="actions">
+ <div class="btn-group btn-group-devided">
+ <button class="btn btn-success" type="submit" name="save">
+ <i class="fa fa-check"></i> @Loc["Admin.Common.Save"]
+ </button>
+ <button class="btn btn-success" type="submit" name="save-continue">
+ <i class="fa fa-check-circle"></i> @Loc["Admin.Common.SaveContinue"]
+ </button>
+ <vc:admin-widget widget-zone="checkout_attribute_details_buttons" additional-data="null"/>
+ </div>
+ </div>
+ </div>
+ <div class="x_content form">
+ <partial name="Partials/CreateOrUpdate" model="Model"/>
+ </div>
+ </div>
+ </div>
+ </div>
+</form>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Edit.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Edit.cshtml
new file mode 100644
index 000000000..34ab60b99
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Edit.cshtml
@@ -0,0 +1,42 @@
+@model CheckoutAttributeModel
+
+@{
+ //page title
+ ViewBag.Title = Loc["Admin.Orders.CheckoutAttributes.EditAttributeDetails"];
+}
+<form asp-area="@Constants.AreaStore" asp-controller="CheckoutAttribute" asp-action="Edit" method="post" id="checkoutattribute-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.Orders.CheckoutAttributes.EditAttributeDetails"] - @Model.Name
+ <small>
+ <i class="fa fa-arrow-circle-left"></i>@Html.ActionLink(Loc["Admin.Orders.CheckoutAttributes.BackToList"], "List")
+ </small>
+ </div>
+ <div class="actions">
+ <div class="btn-group btn-group-devided util-btn-margin-bottom-5">
+ <button class="btn btn-success" type="submit" name="save">
+ <i class="fa fa-check"></i> @Loc["Admin.Common.Save"]
+ </button>
+ <button class="btn btn-success" type="submit" name="save-continue">
+ <i class="fa fa-check-circle"></i> @Loc["Admin.Common.SaveContinue"]
+ </button>
+ <span id="checkoutattribute-delete" class="btn red">
+ <i class="fa fa-trash-o"></i> @Loc["Admin.Common.Delete"]
+ </span>
+ <vc:admin-widget widget-zone="checkout_attribute_details_buttons" additional-data="Model"/>
+ </div>
+ </div>
+ </div>
+ <div class="x_content form">
+ <partial name="Partials/CreateOrUpdate" model="Model"/>
+ </div>
+ </div>
+ </div>
+ </div>
+</form>
+<admin-delete-confirmation button-id="checkoutattribute-delete"/>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/List.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/List.cshtml
new file mode 100644
index 000000000..da94020f9
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/List.cshtml
@@ -0,0 +1,98 @@
+@{
+ //page title
+ ViewBag.Title = Loc["Admin.Orders.CheckoutAttributes"];
+}
+
+<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.Orders.CheckoutAttributes"]
+ </div>
+ <div class="actions btn-group btn-group-devided">
+ <a href="@Url.Action("Create", new { area = Constants.AreaStore })" class="btn green">
+ <i class="fa fa-plus"></i><span class="d-none d-sm-inline"> @Loc["Admin.Common.AddNew"] </span>
+ </a>
+ <vc:admin-widget widget-zone="checkout_attribute_list_buttons" additional-data="null"/>
+ </div>
+
+ </div>
+ <div class="x_content form">
+ <div class="form-horizontal">
+ <div class="form-body">
+ <div class="x_content">
+ <div id="checkoutattributes-grid"></div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+<script>
+ $(document).ready(function () {
+ $("#checkoutattributes-grid").kendoGrid({
+ dataSource: {
+ transport: {
+ read: {
+ url: "@Html.Raw(Url.Action("List", "CheckoutAttribute", new { area = Constants.AreaStore }))",
+ type: "POST",
+ dataType: "json",
+ data: addAntiForgeryToken
+ }
+ },
+ schema: {
+ data: "Data",
+ total: "Total",
+ errors: "Errors"
+ },
+ error: function(e) {
+ display_kendoui_grid_error(e);
+ // Cancel the changes
+ this.cancelChanges();
+ },
+ serverPaging: true,
+ serverFiltering: true,
+ serverSorting: true
+ },
+ pageable: {
+ refresh: true,
+ numeric: false,
+ previousNext: false,
+ info: false
+ },
+ editable: {
+ confirmation: false,
+ mode: "inline"
+ },
+ scrollable: false,
+ columns: [{
+ field: "Name",
+ title: "@Loc["Admin.Orders.CheckoutAttributes.Fields.Name"]",
+ template: '<a class="k-link" href="@Url.Action("Edit", "CheckoutAttribute", new { area = Constants.AreaStore })/#=Id#">#=kendo.htmlEncode(Name)#</a>',
+ }, {
+ field: "AttributeControlTypeName",
+ title: "@Loc["Admin.Orders.CheckoutAttributes.Fields.AttributeControlType"]",
+ headerAttributes: { style: "text-align:center" },
+ attributes: { style: "text-align:center" },
+ width: 200,
+ minScreenWidth: 750,
+ },{
+ field: "IsRequired",
+ title: "@Loc["Admin.Orders.CheckoutAttributes.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.Orders.CheckoutAttributes.Fields.DisplayOrder"]",
+ width: 100,
+ minScreenWidth: 750,
+ }]
+ });
+ });
+</script>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/CreateOrUpdate.TabCondition.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/CreateOrUpdate.TabCondition.cshtml
new file mode 100644
index 000000000..3031f4945
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/CreateOrUpdate.TabCondition.cshtml
@@ -0,0 +1,126 @@
+@model CheckoutAttributeModel
+<vc:admin-widget widget-zone="checkout_attribute_details_condition_top" additional-data="Model"/>
+@{
+ 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 selectedCheckoutAttributeId = $("#@Html.IdFor(model => model.ConditionModel.SelectedAttributeId)").val();
+ $('[id^="pnl_attribute_values_"]').hide();
+ $('#pnl_attribute_values_' + selectedCheckoutAttributeId).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:
+ //not supported as conditions
+ break;
+ }
+ </div>
+ }
+ </div>
+ </div>
+ </div>
+ </div>
+ }
+ else
+ {
+ <div class="note note-info">
+ @Loc["Admin.Orders.CheckoutAttributes.Condition.NoAttributeExists"]
+ </div>
+ }
+ </div>
+ }
+ else
+ {
+ <div class="note note-info">
+ @Loc["Admin.Orders.CheckoutAttributes.Condition.SaveBeforeEdit"]
+ </div>
+ }
+}
+<vc:admin-widget widget-zone="checkout_attribute_details_condition_bottom" additional-data="Model"/>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/CreateOrUpdate.TabInfo.cshtml
new file mode 100644
index 000000000..fd67f2a7f
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/CreateOrUpdate.TabInfo.cshtml
@@ -0,0 +1,201 @@
+@using Microsoft.AspNetCore.Mvc.Razor
+@model CheckoutAttributeModel
+
+<script>
+ $(document).ready(function () {
+
+ $("#@Html.IdFor(model => model.IsTaxExempt)").click(toggleTax);
+ $("#@Html.IdFor(model => model.AttributeControlTypeId)").change(toggleAttributeControlType);
+
+ toggleTax();
+ toggleAttributeControlType();
+ });
+
+ function toggleTax() {
+ if ($('#@Html.IdFor(model => model.IsTaxExempt)').is(':checked')) {
+ $('#pnlTaxCategory').hide();
+ } else {
+ $('#pnlTaxCategory').show();
+ }
+ }
+
+ 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-checkoutAttributesValues').hide();
+ } else if (selectedAttributeControlTypeId == @(((int)AttributeControlType.MultilineTextbox).ToString())) {
+ $('#pnlValidationMinLength').show();
+ $('#pnlValidationMaxLength').show();
+ $('#pnlValidationFileMaximumSize').hide();
+ $('#pnlValidationFileAllowedExtensions').hide();
+ $('#pnlDefaultValue').show();
+ $('#tab-checkoutAttributesValues').hide();
+ } else if (selectedAttributeControlTypeId == @(((int)AttributeControlType.FileUpload).ToString())) {
+ $('#pnlValidationMinLength').hide();
+ $('#pnlValidationMaxLength').hide();
+ $('#pnlValidationFileMaximumSize').show();
+ $('#pnlValidationFileAllowedExtensions').show();
+ $('#pnlDefaultValue').hide();
+ $('#tab-checkoutAttributesValues').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-checkoutAttributesValues').show();
+ }else {
+ $('#pnlValidationMinLength').hide();
+ $('#pnlValidationMaxLength').hide();
+ $('#pnlValidationFileMaximumSize').hide();
+ $('#pnlValidationFileAllowedExtensions').hide();
+ $('#pnlDefaultValue').hide();
+ $('#tab-checkoutAttributesValues').hide();
+ }
+ }
+</script>
+<vc:admin-widget widget-zone="checkout_attribute_details_info_top" additional-data="Model"/>
+
+@{
+ Func<int, HelperResult>
+ template = @<div class="form-body">
+ <div class="form-group">
+ <admin-label asp-for="@Model.Locales[item].Name"/>
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="@Model.Locales[item].Name"/>
+ <span asp-validation-for="@Model.Locales[item].Name"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <admin-label asp-for="@Model.Locales[item].TextPrompt"/>
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="@Model.Locales[item].TextPrompt"/>
+ <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="checkoutattribute-localized" language-ids="@Model.Locales.Select(c => c.LanguageId).ToList()">
+ <div class="form-body">
+ <div class="form-group">
+ <admin-label asp-for="Name"/>
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="Name"/>
+ <span asp-validation-for="Name"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <admin-label asp-for="TextPrompt"/>
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="TextPrompt"/>
+ <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"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="IsRequired"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <admin-label asp-for="ShippableProductRequired"/>
+ <div class="col-md-9 col-sm-9">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="ShippableProductRequired"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="ShippableProductRequired"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <admin-label asp-for="IsTaxExempt"/>
+ <div class="col-md-9 col-sm-9">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="IsTaxExempt"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="IsTaxExempt"></span>
+ </div>
+ </div>
+ <div class="form-group" id="pnlTaxCategory">
+ <admin-label asp-for="TaxCategoryId"/>
+ <div class="col-md-9 col-sm-9">
+ <admin-select asp-for="TaxCategoryId" asp-items="Model.AvailableTaxCategories"/>
+ <span asp-validation-for="TaxCategoryId"></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"/>
+ <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"/>
+ <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"/>
+ <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"/>
+ <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"/>
+ <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"/>
+ <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"/>
+ <span asp-validation-for="DefaultValue"></span>
+ </div>
+ </div>
+ </div>
+</div>
+<vc:admin-widget widget-zone="checkout_attribute_details_info_bottom" additional-data="Model"/>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/CreateOrUpdate.TabValues.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/CreateOrUpdate.TabValues.cshtml
new file mode 100644
index 000000000..183bbbbd8
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/CreateOrUpdate.TabValues.cshtml
@@ -0,0 +1,146 @@
+@model CheckoutAttributeModel
+<vc:admin-widget widget-zone="checkout_attribute_details_values_top" additional-data="Model"/>
+@{
+ if (!string.IsNullOrEmpty(Model.Id))
+ {
+ <div class="panel panel-default">
+ <div class="panel-body">
+ <div id="checkoutattributevalues-grid"></div>
+ </div>
+ <div class="panel-footer">
+ <a id="btnAddNewValue" href="@(Url.Action("ValueCreatePopup", "CheckoutAttribute", new { checkoutAttributeId = Model.Id, area = Constants.AreaStore }))" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Orders.CheckoutAttributes.Values.AddNew"]</a>
+ <input type="submit" id="btnRefresh" style="display: none"/>
+ </div>
+ </div>
+
+ <script>
+ $(document).ready(function () {
+ $('#btnAddNewValue').magnificPopup({
+ type: 'ajax',
+ settings: { cache: false, async: false },
+ midClick: true,
+ callbacks: {
+ parseAjax: function (mfpResponse) {
+ mfpResponse.data = $('<div></div>').html(mfpResponse.data);
+ },
+ ajaxContentAdded: function () {
+ $('.mfp-wrap').removeAttr('tabindex');
+ }
+ }
+ });
+ $("#checkoutattributevalues-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", "CheckoutAttribute", new { checkoutAttributeId = Model.Id, area = Constants.AreaStore }))",
+ type: "POST",
+ dataType: "json",
+ data: addAntiForgeryToken
+ },
+ destroy: {
+ url: "@Html.Raw(Url.Action("ValueDelete", "CheckoutAttribute", new { area = Constants.AreaStore }))",
+ type: "POST",
+ dataType: "json",
+ data: addAntiForgeryToken
+ }
+ },
+ schema: {
+ data: "Data",
+ total: "Total",
+ errors: "Errors",
+ model: {
+ id: "Id"
+ }
+ },
+ error: function(e) {
+ display_kendoui_grid_error(e);
+ // Cancel the changes
+ this.cancelChanges();
+ },
+ serverPaging: true,
+ serverFiltering: true,
+ serverSorting: true
+ },
+ pageable: {
+ refresh: true,
+ numeric: false,
+ previousNext: false,
+ info: false
+ },
+ editable: {
+ confirmation: true,
+ mode: "inline"
+ },
+ scrollable: false,
+ columns: [{
+ field: "Name",
+ title: "@Loc["Admin.Orders.CheckoutAttributes.Values.Fields.Name"]",
+ template: "<a class='k-link editvalue' href=\"@Url.Action("ValueEditPopup", "CheckoutAttribute", new { area = Constants.AreaStore })/#=Id#[email protected]\">#=kendo.htmlEncode(Name)#</a>"
+ }, {
+ field: "PriceAdjustment",
+ title: "@Loc["Admin.Orders.CheckoutAttributes.Values.Fields.PriceAdjustment"]",
+ width: 150,
+ minScreenWidth: 750,
+ }, {
+ field: "WeightAdjustment",
+ title: "@Loc["Admin.Orders.CheckoutAttributes.Values.Fields.WeightAdjustment"]",
+ width: 150,
+ minScreenWidth: 750,
+ }, {
+ field: "IsPreSelected",
+ title: "@Loc["Admin.Orders.CheckoutAttributes.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.Orders.CheckoutAttributes.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
+ }]
+ });
+ });
+ </script>
+ <script>
+ $(document).ready(function () {
+ $('#btnRefresh').click(function () {
+ //refresh grid
+ var grid = $("#checkoutattributevalues-grid").data('kendoGrid');
+ grid.dataSource.read();
+
+ //return false to don't reload a page
+ return false;
+ });
+ });
+ </script>
+ }
+ else
+ {
+ <div class="note note-info">
+ @Loc["Admin.Orders.CheckoutAttributes.Values.SaveBeforeEdit"]
+ </div>
+ }
+}
+<vc:admin-widget widget-zone="checkout_attribute_details_values_bottom" additional-data="Model"/>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/CreateOrUpdate.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/CreateOrUpdate.cshtml
new file mode 100644
index 000000000..29de17e25
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/CreateOrUpdate.cshtml
@@ -0,0 +1,34 @@
+@model CheckoutAttributeModel
+
+<div asp-validation-summary="All"></div>
+<input asp-for="Id" type="hidden"/>
+
+<admin-tabstrip name="checkoutattribute-edit">
+ <items>
+ <tabstrip-item text="@Loc["Admin.Orders.CheckoutAttributes.Info"]" tab-index="0">
+ <content>
+ <div>
+ <partial name="Partials/CreateOrUpdate.TabInfo" model="Model"/>
+ </div>
+ </content>
+ </tabstrip-item>
+ <tabstrip-item text="@Loc["Admin.Orders.CheckoutAttributes.Values"]" tab-index="1" id="tab-checkoutAttributesValues">
+ <content>
+ <div>
+ <partial name="Partials/CreateOrUpdate.TabValues" model="Model"/>
+ </div>
+ </content>
+ </tabstrip-item>
+ @if (Model.ConditionAllowed)
+ {
+ <tabstrip-item text="@Loc["Admin.Orders.CheckoutAttributes.Condition"]" tab-index="2">
+ <content>
+ <div>
+ <partial name="Partials/CreateOrUpdate.TabCondition" model="Model"/>
+ </div>
+ </content>
+ </tabstrip-item>
+ }
+ <vc:admin-widget widget-zone="checkout_attribute_details_tabs" additional-data="Model"/>
+ </items>
+</admin-tabstrip>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/CreateOrUpdateValue.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/CreateOrUpdateValue.cshtml
new file mode 100644
index 000000000..e05bbca6f
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/Partials/CreateOrUpdateValue.cshtml
@@ -0,0 +1,95 @@
+@using Microsoft.AspNetCore.Mvc.Razor
+@model CheckoutAttributeValueModel
+
+<div asp-validation-summary="All"></div>
+<input asp-for="Id" type="hidden"/>
+<input asp-for="CheckoutAttributeId" type="hidden"/>
+<input asp-for="DisplayColorSquaresRgb" type="hidden"/>
+
+<vc:admin-widget widget-zone="checkout_attribute_top" additional-data="Model"/>
+
+@{
+ Func<int, HelperResult>
+ template = @<div class="form-body">
+ <div class="form-group">
+ <admin-label asp-for="@Model.Locales[item].Name" class="col-sm-3 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="checkoutattributevalue-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="PriceAdjustment" class="col-sm-3 control-label"/>
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="PriceAdjustment"/> [@Model.PrimaryStoreCurrencyCode]
+ <span asp-validation-for="PriceAdjustment"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <admin-label asp-for="WeightAdjustment" class="col-sm-3 control-label"/>
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="WeightAdjustment"/> [@Model.BaseWeightIn]
+ <span asp-validation-for="WeightAdjustment"></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>
+ <vc:admin-widget widget-zone="checkout_attribute_value_details_buttons" additional-data="Model"/>
+ </div>
+ </div>
+ </div>
+</div>
+<vc:admin-widget widget-zone="checkout_attribute_bottom" additional-data="Model"/>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/ValueCreatePopup.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/ValueCreatePopup.cshtml
new file mode 100644
index 000000000..816a1f3a9
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/ValueCreatePopup.cshtml
@@ -0,0 +1,58 @@
+@{
+ Layout = "";
+}
+
+@model CheckoutAttributeValueModel
+
+<form id="ValueCreatePopup" asp-area="@Constants.AreaStore" asp-controller="CheckoutAttribute" asp-action="ValueCreatePopup"
+ asp-route-checkoutAttributeId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["checkoutAttributeId"])">
+ <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.Orders.CheckoutAttributes.Values.AddNew"]
+ </div>
+ <div class="actions">
+ <vc:admin-widget widget-zone="checkout_attribute_value_details_buttons" additional-data="null"/>
+ </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>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/ValueEditPopup.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/ValueEditPopup.cshtml
new file mode 100644
index 000000000..d5acf93a8
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/CheckoutAttribute/ValueEditPopup.cshtml
@@ -0,0 +1,54 @@
+@model CheckoutAttributeValueModel
+@{
+ Layout = "";
+}
+<form id="ValueEditPopup" asp-area="@Constants.AreaStore" asp-controller="CheckoutAttribute" asp-action="ValueEditPopup"
+ asp-route-checkoutAttributeId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["checkoutAttributeId"])">
+
+ <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.Orders.CheckoutAttributes.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>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Controllers/CheckoutAttributeController.cs b/src/Web/Grand.Web.Store/Controllers/CheckoutAttributeController.cs
new file mode 100644
index 000000000..d1510740d
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Controllers/CheckoutAttributeController.cs
@@ -0,0 +1,372 @@
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Catalog.Directory;
+using Grand.Business.Core.Interfaces.Checkout.CheckoutAttributes;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Domain.Catalog;
+using Grand.Domain.Directory;
+using Grand.Domain.Orders;
+using Grand.Domain.Permissions;
+using Grand.Infrastructure;
+using Grand.Web.AdminShared.Extensions.Mapping;
+using Grand.Web.AdminShared.Interfaces;
+using Grand.Web.AdminShared.Models.Orders;
+using Grand.Web.Common.DataSource;
+using Grand.Web.Common.Filters;
+using Grand.Web.Common.Security.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Grand.Web.AdminShared.Extensions;
+
+namespace Grand.Web.Store.Controllers;
+
+[PermissionAuthorize(PermissionSystemName.CheckoutAttributes)]
+public class CheckoutAttributeController : BaseStoreController
+{
+ #region Constructors
+
+ public CheckoutAttributeController(ICheckoutAttributeService checkoutAttributeService,
+ IContextAccessor contextAccessor,
+ ILanguageService languageService,
+ ITranslationService translationService,
+ ICurrencyService currencyService,
+ CurrencySettings currencySettings,
+ IMeasureService measureService,
+ MeasureSettings measureSettings,
+ ICheckoutAttributeViewModelService checkoutAttributeViewModelService)
+ {
+ _checkoutAttributeService = checkoutAttributeService;
+ _contextAccessor = contextAccessor;
+ _languageService = languageService;
+ _translationService = translationService;
+ _currencyService = currencyService;
+ _currencySettings = currencySettings;
+ _measureService = measureService;
+ _measureSettings = measureSettings;
+ _checkoutAttributeViewModelService = checkoutAttributeViewModelService;
+ }
+
+ #endregion
+
+ #region Fields
+
+ private readonly ICheckoutAttributeService _checkoutAttributeService;
+ private readonly IContextAccessor _contextAccessor;
+ private readonly ILanguageService _languageService;
+ private readonly ITranslationService _translationService;
+ private readonly ICurrencyService _currencyService;
+ private readonly CurrencySettings _currencySettings;
+ private readonly IMeasureService _measureService;
+ private readonly MeasureSettings _measureSettings;
+ private readonly ICheckoutAttributeViewModelService _checkoutAttributeViewModelService;
+
+ #endregion
+
+ #region Helper Methods
+
+ /// <summary>
+ /// Checks access permissions for a checkout attribute and handles warnings
+ /// </summary>
+ /// <param name="checkoutAttribute">Checkout attribute to check</param>
+ /// <returns>True if access is allowed, false if access should be denied</returns>
+ private bool CheckAccessPermission(CheckoutAttribute checkoutAttribute)
+ {
+ if (checkoutAttribute == null)
+ return false;
+
+ if (!checkoutAttribute.LimitedToStores || (checkoutAttribute.LimitedToStores &&
+ checkoutAttribute.Stores.Contains(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId) &&
+ checkoutAttribute.Stores.Count > 1))
+ {
+ Warning(_translationService.GetResource("admin.Catalog.attributes.checkoutAttributes.permissions"));
+ return true;
+ }
+
+ return checkoutAttribute.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId);
+ }
+
+ #endregion
+
+ #region Checkout attributes
+
+ //list
+ public IActionResult Index()
+ {
+ return RedirectToAction("List");
+ }
+
+ public IActionResult List()
+ {
+ return View();
+ }
+
+ [HttpPost]
+ [PermissionAuthorizeAction(PermissionActionName.List)]
+ public async Task<IActionResult> List(DataSourceRequest command)
+ {
+ var checkoutAttributes = await _checkoutAttributeViewModelService.PrepareCheckoutAttributeListModel(_contextAccessor.WorkContext.CurrentCustomer.StoreId);
+ var gridModel = new DataSourceResult {
+ Data = checkoutAttributes.ToList(),
+ Total = checkoutAttributes.Count()
+ };
+ return Json(gridModel);
+ }
+
+ //create
+ [PermissionAuthorizeAction(PermissionActionName.Create)]
+ public async Task<IActionResult> Create()
+ {
+ var model = await _checkoutAttributeViewModelService.PrepareCheckoutAttributeModel();
+ //locales
+ await AddLocales(_languageService, model.Locales);
+
+ return View(model);
+ }
+
+ [HttpPost]
+ [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]
+ [PermissionAuthorizeAction(PermissionActionName.Create)]
+ public async Task<IActionResult> Create(CheckoutAttributeModel model, bool continueEditing)
+ {
+ if (ModelState.IsValid)
+ {
+ model.Stores = [_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId];
+ model.CustomerGroups = [];
+ var checkoutAttribute = await _checkoutAttributeViewModelService.InsertCheckoutAttributeModel(model);
+ Success(_translationService.GetResource("Admin.Orders.CheckoutAttributes.Added"));
+ return continueEditing
+ ? RedirectToAction("Edit", new { id = checkoutAttribute.Id })
+ : RedirectToAction("List");
+ }
+
+ //If we got this far, something failed, redisplay form
+ //tax categories
+ await _checkoutAttributeViewModelService.PrepareTaxCategories(model, null, true);
+
+ return View(model);
+ }
+
+ //edit
+ [PermissionAuthorizeAction(PermissionActionName.Preview)]
+ public async Task<IActionResult> Edit(string id)
+ {
+ var checkoutAttribute = await _checkoutAttributeService.GetCheckoutAttributeById(id);
+ if (checkoutAttribute == null)
+ //No checkout attribute found with the specified id
+ return RedirectToAction("List");
+
+ if (!CheckAccessPermission(checkoutAttribute))
+ return RedirectToAction("List");
+
+ var model = checkoutAttribute.ToModel();
+ //locales
+ await AddLocales(_languageService, model.Locales, (locale, languageId) =>
+ {
+ locale.Name = checkoutAttribute.GetTranslation(x => x.Name, languageId, false);
+ locale.TextPrompt = checkoutAttribute.GetTranslation(x => x.TextPrompt, languageId, false);
+ });
+
+ //tax categories
+ await _checkoutAttributeViewModelService.PrepareTaxCategories(model, checkoutAttribute, false);
+
+ //condition
+ await _checkoutAttributeViewModelService.PrepareConditionAttributes(model, checkoutAttribute);
+
+ return View(model);
+ }
+
+ [HttpPost]
+ [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ public async Task<IActionResult> Edit(CheckoutAttributeModel model, bool continueEditing)
+ {
+ var checkoutAttribute = await _checkoutAttributeService.GetCheckoutAttributeById(model.Id);
+ if (checkoutAttribute == null)
+ //No checkout attribute found with the specified id
+ return RedirectToAction("List");
+
+ if (!checkoutAttribute.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))
+ return RedirectToAction("Edit", new { id = checkoutAttribute.Id });
+
+ if (ModelState.IsValid)
+ {
+ model.Stores = [_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId];
+ model.CustomerGroups = [];
+
+ checkoutAttribute = await _checkoutAttributeViewModelService.UpdateCheckoutAttributeModel(checkoutAttribute, model);
+ Success(_translationService.GetResource("Admin.Orders.CheckoutAttributes.Updated"));
+ if (continueEditing)
+ {
+ //selected tab
+ await SaveSelectedTabIndex();
+
+ return RedirectToAction("Edit", new { id = checkoutAttribute.Id });
+ }
+
+ return RedirectToAction("List");
+ }
+
+ //If we got this far, something failed, redisplay form
+ //tax categories
+ await _checkoutAttributeViewModelService.PrepareTaxCategories(model, checkoutAttribute, true);
+ return View(model);
+ }
+
+ //delete
+ [HttpPost]
+ [PermissionAuthorizeAction(PermissionActionName.Delete)]
+ public async Task<IActionResult> Delete(string id)
+ {
+ var checkoutAttribute = await _checkoutAttributeService.GetCheckoutAttributeById(id);
+
+ if (!checkoutAttribute.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))
+ return RedirectToAction("List");
+
+ await _checkoutAttributeService.DeleteCheckoutAttribute(checkoutAttribute);
+
+ Success(_translationService.GetResource("Admin.Orders.CheckoutAttributes.Deleted"));
+ return RedirectToAction("List");
+ }
+
+ #endregion
+
+ #region Checkout attribute values
+
+ //list
+ [HttpPost]
+ [PermissionAuthorizeAction(PermissionActionName.Preview)]
+ public async Task<IActionResult> ValueList(string checkoutAttributeId, DataSourceRequest command)
+ {
+ var ca = await _checkoutAttributeService.GetCheckoutAttributeById(checkoutAttributeId);
+ if (!CheckAccessPermission(ca))
+ return View("AccessDenied", _translationService.GetResource("admin.Catalog.attributes.checkoutAttributes.permissions"));
+
+ var checkoutAttribute = await _checkoutAttributeViewModelService.PrepareCheckoutAttributeValuesModel(checkoutAttributeId);
+
+ var gridModel = new DataSourceResult {
+ Data = checkoutAttribute.ToList(),
+ Total = checkoutAttribute.Count()
+ };
+ return Json(gridModel);
+ }
+
+ //create
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ public async Task<IActionResult> ValueCreatePopup(string checkoutAttributeId)
+ {
+ var ca = await _checkoutAttributeService.GetCheckoutAttributeById(checkoutAttributeId);
+ if (ca == null)
+ throw new ArgumentException("No checkout attribute found with the specified id");
+
+ if (!ca.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))
+ return View("AccessDenied", _translationService.GetResource("admin.Catalog.attributes.checkoutattributes.permissions"));
+
+ var model = await _checkoutAttributeViewModelService.PrepareCheckoutAttributeValueModel(checkoutAttributeId);
+ //locales
+ await AddLocales(_languageService, model.Locales);
+ return View(model);
+ }
+
+ [HttpPost]
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ public async Task<IActionResult> ValueCreatePopup(CheckoutAttributeValueModel model)
+ {
+ var checkoutAttribute = await _checkoutAttributeService.GetCheckoutAttributeById(model.CheckoutAttributeId);
+ if (checkoutAttribute == null)
+ //No checkout attribute found with the specified id
+ return RedirectToAction("List");
+
+ if (!checkoutAttribute.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))
+ return View("AccessDenied", _translationService.GetResource("admin.Catalog.attributes.checkoutattributes.permissions"));
+
+ if (ModelState.IsValid)
+ {
+ await _checkoutAttributeViewModelService.InsertCheckoutAttributeValueModel(checkoutAttribute, model);
+ return Content("");
+ }
+
+ //If we got this far, something failed, redisplay form
+ model.PrimaryStoreCurrencyCode =
+ (await _currencyService.GetCurrencyById(_currencySettings.PrimaryStoreCurrencyId)).CurrencyCode;
+ model.BaseWeightIn = (await _measureService.GetMeasureWeightById(_measureSettings.BaseWeightId)).Name;
+ return View(model);
+ }
+
+ //edit
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ public async Task<IActionResult> ValueEditPopup(string id, string checkoutAttributeId)
+ {
+ var checkoutAttribute = await _checkoutAttributeService.GetCheckoutAttributeById(checkoutAttributeId);
+
+ if (!CheckAccessPermission(checkoutAttribute))
+ return View("AccessDenied", _translationService.GetResource("admin.Catalog.attributes.checkoutAttributes.permissions"));
+
+ var cav = checkoutAttribute.CheckoutAttributeValues.FirstOrDefault(x => x.Id == id);
+ if (cav == null)
+ //No checkout attribute value found with the specified id
+ return RedirectToAction("List");
+
+ var model = await _checkoutAttributeViewModelService.PrepareCheckoutAttributeValueModel(checkoutAttribute, cav);
+
+ //locales
+ 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(CheckoutAttributeValueModel model)
+ {
+ var checkoutAttribute = await _checkoutAttributeService.GetCheckoutAttributeById(model.CheckoutAttributeId);
+
+ if (!checkoutAttribute.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))
+ return View("AccessDenied", _translationService.GetResource("admin.Catalog.attributes.checkoutAttributes.permissions"));
+
+ var cav = checkoutAttribute.CheckoutAttributeValues.FirstOrDefault(x => x.Id == model.Id);
+ if (cav == null)
+ //No checkout attribute value found with the specified id
+ return RedirectToAction("List");
+
+ if (ModelState.IsValid)
+ {
+ await _checkoutAttributeViewModelService.UpdateCheckoutAttributeValueModel(checkoutAttribute, cav, model);
+ return Content("");
+ }
+
+ //If we got this far, something failed, redisplay form
+ model.PrimaryStoreCurrencyCode =
+ (await _currencyService.GetCurrencyById(_currencySettings.PrimaryStoreCurrencyId)).CurrencyCode;
+ model.BaseWeightIn = (await _measureService.GetMeasureWeightById(_measureSettings.BaseWeightId)).Name;
+
+ return View(model);
+ }
+
+ //delete
+ [HttpPost]
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ public async Task<IActionResult> ValueDelete(string id, string checkoutAttributeId)
+ {
+ var checkoutAttribute = await _checkoutAttributeService.GetCheckoutAttributeById(checkoutAttributeId);
+
+ if (!checkoutAttribute.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))
+ return View("AccessDenied", _translationService.GetResource("admin.Catalog.attributes.checkoutAttributes.permissions"));
+
+ var cav = checkoutAttribute.CheckoutAttributeValues.FirstOrDefault(x => x.Id == id);
+ if (cav == null)
+ throw new ArgumentException("No checkout attribute value found with the specified id");
+
+ if (ModelState.IsValid)
+ {
+ checkoutAttribute.CheckoutAttributeValues.Remove(cav);
+ await _checkoutAttributeService.UpdateCheckoutAttribute(checkoutAttribute);
+ return new JsonResult("");
+ }
+
+ return ErrorForKendoGridJson(ModelState);
+ }
+
+ #endregion
+}
\ No newline at end of file
diff --git a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml
index da1c65d7c..8b59be237 100644
Binary files a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml and b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml differ