Skip to content

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.

feat(arch001): add order totals/shipping method/user fields region

KrzysztofPajak5fc265ae1a94
diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseOrderManagementControllerTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseOrderManagementControllerTests.cs
index 702b0badf..5278e0e5f 100644
--- a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseOrderManagementControllerTests.cs
+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseOrderManagementControllerTests.cs
@@ -136,4 +136,32 @@ public class BaseOrderManagementControllerTests
_mediatorMock.Verify(m => m.Send(
It.Is<DeleteOrderCommand>(c => c.Order == order), default), Times.Once);
}
+
+ [TestMethod]
+ public async Task EditOrderTotals_ScopeDenies_RedirectsToList_NoUpdate()
+ {
+ var order = new Order { Id = "o1" };
+ _orderServiceMock.Setup(s => s.GetOrderById("o1")).ReturnsAsync(order);
+ _scopeMock.Setup(s => s.HasAccess(order)).ReturnsAsync(false);
+
+ var result = await _controller.EditOrderTotals("o1", new OrderModel());
+
+ Assert.AreEqual("List", (result as RedirectToActionResult)?.ActionName);
+ _orderServiceMock.Verify(s => s.UpdateOrder(It.IsAny<Order>()), Times.Never);
+ }
+
+ [TestMethod]
+ public async Task EditOrderTotals_Authorized_UpdatesOrderAndInsertsNote()
+ {
+ var order = new Order { Id = "o1" };
+ _orderServiceMock.Setup(s => s.GetOrderById("o1")).ReturnsAsync(order);
+ _scopeMock.Setup(s => s.HasAccess(order)).ReturnsAsync(true);
+
+ var model = new OrderModel { OrderTotalValue = 99.0, CurrencyRate = 1.0 };
+ var result = await _controller.EditOrderTotals("o1", model);
+
+ Assert.AreEqual("o1", (result as RedirectToActionResult)?.RouteValues["id"]);
+ Assert.AreEqual(99.0, order.OrderTotal);
+ _orderServiceMock.Verify(s => s.InsertOrderNote(It.Is<OrderNote>(n => n.Note == "Order totals have been edited")), Times.Once);
+ }
}
diff --git a/src/Web/Grand.Web.AdminShared/Controllers/BaseOrderManagementController.cs b/src/Web/Grand.Web.AdminShared/Controllers/BaseOrderManagementController.cs
index fb559b082..f9b4628d1 100644
--- a/src/Web/Grand.Web.AdminShared/Controllers/BaseOrderManagementController.cs
+++ b/src/Web/Grand.Web.AdminShared/Controllers/BaseOrderManagementController.cs
@@ -112,6 +112,76 @@ public abstract class BaseOrderManagementController(
#endregion
+ #region Order totals / shipping / user fields
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ [HttpPost]
+ public async Task<IActionResult> EditOrderTotals(string id, OrderModel model)
+ {
+ var (order, denied) = await LoadAuthorizedOrder(id);
+ if (denied != null) return denied;
+
+ order.OrderSubtotalInclTax = model.OrderSubtotalInclTaxValue;
+ order.OrderSubtotalExclTax = model.OrderSubtotalExclTaxValue;
+ order.OrderSubTotalDiscountInclTax = model.OrderSubTotalDiscountInclTaxValue;
+ order.OrderSubTotalDiscountExclTax = model.OrderSubTotalDiscountExclTaxValue;
+ order.OrderShippingInclTax = model.OrderShippingInclTaxValue;
+ order.OrderShippingExclTax = model.OrderShippingExclTaxValue;
+ order.PaymentMethodAdditionalFeeInclTax = model.PaymentMethodAdditionalFeeInclTaxValue;
+ order.PaymentMethodAdditionalFeeExclTax = model.PaymentMethodAdditionalFeeExclTaxValue;
+ order.OrderTax = model.TaxValue;
+ order.OrderDiscount = model.OrderTotalDiscountValue;
+ order.OrderTotal = model.OrderTotalValue;
+ order.CurrencyRate = model.CurrencyRate;
+ await orderService.UpdateOrder(order);
+
+ await orderService.InsertOrderNote(new OrderNote {
+ Note = "Order totals have been edited",
+ DisplayToCustomer = false,
+ OrderId = order.Id
+ });
+
+ await orderViewModelService.PrepareOrderDetailsModel(model, order);
+ return RedirectToAction("Edit", "Order", new { id });
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ [HttpPost]
+ public async Task<IActionResult> EditShippingMethod(string id, OrderModel model)
+ {
+ var (order, denied) = await LoadAuthorizedOrder(id);
+ if (denied != null) return denied;
+
+ order.ShippingMethod = model.ShippingMethod;
+ await orderService.UpdateOrder(order);
+
+ await orderService.InsertOrderNote(new OrderNote {
+ Note = "Shipping method has been edited",
+ DisplayToCustomer = false,
+ OrderId = order.Id
+ });
+ await orderViewModelService.PrepareOrderDetailsModel(model, order);
+
+ await SaveSelectedTabIndex(persistForTheNextRequest: true);
+ return RedirectToAction("Edit", "Order", new { id });
+ }
+
+ [HttpPost]
+ public async Task<IActionResult> EditUserFields(string id, OrderModel model)
+ {
+ var (order, denied) = await LoadAuthorizedOrder(id);
+ if (denied != null) return denied;
+
+ order.UserFields = model.UserFields;
+ await orderService.UpdateOrder(order);
+ await orderViewModelService.PrepareOrderDetailsModel(model, order);
+
+ await SaveSelectedTabIndex(persistForTheNextRequest: true);
+ return RedirectToAction("Edit", "Order", new { id });
+ }
+
+ #endregion
+
#region Edit, delete
[PermissionAuthorizeAction(PermissionActionName.Delete)]