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.

Migrate RelatedProductAddPopup.cshtml to AdminShared (ARCH-001 Phase 2)

KrzysztofPajak78efefedc816
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/RelatedProductAddPopup.cshtml b/src/Web/Grand.Web.AdminShared/Views/Product/RelatedProductAddPopup.cshtml
similarity index 82%
rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/RelatedProductAddPopup.cshtml
rename to src/Web/Grand.Web.AdminShared/Views/Product/RelatedProductAddPopup.cshtml
index 27144de2d..78e26217d 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/RelatedProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.AdminShared/Views/Product/RelatedProductAddPopup.cshtml
@@ -1,11 +1,12 @@
-@model ProductModel.AddRelatedProductModel
+@model ProductModel.AddRelatedProductModel
@inject AdminAreaSettings adminAreaSettings
@{
Layout = "";
+ var area = ViewContext.RouteData.Values["area"]?.ToString();
//page title
- ViewBag.Title = Loc["Admin.Catalog.Products.RelatedProducts.AddNew"];
+ ViewBag.Title = Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.RelatedProducts.AddNew"];
}
-<form id="RelatedProductAddPopup" asp-area="@Constants.AreaAdmin" asp-controller="Product" asp-action="RelatedProductAddPopup"
+<form id="RelatedProductAddPopup" asp-area="@area" asp-controller="Product" asp-action="RelatedProductAddPopup"
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"])">
@@ -17,7 +18,7 @@
<div class="x_title">
<div class="caption">
<i class="fa fa-cubes"></i>
- @Loc["Admin.Catalog.Products.RelatedProducts.AddNew"]
+ @Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.RelatedProducts.AddNew"]
</div>
</div>
<div class="x_content form">
@@ -35,13 +36,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>&nbsp; @Loc["Admin.Common.Search"]
+ <i class="fa fa-search"></i>&nbsp; @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>&nbsp; @Loc["Admin.Common.Filters"]
+ <i class="fa fa-filter"></i>&nbsp; @Loc[$"{Scope.ResourceKeyPrefix}.Common.Filters"]
</button>
</div>
- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> &nbsp; @Loc["Admin.Common.Save"] </button>
+ <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> &nbsp; @Loc[$"{Scope.ResourceKeyPrefix}.Common.Save"] </button>
</div>
</div>
</div>
@@ -66,18 +67,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">
@@ -129,8 +133,11 @@
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);
@@ -142,12 +149,12 @@
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("RelatedProductAddPopupList", "Product", new { area = Constants.AreaAdmin }))",
+ url: "@Html.Raw(Url.Action("RelatedProductAddPopupList", "Product", new { area = area }))",
type: "POST",
dataType: "json",
data: additionalData
@@ -186,17 +193,17 @@
width: 50
}, {
field: "Name",
- title: "@Loc["Admin.Catalog.Products.Fields.Name"]"
+ title: "@Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.Fields.Name"]"
}, {
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" },
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
@@ -221,6 +228,6 @@
$('#products-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function(e) {
updateMasterCheckbox();
});
-
+
</script>
-</form>
\ No newline at end of file
+</form>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Product/RelatedProductAddPopup.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Product/RelatedProductAddPopup.cshtml
deleted file mode 100644
index 0604e40e4..000000000
--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Product/RelatedProductAddPopup.cshtml
+++ /dev/null
@@ -1,212 +0,0 @@
-@model ProductModel.AddRelatedProductModel
-@inject AdminAreaSettings adminAreaSettings
-@{
- Layout = "";
- //page title
- ViewBag.Title = Loc["Admin.Catalog.Products.RelatedProducts.AddNew"];
-}
-<form id="RelatedProductAddPopup" asp-area="@Constants.AreaStore" asp-controller="Product" asp-action="RelatedProductAddPopup"
- 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.RelatedProducts.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>&nbsp; @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>&nbsp; @Loc["Admin.Common.Filters"]
- </button>
- </div>
- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> &nbsp; @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;
- $("#RelatedProductAddPopup").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();
- $('#btnRefreshRelatedProducts').click();
- } else {
- $.magnificPopup.open({
- items: {
- src: data,
- type: 'inline'
- },
- callbacks: {
- open: function () {
- $('.mfp-wrap').removeAttr('tabindex');
- }
- }
- });
- }
- }
- });
- });
- 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("RelatedProductAddPopupList", "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"]"
- }, {
- 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 file
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/RelatedProductAddPopup.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/RelatedProductAddPopup.cshtml
deleted file mode 100644
index d5d1a39c6..000000000
--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/RelatedProductAddPopup.cshtml
+++ /dev/null
@@ -1,212 +0,0 @@
-@model ProductModel.AddRelatedProductModel
-@inject AdminAreaSettings adminAreaSettings
-@{
- Layout = "";
- //page title
- ViewBag.Title = Loc["Vendor.Catalog.Products.RelatedProducts.AddNew"];
-}
-<form id="RelatedProductAddPopup" asp-area="@Constants.AreaVendor" asp-controller="Product" asp-action="RelatedProductAddPopup"
- 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.RelatedProducts.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>&nbsp; @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>&nbsp; @Loc["Vendor.Common.Filters"]
- </button>
- </div>
- <button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> &nbsp; @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;
- $("#RelatedProductAddPopup").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();
- $('#btnRefreshRelatedProducts').click();
- } else {
- $.magnificPopup.open({
- items: {
- src: data,
- type: 'inline'
- },
- callbacks: {
- open: function () {
- $('.mfp-wrap').removeAttr('tabindex');
- }
- }
- });
- }
- }
- });
- });
- 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("RelatedProductAddPopupList", "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"]"
- }, {
- 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