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
Fix vendor review
KrzysztofPajak7b33ff96f68d
diff --git a/src/Web/Grand.Web/Controllers/CatalogController.cs b/src/Web/Grand.Web/Controllers/CatalogController.csindex c7c567f5f..d93a92af8 100644--- a/src/Web/Grand.Web/Controllers/CatalogController.cs+++ b/src/Web/Grand.Web/Controllers/CatalogController.cs@@ -350,31 +350,16 @@ namespace Grand.Web.Controllers#region Vendor reviews- public virtual async Task<IActionResult> VendorReviews(string vendorId)- {- var vendor = await _vendorService.GetVendorById(vendorId);- if (vendor == null || !vendor.Active || !vendor.AllowCustomerReviews)- return RedirectToRoute("HomePage");-- var model = await _mediator.Send(new GetVendorReviews() { Vendor = vendor });-- //only registered users can leave reviews- if (await _groupService.IsGuest(_workContext.CurrentCustomer) && !_vendorSettings.AllowAnonymousUsersToReviewVendor)- ModelState.AddModelError("", _translationService.GetResource("VendorReviews.OnlyRegisteredUsersCanWriteReviews"));- //default value- model.AddVendorReview.Rating = _vendorSettings.DefaultVendorRatingValue;- return View(model);- }-[HttpPost][AutoValidateAntiforgeryToken][ValidateCaptcha]- public virtual async Task<IActionResult> VendorReviews(string vendorId, VendorReviewsModel model, bool captchaValid,+ public virtual async Task<IActionResult> VendorReviews(+ VendorReviewsModel model, bool captchaValid,[FromServices] CaptchaSettings captchaSettings){- var vendor = await _vendorService.GetVendorById(vendorId);+ var vendor = await _vendorService.GetVendorById(model.VendorId);if (vendor == null || !vendor.Active || !vendor.AllowCustomerReviews)- return RedirectToRoute("HomePage");+ return Content("");//validate CAPTCHAif (captchaSettings.Enabled && captchaSettings.ShowOnVendorReviewPage && !captchaValid)@@ -392,7 +377,7 @@ namespace Grand.Web.Controllers!(await _mediator.Send(new GetOrderQuery(){CustomerId = _workContext.CurrentCustomer.Id,- VendorId = vendorId,+ VendorId = vendor.Id,Os = (int)OrderStatusSystem.Complete,PageSize = 1})).Any())@@ -422,14 +407,16 @@ namespace Grand.Web.Controllersmodel.AddVendorReview.Result = _translationService.GetResource("VendorReviews.SuccessfullyAdded");model.VendorReviewOverview = PrepareVendorReviewOverviewModel(vendor);}- return View(model);+ return Json(model);}- model = await _mediator.Send(new GetVendorReviews() { Vendor = vendor });- model.AddVendorReview.SuccessfullyAdded = false;- model.AddVendorReview.Result = string.Join("; ", ModelState.Values.SelectMany(x => x.Errors).Select(x => x.ErrorMessage));+ var returnmodel = await _mediator.Send(new GetVendorReviews() { Vendor = vendor });+ returnmodel.AddVendorReview.ReviewText = model.AddVendorReview.ReviewText;+ returnmodel.AddVendorReview.Title = model.AddVendorReview.Title;+ returnmodel.AddVendorReview.SuccessfullyAdded = false;+ returnmodel.AddVendorReview.Result = string.Join("; ", ModelState.Values.SelectMany(x => x.Errors).Select(x => x.ErrorMessage));- return View(model);+ return Json(returnmodel);}[HttpPost]diff --git a/src/Web/Grand.Web/Views/Catalog/Components/VendorContact/Default.cshtml b/src/Web/Grand.Web/Views/Catalog/Components/VendorContact/Default.cshtmlindex 97fb5eaa5..3d3dceea5 100644--- a/src/Web/Grand.Web/Views/Catalog/Components/VendorContact/Default.cshtml+++ b/src/Web/Grand.Web/Views/Catalog/Components/VendorContact/Default.cshtml@@ -89,6 +89,7 @@ else}),methods: {test(url) {+ alert('test');var bodyFormData = new FormData(document.getElementById("vendorContact"));axios({url: url,diff --git a/src/Web/Grand.Web/Views/Catalog/Components/VendorReviews/Default.cshtml b/src/Web/Grand.Web/Views/Catalog/Components/VendorReviews/Default.cshtmlindex 6266d4580..75ba5c2b9 100644--- a/src/Web/Grand.Web/Views/Catalog/Components/VendorReviews/Default.cshtml+++ b/src/Web/Grand.Web/Views/Catalog/Components/VendorReviews/Default.cshtml@@ -1,7 +1,7 @@@model VendorReviewsModel<div class="mb-3">- <a class="btn btn-info" @@click="vendorreviews.addVendorReview('@Url.RouteUrl("VendorReviews", new { vendorId = Model.VendorId })')">@Loc["Reviews.Overview.AddNew"]</a>+ <a class="btn btn-info" @@click="vendorreviews.addVendorReview()">@Loc["Reviews.Overview.AddNew"]</a></div>@if (Model.AddVendorReview.DisplayCaptcha){@@ -11,7 +11,8 @@</div></div>}-<partial name="_VendorReview.Modal" />+<partial name="_VendorReview.Modal" model="Model" />+<template id="vendor-review-list" v-if="vendorreviews.Model.Items.length > 0"><div class="vendor-review-list"><h5 class="mb-3"><strong>@Loc["Reviews.ExistingReviews"]</strong></h5>@@ -68,7 +69,6 @@Model: null,rating: null,captcha: null,- PopupVendorReviewVueModal: null,}},created() {@@ -106,29 +106,18 @@alert(error);})},- addVendorReview: function (url) {- axios({- url: url,- method: 'get',- headers: {- 'Accept': 'application/json',- 'Content-Type': 'application/json',- 'X-Response-View': 'Json'- }- }).then(function (response) {- vendorreviews.PopupVendorReviewVueModal = response.data;- vm.$refs['ModalVendorReview'].show();- });+ addVendorReview: function () {+ vm.$refs['ModalVendorReview'].show();},modalReviewShown: function () {- if (vendorreviews.PopupVendorReviewVueModal.AddVendorReview.DisplayCaptcha && document.querySelector("#ModalVendorReview .captcha-box") == null) {+ if (vendorreviews.Model.AddVendorReview.DisplayCaptcha && document.querySelector("#ModalVendorReview .captcha-box") == null) {var html = document.getElementById("captcha-box");document.getElementById("captcha-popup").prepend(html);}- vendorreviews.PopupVendorReviewVueModal = Object.assign({}, vendorreviews.PopupVendorReviewVueModal, { ReviewTitle: '', ReviewText: '' })+ vendorreviews.Model = Object.assign({}, vendorreviews.Model, { ReviewTitle: '', ReviewText: '' })},modalReviewClose: function () {- if (vendorreviews.PopupVendorReviewVueModal.AddVendorReview.DisplayCaptcha && document.querySelector("#ModalVendorReview .captcha-box") !== null) {+ if (vendorreviews.Model.AddVendorReview.DisplayCaptcha && document.querySelector("#ModalVendorReview .captcha-box") !== null) {var html = document.getElementById("captcha-box");document.getElementById("captcha-container").prepend(html);}@@ -147,7 +136,7 @@'X-Response-View': 'Json'},}).then(function (response) {- vendorreviews.PopupVendorReviewVueModal = response.data;+ vendorreviews.Model = response.data;vendorreviews.Model.Items = response.data.Items;var result = response.data.AddVendorReview.Result;diff --git a/src/Web/Grand.Web/Views/Catalog/VendorReviews.cshtml b/src/Web/Grand.Web/Views/Catalog/VendorReviews.cshtmldeleted file mode 100644index 5cfd0a96a..000000000--- a/src/Web/Grand.Web/Views/Catalog/VendorReviews.cshtml+++ /dev/null@@ -1,91 +0,0 @@-@model VendorReviewsModel-@inject IPageHeadBuilder pagebuilder-@{- Layout = "_SingleColumn";-- //title- pagebuilder.AddTitleParts(Model.VendorName);- pagebuilder.AddTitleParts(Loc["Title.VendorReviews"]);-}-<div class="page vendor-reviews-page">- <h2 class="generalTitle text-center">@Loc["Reviews.VendorReviewsFor"] <a href="@Url.RouteUrl("Vendor", new { SeName = Model.VendorSeName })">@Model.VendorName</a></h2>- @await Component.InvokeAsync("Widget", new { widgetZone = "vendorreviews_page_top", additionalData = Model.VendorId })- @if (Model.AddVendorReview.SuccessfullyAdded)- {- <div class="alert alert-success">@Model.AddVendorReview.Result</div>- }- else- {- <div class="write-review" id="review-form">- <h5 class="generalTitle"><strong>@Loc["Reviews.Write"]</strong></h5>- <form asp-route="VendorReviews" method="post">- <input type="hidden" asp-for="VendorId" />- <div asp-validation-summary="ModelOnly" class="message-error alert alert-danger my-3"></div>- <fieldset>- <div class="form-fields">- <div class="form-group">- <label asp-for="AddVendorReview.Title" class="col-form-label">@Loc["Reviews.Fields.Title"]:</label>- <input asp-for="AddVendorReview.Title" class="form-control review-title" asp-disabled="@(!Model.AddVendorReview.CanCurrentCustomerLeaveReview)" />- <span asp-validation-for="AddVendorReview.Title"></span>- </div>- <label asp-for="AddVendorReview.ReviewText" class="col-form-label">@Loc["Reviews.Fields.ReviewText"]:</label>- <textarea asp-for="AddVendorReview.ReviewText" class="form-control review-text" asp-disabled="@(!Model.AddVendorReview.CanCurrentCustomerLeaveReview)"></textarea>- <span asp-validation-for="AddVendorReview.ReviewText"></span>- <div class="form-group review-rating d-flex flex-wrap">- <label asp-for="AddVendorReview.Rating" class="col-form-label w-100">@Loc["Reviews.Fields.Rating"]:</label>- <b-form-rating v-model="value" variant="warning" show-value value="5" inline></b-form-rating>- <input class="sr-only" asp-for="AddVendorReview.Rating" v-model="value" />- </div>- @if (Model.AddVendorReview.DisplayCaptcha)- {- <div class="captcha-box">- <captcha />- </div>- }- </div>- </fieldset>- <div class="buttons my-3">- <input type="submit" name="add-review" class="btn btn-info write-vendor-review-button" value="@Loc["Reviews.SubmitButton"]" />- </div>- </form>- </div>- }- @if (Model.Items.Any())- {- <div class="vendor-review-list">- <h5><strong>@Loc["Reviews.ExistingReviews"]</strong></h5>- @foreach (var review in Model.Items)- {- int ratingStars = review.Rating;- <div class="card product-review-item mb-3">- <header class="card-header">- <div class="review-info d-inline-flex w-100">- <div class="user d-inline-flex align-items-center">- <small class="text-muted mr-2">@Loc["Reviews.From"]:</small>- <h6 class="mb-0">@review.CustomerName</h6>- </div>- <b-icon icon="calendar2-check" variant="info" class="mx-2"></b-icon>- <small class="date text-muted">- <span>@Loc["Reviews.Date"]:</span>- <span>@review.WrittenOnStr</span>- </small>- </div>- </header>- <div class="review-title mb-3">- <h5 class="mb-0">@review.Title</h5>- <b-form-rating id='rating-inline2' class='p-0' variant='warning' no-border size='sm' show-value precision='2' readonly inline value='@(ratingStars)'></b-form-rating>- </div>- <div class="review-content">- <div class="review-text">- @review.ReviewText- </div>- </div>- <footer class="card-footer">- <partial name="_VendorReviewHelpfulness" model="review.Helpfulness" />- </footer>- </div>- }- </div>- }- @await Component.InvokeAsync("Widget", new { widgetZone = "productreviews_page_bottom", additionalData = Model.VendorId })-</div>\ No newline at end of filediff --git a/src/Web/Grand.Web/Views/Catalog/_VendorReview.Modal.cshtml b/src/Web/Grand.Web/Views/Catalog/_VendorReview.Modal.cshtmlindex acacc393e..45a37f760 100644--- a/src/Web/Grand.Web/Views/Catalog/_VendorReview.Modal.cshtml+++ b/src/Web/Grand.Web/Views/Catalog/_VendorReview.Modal.cshtml@@ -1,31 +1,32 @@-@{- var vendorlink = @Url.RouteUrl("Vendor");+@model VendorReviewsModel+@{+ var vendorlink = @Url.RouteUrl("Vendor", new { SeName = Model.VendorSeName } );}-<b-modal id="ModalVendorReview" ref="ModalVendorReview" :dark-theme="darkMode" size="xl" @@shown="vendorreviews.modalReviewShown()" @@hide="vendorreviews.modalReviewClose()" centered hide-footer hide-header>- <template v-if="vendorreviews.PopupVendorReviewVueModal !== null">- <h2 class="generalTitle h3">@Loc["Reviews.VendorReviewsFor"] <a href="@vendorlink">{{vendorreviews.PopupVendorReviewVueModal.VendorName}}</a></h2>+ <template v-if="vendorreviews.Model !== null">+ <h2 class="generalTitle h3">@Loc["Reviews.VendorReviewsFor"] <a href="@vendorlink">{{vendorreviews.Model.VendorName}}</a></h2><a class="modal-close" @@click="$bvModal.hide('ModalVendorReview')"><b-icon icon="x"></b-icon></a>- <template v-if="!vendorreviews.PopupVendorReviewVueModal.AddVendorReview.SuccessfullyAdded">+ <template v-if="!vendorreviews.Model.AddVendorReview.SuccessfullyAdded"><div class="write-review" id="review-form"><h5 class="generalTitle"><strong>@Loc["Reviews.Write"]</strong></h5><validation-observer v-slot="{ handleSubmit }">- <form id="addReviewForm" :action="'/vendoreviews/' + vendorreviews.PopupVendorReviewVueModal.VendorId" method="post" ref="modalForm" v-on:submit.prevent="handleSubmit(vendorreviews.submitVendorReview)" :data-title="'@Loc["Reviews.VendorReviewsFor"] ' + vendorreviews.PopupVendorReviewVueModal.VendorName">- <input type="hidden" name="VendorId" :value="vendorreviews.PopupVendorReviewVueModal.VendorId" />+ <form id="addReviewForm" asp-route="VendorReviews" asp-route-VendorId="@Model.VendorId"+ method="post" ref="modalForm" v-on:submit.prevent="handleSubmit(vendorreviews.submitVendorReview)" :data-title="'@Loc["Reviews.VendorReviewsFor"] ' + vendorreviews.Model.VendorName">+ <input type="hidden" name="VendorId" :value="vendorreviews.Model.VendorId" /><div asp-validation-summary="ModelOnly" class="message-error alert alert-danger my-3"></div><fieldset><div class="form-fields"><div class="form-group"><validation-provider tag="div" rules="required" name="AddVendorReview.Title" v-slot="{ errors, classes }"><label for="AddVendorReview_Title" class="col-form-label">@Loc["Reviews.Fields.Title"]:</label>- <input data-val-required="@Loc["reviews.fields.title.required"]" v-model="vendorreviews.PopupVendorReviewVueModal.ReviewTitle" id="AddVendorReview_Title" name="AddVendorReview.Title" v-bind:class="[classes , 'form-control review-title']" :disabled="!vendorreviews.PopupVendorReviewVueModal.AddVendorReview.CanCurrentCustomerLeaveReview" />+ <input data-val-required="@Loc["reviews.fields.title.required"]" v-model="vendorreviews.Model.AddVendorReview.Title" id="AddVendorReview_Title" name="AddVendorReview.Title" v-bind:class="[classes , 'form-control review-title']" :disabled="!vendorreviews.Model.AddVendorReview.CanCurrentCustomerLeaveReview" /><span class="field-validation-error">{{ errors[0] }}</span></validation-provider></div><div class="form-group"><validation-provider tag="div" rules="required" name="AddVendorReview.ReviewText" v-slot="{ errors, classes }"><label for="AddVendorReview_ReviewText" class="col-form-label">@Loc["Reviews.Fields.ReviewText"]:</label>- <textarea data-val-required="@Loc["reviews.fields.reviewtext.required"]" v-model="vendorreviews.PopupVendorReviewVueModal.ReviewText" id="AddVendorReview_ReviewText" name="AddVendorReview.ReviewText" v-bind:class="[classes , 'form-control review-text']" :disabled="!vendorreviews.PopupVendorReviewVueModal.AddVendorReview.CanCurrentCustomerLeaveReview"></textarea>+ <textarea data-val-required="@Loc["reviews.fields.reviewtext.required"]" v-model="vendorreviews.Model.AddVendorReview.ReviewText" id="AddVendorReview_ReviewText" name="AddVendorReview.ReviewText" v-bind:class="[classes , 'form-control review-text']" :disabled="!vendorreviews.Model.AddVendorReview.CanCurrentCustomerLeaveReview"></textarea><span class="field-validation-error">{{ errors[0] }}</span></validation-provider></div>@@ -34,13 +35,13 @@<b-form-rating v-model="value" variant="warning" show-value value="5" inline></b-form-rating><input class="sr-only" id="AddVendorReview_Rating" name="AddVendorReview.Rating" v-model="value" /></div>- <template v-if="vendorreviews.PopupVendorReviewVueModal.AddVendorReview.DisplayCaptcha">+ <template v-if="vendorreviews.Model.AddVendorReview.DisplayCaptcha"><div id="captcha-popup"></div></template></div></fieldset><div class="buttons my-3">- <input type="submit" class="btn btn-info write-vendor-review-button" value="@Loc[" Reviews.SubmitButton"]" :disabled="!vendorreviews.PopupVendorReviewVueModal.AddVendorReview.CanCurrentCustomerLeaveReview" />+ <input type="submit" class="btn btn-info write-vendor-review-button" value="@Loc[" Reviews.SubmitButton"]" :disabled="!vendorreviews.Model.AddVendorReview.CanCurrentCustomerLeaveReview" /></div></form></validation-observer>