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
Allow leaving only one product review per customer #161
KrzysztofPajakb5f5d2b6dddb
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataSettings.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataSettings.csindex 65f045853..738dcc700 100644--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataSettings.cs+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataSettings.cs@@ -199,6 +199,7 @@ namespace Grand.Business.System.Services.InstallationDefaultProductRatingValue = 5,AllowAnonymousUsersToReviewProduct = false,ProductReviewPossibleOnlyAfterPurchasing = false,+ ProductReviewPossibleOnlyOnce = false,NotifyStoreOwnerAboutNewProductReviews = false,EmailAFriendEnabled = true,AskQuestionEnabled = false,diff --git a/src/Core/Grand.Domain/Catalog/CatalogSettings.cs b/src/Core/Grand.Domain/Catalog/CatalogSettings.csindex 80774bd02..e519e0200 100644--- a/src/Core/Grand.Domain/Catalog/CatalogSettings.cs+++ b/src/Core/Grand.Domain/Catalog/CatalogSettings.cs@@ -154,6 +154,12 @@ namespace Grand.Domain.Catalog/// Gets or sets a value indicating whether product can be reviewed only by customer who have already ordered it/// </summary>public bool ProductReviewPossibleOnlyAfterPurchasing { get; set; }++ /// <summary>+ /// Gets or sets a value indicating whether product can be reviewed only once by customer+ /// </summary>+ public bool ProductReviewPossibleOnlyOnce { get; set; }+/// <summary>/// Gets or sets a number of "Recently viewed products"/// </summary>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/Catalog.TabProductReviews.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/Catalog.TabProductReviews.cshtmlindex e231dddf1..640f6ac36 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/Catalog.TabProductReviews.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/Catalog.TabProductReviews.cshtml@@ -50,6 +50,18 @@<span asp-validation-for="ProductReviewPossibleOnlyAfterPurchasing"></span></div></div>+ <div class="form-group">+ <div class="col-8 col-md-4 col-sm-4 text-right">+ <admin-label asp-for="ProductReviewPossibleOnlyOnce" class="control-label" />+ </div>+ <div class="col-4 col-md-8 col-sm-8">+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">+ <admin-input asp-for="ProductReviewPossibleOnlyOnce" />+ <div class="control__indicator"></div>+ </label>+ <span asp-validation-for="ProductReviewPossibleOnlyOnce"></span>+ </div>+ </div><div class="form-group"><div class="col-8 col-md-4 col-sm-4 text-right"><admin-label asp-for="DefaultProductRatingValue" class="control-label" />diff --git a/src/Web/Grand.Web.Admin/Models/Settings/CatalogSettingsModel.cs b/src/Web/Grand.Web.Admin/Models/Settings/CatalogSettingsModel.csindex 22c260b3a..fb7100c70 100644--- a/src/Web/Grand.Web.Admin/Models/Settings/CatalogSettingsModel.cs+++ b/src/Web/Grand.Web.Admin/Models/Settings/CatalogSettingsModel.cs@@ -72,6 +72,9 @@ namespace Grand.Web.Admin.Models.Settings[GrandResourceDisplayName("Admin.Settings.Catalog.ProductReviewPossibleOnlyAfterPurchasing")]public bool ProductReviewPossibleOnlyAfterPurchasing { get; set; }+ [GrandResourceDisplayName("Admin.Settings.Catalog.ProductReviewPossibleOnlyOnce")]+ public bool ProductReviewPossibleOnlyOnce { get; set; }+[GrandResourceDisplayName("Admin.Settings.Catalog.NotifyStoreOwnerAboutNewProductReviews")]public bool NotifyStoreOwnerAboutNewProductReviews { get; set; }diff --git a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xmlindex e86e82842..b7d47e2e2 100644--- a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml+++ b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml@@ -10714,6 +10714,9 @@<Resource Name="Admin.Settings.Catalog.ProductReviewPossibleOnlyAfterPurchasing"><Value>Product review possible only after purchasing product</Value></Resource>+ <Resource Name="Admin.Settings.Catalog.ProductReviewPossibleOnlyOnce">+ <Value>Product review possible only once by customer</Value>+ </Resource><Resource Name="Admin.Settings.Catalog.ProductReviews"><Value>Product reviews</Value></Resource>@@ -15792,6 +15795,9 @@<Resource Name="Reviews.ProductReviewPossibleOnlyAfterPurchasing"><Value>Product can be reviewed only after purchasing it</Value></Resource>+ <Resource Name="Reviews.ProductReviewPossibleOnlyOnce">+ <Value>Product can be reviewed only once by customer</Value>+ </Resource><Resource Name="Reviews.ProductReviewsFor"><Value>Product reviews for</Value></Resource>diff --git a/src/Web/Grand.Web/Commands/Handler/Products/InsertProductReviewCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Products/InsertProductReviewCommandHandler.csindex 217ef87fa..50ee0586e 100644--- a/src/Web/Grand.Web/Commands/Handler/Products/InsertProductReviewCommandHandler.cs+++ b/src/Web/Grand.Web/Commands/Handler/Products/InsertProductReviewCommandHandler.cs@@ -49,7 +49,7 @@ namespace Grand.Web.Commands.Handler.Productsrating = _catalogSettings.DefaultProductRatingValue;var isApproved = !_catalogSettings.ProductReviewsMustBeApproved;- var confirmPurchased = _catalogSettings.ProductReviewPossibleOnlyAfterPurchasing ? true :+ var confirmPurchased =(await _mediator.Send(new GetOrderQuery(){CustomerId = request.Customer.Id,diff --git a/src/Web/Grand.Web/Controllers/ProductController.cs b/src/Web/Grand.Web/Controllers/ProductController.csindex efc487048..46dcad12c 100644--- a/src/Web/Grand.Web/Controllers/ProductController.cs+++ b/src/Web/Grand.Web/Controllers/ProductController.cs@@ -488,9 +488,13 @@ namespace Grand.Web.Controllers[HttpPost][AutoValidateAntiforgeryToken][ValidateCaptcha]- public virtual async Task<IActionResult> ProductReviews(string productId, ProductReviewsModel model, bool captchaValid,+ public virtual async Task<IActionResult> ProductReviews(+ string productId,+ ProductReviewsModel model,+ bool captchaValid,[FromServices] IGroupService groupService,- [FromServices] IOrderService orderService)+ [FromServices] IOrderService orderService,+ [FromServices] IProductReviewService productReviewService){var product = await _productService.GetProductById(productId);if (product == null || !product.Published || !product.AllowCustomerReviews)@@ -511,6 +515,15 @@ namespace Grand.Web.Controllers!(await orderService.SearchOrders(customerId: _workContext.CurrentCustomer.Id, productId: productId, os: (int)OrderStatusSystem.Complete)).Any())ModelState.AddModelError(string.Empty, _translationService.GetResource("Reviews.ProductReviewPossibleOnlyAfterPurchasing"));+ if (_catalogSettings.ProductReviewPossibleOnlyOnce)+ {+ var reviews = await productReviewService.GetAllProductReviews(customerId: _workContext.CurrentCustomer.Id,+ productId: productId,+ pageSize: 1);+ if(reviews.Any())+ ModelState.AddModelError(string.Empty, _translationService.GetResource("Reviews.ProductReviewPossibleOnlyOnce"));+ }+if (ModelState.IsValid){var productReview = await _mediator.Send(new InsertProductReviewCommand() {diff --git a/src/Web/Grand.Web/Features/Handlers/Products/GetProductReviewsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Products/GetProductReviewsHandler.csindex 06a75269a..3f7c4bdfc 100644--- a/src/Web/Grand.Web/Features/Handlers/Products/GetProductReviewsHandler.cs+++ b/src/Web/Grand.Web/Features/Handlers/Products/GetProductReviewsHandler.cs@@ -47,11 +47,11 @@ namespace Grand.Web.Features.Handlers.Productsif (request.Product == null)throw new ArgumentNullException(nameof(request.Product));- var model = new ProductReviewsModel();-- model.ProductId = request.Product.Id;- model.ProductName = request.Product.GetTranslation(x => x.Name, request.Language.Id);- model.ProductSeName = request.Product.GetSeName(request.Language.Id);+ var model = new ProductReviewsModel {+ ProductId = request.Product.Id,+ ProductName = request.Product.GetTranslation(x => x.Name, request.Language.Id),+ ProductSeName = request.Product.GetSeName(request.Language.Id)+ };var productReviews = await _productReviewService.GetAllProductReviews("", true, null, null, "", "", request.Product.Id, 0, request.Size);foreach (var pr in productReviews){diff --git a/src/Web/Grand.Web/Views/Product/Components/ProductReviews/_ProductReview.Modal.cshtml b/src/Web/Grand.Web/Views/Product/Components/ProductReviews/_ProductReview.Modal.cshtmlindex c4f32e087..deceabca4 100644--- a/src/Web/Grand.Web/Views/Product/Components/ProductReviews/_ProductReview.Modal.cshtml+++ b/src/Web/Grand.Web/Views/Product/Components/ProductReviews/_ProductReview.Modal.cshtml@@ -21,14 +21,14 @@<div class="form-group"><validation-provider tag="div" rules="required" name="AddProductReview.Title" v-slot="{ errors, classes }"><label for="AddProductReview_Title" class="col-form-label">@Loc["Reviews.Fields.Title"]:</label>- <input data-val-required="@Loc["reviews.fields.title.required"]" v-model="productreviews.Model.ReviewTitle" id="AddProductReview_Title" name="AddProductReview.Title" v-bind:class="[classes , 'form-control review-title']" :disabled="!productreviews.Model.AddProductReview.CanCurrentCustomerLeaveReview" />+ <input data-val-required="@Loc["reviews.fields.title.required"]" v-model="productreviews.Model.AddProductReview.Title" id="AddProductReview_Title" name="AddProductReview.Title" v-bind:class="[classes , 'form-control review-title']" :disabled="!productreviews.Model.AddProductReview.CanCurrentCustomerLeaveReview" /><span class="field-validation-error">{{ errors[0] }}</span></validation-provider></div><div class="form-group"><validation-provider tag="div" rules="required" name="AddProductReview.ReviewText" v-slot="{ errors, classes }"><label for="AddProductReview_ReviewText" class="col-form-label">@Loc["Reviews.Fields.ReviewText"]:</label>- <textarea data-val-required="@Loc["reviews.fields.reviewtext.required"]" v-model="productreviews.Model.ReviewText" id="AddProductReview_ReviewText" name="AddProductReview.ReviewText" v-bind:class="[classes , 'form-control review-text']" :disabled="!productreviews.Model.AddProductReview.CanCurrentCustomerLeaveReview"></textarea>+ <textarea data-val-required="@Loc["reviews.fields.reviewtext.required"]" v-model="productreviews.Model.AddProductReview.ReviewText" id="AddProductReview_ReviewText" name="AddProductReview.ReviewText" v-bind:class="[classes , 'form-control review-text']" :disabled="!productreviews.Model.AddProductReview.CanCurrentCustomerLeaveReview"></textarea><span class="field-validation-error">{{ errors[0] }}</span></validation-provider></div>