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
Migrate AssociatedProductAddPopup.cshtml to AdminShared (ARCH-001 Phase 2)
KrzysztofPajakf3d9b009f935
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/AssociatedProductAddPopup.cshtml b/src/Web/Grand.Web.AdminShared/Views/Product/AssociatedProductAddPopup.cshtmlsimilarity index 82%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/AssociatedProductAddPopup.cshtmlrename to src/Web/Grand.Web.AdminShared/Views/Product/AssociatedProductAddPopup.cshtmlindex adac34c4c..186039b2f 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/AssociatedProductAddPopup.cshtml+++ b/src/Web/Grand.Web.AdminShared/Views/Product/AssociatedProductAddPopup.cshtml@@ -1,12 +1,13 @@-@model ProductModel.AddAssociatedProductModel+@model ProductModel.AddAssociatedProductModel@inject AdminAreaSettings adminAreaSettings@{Layout = "";+ var area = ViewContext.RouteData.Values["area"]?.ToString();//page title- ViewBag.Title = Loc["Admin.Catalog.Products.AssociatedProducts.AddNew"];+ ViewBag.Title = Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.AssociatedProducts.AddNew"];}-<form id="AssociatedProductAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Product" asp-action="AssociatedProductAddPopup"+<form id="AssociatedProductAddPopup" asp-area="@area" asp-controller="Product" asp-action="AssociatedProductAddPopup"asp-route-ProductId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductId"])"asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">@@ -18,7 +19,7 @@<div class="x_title"><div class="caption"><i class="fa fa-cubes"></i>- @Loc["Admin.Catalog.Products.AssociatedProducts.AddNew"]+ @Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.AssociatedProducts.AddNew"]</div></div><div class="x_content form">@@ -36,13 +37,13 @@<div class="form-actions"><div class="btn-group btn-group-devided"><button class="btn btn-success filter-submit" id="search-products">- <i class="fa fa-search"></i> @Loc["Admin.Common.Search"]+ <i class="fa fa-search"></i> @Loc[$"{Scope.ResourceKeyPrefix}.Common.Search"]</button><button class="btn btn-info" type="button" data-toggle="collapse" data-target="#filterCollapse" aria-expanded="false" aria-controls="filterCollapse">- <i class="fa fa-filter"></i> @Loc["Admin.Common.Filters"]+ <i class="fa fa-filter"></i> @Loc[$"{Scope.ResourceKeyPrefix}.Common.Filters"]</button></div>- <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"><i class="fa fa-check"></i> @Loc[$"{Scope.ResourceKeyPrefix}.Common.Save"] </button></div></div></div>@@ -67,18 +68,21 @@<admin-input asp-for="SearchCollectionId"/></div></div>- <div class="form-group">- <admin-label asp-for="SearchStoreId" class="col-sm-3 control-label"/>- <div class="col-md-9 col-sm-9">- <admin-select asp-for="SearchStoreId" asp-items="Model.AvailableStores"/>+ @if (area == "Admin")+ {+ <div class="form-group">+ <admin-label asp-for="SearchStoreId" class="col-sm-3 control-label"/>+ <div class="col-md-9 col-sm-9">+ <admin-select asp-for="SearchStoreId" asp-items="Model.AvailableStores"/>+ </div></div>- </div>- <div class="form-group">- <admin-label asp-for="SearchVendorId" class="col-sm-3 control-label"/>- <div class="col-md-9 col-sm-9">- <admin-select asp-for="SearchVendorId" asp-items="Model.AvailableVendors"/>+ <div class="form-group">+ <admin-label asp-for="SearchVendorId" class="col-sm-3 control-label"/>+ <div class="col-md-9 col-sm-9">+ <admin-select asp-for="SearchVendorId" asp-items="Model.AvailableVendors"/>+ </div></div>- </div>+ }<div class="form-group"><admin-label asp-for="SearchProductTypeId" class="col-sm-3 control-label"/><div class="col-md-9 col-sm-9">@@ -131,15 +135,18 @@$('.filter-text-close').toggle();});-+function additionalData() {var data = {SearchProductName: $('#@Html.IdFor(model => model.SearchProductName)').val(),SearchCategoryId: $('#SearchCategoryId').val(),SearchBrandId: $('#SearchBrandId').val(),SearchCollectionId: $('#SearchCollectionId').val(),- SearchStoreId: $('#SearchStoreId').val(),- SearchVendorId: $('#SearchVendorId').val(),+ @if (area == "Admin")+ {+ <text>SearchStoreId: $('#SearchStoreId').val(),+ SearchVendorId: $('#SearchVendorId').val(),</text>+ }SearchProductTypeId: $('#SearchProductTypeId').val()};addAntiForgeryToken(data);@@ -156,7 +163,7 @@dataSource: {transport: {read: {- url: "@Html.Raw(Url.Action("AssociatedProductAddPopupList", "Product", new { area = Constants.AreaAdmin }))",+ url: "@Html.Raw(Url.Action("AssociatedProductAddPopupList", "Product", new { area = area }))",type: "POST",dataType: "json",data: additionalData@@ -197,11 +204,11 @@width: 50}, {field: "Name",- title: "@Loc["Admin.Catalog.Products.Fields.Name"]",- template: "#:Name# # if(AssociatedToProductName !== null) {# <br /><i>@Loc["Admin.Catalog.Products.Fields.AssociatedToProductName"]: #:AssociatedToProductName#</i> #} #"+ title: "@Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.Fields.Name"]",+ template: "#:Name# # if(AssociatedToProductName !== null) {# <br /><i>@Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.Fields.AssociatedToProductName"]: #:AssociatedToProductName#</i> #} #"}, {field: "Published",- title: "@Loc["Admin.Catalog.Products.Fields.Published"]",+ title: "@Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.Fields.Published"]",width: 100,headerAttributes: { style: "text-align:center" },attributes: { style: "text-align:center" },@@ -234,4 +241,4 @@updateMasterCheckbox();});</script>-</form>\ No newline at end of file+</form>diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Product/AssociatedProductAddPopup.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Product/AssociatedProductAddPopup.cshtmldeleted file mode 100644index fb283c0d9..000000000--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Product/AssociatedProductAddPopup.cshtml+++ /dev/null@@ -1,223 +0,0 @@-@model ProductModel.AddAssociatedProductModel-@inject AdminAreaSettings adminAreaSettings-@{- Layout = "";- //page title- ViewBag.Title = Loc["Admin.Catalog.Products.AssociatedProducts.AddNew"];-}--<form id="AssociatedProductAddPopup" asp-area="@Constants.AreaStore" asp-controller="Product" asp-action="AssociatedProductAddPopup"- asp-route-ProductId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductId"])"- asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"- asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">--- <div class="row">- <div class="col-md-12">- <div class="x_panel light form-fit popup-window">- <div class="x_title">- <div class="caption">- <i class="fa fa-cubes"></i>- @Loc["Admin.Catalog.Products.AssociatedProducts.AddNew"]- </div>- </div>- <div class="x_content form">- <div class="form-horizontal">- <div class="form-body">- <div class="main-header col-12 px-0">- <div class="row align-items-end">- <div class="col-md col-ms-12 col-12">- <div class="form-group mb-0">- <admin-label asp-for="SearchProductName" class="control-label"/>- <admin-input asp-for="SearchProductName"/>- </div>- </div>- <div class="col-md-auto col-sm-12 col-12">- <div class="form-actions">- <div class="btn-group btn-group-devided">- <button class="btn btn-success filter-submit" id="search-products">- <i class="fa fa-search"></i> @Loc["Admin.Common.Search"]- </button>- <button class="btn btn-info" type="button" data-toggle="collapse" data-target="#filterCollapse" aria-expanded="false" aria-controls="filterCollapse">- <i class="fa fa-filter"></i> @Loc["Admin.Common.Filters"]- </button>- </div>- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>- </div>- </div>- </div>- </div>- <div class="collapse" id="filterCollapse">- <div class="drop-filters-container">- <div class="form-group">- <admin-label asp-for="SearchCategoryId" class="col-sm-3 control-label"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="SearchCategoryId"/>- </div>- </div>- <div class="form-group">- <admin-label asp-for="SearchBrandId" class="col-sm-3 control-label"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="SearchBrandId"/>- </div>- </div>- <div class="form-group">- <admin-label asp-for="SearchCollectionId" class="col-sm-3 control-label"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="SearchCollectionId"/>- </div>- </div>- <div class="form-group">- <admin-label asp-for="SearchProductTypeId" class="col-sm-3 control-label"/>- <div class="col-md-9 col-sm-9">- <admin-select asp-for="SearchProductTypeId" asp-items="Model.AvailableProductTypes"/>- </div>- </div>- </div>- </div>- <div id="products-grid"></div>- </div>- </div>- </div>- </div>- </div>- </div>- <script>- var mfp = $.magnificPopup.instance;- $("#AssociatedProductAddPopup").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();- $('#btnRefreshAssociatedProducts').click();- } else {- $.magnificPopup.open({- items: {- src: data,- type: 'inline'- },- callbacks: {- open: function () {- $('.mfp-wrap').removeAttr('tabindex');- }- }- });- }- }- });- });-- $('.extend-collapse').hide();- $('.filter-extend-button').click(function () {- $('.extend-collapse').toggle("slow");- $('.filter-text-close').toggle();- });--- function additionalData() {- var data = {- SearchProductName: $('#@Html.IdFor(model => model.SearchProductName)').val(),- SearchCategoryId: $('#SearchCategoryId').val(),- SearchBrandId: $('#SearchBrandId').val(),- SearchCollectionId: $('#SearchCollectionId').val(),- SearchProductTypeId: $('#SearchProductTypeId').val()- };- addAntiForgeryToken(data);- return data;- }-- function updateMasterCheckbox() {- var numChkBoxes = $('#products-grid input[type=checkbox][id!=mastercheckbox]').length;- var numChkBoxesChecked = $('#products-grid input[type=checkbox][id!=mastercheckbox]:checked').length;- $('#mastercheckbox').prop('checked', numChkBoxes == numChkBoxesChecked && numChkBoxes > 0);- }-- $("#products-grid").kendoGrid({- dataSource: {- transport: {- read: {- url: "@Html.Raw(Url.Action("AssociatedProductAddPopupList", "Product", new { area = Constants.AreaStore }))",- type: "POST",- dataType: "json",- data: additionalData- }- },- schema: {- data: "Data",- total: "Total",- errors: "Errors"- },- error: function(e) {- display_kendoui_grid_error(e);- // Cancel the changes- this.cancelChanges();- },- pageSize: @(adminAreaSettings.DefaultGridPageSize),- serverPaging: true,- serverFiltering: true,- serverSorting: true- },- pageable: {- refresh: true,- pageSizes: [@(adminAreaSettings.GridPageSizes)]- },- editable: {- confirmation: false,- mode: "inline"- },- scrollable: false,- columns: [{- field: "Id",- headerTemplate: "<input id='mastercheckbox' type='checkbox'/>",- headerAttributes: { style: "text-align:center" },- template: "<input type='checkbox' name='SelectedProductIds' value='#=Id#' class='checkboxGroups' />",- attributes: {- style: "text-align:center"- },- width: 50- }, {- field: "Name",- title: "@Loc["Admin.Catalog.Products.Fields.Name"]",- template: "#:Name# # if(AssociatedToProductName !== null) {# <br /><i>@Loc["Admin.Catalog.Products.Fields.AssociatedToProductName"]: #:AssociatedToProductName#</i> #} #"- }, {- field: "Published",- title: "@Loc["Admin.Catalog.Products.Fields.Published"]",- width: 100,- headerAttributes: { style: "text-align:center" },- attributes: { style: "text-align:center" },- template: '# if(Published) {# <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> #} #'- }]- });-- $('#search-products').click(function () {- var grid = $('#products-grid').data('kendoGrid');- grid.dataSource.page(1); //new search. Set page size to 1- //grid.dataSource.read(); we already loaded the grid above using "page" function- //clear selected checkboxes- $('.checkboxGroups').prop('checked', false).change();- return false;- });-- $("#@Html.IdFor(model => model.SearchProductName)").keydown(function (event) {- if (event.keyCode == 13) {- $("#search-products").click();- return false;- }- });-- //wire up checkboxes- $('#mastercheckbox').click(function() {- $('.checkboxGroups').prop('checked', $(this).is(':checked')).change();- });-- $('#products-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {- updateMasterCheckbox();- });- </script>-</form>\ No newline at end of filediff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/AssociatedProductAddPopup.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/AssociatedProductAddPopup.cshtmldeleted file mode 100644index d32d7fcab..000000000--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/AssociatedProductAddPopup.cshtml+++ /dev/null@@ -1,223 +0,0 @@-@model ProductModel.AddAssociatedProductModel-@inject AdminAreaSettings adminAreaSettings-@{- Layout = "";- //page title- ViewBag.Title = Loc["Vendor.Catalog.Products.AssociatedProducts.AddNew"];-}--<form id="AssociatedProductAddPopup" asp-area="@Constants.AreaVendor" asp-controller="Product" asp-action="AssociatedProductAddPopup"- asp-route-ProductId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductId"])"- asp-route-btnId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["btnId"])"- asp-route-formId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["formId"])">--- <div class="row">- <div class="col-md-12">- <div class="x_panel light form-fit popup-window">- <div class="x_title">- <div class="caption">- <i class="fa fa-cubes"></i>- @Loc["Vendor.Catalog.Products.AssociatedProducts.AddNew"]- </div>- </div>- <div class="x_content form">- <div class="form-horizontal">- <div class="form-body">- <div class="main-header col-12 px-0">- <div class="row align-items-end">- <div class="col-md col-ms-12 col-12">- <div class="form-group mb-0">- <admin-label asp-for="SearchProductName" class="control-label"/>- <admin-input asp-for="SearchProductName"/>- </div>- </div>- <div class="col-md-auto col-sm-12 col-12">- <div class="form-actions">- <div class="btn-group btn-group-devided">- <button class="btn btn-success filter-submit" id="search-products">- <i class="fa fa-search"></i> @Loc["Vendor.Common.Search"]- </button>- <button class="btn btn-info" type="button" data-toggle="collapse" data-target="#filterCollapse" aria-expanded="false" aria-controls="filterCollapse">- <i class="fa fa-filter"></i> @Loc["Vendor.Common.Filters"]- </button>- </div>- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Vendor.Common.Save"] </button>- </div>- </div>- </div>- </div>- <div class="collapse" id="filterCollapse">- <div class="drop-filters-container">- <div class="form-group">- <admin-label asp-for="SearchCategoryId" class="col-sm-3 control-label"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="SearchCategoryId"/>- </div>- </div>- <div class="form-group">- <admin-label asp-for="SearchBrandId" class="col-sm-3 control-label"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="SearchBrandId"/>- </div>- </div>- <div class="form-group">- <admin-label asp-for="SearchCollectionId" class="col-sm-3 control-label"/>- <div class="col-md-9 col-sm-9">- <admin-input asp-for="SearchCollectionId"/>- </div>- </div>- <div class="form-group">- <admin-label asp-for="SearchProductTypeId" class="col-sm-3 control-label"/>- <div class="col-md-9 col-sm-9">- <admin-select asp-for="SearchProductTypeId" asp-items="Model.AvailableProductTypes"/>- </div>- </div>- </div>- </div>- <div id="products-grid"></div>- </div>- </div>- </div>- </div>- </div>- </div>- <script>- var mfp = $.magnificPopup.instance;- $("#AssociatedProductAddPopup").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();- $('#btnRefreshAssociatedProducts').click();- } else {- $.magnificPopup.open({- items: {- src: data,- type: 'inline'- },- callbacks: {- open: function () {- $('.mfp-wrap').removeAttr('tabindex');- }- }- });- }- }- });- });-- $('.extend-collapse').hide();- $('.filter-extend-button').click(function () {- $('.extend-collapse').toggle("slow");- $('.filter-text-close').toggle();- });--- function additionalData() {- var data = {- SearchProductName: $('#@Html.IdFor(model => model.SearchProductName)').val(),- SearchCategoryId: $('#SearchCategoryId').val(),- SearchBrandId: $('#SearchBrandId').val(),- SearchCollectionId: $('#SearchCollectionId').val(),- SearchProductTypeId: $('#SearchProductTypeId').val()- };- addAntiForgeryToken(data);- return data;- }-- function updateMasterCheckbox() {- var numChkBoxes = $('#products-grid input[type=checkbox][id!=mastercheckbox]').length;- var numChkBoxesChecked = $('#products-grid input[type=checkbox][id!=mastercheckbox]:checked').length;- $('#mastercheckbox').prop('checked', numChkBoxes == numChkBoxesChecked && numChkBoxes > 0);- }-- $("#products-grid").kendoGrid({- dataSource: {- transport: {- read: {- url: "@Html.Raw(Url.Action("AssociatedProductAddPopupList", "Product", new { area = Constants.AreaVendor }))",- type: "POST",- dataType: "json",- data: additionalData- }- },- schema: {- data: "Data",- total: "Total",- errors: "Errors"- },- error: function(e) {- display_kendoui_grid_error(e);- // Cancel the changes- this.cancelChanges();- },- pageSize: @(adminAreaSettings.DefaultGridPageSize),- serverPaging: true,- serverFiltering: true,- serverSorting: true- },- pageable: {- refresh: true,- pageSizes: [@(adminAreaSettings.GridPageSizes)]- },- editable: {- confirmation: false,- mode: "inline"- },- scrollable: false,- columns: [{- field: "Id",- headerTemplate: "<input id='mastercheckbox' type='checkbox'/>",- headerAttributes: { style: "text-align:center" },- template: "<input type='checkbox' name='SelectedProductIds' value='#=Id#' class='checkboxGroups' />",- attributes: {- style: "text-align:center"- },- width: 50- }, {- field: "Name",- title: "@Loc["Vendor.Catalog.Products.Fields.Name"]",- template: "#:Name# # if(AssociatedToProductName !== null) {# <br /><i>@Loc["Vendor.Catalog.Products.Fields.AssociatedToProductName"]: #:AssociatedToProductName#</i> #} #"- }, {- field: "Published",- title: "@Loc["Vendor.Catalog.Products.Fields.Published"]",- width: 100,- headerAttributes: { style: "text-align:center" },- attributes: { style: "text-align:center" },- template: '# if(Published) {# <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> #} #'- }]- });-- $('#search-products').click(function () {- var grid = $('#products-grid').data('kendoGrid');- grid.dataSource.page(1); //new search. Set page size to 1- //grid.dataSource.read(); we already loaded the grid above using "page" function- //clear selected checkboxes- $('.checkboxGroups').prop('checked', false).change();- return false;- });-- $("#@Html.IdFor(model => model.SearchProductName)").keydown(function (event) {- if (event.keyCode == 13) {- $("#search-products").click();- return false;- }- });-- //wire up checkboxes- $('#mastercheckbox').click(function() {- $('.checkboxGroups').prop('checked', $(this).is(':checked')).change();- });-- $('#products-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {- updateMasterCheckbox();- });- </script>-</form>\ No newline at end of file