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
feat(arch001): add license popup region
KrzysztofPajak369cf90d6a7f
diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseOrderManagementControllerTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseOrderManagementControllerTests.csindex 74cdf8e55..29be938de 100644--- a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseOrderManagementControllerTests.cs+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseOrderManagementControllerTests.cs@@ -203,4 +203,33 @@ public class BaseOrderManagementControllerTestsAssert.AreEqual("List", (result as RedirectToActionResult)?.ActionName);_mediatorMock.Verify(m => m.Send(It.IsAny<DeleteOrderItemCommand>(), default), Times.Never);}++ [TestMethod]+ public async Task UploadLicenseFilePopupGet_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 productServiceMock = new Mock<Grand.Business.Core.Interfaces.Catalog.Products.IProductService>();++ var result = await _controller.UploadLicenseFilePopup("o1", "i1", productServiceMock.Object);++ Assert.AreEqual("List", (result as RedirectToActionResult)?.ActionName);+ }++ [TestMethod]+ public async Task DeleteLicenseFilePopup_Authorized_ClearsLicenseAndRedirectsToEdit()+ {+ var orderItem = new OrderItem { Id = "i1", LicenseDownloadId = "dl-1" };+ var order = new Order { Id = "o1" };+ order.OrderItems.Add(orderItem);+ _orderServiceMock.Setup(s => s.GetOrderById("o1")).ReturnsAsync(order);+ _scopeMock.Setup(s => s.HasAccess(order)).ReturnsAsync(true);++ var result = await _controller.DeleteLicenseFilePopup(+ new OrderModel.UploadLicenseModel { OrderId = "o1", OrderItemId = "i1" });++ Assert.IsNull(orderItem.LicenseDownloadId);+ Assert.AreEqual("Edit", (result as RedirectToActionResult)?.ActionName);+ }}diff --git a/src/Web/Grand.Web.AdminShared/Controllers/BaseOrderManagementController.cs b/src/Web/Grand.Web.AdminShared/Controllers/BaseOrderManagementController.csindex 9c6d10aa9..0e9e04d50 100644--- a/src/Web/Grand.Web.AdminShared/Controllers/BaseOrderManagementController.cs+++ b/src/Web/Grand.Web.AdminShared/Controllers/BaseOrderManagementController.cs@@ -331,4 +331,59 @@ public abstract class BaseOrderManagementController(}#endregion++ #region License popup++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ public async Task<IActionResult> UploadLicenseFilePopup(string id, string orderItemId,+ [FromServices] Grand.Business.Core.Interfaces.Catalog.Products.IProductService productService)+ {+ var (order, denied) = await LoadAuthorizedOrder(id);+ if (denied != null) return denied;++ var orderItem = order.OrderItems.FirstOrDefault(x => x.Id == orderItemId)+ ?? throw new ArgumentException("No order item found with the specified id");+ var product = await productService.GetProductByIdIncludeArch(orderItem.ProductId);+ if (!product.IsDownload) throw new ArgumentException("Product is not downloadable");++ var model = new OrderModel.UploadLicenseModel {+ LicenseDownloadId = !string.IsNullOrEmpty(orderItem.LicenseDownloadId) ? orderItem.LicenseDownloadId : "",+ OrderId = order.Id,+ OrderItemId = orderItem.Id+ };+ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ public async Task<IActionResult> UploadLicenseFilePopup(OrderModel.UploadLicenseModel model)+ {+ var (order, denied) = await LoadAuthorizedOrder(model.OrderId);+ if (denied != null) return denied;++ var orderItem = order.OrderItems.FirstOrDefault(x => x.Id == model.OrderItemId)+ ?? throw new ArgumentException("No order item found with the specified id");+ orderItem.LicenseDownloadId = !string.IsNullOrEmpty(model.LicenseDownloadId) ? model.LicenseDownloadId : null;+ await orderService.UpdateOrder(order);++ model.RefreshPage = true;+ return View(model);+ }++ [PermissionAuthorizeAction(PermissionActionName.Edit)]+ [HttpPost]+ public async Task<IActionResult> DeleteLicenseFilePopup(OrderModel.UploadLicenseModel model)+ {+ var (order, denied) = await LoadAuthorizedOrder(model.OrderId);+ if (denied != null) return denied;++ var orderItem = order.OrderItems.FirstOrDefault(x => x.Id == model.OrderItemId)+ ?? throw new ArgumentException("No order item found with the specified id");+ orderItem.LicenseDownloadId = null;+ await orderService.UpdateOrder(order);++ return RedirectToAction("Edit", "Order", new { id = model.OrderId });+ }++ #endregion}