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
Move EmailWishlist to the component
KrzysztofPajaka66a4348365c
diff --git a/src/Web/Grand.Web/Components/EmailWishlist.cs b/src/Web/Grand.Web/Components/EmailWishlist.csnew file mode 100644index 000000000..1c885cd87--- /dev/null+++ b/src/Web/Grand.Web/Components/EmailWishlist.cs@@ -0,0 +1,56 @@+using Grand.Business.Checkout.Interfaces.Orders;+using Grand.Business.Common.Interfaces.Security;+using Grand.Business.Common.Services.Security;+using Grand.Domain.Orders;+using Grand.Infrastructure;+using Grand.Web.Common.Components;+using Grand.Web.Common.Security.Captcha;+using Grand.Web.Models.ShoppingCart;+using Microsoft.AspNetCore.Mvc;+using System.Linq;+using System.Threading.Tasks;++namespace Grand.Web.ViewComponents+{+ public class EmailWishlistViewComponent : BaseViewComponent+ {+ private readonly IWorkContext _workContext;+ private readonly IShoppingCartService _shoppingCartService;+ private readonly IPermissionService _permissionService;+ private readonly ShoppingCartSettings _shoppingCartSettings;+ private readonly CaptchaSettings _captchaSettings;++ public EmailWishlistViewComponent(+ IWorkContext workContext,+ IShoppingCartService shoppingCartService,+ IPermissionService permissionService,+ ShoppingCartSettings shoppingCartSettings,+ CaptchaSettings captchaSettings+ )+ {+ _workContext = workContext;+ _shoppingCartService = shoppingCartService;+ _permissionService = permissionService;+ _shoppingCartSettings = shoppingCartSettings;+ _captchaSettings = captchaSettings;+ }++ public async Task<IViewComponentResult> InvokeAsync()+ {+ if (!await _permissionService.Authorize(StandardPermission.EnableWishlist) || !_shoppingCartSettings.EmailWishlistEnabled)+ return Content("");++ var cart = _shoppingCartService.GetShoppingCart(_workContext.CurrentStore.Id, ShoppingCartType.Wishlist);++ if (!cart.Any())+ return Content("");++ var model = new WishlistEmailAFriendModel {+ YourEmailAddress = _workContext.CurrentCustomer.Email,+ DisplayCaptcha = _captchaSettings.Enabled && _captchaSettings.ShowOnEmailWishlistToFriendPage+ };+ return View(model);+ }++ }+}diff --git a/src/Web/Grand.Web/Controllers/ProductController.cs b/src/Web/Grand.Web/Controllers/ProductController.csindex b8a1bbb70..efc487048 100644--- a/src/Web/Grand.Web/Controllers/ProductController.cs+++ b/src/Web/Grand.Web/Controllers/ProductController.cs@@ -16,7 +16,6 @@ using Grand.Domain.Media;using Grand.Domain.Orders;using Grand.Infrastructure;using Grand.Infrastructure.Caching.Constants;-using Grand.SharedKernel.Extensions;using Grand.Web.Commands.Models.Products;using Grand.Web.Common.Filters;using Grand.Web.Common.Security.Captcha;diff --git a/src/Web/Grand.Web/Controllers/WishlistController.cs b/src/Web/Grand.Web/Controllers/WishlistController.csindex aca3f321e..b19a19b5c 100644--- a/src/Web/Grand.Web/Controllers/WishlistController.cs+++ b/src/Web/Grand.Web/Controllers/WishlistController.cs@@ -11,13 +11,11 @@ using Grand.Domain.Customers;using Grand.Domain.Orders;using Grand.Infrastructure;using Grand.SharedKernel.Extensions;-using Grand.Web.Common.Controllers;using Grand.Web.Common.Filters;using Grand.Web.Common.Security.Captcha;using Grand.Web.Features.Models.ShoppingCart;using Grand.Web.Models.ShoppingCart;using MediatR;-using Microsoft.AspNetCore.Http;using Microsoft.AspNetCore.Mvc;using System;using System.Collections.Generic;@@ -170,7 +168,7 @@ namespace Grand.Web.Controllersif (warnings.Any())return Json(new { success = false, message = string.Join(',', warnings) });- if(_shoppingCartSettings.MoveItemsFromWishlistToCart)+ if (_shoppingCartSettings.MoveItemsFromWishlistToCart)await _shoppingCartService.DeleteShoppingCartItem(_workContext.CurrentCustomer, itemCart);return Json(new { success = true, message = "" });@@ -197,24 +195,7 @@ namespace Grand.Web.Controllersreturn Json(new { success = true, message = "" });}- [HttpGet]- public virtual async Task<IActionResult> EmailWishlist([FromServices] CaptchaSettings captchaSettings)- {- if (!await _permissionService.Authorize(StandardPermission.EnableWishlist) || !_shoppingCartSettings.EmailWishlistEnabled)- return RedirectToRoute("HomePage");-- var cart = _shoppingCartService.GetShoppingCart(_workContext.CurrentStore.Id, ShoppingCartType.Wishlist);-- if (!cart.Any())- return RedirectToRoute("HomePage");-- var model = new WishlistEmailAFriendModel {- YourEmailAddress = _workContext.CurrentCustomer.Email,- DisplayCaptcha = captchaSettings.Enabled && captchaSettings.ShowOnEmailWishlistToFriendPage- };- return View(model);- }-+[HttpPost][AutoValidateAntiforgeryToken][ValidateCaptcha]