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

KrzysztofPajake739fa4a732c
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdate.Reviews.cshtml b/src/Web/Grand.Web.AdminShared/Views/Product/Partials/CreateOrUpdate.Reviews.cshtml
similarity index 62%
rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdate.Reviews.cshtml
rename to src/Web/Grand.Web.AdminShared/Views/Product/Partials/CreateOrUpdate.Reviews.cshtml
index 5869caccc..e3122522c 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdate.Reviews.cshtml
+++ b/src/Web/Grand.Web.AdminShared/Views/Product/Partials/CreateOrUpdate.Reviews.cshtml
@@ -1,12 +1,15 @@
-@model ProductModel
+@model ProductModel
@inject AdminAreaSettings adminAreaSettings
+@{
+ var area = ViewContext.RouteData.Values["area"]?.ToString();
+}
<div class="panel panel-default">
- <vc:admin-widget widget-zone="product_details_reviews_top" additional-data="Model"/>
+ <partial name="Partials/WidgetZone.Reviews.Top" model="Model"/>
<div class="panel-body">
<div id="reviews-grid"></div>
</div>
- <vc:admin-widget widget-zone="product_details_reviews_bottom" additional-data="Model"/>
+ <partial name="Partials/WidgetZone.Reviews.Bottom" model="Model"/>
</div>
<script>
$(document).ready(function () {
@@ -14,7 +17,7 @@
dataSource: {
transport: {
read: {
- url: "@Html.Raw(Url.Action("Reviews", "Product", new { productId = Model.Id, area = Constants.AreaAdmin }))",
+ url: "@Html.Raw(Url.Action("Reviews", "Product", new { productId = Model.Id, area = area }))",
type: "POST",
dataType: "json",
data: addAntiForgeryToken
@@ -47,26 +50,40 @@
scrollable: false,
columns: [{
field: "CustomerId",
- title: "@Loc["Admin.Catalog.ProductReviews.Fields.Customer"]",
+ title: "@Loc[$"{Scope.ResourceKeyPrefix}.Catalog.ProductReviews.Fields.Customer"]",
width: 200,
- template: '<a class="k-link" href="@Url.Action("Edit", "Customer", new { area = Constants.AreaAdmin })/#=CustomerId#">#:CustomerInfo#</a>',
+ @if (Scope.ResourceKeyPrefix == "Vendor")
+ {
+ <text>template: '#:CustomerInfo#',</text>
+ }
+ else
+ {
+ <text>template: '<a class="k-link" href="@Url.Action("Edit", "Customer", new { area = area })/#=CustomerId#">#:CustomerInfo#</a>',</text>
+ }
minScreenWidth: 750,
},
{
field: "Title",
- title: "@Loc["Admin.Catalog.ProductReviews.Fields.Title"]",
- template: '<a class="k-link" href="@Url.Action("Edit", "ProductReview", new { area = Constants.AreaAdmin })/#=Id#">#:Title#</a>',
+ title: "@Loc[$"{Scope.ResourceKeyPrefix}.Catalog.ProductReviews.Fields.Title"]",
+ @if (Scope.ResourceKeyPrefix == "Vendor")
+ {
+ <text>template: '#:Title#',</text>
+ }
+ else
+ {
+ <text>template: '<a class="k-link" href="@Url.Action("Edit", "ProductReview", new { area = area })/#=Id#">#:Title#</a>',</text>
+ }
width: 280,
},
{
field: "Rating",
- title: "@Loc["Admin.Catalog.ProductReviews.Fields.Rating"]",
+ title: "@Loc[$"{Scope.ResourceKeyPrefix}.Catalog.ProductReviews.Fields.Rating"]",
width: 60,
minScreenWidth: 500,
},
{
field: "IsApproved",
- title: "@Loc["Admin.Catalog.ProductReviews.Fields.IsApproved"]",
+ title: "@Loc[$"{Scope.ResourceKeyPrefix}.Catalog.ProductReviews.Fields.IsApproved"]",
width: 80,
headerAttributes: { style: "text-align:center" },
attributes: { style: "text-align:center" },
@@ -75,7 +92,7 @@
},
{
field: "CreatedOn",
- title: "@Loc["Admin.Orders.Fields.CreatedOn"]",
+ title: "@Loc[$"{Scope.ResourceKeyPrefix}.Orders.Fields.CreatedOn"]",
width: 150,
type: "date",
format: "{0:G}",
@@ -83,4 +100,4 @@
}]
});
});
-</script>
\ No newline at end of file
+</script>
diff --git a/src/Web/Grand.Web.AdminShared/Views/Product/Partials/WidgetZone.Reviews.Bottom.cshtml b/src/Web/Grand.Web.AdminShared/Views/Product/Partials/WidgetZone.Reviews.Bottom.cshtml
new file mode 100644
index 000000000..457da7c51
--- /dev/null
+++ b/src/Web/Grand.Web.AdminShared/Views/Product/Partials/WidgetZone.Reviews.Bottom.cshtml
@@ -0,0 +1,2 @@
+@model ProductModel
+<vc:admin-widget widget-zone="product_details_reviews_bottom" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.AdminShared/Views/Product/Partials/WidgetZone.Reviews.Top.cshtml b/src/Web/Grand.Web.AdminShared/Views/Product/Partials/WidgetZone.Reviews.Top.cshtml
new file mode 100644
index 000000000..9423f693e
--- /dev/null
+++ b/src/Web/Grand.Web.AdminShared/Views/Product/Partials/WidgetZone.Reviews.Top.cshtml
@@ -0,0 +1,2 @@
+@model ProductModel
+<vc:admin-widget widget-zone="product_details_reviews_top" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Product/Partials/CreateOrUpdate.Reviews.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Product/Partials/CreateOrUpdate.Reviews.cshtml
deleted file mode 100644
index 51f45a66f..000000000
--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Product/Partials/CreateOrUpdate.Reviews.cshtml
+++ /dev/null
@@ -1,86 +0,0 @@
-@model ProductModel
-@inject AdminAreaSettings adminAreaSettings
-
-<div class="panel panel-default">
- <vc:admin-widget widget-zone="product_details_reviews_top" additional-data="Model"/>
- <div class="panel-body">
- <div id="reviews-grid"></div>
- </div>
- <vc:admin-widget widget-zone="product_details_reviews_bottom" additional-data="Model"/>
-</div>
-<script>
- $(document).ready(function () {
- $("#reviews-grid").kendoGrid({
- dataSource: {
- transport: {
- read: {
- url: "@Html.Raw(Url.Action("Reviews", "Product", new { productId = Model.Id, 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();
- },
- pageSize: @(adminAreaSettings.DefaultGridPageSize),
- serverPaging: true,
- serverFiltering: true,
- serverSorting: true
- },
- autoBind: false,
- pageable: {
- refresh: true,
- pageSizes: [@(adminAreaSettings.GridPageSizes)]
- },
- editable: {
- confirmation: false,
- mode: "inline"
- },
- scrollable: false,
- columns: [{
- field: "CustomerId",
- title: "@Loc["Admin.Catalog.ProductReviews.Fields.Customer"]",
- width: 200,
- template: '<a class="k-link" href="@Url.Action("Edit", "Customer", new { area = Constants.AreaStore })/#=CustomerId#">#:CustomerInfo#</a>',
- minScreenWidth: 750,
- },
- {
- field: "Title",
- title: "@Loc["Admin.Catalog.ProductReviews.Fields.Title"]",
- template: '<a class="k-link" href="@Url.Action("Edit", "ProductReview", new { area = Constants.AreaStore })/#=Id#">#:Title#</a>',
- width: 280,
- },
- {
- field: "Rating",
- title: "@Loc["Admin.Catalog.ProductReviews.Fields.Rating"]",
- width: 60,
- minScreenWidth: 500,
- },
- {
- field: "IsApproved",
- title: "@Loc["Admin.Catalog.ProductReviews.Fields.IsApproved"]",
- width: 80,
- headerAttributes: { style: "text-align:center" },
- attributes: { style: "text-align:center" },
- template: '# if(IsApproved) {# <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> #} #',
- minScreenWidth: 500,
- },
- {
- field: "CreatedOn",
- title: "@Loc["Admin.Orders.Fields.CreatedOn"]",
- width: 150,
- type: "date",
- format: "{0:G}",
- minScreenWidth: 500,
- }]
- });
- });
-</script>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/CreateOrUpdate.Reviews.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/CreateOrUpdate.Reviews.cshtml
deleted file mode 100644
index 8fce92cf4..000000000
--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/CreateOrUpdate.Reviews.cshtml
+++ /dev/null
@@ -1,86 +0,0 @@
-@model ProductModel
-@inject AdminAreaSettings adminAreaSettings
-
-<div class="panel panel-default">
- <vc:vendor-widget widget-zone="vendor_product_details_reviews_top" additional-data="Model"/>
- <div class="panel-body">
- <div id="reviews-grid"></div>
- </div>
- <vc:vendor-widget widget-zone="vendor_product_details_reviews_bottom" additional-data="Model"/>
-</div>
-<script>
- $(document).ready(function () {
- $("#reviews-grid").kendoGrid({
- dataSource: {
- transport: {
- read: {
- url: "@Html.Raw(Url.Action("Reviews", "Product", new { productId = Model.Id, area = Constants.AreaVendor }))",
- 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();
- },
- pageSize: @(adminAreaSettings.DefaultGridPageSize),
- serverPaging: true,
- serverFiltering: true,
- serverSorting: true
- },
- autoBind: false,
- pageable: {
- refresh: true,
- pageSizes: [@(adminAreaSettings.GridPageSizes)]
- },
- editable: {
- confirmation: false,
- mode: "inline"
- },
- scrollable: false,
- columns: [{
- field: "CustomerId",
- title: "@Loc["Vendor.Catalog.ProductReviews.Fields.Customer"]",
- width: 200,
- template: '#:CustomerInfo#',
- minScreenWidth: 750,
- },
- {
- field: "Title",
- title: "@Loc["Vendor.Catalog.ProductReviews.Fields.Title"]",
- template: '#:Title#',
- width: 280,
- },
- {
- field: "Rating",
- title: "@Loc["Vendor.Catalog.ProductReviews.Fields.Rating"]",
- width: 60,
- minScreenWidth: 500,
- },
- {
- field: "IsApproved",
- title: "@Loc["Vendor.Catalog.ProductReviews.Fields.IsApproved"]",
- width: 80,
- headerAttributes: { style: "text-align:center" },
- attributes: { style: "text-align:center" },
- template: '# if(IsApproved) {# <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> #} #',
- minScreenWidth: 500,
- },
- {
- field: "CreatedOn",
- title: "@Loc["Vendor.Orders.Fields.CreatedOn"]",
- width: 150,
- type: "date",
- format: "{0:G}",
- minScreenWidth: 500,
- }]
- });
- });
-</script>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/WidgetZone.Reviews.Bottom.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/WidgetZone.Reviews.Bottom.cshtml
new file mode 100644
index 000000000..5704aea05
--- /dev/null
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/WidgetZone.Reviews.Bottom.cshtml
@@ -0,0 +1,2 @@
+@model ProductModel
+<vc:vendor-widget widget-zone="vendor_product_details_reviews_bottom" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/WidgetZone.Reviews.Top.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/WidgetZone.Reviews.Top.cshtml
new file mode 100644
index 000000000..e75d6cdf3
--- /dev/null
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/WidgetZone.Reviews.Top.cshtml
@@ -0,0 +1,2 @@
+@model ProductModel
+<vc:vendor-widget widget-zone="vendor_product_details_reviews_top" additional-data="Model"/>