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
WishlistController - move validator logic from Controller to Validator
supportd75cea62570b
diff --git a/src/Web/Grand.Web/Controllers/WishlistController.cs b/src/Web/Grand.Web/Controllers/WishlistController.csindex 77bc05f71..bcdefc071 100644--- a/src/Web/Grand.Web/Controllers/WishlistController.cs+++ b/src/Web/Grand.Web/Controllers/WishlistController.cs@@ -60,7 +60,7 @@ namespace Grand.Web.Controllers#region Wishlist-+ [HttpGet]public async Task<IActionResult> SidebarWishlist(){if (!await _permissionService.Authorize(StandardPermission.EnableWishlist))@@ -115,37 +115,24 @@ namespace Grand.Web.Controllers[AutoValidateAntiforgeryToken][DenySystemAccount][HttpPost]- public virtual async Task<IActionResult> UpdateQuantity(string shoppingcartId, int quantity)+ public virtual async Task<IActionResult> UpdateQuantity(UpdateQuantityModel model){- if (!await _permissionService.Authorize(StandardPermission.EnableWishlist))- return RedirectToRoute("HomePage");-- var cart = (await _shoppingCartService.GetShoppingCart(_workContext.CurrentStore.Id, ShoppingCartType.Wishlist)).FirstOrDefault(x => x.Id == shoppingcartId);- if (cart == null)+ var warnings = new List<string>();+ if (ModelState.IsValid){- return Json(new- {- success = false,- warnings = "Shopping cart item not found"- });+ var cart = (await _shoppingCartService.GetShoppingCart(_workContext.CurrentStore.Id, ShoppingCartType.Wishlist)).FirstOrDefault(x => x.Id == model.ShoppingCartId);++ var currSciWarnings = await _shoppingCartService.UpdateShoppingCartItem(_workContext.CurrentCustomer,+ cart.Id, cart.WarehouseId, cart.Attributes, cart.EnteredPrice,+ cart.RentalStartDateUtc, cart.RentalEndDateUtc,+ model.Quantity);+ warnings.AddRange(currSciWarnings);}- if (quantity <= 0)+ else{- return Json(new- {- success = false,- warnings = "Wrong quantity "- });+ warnings = ModelState.Values.SelectMany(x => x.Errors.Select(x => x.ErrorMessage)).ToList();}-- var warnings = new List<string>();- var currSciWarnings = await _shoppingCartService.UpdateShoppingCartItem(_workContext.CurrentCustomer,- cart.Id, cart.WarehouseId, cart.Attributes, cart.EnteredPrice,- cart.RentalStartDateUtc, cart.RentalEndDateUtc,- quantity);- warnings.AddRange(currSciWarnings);-return Json(new{success = !warnings.Any(),@@ -157,7 +144,7 @@ namespace Grand.Web.Controllers[DenySystemAccount][HttpPost]- public virtual async Task<IActionResult> AddItemToCartFromWishlist(Guid? customerGuid, string shoppingcartId)+ public virtual async Task<IActionResult> AddItemToCartFromWishlist(AddCartFromWishlistModel model){if (!await _permissionService.Authorize(StandardPermission.EnableShoppingCart))return Json(new { success = false, message = "No permission" });@@ -165,14 +152,14 @@ namespace Grand.Web.Controllersif (!await _permissionService.Authorize(StandardPermission.EnableWishlist))return Json(new { success = false, message = "No permission" });- var pageCustomer = customerGuid.HasValue- ? await _customerService.GetCustomerByGuid(customerGuid.Value)+ var pageCustomer = model.CustomerGuid.HasValue+ ? await _customerService.GetCustomerByGuid(model.CustomerGuid.Value): _workContext.CurrentCustomer;if (pageCustomer == null)return Json(new { success = false, message = "Customer not found" });var itemCart = pageCustomer.ShoppingCartItems- .FirstOrDefault(sci => sci.ShoppingCartTypeId == ShoppingCartType.Wishlist && sci.Id == shoppingcartId);+ .FirstOrDefault(sci => sci.ShoppingCartTypeId == ShoppingCartType.Wishlist && sci.Id == model.ShoppingCartId);if (itemCart == null)return Json(new { success = false, message = "Shopping cart ident not found" });@@ -195,8 +182,8 @@ namespace Grand.Web.Controllers}[DenySystemAccount]- [HttpPost]- public virtual async Task<IActionResult> DeleteItemFromWishlist(string shoppingcartId)+ [HttpGet]+ public virtual async Task<IActionResult> DeleteItemFromWishlist(string shoppingCartId){if (!await _permissionService.Authorize(StandardPermission.EnableShoppingCart))return Json(new { success = false, message = "No permission" });@@ -205,7 +192,7 @@ namespace Grand.Web.Controllersreturn Json(new { success = false, message = "No permission" });var itemCart = _workContext.CurrentCustomer.ShoppingCartItems- .FirstOrDefault(sci => sci.ShoppingCartTypeId == ShoppingCartType.Wishlist && sci.Id == shoppingcartId);+ .FirstOrDefault(sci => sci.ShoppingCartTypeId == ShoppingCartType.Wishlist && sci.Id == shoppingCartId);if (itemCart == null)return Json(new { success = false, message = "Shopping cart ident not found" });@@ -218,9 +205,8 @@ namespace Grand.Web.Controllers[HttpPost][AutoValidateAntiforgeryToken]- [ValidateCaptcha][DenySystemAccount]- public virtual async Task<IActionResult> EmailWishlist(WishlistEmailAFriendModel model, bool captchaValid,+ public virtual async Task<IActionResult> EmailWishlist(WishlistEmailAFriendModel model,[FromServices] IMessageProviderService messageProviderService,[FromServices] CaptchaSettings captchaSettings){@@ -230,19 +216,7 @@ namespace Grand.Web.Controllersvar cart = await _shoppingCartService.GetShoppingCart(_workContext.CurrentStore.Id, ShoppingCartType.Wishlist);if (!cart.Any())return Content("");-- //validate CAPTCHA- if (captchaSettings.Enabled && captchaSettings.ShowOnEmailWishlistToFriendPage && !captchaValid)- {- ModelState.AddModelError("", captchaSettings.GetWrongCaptchaMessage(_translationService));- }-- //check whether the current customer is guest and ia allowed to email wishlist- if (await _groupService.IsGuest(_workContext.CurrentCustomer) && !_shoppingCartSettings.AllowAnonymousUsersToEmailWishlist)- {- ModelState.AddModelError("", _translationService.GetResource("Wishlist.EmailAFriend.OnlyRegisteredUsers"));- }-+if (ModelState.IsValid){diff --git a/src/Web/Grand.Web/Models/ShoppingCart/AddCartFromWishlistModel.cs b/src/Web/Grand.Web/Models/ShoppingCart/AddCartFromWishlistModel.csnew file mode 100644index 000000000..493a06ae5--- /dev/null+++ b/src/Web/Grand.Web/Models/ShoppingCart/AddCartFromWishlistModel.cs@@ -0,0 +1,7 @@+namespace Grand.Web.Models.ShoppingCart;++public class AddCartFromWishlistModel+{+ public Guid? CustomerGuid { get; set; }+ public string ShoppingCartId { get; set; }+}\ No newline at end of filediff --git a/src/Web/Grand.Web/Models/ShoppingCart/UpdateQuantityModel.cs b/src/Web/Grand.Web/Models/ShoppingCart/UpdateQuantityModel.csindex b5d01e5ff..2952db345 100644--- a/src/Web/Grand.Web/Models/ShoppingCart/UpdateQuantityModel.cs+++ b/src/Web/Grand.Web/Models/ShoppingCart/UpdateQuantityModel.cs@@ -1,7 +1,11 @@-namespace Grand.Web.Models.ShoppingCart;+using Grand.Domain.Orders;++namespace Grand.Web.Models.ShoppingCart;public class UpdateQuantityModel{public string ShoppingCartId { get; set; }public int Quantity { get; set; }+ public ShoppingCartType ShoppingCartType { get; set; }+}\ No newline at end of filediff --git a/src/Web/Grand.Web/Models/ShoppingCart/WishlistEmailAFriendModel.cs b/src/Web/Grand.Web/Models/ShoppingCart/WishlistEmailAFriendModel.csindex 24a1c46f4..e9dabdba0 100644--- a/src/Web/Grand.Web/Models/ShoppingCart/WishlistEmailAFriendModel.cs+++ b/src/Web/Grand.Web/Models/ShoppingCart/WishlistEmailAFriendModel.cs@@ -1,5 +1,6 @@using Grand.Infrastructure.ModelBinding;using Grand.Infrastructure.Models;+using Grand.Web.Models.Common;namespace Grand.Web.Models.ShoppingCart{@@ -19,5 +20,6 @@ namespace Grand.Web.Models.ShoppingCartpublic bool DisplayCaptcha { get; set; }+ public ICaptchaValidModel Captcha { get; set; } = new CaptchaModel();}}\ No newline at end of filediff --git a/src/Web/Grand.Web/Validators/ShoppingCart/UpdateQuantityValidator.cs b/src/Web/Grand.Web/Validators/ShoppingCart/UpdateQuantityValidator.csindex ca3b751a6..2477418a4 100644--- a/src/Web/Grand.Web/Validators/ShoppingCart/UpdateQuantityValidator.cs+++ b/src/Web/Grand.Web/Validators/ShoppingCart/UpdateQuantityValidator.cs@@ -20,8 +20,13 @@ namespace Grand.Web.Validators.ShoppingCartRuleFor(x => x.Quantity).GreaterThan(0).WithMessage("Wrong quantity");RuleFor(x => x).CustomAsync(async (x, context, _) =>{- if (!await permissionService.Authorize(StandardPermission.EnableShoppingCart))- context.AddFailure("No permission");+ if(x.ShoppingCartType == ShoppingCartType.ShoppingCart)+ if (!await permissionService.Authorize(StandardPermission.EnableShoppingCart))+ context.AddFailure("No permission");++ if(x.ShoppingCartType == ShoppingCartType.Wishlist)+ if (!await permissionService.Authorize(StandardPermission.EnableWishlist))+ context.AddFailure("No permission");var cart = (await shoppingCartService.GetShoppingCart(workContext.CurrentStore.Id, PrepareCartTypes())).FirstOrDefault(z => z.Id == x.ShoppingCartId);@@ -35,7 +40,7 @@ namespace Grand.Web.Validators.ShoppingCart{var shoppingCartTypes = new List<ShoppingCartType> {ShoppingCartType.ShoppingCart,- ShoppingCartType.Auctions+ ShoppingCartType.Wishlist};if (shoppingCartSettings.AllowOnHoldCart)shoppingCartTypes.Add(ShoppingCartType.OnHoldCart);diff --git a/src/Web/Grand.Web/Validators/ShoppingCart/WishlistEmailAFriendValidator.cs b/src/Web/Grand.Web/Validators/ShoppingCart/WishlistEmailAFriendValidator.csindex dea342a19..505ff0f41 100644--- a/src/Web/Grand.Web/Validators/ShoppingCart/WishlistEmailAFriendValidator.cs+++ b/src/Web/Grand.Web/Validators/ShoppingCart/WishlistEmailAFriendValidator.cs@@ -1,7 +1,14 @@using FluentValidation;+using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Domain.Orders;+using Grand.Infrastructure;+using Grand.Infrastructure.Models;using Grand.Infrastructure.Validators;+using Grand.Web.Common.Security.Captcha;+using Grand.Web.Common.Validators;using Grand.Web.Models.ShoppingCart;+using Microsoft.AspNetCore.Http;namespace Grand.Web.Validators.ShoppingCart{@@ -9,6 +16,10 @@ namespace Grand.Web.Validators.ShoppingCart{public WishlistEmailAFriendValidator(IEnumerable<IValidatorConsumer<WishlistEmailAFriendModel>> validators,+ IEnumerable<IValidatorConsumer<ICaptchaValidModel>> validatorsCaptcha,+ IWorkContext workContext, IGroupService groupService,+ CaptchaSettings captchaSettings, ShoppingCartSettings shoppingCartSettings,+ IHttpContextAccessor contextAccessor, GoogleReCaptchaValidator googleReCaptchaValidator,ITranslationService translationService): base(validators){@@ -17,5 +28,22 @@ namespace Grand.Web.Validators.ShoppingCartRuleFor(x => x.YourEmailAddress).NotEmpty().WithMessage(translationService.GetResource("Wishlist.EmailAFriend.YourEmailAddress.Required"));RuleFor(x => x.YourEmailAddress).EmailAddress().WithMessage(translationService.GetResource("Common.WrongEmail"));++ if (captchaSettings.Enabled && captchaSettings.ShowOnEmailWishlistToFriendPage)+ {+ RuleFor(x => x.Captcha).NotNull()+ .WithMessage(translationService.GetResource("Account.Captcha.Required"));+ RuleFor(x => x.Captcha)+ .SetValidator(new CaptchaValidator(validatorsCaptcha, contextAccessor, googleReCaptchaValidator));+ }++ RuleFor(x => x).CustomAsync(async (x, context, _) =>+ {+ //check whether the current customer is guest and ia allowed to email wishlist+ if (await groupService.IsGuest(workContext.CurrentCustomer) && !shoppingCartSettings.AllowAnonymousUsersToEmailWishlist)+ {+ context.AddFailure(translationService.GetResource("Wishlist.EmailAFriend.OnlyRegisteredUsers"));+ }+ });}}}\ No newline at end of filediff --git a/src/Web/Grand.Web/Views/ShoppingCart/Partials/ModelScript.cshtml b/src/Web/Grand.Web/Views/ShoppingCart/Partials/ModelScript.cshtmlindex 38ac86287..3aa62a6a7 100644--- a/src/Web/Grand.Web/Views/ShoppingCart/Partials/ModelScript.cshtml+++ b/src/Web/Grand.Web/Views/ShoppingCart/Partials/ModelScript.cshtml@@ -130,6 +130,7 @@var elementById = document.getElementById(element + id);var data = new FormData();data.append('shoppingcartId', id);+ data.append('ShoppingCartType', 1);data.append('quantity', elementById.value);data.append('__RequestVerificationToken',document.querySelector('input[name=__RequestVerificationToken]').value);diff --git a/src/Web/Grand.Web/Views/Wishlist/Partials/ModelScript.cshtml b/src/Web/Grand.Web/Views/Wishlist/Partials/ModelScript.cshtmlindex 936cb893f..bb21e6425 100644--- a/src/Web/Grand.Web/Views/Wishlist/Partials/ModelScript.cshtml+++ b/src/Web/Grand.Web/Views/Wishlist/Partials/ModelScript.cshtml@@ -14,8 +14,7 @@deleteFromWishlist(id) {axios({url: '@Url.RouteUrl("DeleteItemFromWishlist")'+'/'+ id,- method: 'post',- headers: { 'Content-Type': 'application/json' }+ method: 'get',}).then(function (response) {if (response.data.success) {vmwishlist.getModel();@@ -58,6 +57,7 @@var elementById = document.getElementById(element + id);var data = new FormData();data.append('shoppingcartId', id);+ data.append('ShoppingCartType', 2);data.append('quantity', elementById.value);data.append('__RequestVerificationToken',document.querySelector('input[name=__RequestVerificationToken]').value);