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
#570 - Enhance product review management functionality (#608)
Krzysztof Pajakb675cc72e28f
diff --git a/src/Modules/Grand.Module.Installer/Extensions/PermissionExtensions.cs b/src/Modules/Grand.Module.Installer/Extensions/PermissionExtensions.csindex e4a6d1e4f..f998b7cb9 100644--- a/src/Modules/Grand.Module.Installer/Extensions/PermissionExtensions.cs+++ b/src/Modules/Grand.Module.Installer/Extensions/PermissionExtensions.cs@@ -201,6 +201,7 @@ public static class PermissionExtensionsStandardPermission.ManageProducts,StandardPermission.ManageProductAttributes,StandardPermission.ManageSpecificationAttributes,+ StandardPermission.ManageProductReviews,StandardPermission.ManageFiles,StandardPermission.ManagePictures,StandardPermission.ManageCategories,diff --git a/src/Web/Grand.Web.Admin/Controllers/ProductReviewController.cs b/src/Web/Grand.Web.Admin/Controllers/ProductReviewController.csindex c3d140449..ff6657f4f 100644--- a/src/Web/Grand.Web.Admin/Controllers/ProductReviewController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/ProductReviewController.cs@@ -1,8 +1,6 @@using Grand.Business.Core.Interfaces.Catalog.Products;-using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Domain.Permissions;-using Grand.Infrastructure;using Grand.Web.AdminShared.Interfaces;using Grand.Web.AdminShared.Models.Catalog;using Grand.Web.Common.DataSource;@@ -20,15 +18,11 @@ public class ProductReviewController : BaseAdminControllerpublic ProductReviewController(IProductReviewViewModelService productReviewViewModelService,IProductReviewService productReviewService,- ITranslationService translationService,- IContextAccessor contextAccessor,- IGroupService groupService)+ ITranslationService translationService){_productReviewViewModelService = productReviewViewModelService;_productReviewService = productReviewService;_translationService = translationService;- _contextAccessor = contextAccessor;- _groupService = groupService;}#endregion@@ -38,8 +32,6 @@ public class ProductReviewController : BaseAdminControllerprivate readonly IProductReviewViewModelService _productReviewViewModelService;private readonly IProductReviewService _productReviewService;private readonly ITranslationService _translationService;- private readonly IContextAccessor _contextAccessor;- private readonly IGroupService _groupService;#endregion Fields@@ -53,8 +45,7 @@ public class ProductReviewController : BaseAdminControllerpublic async Task<IActionResult> List(){- var model = await _productReviewViewModelService.PrepareProductReviewListModel(_contextAccessor.WorkContext.CurrentCustomer- .StaffStoreId);+ var model = await _productReviewViewModelService.PrepareProductReviewListModel();return View(model);}@@ -62,10 +53,6 @@ public class ProductReviewController : BaseAdminController[HttpPost]public async Task<IActionResult> List(DataSourceRequest command, ProductReviewListModel model){- //limit for store manager- if (await _groupService.IsStoreManager(_contextAccessor.WorkContext.CurrentCustomer))- model.SearchStoreId = _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId;-var (productReviewModels, totalCount) =await _productReviewViewModelService.PrepareProductReviewsModel(model, command.Page, command.PageSize);var gridModel = new DataSourceResult {@@ -86,9 +73,6 @@ public class ProductReviewController : BaseAdminController//No product review found with the specified idreturn RedirectToAction("List");- if (await _groupService.IsStoreManager(_contextAccessor.WorkContext.CurrentCustomer) &&- productReview.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId) return RedirectToAction("List");-var model = new ProductReviewModel();await _productReviewViewModelService.PrepareProductReviewModel(model, productReview, false, false);return View(model);@@ -104,15 +88,12 @@ public class ProductReviewController : BaseAdminController//No product review found with the specified idreturn RedirectToAction("List");- if (await _groupService.IsStoreManager(_contextAccessor.WorkContext.CurrentCustomer) &&- productReview.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId) return RedirectToAction("List");-if (ModelState.IsValid){productReview = await _productReviewViewModelService.UpdateProductReview(productReview, model);Success(_translationService.GetResource("Admin.Catalog.ProductReviews.Updated"));return continueEditing- ? RedirectToAction("Edit", new { id = productReview.Id, productReview.ProductId })+ ? RedirectToAction("Edit", new { productReview.Id, productReview.ProductId }): RedirectToAction("List");}@@ -131,9 +112,6 @@ public class ProductReviewController : BaseAdminController//No product review found with the specified idreturn RedirectToAction("List");- if (await _groupService.IsStoreManager(_contextAccessor.WorkContext.CurrentCustomer) &&- productReview.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId) return RedirectToAction("List");-if (ModelState.IsValid){await _productReviewViewModelService.DeleteProductReview(productReview);@@ -150,8 +128,7 @@ public class ProductReviewController : BaseAdminControllerpublic async Task<IActionResult> ApproveSelected(ICollection<string> selectedIds){if (selectedIds != null)- await _productReviewViewModelService.ApproveSelected(selectedIds.ToList(),- _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId);+ await _productReviewViewModelService.ApproveSelected(selectedIds.ToList());return Json(new { Result = true });}@@ -161,8 +138,7 @@ public class ProductReviewController : BaseAdminControllerpublic async Task<IActionResult> DisapproveSelected(ICollection<string> selectedIds){if (selectedIds != null)- await _productReviewViewModelService.DisapproveSelected(selectedIds.ToList(),- _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId);+ await _productReviewViewModelService.DisapproveSelected(selectedIds.ToList());return Json(new { Result = true });}@@ -175,23 +151,19 @@ public class ProductReviewController : BaseAdminControllerif (string.IsNullOrWhiteSpace(term) || term.Length < searchTermMinimumLength)return Content("");- var storeId = string.Empty;- if (await _groupService.IsStoreManager(_contextAccessor.WorkContext.CurrentCustomer))- storeId = _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId;-//productsconst int productNumber = 15;var products = (await productService.SearchProducts(- storeId: storeId,keywords: term,pageSize: productNumber,showHidden: true)).products;var result = (from p in products- select new {- label = p.Name,- productid = p.Id- })+ select new+ {+ label = p.Name,+ productid = p.Id+ }).ToList();return Json(result);}diff --git a/src/Web/Grand.Web.AdminShared/Interfaces/IProductReviewViewModelService.cs b/src/Web/Grand.Web.AdminShared/Interfaces/IProductReviewViewModelService.csindex cbb6085b0..0a1b0a308 100644--- a/src/Web/Grand.Web.AdminShared/Interfaces/IProductReviewViewModelService.cs+++ b/src/Web/Grand.Web.AdminShared/Interfaces/IProductReviewViewModelService.cs@@ -12,8 +12,8 @@ public interface IProductReviewViewModelServiceProductReviewListModel model, int pageIndex, int pageSize);Task<ProductReview> UpdateProductReview(ProductReview productReview, ProductReviewModel model);- Task<ProductReviewListModel> PrepareProductReviewListModel(string storeId);+ Task<ProductReviewListModel> PrepareProductReviewListModel(string storeId = "");Task DeleteProductReview(ProductReview productReview);- Task ApproveSelected(IEnumerable<string> selectedIds, string storeId);- Task DisapproveSelected(IEnumerable<string> selectedIds, string storeId);+ Task ApproveSelected(IEnumerable<string> selectedIds, string storeId = "");+ Task DisapproveSelected(IEnumerable<string> selectedIds, string storeId = "");}\ No newline at end of filediff --git a/src/Web/Grand.Web.AdminShared/Services/ProductReviewViewModelService.cs b/src/Web/Grand.Web.AdminShared/Services/ProductReviewViewModelService.csindex 2bf7ebb80..a94ead0cb 100644--- a/src/Web/Grand.Web.AdminShared/Services/ProductReviewViewModelService.cs+++ b/src/Web/Grand.Web.AdminShared/Services/ProductReviewViewModelService.cs@@ -84,7 +84,7 @@ public class ProductReviewViewModelService : IProductReviewViewModelService}}- public virtual async Task<ProductReviewListModel> PrepareProductReviewListModel(string storeId)+ public virtual async Task<ProductReviewListModel> PrepareProductReviewListModel(string storeId = ""){var model = new ProductReviewListModel();@@ -146,7 +146,7 @@ public class ProductReviewViewModelService : IProductReviewViewModelServiceawait _mediator.Send(new UpdateProductReviewTotalsCommand { Product = product });}- public virtual async Task ApproveSelected(IEnumerable<string> selectedIds, string storeId)+ public virtual async Task ApproveSelected(IEnumerable<string> selectedIds, string storeId = ""){foreach (var id in selectedIds){@@ -170,7 +170,7 @@ public class ProductReviewViewModelService : IProductReviewViewModelService}}- public virtual async Task DisapproveSelected(IEnumerable<string> selectedIds, string storeId)+ public virtual async Task DisapproveSelected(IEnumerable<string> selectedIds, string storeId = ""){foreach (var id in selectedIds){diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductReview/Edit.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductReview/Edit.cshtmlnew file mode 100644index 000000000..b99753717--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductReview/Edit.cshtml@@ -0,0 +1,41 @@+@model ProductReviewModel+@{+ //page title+ ViewBag.Title = Loc["Admin.Catalog.ProductReviews.EditProductReviewDetails"];+}+<form asp-area="@Constants.AreaStore" asp-controller="ProductReview" asp-action="Edit" method="post" asp-route-ProductId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["ProductId"])">++ <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-cube"></i>+ @Loc["Admin.Catalog.ProductReviews.EditProductReviewDetails"]+ <small>+ <i class="fa fa-arrow-circle-left"></i>@Html.ActionLink(Loc["Admin.Catalog.ProductReviews.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>+ <span id="productreview-delete" class="btn red">+ <i class="fa fa-trash-o"></i> @Loc["Admin.Common.Delete"]+ </span>+ <vc:admin-widget widget-zone="product_review_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="productreview-delete"/>\ No newline at end of filediff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductReview/List.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductReview/List.cshtmlnew file mode 100644index 000000000..cef7a7222--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductReview/List.cshtml@@ -0,0 +1,317 @@+@model ProductReviewListModel+@inject AdminAreaSettings adminAreaSettings+@{+ //page title+ ViewBag.Title = Loc["Admin.Catalog.ProductReviews"];+}++<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.ProductReviews"]+ </div>+ <div class="actions btn-group btn-group-devided">+ <input type="button" id="approve-selected" class="btn default" value="@Loc["Admin.Catalog.ProductReviews.ApproveSelected"]"/>+ <input type="button" id="disapprove-selected" class="btn default" value="@Loc["Admin.Catalog.ProductReviews.DisapproveSelected"]"/>+ <vc:admin-widget widget-zone="product_review_list_buttons" additional-data="null"/>+ </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-4 col-ms-12 col-12">+ <div class="form-group mb-0">+ <admin-label asp-for="SearchProductId" class="control-label"/>+ <div>+ <input type="text" class="form-control text-box single-line" id="search-product-name" autocomplete="off"/>+ <span id="search-product-friendly-name"></span>+ <input type="button" id="search-product-clear" class="k-button" style="display: none;" value="@Loc["Admin.Common.Clear"]"/>+ <admin-textarea asp-for="SearchProductId" autocomplete="off" style="display: none;"></admin-textarea>+ <script>+ $(document).ready(function() {+ $('#search-product-name').autocomplete({+ delay: 500,+ minLength: 3,+ source: '@(Url.Action("ProductSearchAutoComplete", new { area = Constants.AreaStore }))',+ select: function(event, ui) {+ $('#@Html.IdFor(model => model.SearchProductId)').val(ui.item.productid);+ $('#search-product-friendly-name').text(ui.item.label);+ $('#search-product-clear').show();+ return false;+ }+ });++ //remove button+ $('#search-product-clear').click(function() {+ $('#@Html.IdFor(model => model.SearchProductId)').val('');+ $('#search-product-friendly-name').text('');+ $('#search-product-clear').hide();+ return false;+ });+ });+ </script>+ </div>+ </div>+ </div>+ <div class="col-md-4 col-ms-12 col-12">+ <div class="form-group mb-0">+ <admin-label asp-for="SearchText" class="control-label"/>+ <admin-input asp-for="SearchText"/>+ </div>+ </div>+ <div class="col-md-4 col-sm-12 col-12">+ <div class="form-actions">+ <div class="btn-group">+ <button class="btn btn-success filter-submit" id="search-productreviews">+ <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>+ </div>+ </div>+ </div>+ </div>+ <div class="collapse" id="filterCollapse">+ <div class="drop-filters-container">+ <div class="form-group">+ <admin-label asp-for="CreatedOnFrom" class="col-sm-3 control-label"/>+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="CreatedOnFrom"/>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="CreatedOnTo" class="col-sm-3 control-label"/>+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="CreatedOnTo"/>+ </div>+ </div>+ </div>+ </div>+ </div>+ <div class="x_content">+ <div id="productreviews-grid"></div>+ </div>++ </div>+ </div>+ </div>+ </div>+</div>++<script>+$(document).ready(function () {+ $("#productreviews-grid").kendoGrid({+ dataSource: {+ transport: {+ read: {+ url: "@Html.Raw(Url.Action("List", "ProductReview", 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)]+ },+ scrollable: false,+ dataBound: onDataBound,+ columns: [{+ field: "Ids",+ headerTemplate: "<label class='mt-checkbox mt-checkbox-outline control control-checkbox'><input id='mastercheckbox' type='checkbox'/> <div class='control__indicator'></div></label>",+ headerAttributes: { style: "text-align:center" },+ attributes: { style: "text-align:center" },+ template: "<label class='mt-checkbox mt-checkbox-outline control control-checkbox'><input type='checkbox' value='#=Ids#' class='checkboxGroups'/> <div class='control__indicator'></div></label>",+ width: 40+ },+ {+ field: "ProductName",+ title: "@Loc["Admin.Catalog.ProductReviews.Fields.Product"]",+ width: 200,+ template: '<a class="k-link" href="@Url.Action("Edit", "Product", new { area = Constants.AreaStore })/#=ProductId#">#:kendo.htmlEncode(ProductName)#</a>'+ }, {+ field: "CustomerId",+ title: "@Loc["Admin.Catalog.ProductReviews.Fields.Customer"]",+ width: 200,+ minScreenWidth: 750,+ template: '<a class="k-link" href="@Url.Action("Edit", "Customer", new { area = Constants.AreaStore })/#=CustomerId#">#:kendo.htmlEncode(CustomerInfo)#</a>'+ }, {+ field: "Title",+ title: "@Loc["Admin.Catalog.ProductReviews.Fields.Title"]",+ width: 200,+ template: '<a class="k-link" href="Edit/#=Id#?ProductId=#=ProductId#">#:kendo.htmlEncode(Title)#</a>'+ }, {+ field: "Rating",+ title: "@Loc["Admin.Catalog.ProductReviews.Fields.Rating"]",+ width: 60,+ minScreenWidth: 750,+ }, {+ 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> #} #'+ }, {+ field: "CreatedOn",+ title: "@Loc["Admin.Catalog.ProductReviews.Fields.CreatedOn"]",+ width: 120,+ type: "date",+ format: "{0:G}"+ }]+ });+});+</script>+<script>++ var selectedIds = [];++ $(document).ready(function () {++ //search button+ $('#search-productreviews').click(function () {+ //search+ var grid = $('#productreviews-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();+ selectedIds = [];+ return false;+ });++ //"approve selected" button+ $('#approve-selected').click(function (e) {+ e.preventDefault();++ var postData = {+ selectedIds: selectedIds,+ };+ addAntiForgeryToken(postData);++ $.ajax({+ cache:false,+ type: "POST",+ url: "@(Url.Action("ApproveSelected", "ProductReview", new { area = Constants.AreaStore }))",+ data: postData,+ complete: function (data) {+ //reload grid+ var grid = $('#productreviews-grid').data('kendoGrid');+ grid.dataSource.read();+ },+ error:function (xhr, ajaxOptions, thrownError){+ alert(thrownError);+ },+ traditional: true+ });+ return false;+ });++ //"disapprove selected" button+ $('#disapprove-selected').click(function (e) {+ e.preventDefault();++ var postData = {+ selectedIds: selectedIds,+ };+ addAntiForgeryToken(postData);++ $.ajax({+ cache:false,+ type: "POST",+ url: "@(Url.Action("DisapproveSelected", "ProductReview", new { area = Constants.AreaStore }))",+ data: postData,+ complete: function (data) {+ //reload grid+ var grid = $('#productreviews-grid').data('kendoGrid');+ grid.dataSource.read();+ },+ error:function (xhr, ajaxOptions, thrownError){+ alert(thrownError);+ },+ traditional: true+ });+ return false;+ });+++ $('#mastercheckbox').click(function () {+ $('.checkboxGroups').prop('checked', $(this).is(':checked')).change();+ });++ //wire up checkboxes.+ $('#productreviews-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function (e) {+ var $check = $(this);+ if ($check.is(":checked") == true) {+ var checked = jQuery.inArray($check.val(), selectedIds);+ if (checked == -1) {+ //add id to selectedIds.+ selectedIds.push($check.val());+ }+ }+ else {+ var checked = jQuery.inArray($check.val(), selectedIds);+ if (checked > -1) {+ //remove id from selectedIds.+ selectedIds = $.grep(selectedIds, function (item, index) {+ return item != $check.val();+ });+ }+ }+ updateMasterCheckbox();+ });+ });++ function additionalData() {+ var data = {+ CreatedOnFrom: $('#@Html.IdFor(model => model.CreatedOnFrom)').val(),+ CreatedOnTo: $('#@Html.IdFor(model => model.CreatedOnTo)').val(),+ SearchText: $('#@Html.IdFor(model => model.SearchText)').val(),+ SearchProductId: $('#@Html.IdFor(model => model.SearchProductId)').val()+ };+ addAntiForgeryToken(data);+ return data;+ }++ function onDataBound(e) {++ $('#productreviews-grid input[type=checkbox][id!=mastercheckbox]').each(function () {+ var currentId = $(this).val();+ var checked = jQuery.inArray(currentId, selectedIds);+ //set checked based on if current checkbox's value is in selectedIds.+ $(this).prop('checked', checked > -1);+ });++ updateMasterCheckbox();+ }++ function updateMasterCheckbox() {+ var numChkBoxes = $('#productreviews-grid input[type=checkbox][id!=mastercheckbox]').length;+ var numChkBoxesChecked = $('#productreviews-grid input[type=checkbox][id!=mastercheckbox]:checked').length;+ $('#mastercheckbox').prop('checked', numChkBoxes == numChkBoxesChecked && numChkBoxes > 0);+ }++</script>\ No newline at end of filediff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/ProductReview/Partials/CreateOrUpdate.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductReview/Partials/CreateOrUpdate.cshtmlnew file mode 100644index 000000000..abf7decf4--- /dev/null+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/ProductReview/Partials/CreateOrUpdate.cshtml@@ -0,0 +1,78 @@+@model ProductReviewModel+<div asp-validation-summary="All"></div>+<input asp-for="Id" type="hidden"/>+<input asp-for="ProductId" type="hidden"/>+<div class="form-horizontal">+ <vc:admin-widget widget-zone="product_review_details_top" additional-data="Model"/>+ <div class="form-body">+ <div class="form-group">+ <admin-label asp-for="ProductName"/>+ <div class="col-md-9 col-sm-9">+ <label class="control-label">@Html.ActionLink(Model.ProductName, "Edit", "Product", new { id = Model.ProductId }, new { })</label>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="StoreName"/>+ <div class="col-md-9 col-sm-9">+ <span class="form-control">@Model.StoreName</span>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="CustomerInfo"/>+ <div class="col-md-9 col-sm-9">+ <label class="control-label">@Html.ActionLink(Model.CustomerInfo, "Edit", "Customer", new { id = Model.CustomerId }, new { })</label>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="Title"/>+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="Title"/>+ <span asp-validation-for="Title"></span>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="ReviewText"/>+ <div class="col-md-9 col-sm-9">+ <admin-textarea asp-for="ReviewText"></admin-textarea>+ <span asp-validation-for="ReviewText"></span>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="ReplyText"/>+ <div class="col-md-9 col-sm-9">+ <admin-textarea asp-for="ReplyText"></admin-textarea>+ <span asp-validation-for="ReplyText"></span>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="Signature"/>+ <div class="col-md-9 col-sm-9">+ <admin-input asp-for="Signature"/>+ <span asp-validation-for="Signature"></span>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="Rating"/>+ <div class="col-md-9 col-sm-9">+ <label class="control-label">@Model.Rating</label>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="IsApproved"/>+ <div class="col-md-9 col-sm-9">+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">+ <admin-input asp-for="IsApproved"/>+ <div class="control__indicator"></div>+ </label>+ <span asp-validation-for="IsApproved"></span>+ </div>+ </div>+ <div class="form-group">+ <admin-label asp-for="CreatedOn"/>+ <div class="col-md-9 col-sm-9">+ <label class="control-label">@Model.CreatedOn</label>+ </div>+ </div>+ </div>+ <vc:admin-widget widget-zone="product_review_details_bottom" additional-data="Model"/>+</div>\ No newline at end of filediff --git a/src/Web/Grand.Web.Store/Controllers/ProductController.cs b/src/Web/Grand.Web.Store/Controllers/ProductController.csindex 02d532b6a..a0a39345a 100644--- a/src/Web/Grand.Web.Store/Controllers/ProductController.cs+++ b/src/Web/Grand.Web.Store/Controllers/ProductController.cs@@ -1,5 +1,4 @@-using Grand.Business.Catalog.Services.Products;-using Grand.Business.Core.Extensions;+using Grand.Business.Core.Extensions;using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Interfaces.Common.Localization;@@ -16,7 +15,6 @@ using Grand.Web.AdminShared.Extensions.Mapping;using Grand.Web.AdminShared.Interfaces;using Grand.Web.AdminShared.Models.Catalog;using Grand.Web.AdminShared.Models.Orders;-using Grand.Web.Common;using Grand.Web.Common.DataSource;using Grand.Web.Common.Extensions;using Grand.Web.Common.Filters;@@ -275,7 +273,7 @@ public class ProductController : BaseStoreController{var originalProduct = await _productService.GetProductById(copyModel.Id, true);- if (!originalProduct.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))+ if (originalProduct.LimitedToStores && !originalProduct.Stores.Contains(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId))return RedirectToAction("List");originalProduct.LimitedToStores = true;@@ -1452,7 +1450,7 @@ public class ProductController : BaseStoreControllerreturn new JsonResult("");}-+[PermissionAuthorizeAction(PermissionActionName.Delete)][HttpPost]public async Task<IActionResult> BulkEditDelete(IEnumerable<BulkEditProductModel> products)diff --git a/src/Web/Grand.Web.Store/Controllers/ProductReviewController.cs b/src/Web/Grand.Web.Store/Controllers/ProductReviewController.csnew file mode 100644index 000000000..087e0de8f--- /dev/null+++ b/src/Web/Grand.Web.Store/Controllers/ProductReviewController.cs@@ -0,0 +1,187 @@+using Grand.Business.Core.Interfaces.Catalog.Products;+using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Domain.Permissions;+using Grand.Infrastructure;+using Grand.Web.AdminShared.Interfaces;+using Grand.Web.AdminShared.Models.Catalog;+using Grand.Web.Common.DataSource;+using Grand.Web.Common.Filters;+using Grand.Web.Common.Security.Authorization;+using Microsoft.AspNetCore.Mvc;++namespace Grand.Web.Store.Controllers;++[PermissionAuthorize(PermissionSystemName.ProductReviews)]+public class ProductReviewController : BaseStoreController+{+ #region Constructors++ public ProductReviewController(+ IProductReviewViewModelService productReviewViewModelService,+ IProductReviewService productReviewService,+ ITranslationService translationService,+ IContextAccessor contextAccessor)+ {+ _productReviewViewModelService = productReviewViewModelService;+ _productReviewService = productReviewService;+ _translationService = translationService;+ _contextAccessor = contextAccessor;+ }++ #endregion++ #region Fields++ private readonly IProductReviewViewModelService _productReviewViewModelService;+ private readonly IProductReviewService _productReviewService;+ private readonly ITranslationService _translationService;+ private readonly IContextAccessor _contextAccessor;++ #endregion Fields++ #region Methods++ //list+ public IActionResult Index()+ {+ return RedirectToAction("List");+ }++ public IActionResult List()+ {+ var model = new ProductReviewListModel();+ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.List)]+ [HttpPost]+ public async Task<IActionResult> List(DataSourceRequest command, ProductReviewListModel model)+ {+ model.SearchStoreId = _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId;+ var (productReviewModels, totalCount) = await _productReviewViewModelService.PrepareProductReviewsModel(model, command.Page, command.PageSize);+ var gridModel = new DataSourceResult {+ Data = productReviewModels.ToList(),+ Total = totalCount+ };++ return Json(gridModel);+ }++ //edit+ [PermissionAuthorizeAction(PermissionActionName.Preview)]+ public async Task<IActionResult> Edit(string id)+ {+ var productReview = await _productReviewService.GetProductReviewById(id);++ if (productReview == null)+ //No product review found with the specified id+ return RedirectToAction("List");++ if (productReview.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId) return RedirectToAction("List");++ var model = new ProductReviewModel();+ await _productReviewViewModelService.PrepareProductReviewModel(model, productReview, false, false);+ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]+ public async Task<IActionResult> Edit(ProductReviewModel model, bool continueEditing)+ {+ var productReview = await _productReviewService.GetProductReviewById(model.Id);+ if (productReview == null)+ //No product review found with the specified id+ return RedirectToAction("List");++ if (productReview.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId) return RedirectToAction("List");++ if (ModelState.IsValid)+ {+ productReview = await _productReviewViewModelService.UpdateProductReview(productReview, model);+ Success(_translationService.GetResource("Admin.Catalog.ProductReviews.Updated"));+ return continueEditing+ ? RedirectToAction("Edit", new { productReview.Id, productReview.ProductId })+ : RedirectToAction("List");+ }++ //If we got this far, something failed, redisplay form+ await _productReviewViewModelService.PrepareProductReviewModel(model, productReview, true, false);+ return View(model);+ }++ //delete+ [PermissionAuthorizeAction(PermissionActionName.Delete)]+ [HttpPost]+ public async Task<IActionResult> Delete(string id)+ {+ var productReview = await _productReviewService.GetProductReviewById(id);+ if (productReview == null)+ //No product review found with the specified id+ return RedirectToAction("List");++ if (productReview.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId) return RedirectToAction("List");++ if (ModelState.IsValid)+ {+ await _productReviewViewModelService.DeleteProductReview(productReview);+ Success(_translationService.GetResource("Admin.Catalog.ProductReviews.Deleted"));+ return RedirectToAction("List");+ }++ Error(ModelState);+ return RedirectToAction("Edit", new { id = productReview.Id });+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ public async Task<IActionResult> ApproveSelected(ICollection<string> selectedIds)+ {+ if (selectedIds != null)+ await _productReviewViewModelService.ApproveSelected(selectedIds.ToList(),+ _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId);++ return Json(new { Result = true });+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ public async Task<IActionResult> DisapproveSelected(ICollection<string> selectedIds)+ {+ if (selectedIds != null)+ await _productReviewViewModelService.DisapproveSelected(selectedIds.ToList(),+ _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId);++ return Json(new { Result = true });+ }+++ public async Task<IActionResult> ProductSearchAutoComplete(string term,+ [FromServices] IProductService productService)+ {+ const int searchTermMinimumLength = 3;+ if (string.IsNullOrWhiteSpace(term) || term.Length < searchTermMinimumLength)+ return Content("");++ var storeId = _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId;++ //products+ const int productNumber = 15;+ var products = (await productService.SearchProducts(+ storeId: storeId,+ keywords: term,+ pageSize: productNumber,+ showHidden: true)).products;++ var result = (from p in products+ select new+ {+ label = p.Name,+ productid = p.Id+ })+ .ToList();+ return Json(result);+ }++ #endregion+}\ No newline at end of file