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 AddProductToOrder region

KrzysztofPajak90f90fd3cc74
diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseOrderManagementControllerTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseOrderManagementControllerTests.cs
index 29be938de..a9bd177e8 100644
--- a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseOrderManagementControllerTests.cs
+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseOrderManagementControllerTests.cs
@@ -232,4 +232,34 @@ public class BaseOrderManagementControllerTests
Assert.IsNull(orderItem.LicenseDownloadId);
Assert.AreEqual("Edit", (result as RedirectToActionResult)?.ActionName);
}
+
+ [TestMethod]
+ public async Task AddProductToOrder_ScopeDenies_RedirectsToList()
+ {
+ 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.AddProductToOrder("o1");
+
+ Assert.AreEqual("List", (result as RedirectToActionResult)?.ActionName);
+ }
+
+ [TestMethod]
+ public async Task AddProductToOrderDetailsPost_NoWarnings_RedirectsToEdit()
+ {
+ var order = new Order { Id = "o1" };
+ _orderServiceMock.Setup(s => s.GetOrderById("o1")).ReturnsAsync(order);
+ _scopeMock.Setup(s => s.HasAccess(order)).ReturnsAsync(true);
+ _orderViewModelServiceMock
+ .Setup(v => v.AddProductToOrderDetails(It.IsAny<AddProductToOrderModel>()))
+ .ReturnsAsync(new List<string>());
+
+ var result = await _controller.AddProductToOrderDetails(
+ new AddProductToOrderModel("o1", "p1", 0, 0, 1, 0));
+
+ var redirect = result as RedirectToActionResult;
+ Assert.AreEqual("Edit", redirect?.ActionName);
+ Assert.AreEqual("o1", redirect?.RouteValues["id"]);
+ }
}
diff --git a/src/Web/Grand.Web.AdminShared/Controllers/BaseOrderManagementController.cs b/src/Web/Grand.Web.AdminShared/Controllers/BaseOrderManagementController.cs
index 0e9e04d50..85a685123 100644
--- a/src/Web/Grand.Web.AdminShared/Controllers/BaseOrderManagementController.cs
+++ b/src/Web/Grand.Web.AdminShared/Controllers/BaseOrderManagementController.cs
@@ -386,4 +386,71 @@ public abstract class BaseOrderManagementController(
}
#endregion
+
+ #region Add product to order
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ public async Task<IActionResult> AddProductToOrder(string orderId)
+ {
+ var (order, denied) = await LoadAuthorizedOrder(orderId);
+ if (denied != null) return denied;
+
+ var model = await orderViewModelService.PrepareAddOrderProductModel(order);
+ return View(model);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ [HttpPost]
+ public async Task<IActionResult> AddProductToOrder(
+ Grand.Web.Common.DataSource.DataSourceRequest command, OrderModel.AddOrderProductModel model,
+ [FromServices] Grand.Business.Core.Interfaces.Catalog.Products.IProductService productService)
+ {
+ var categoryIds = new List<string>();
+ if (!string.IsNullOrEmpty(model.SearchCategoryId)) categoryIds.Add(model.SearchCategoryId);
+
+ var gridModel = new Grand.Web.Common.DataSource.DataSourceResult();
+ var products = (await productService.SearchProducts(categoryIds: categoryIds,
+ storeId: scope.DefaultStoreId,
+ brandId: model.SearchBrandId,
+ collectionId: model.SearchCollectionId,
+ productType: model.SearchProductTypeId > 0 ? (Grand.Domain.Catalog.ProductType?)model.SearchProductTypeId : null,
+ keywords: model.SearchProductName,
+ pageIndex: command.Page - 1,
+ pageSize: command.PageSize,
+ showHidden: true)).products;
+
+ gridModel.Data = products.Select(x => new OrderModel.AddOrderProductModel.ProductModel {
+ Id = x.Id, Name = x.Name, Sku = x.Sku
+ });
+ gridModel.Total = products.TotalCount;
+
+ return Json(gridModel);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ public async Task<IActionResult> AddProductToOrderDetails(string orderId, string productId)
+ {
+ var (order, denied) = await LoadAuthorizedOrder(orderId);
+ if (denied != null) return denied;
+
+ var model = await orderViewModelService.PrepareAddProductToOrderModel(order, productId);
+ return View(model);
+ }
+
+ [PermissionAuthorizeAction(PermissionActionName.Edit)]
+ [HttpPost]
+ public async Task<IActionResult> AddProductToOrderDetails(AddProductToOrderModel model)
+ {
+ var (order, denied) = await LoadAuthorizedOrder(model.OrderId);
+ if (denied != null) return denied;
+
+ var warnings = await orderViewModelService.AddProductToOrderDetails(model);
+ if (!warnings.Any()) return RedirectToAction("Edit", "Order", new { id = model.OrderId });
+
+ var result = await orderViewModelService.PrepareAddProductToOrderModel(order, model.ProductId);
+ result.Warnings.AddRange(warnings);
+ return View(result);
+ }
+
+ #endregion
}