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 RequiredProductAddPopup.cshtml to AdminShared (ARCH-001 Phase 2)

KrzysztofPajak16cdbd444520
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/RequiredProductAddPopup.cshtml b/src/Web/Grand.Web.AdminShared/Views/Product/RequiredProductAddPopup.cshtml
similarity index 79%
rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/RequiredProductAddPopup.cshtml
rename to src/Web/Grand.Web.AdminShared/Views/Product/RequiredProductAddPopup.cshtml
index 301c2f739..35a55dd26 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/RequiredProductAddPopup.cshtml
+++ b/src/Web/Grand.Web.AdminShared/Views/Product/RequiredProductAddPopup.cshtml
@@ -1,9 +1,10 @@
-@model ProductModel.AddRequiredProductModel
+@model ProductModel.AddRequiredProductModel
@inject AdminAreaSettings adminAreaSettings
@{
Layout = "";
+ var area = ViewContext.RouteData.Values["area"]?.ToString();
//page title
- ViewBag.Title = Loc["Admin.Catalog.Products.Fields.RequiredProductIds.Choose"];
+ ViewBag.Title = Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.Fields.RequiredProductIds.Choose"];
}
<div class="row">
@@ -12,7 +13,7 @@
<div class="x_title">
<div class="caption">
<i class="fa fa-cubes"></i>
- @Loc["Admin.Catalog.Products.Fields.RequiredProductIds.Choose"]
+ @Loc[$"{Scope.ResourceKeyPrefix}.Catalog.Products.Fields.RequiredProductIds.Choose"]
</div>
</div>
<div class="x_content form">
@@ -30,13 +31,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>
@@ -61,18 +62,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">
@@ -94,8 +98,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);
@@ -120,7 +127,7 @@
dataSource: {
transport: {
read: {
- url: "@Html.Raw(Url.Action("RequiredProductAddPopupList", "Product", new { area = Constants.AreaAdmin }))",
+ url: "@Html.Raw(Url.Action("RequiredProductAddPopupList", "Product", new { area = area }))",
type: "POST",
dataType: "json",
data: additionalData
@@ -152,15 +159,15 @@
scrollable: false,
columns: [{
field: "Name",
- title: "@Loc["Admin.Common.Select"]",
+ title: "@Loc[$"{Scope.ResourceKeyPrefix}.Common.Select"]",
width: 50,
- template: '<input type="button" value="@Loc["Admin.Common.Select"]" onclick="selectRequiredProduct(\'#=Id#\')" class="k-button" />'
+ template: '<input type="button" value="@Loc[$"{Scope.ResourceKeyPrefix}.Common.Select"]" onclick="selectRequiredProduct(\'#=Id#\')" class="k-button" />'
},{
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" },
@@ -183,4 +190,4 @@
});
</script>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Product/RequiredProductAddPopup.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Product/RequiredProductAddPopup.cshtml
deleted file mode 100644
index dbcd9502e..000000000
--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Product/RequiredProductAddPopup.cshtml
+++ /dev/null
@@ -1,172 +0,0 @@
-@model ProductModel.AddRequiredProductModel
-@inject AdminAreaSettings adminAreaSettings
-@{
- Layout = "";
- //page title
- ViewBag.Title = Loc["Admin.Catalog.Products.Fields.RequiredProductIds.Choose"];
-}
-
-<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.Fields.RequiredProductIds.Choose"]
- </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>
- <script>
- 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 selectRequiredProduct(productid) {
- try {
- var currentValue = document.getElementById('@(Context.Request.Query["productIdsInput"])').value;
- if (currentValue) {
- //add comma
- document.getElementById('@(Context.Request.Query["productIdsInput"])').value += ', ';
- }
- document.getElementById('@(Context.Request.Query["productIdsInput"])').value += productid;
- document.getElementById('@(Context.Request.Query["btnId"])').click();
- }
- catch (e){}
- $.magnificPopup.instance.close();
- }
-
- $("#products-grid").kendoGrid({
- dataSource: {
- transport: {
- read: {
- url: "@Html.Raw(Url.Action("RequiredProductAddPopupList", "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: "Name",
- title: "@Loc["Admin.Common.Select"]",
- width: 50,
- template: '<input type="button" value="@Loc["Admin.Common.Select"]" onclick="selectRequiredProduct(\'#=Id#\')" class="k-button" />'
- },{
- 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
- return false;
- });
-
- $("#@Html.IdFor(model => model.SearchProductName)").keydown(function (event) {
- if (event.keyCode == 13) {
- $("#search-products").click();
- return false;
- }
- });
-
- </script>
-</div>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/RequiredProductAddPopup.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/RequiredProductAddPopup.cshtml
deleted file mode 100644
index 0dc56e055..000000000
--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/RequiredProductAddPopup.cshtml
+++ /dev/null
@@ -1,172 +0,0 @@
-@model ProductModel.AddRequiredProductModel
-@inject AdminAreaSettings adminAreaSettings
-@{
- Layout = "";
- //page title
- ViewBag.Title = Loc["Vendor.Catalog.Products.Fields.RequiredProductIds.Choose"];
-}
-
-<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.Fields.RequiredProductIds.Choose"]
- </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>
- <script>
- 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 selectRequiredProduct(productid) {
- try {
- var currentValue = document.getElementById('@(Context.Request.Query["productIdsInput"])').value;
- if (currentValue) {
- //add comma
- document.getElementById('@(Context.Request.Query["productIdsInput"])').value += ', ';
- }
- document.getElementById('@(Context.Request.Query["productIdsInput"])').value += productid;
- document.getElementById('@(Context.Request.Query["btnId"])').click();
- }
- catch (e){}
- $.magnificPopup.instance.close();
- }
-
- $("#products-grid").kendoGrid({
- dataSource: {
- transport: {
- read: {
- url: "@Html.Raw(Url.Action("RequiredProductAddPopupList", "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: "Name",
- title: "@Loc["Vendor.Common.Select"]",
- width: 50,
- template: '<input type="button" value="@Loc["Vendor.Common.Select"]" onclick="selectRequiredProduct(\'#=Id#\')" class="k-button" />'
- },{
- 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
- return false;
- });
-
- $("#@Html.IdFor(model => model.SearchProductName)").keydown(function (event) {
- if (event.keyCode == 13) {
- $("#search-products").click();
- return false;
- }
- });
-
- </script>
-</div>
\ No newline at end of file