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 OrderSummary Component to the ShoppingCartController
support59ff7971369b
diff --git a/src/Web/Grand.Web/Components/OrderSummary.cs b/src/Web/Grand.Web/Components/OrderSummary.csdeleted file mode 100644index 36ca36b58..000000000--- a/src/Web/Grand.Web/Components/OrderSummary.cs+++ /dev/null@@ -1,47 +0,0 @@-using Grand.Business.Core.Interfaces.Checkout.Orders;-using Grand.Infrastructure;-using Grand.Domain.Orders;-using Grand.Web.Common.Components;-using Grand.Web.Features.Models.ShoppingCart;-using Grand.Web.Models.ShoppingCart;-using MediatR;-using Microsoft.AspNetCore.Mvc;--namespace Grand.Web.ViewComponents-{- public class OrderSummaryViewComponent : BaseViewComponent- {- private readonly IMediator _mediator;- private readonly IShoppingCartService _shoppingCartService;- private readonly IWorkContext _workContext;- public OrderSummaryViewComponent(IMediator mediator, IShoppingCartService shoppingCartService, IWorkContext workContext)- {- _mediator = mediator;- _shoppingCartService = shoppingCartService;- _workContext = workContext;- }-- public async Task<IViewComponentResult> InvokeAsync(bool? prepareAndDisplayOrderReviewData, ShoppingCartModel overriddenModel)- {- if (overriddenModel != null)- return View(overriddenModel);-- var cart = await _shoppingCartService.GetShoppingCart(_workContext.CurrentStore.Id, ShoppingCartType.ShoppingCart, ShoppingCartType.Auctions);-- var model = await _mediator.Send(new GetShoppingCart()- {- Cart = cart,- IsEditable = false,- PrepareAndDisplayOrderReviewData = prepareAndDisplayOrderReviewData.GetValueOrDefault(),- Customer = _workContext.CurrentCustomer,- Currency = _workContext.WorkingCurrency,- Language = _workContext.WorkingLanguage,- Store = _workContext.CurrentStore,- TaxDisplayType = _workContext.TaxDisplayType- });-- return View(model);-- }- }-}diff --git a/src/Web/Grand.Web/Controllers/ShoppingCartController.cs b/src/Web/Grand.Web/Controllers/ShoppingCartController.csindex 1d3b9b341..2b33160f3 100644--- a/src/Web/Grand.Web/Controllers/ShoppingCartController.cs+++ b/src/Web/Grand.Web/Controllers/ShoppingCartController.cs@@ -283,6 +283,26 @@ namespace Grand.Web.Controllersreturn View(model);}+ [DenySystemAccount]+ public async Task<IActionResult> CartSummary(bool? prepareAndDisplayOrderReviewData)+ {+ var cart = await _shoppingCartService.GetShoppingCart(_workContext.CurrentStore.Id, ShoppingCartType.ShoppingCart, ShoppingCartType.Auctions);++ var model = await _mediator.Send(new GetShoppingCart() {+ Cart = cart,+ IsEditable = false,+ PrepareAndDisplayOrderReviewData = prepareAndDisplayOrderReviewData.GetValueOrDefault(),+ Customer = _workContext.CurrentCustomer,+ Currency = _workContext.WorkingCurrency,+ Language = _workContext.WorkingLanguage,+ Store = _workContext.CurrentStore,+ TaxDisplayType = _workContext.TaxDisplayType+ });++ return View(model);++ }+[AutoValidateAntiforgeryToken][DenySystemAccount][HttpPost]diff --git a/src/Web/Grand.Web/Endpoints/EndpointProvider.cs b/src/Web/Grand.Web/Endpoints/EndpointProvider.csindex d68b240e6..42c0c3972 100644--- a/src/Web/Grand.Web/Endpoints/EndpointProvider.cs+++ b/src/Web/Grand.Web/Endpoints/EndpointProvider.cs@@ -538,6 +538,11 @@ namespace Grand.Web.Endpoints$"{pattern}cart/",new { controller = "ShoppingCart", action = "Cart" });+ //shopping cart summary+ endpointRouteBuilder.MapControllerRoute("ShoppingCartSummary",+ $"{pattern}cart/summary/",+ new { controller = "ShoppingCart", action = "CartSummary" });+//Continue shoppingendpointRouteBuilder.MapControllerRoute("ContinueShopping",$"{pattern}cart/continueshopping/",diff --git a/src/Web/Grand.Web/Views/ShoppingCart/_ModelScript.cshtml b/src/Web/Grand.Web/Views/ShoppingCart/_ModelScript.cshtmlindex 6dfc89da9..ae67bcfcb 100644--- a/src/Web/Grand.Web/Views/ShoppingCart/_ModelScript.cshtml+++ b/src/Web/Grand.Web/Views/ShoppingCart/_ModelScript.cshtml@@ -33,7 +33,7 @@},updateCart() {axios({- baseURL: '/Component/Index?Name=OrderSummary',+ baseURL: '@Url.RouteUrl("ShoppingCartSummary")',method: 'get',data: null,headers: {diff --git a/src/Web/Grand.Web/wwwroot/theme/script/public.checkout.js b/src/Web/Grand.Web/wwwroot/theme/script/public.checkout.jsindex ab79cb227..cd5d43895 100644--- a/src/Web/Grand.Web/wwwroot/theme/script/public.checkout.js+++ b/src/Web/Grand.Web/wwwroot/theme/script/public.checkout.js@@ -294,11 +294,8 @@ var vmorder = new Vue({},updateOrderSummary: function (displayOrderReviewData) {axios({- baseURL: '/Component/Index?Name=OrderSummary',- method: 'post',- data: {- prepareAndDisplayOrderReviewData: displayOrderReviewData,- },+ baseURL: '/cart/summary?prepareAndDisplayOrderReviewData='+displayOrderReviewData,+ method: 'get',headers: {'Accept': 'application/json','Content-Type': 'application/json',@@ -757,7 +754,7 @@ var vmorder = new Vue({},updateCart() {axios({- baseURL: '/Component/Index?Name=OrderSummary',+ baseURL: '/cart/summary/',method: 'get',data: null,headers: {