diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseShipmentControllerTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseShipmentControllerTests.cs
new file mode 100644
index 000000000..d2955608d
--- /dev/null
+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/BaseShipmentControllerTests.cs
@@ -0,0 +1,824 @@
+using Grand.Business.Core.Commands.Checkout.Shipping;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Pdf;
+using Grand.Domain.Common;
+using Grand.Domain.Localization;
+using Grand.Domain.Orders;
+using Grand.Domain.Shipping;
+using Grand.Infrastructure;
+using Grand.Mediator;
+using Grand.Web.AdminShared.Controllers;
+using Grand.Web.AdminShared.Interfaces;
+using Grand.Web.AdminShared.Models.Orders;
+using Grand.Web.Common.DataSource;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.Extensions.Logging;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+
+namespace Grand.Web.Admin.Tests.Controllers;
+
+[TestClass]
+public class BaseShipmentControllerTests
+{
+    // BaseShipmentController is abstract; minimal subclass so actions can be invoked directly.
+    private class TestShipmentController(
+        IShipmentViewModelService shipmentViewModelService,
+        IOrderService orderService,
+        ITranslationService translationService,
+        IContextAccessor contextAccessor,
+        IPdfService pdfService,
+        IShipmentService shipmentService,
+        IDateTimeService dateTimeService,
+        IMediator mediator,
+        IAdminDataScope<Shipment> scope,
+        IAdminDataScope<Order> orderScope)
+        : BaseShipmentController(shipmentViewModelService, orderService, translationService,
+            contextAccessor, pdfService, shipmentService, dateTimeService, mediator, scope, orderScope)
+    {
+        public Task<(Shipment shipment, IActionResult denied)> LoadAuthorizedShipmentPublic(string id) =>
+            LoadAuthorizedShipment(id);
+    }
+
+    private TestShipmentController _controller;
+    private Mock<IShipmentViewModelService> _shipmentViewModelServiceMock;
+    private Mock<IOrderService> _orderServiceMock;
+    private Mock<IShipmentService> _shipmentServiceMock;
+    private Mock<IAdminDataScope<Shipment>> _scopeMock;
+    private Mock<IAdminDataScope<Order>> _orderScopeMock;
+    private Mock<IMediator> _mediatorMock;
+    private Mock<IPdfService> _pdfServiceMock;
+
+    [TestInitialize]
+    public void Setup()
+    {
+        _shipmentViewModelServiceMock = new Mock<IShipmentViewModelService>();
+        _orderServiceMock = new Mock<IOrderService>();
+        _shipmentServiceMock = new Mock<IShipmentService>();
+        _scopeMock = new Mock<IAdminDataScope<Shipment>>();
+        _scopeMock.Setup(s => s.DefaultStoreId).Returns((string)null);
+        _scopeMock.Setup(s => s.DefaultVendorId).Returns((string)null);
+        _orderScopeMock = new Mock<IAdminDataScope<Order>>();
+        _orderScopeMock.Setup(s => s.HasAccess(It.IsAny<Order>())).ReturnsAsync(true);
+
+        var translationServiceMock = new Mock<ITranslationService>();
+        translationServiceMock.Setup(t => t.GetResource(It.IsAny<string>())).Returns("resource");
+        var contextAccessorMock = new Mock<IContextAccessor>();
+        var workContextMock = new Mock<IWorkContext>();
+        workContextMock.Setup(w => w.WorkingLanguage).Returns(new Language { Id = "lang-1" });
+        contextAccessorMock.Setup(c => c.WorkContext).Returns(workContextMock.Object);
+        _pdfServiceMock = new Mock<IPdfService>();
+        var dateTimeServiceMock = new Mock<IDateTimeService>();
+        _mediatorMock = new Mock<IMediator>();
+
+        _controller = new TestShipmentController(
+            _shipmentViewModelServiceMock.Object,
+            _orderServiceMock.Object,
+            translationServiceMock.Object,
+            contextAccessorMock.Object,
+            _pdfServiceMock.Object,
+            _shipmentServiceMock.Object,
+            dateTimeServiceMock.Object,
+            _mediatorMock.Object,
+            _scopeMock.Object,
+            _orderScopeMock.Object);
+
+        var httpContext = new DefaultHttpContext();
+        var loggerFactoryMock = new Mock<ILoggerFactory>();
+        loggerFactoryMock.Setup(l => l.CreateLogger(It.IsAny<string>())).Returns(new Mock<ILogger>().Object);
+        var urlHelperFactoryMock = new Mock<IUrlHelperFactory>();
+        urlHelperFactoryMock.Setup(f => f.GetUrlHelper(It.IsAny<ActionContext>())).Returns(new Mock<IUrlHelper>().Object);
+        var requestServicesMock = new Mock<IServiceProvider>();
+        requestServicesMock.Setup(s => s.GetService(typeof(ILoggerFactory))).Returns(loggerFactoryMock.Object);
+        requestServicesMock.Setup(s => s.GetService(typeof(IUrlHelperFactory))).Returns(urlHelperFactoryMock.Object);
+        httpContext.RequestServices = requestServicesMock.Object;
+        _controller.ControllerContext = new ControllerContext { HttpContext = httpContext };
+        _controller.TempData = new TempDataDictionary(httpContext, new Mock<ITempDataProvider>().Object);
+    }
+
+    [TestMethod]
+    public async Task List_ReturnsViewWithPreparedModel()
+    {
+        var model = new ShipmentListModel();
+        _shipmentViewModelServiceMock.Setup(v => v.PrepareShipmentListModel()).ReturnsAsync(model);
+
+        var result = await _controller.List();
+
+        var viewResult = result as ViewResult;
+        Assert.IsNotNull(viewResult);
+        Assert.AreSame(model, viewResult.Model);
+        _shipmentViewModelServiceMock.Verify(v => v.PrepareShipmentListModel(), Times.Once);
+    }
+
+    [TestMethod]
+    public async Task ShipmentListSelect_GlobalScope_DoesNotForceStoreOrVendorId()
+    {
+        _scopeMock.Setup(s => s.DefaultStoreId).Returns((string)null);
+        _scopeMock.Setup(s => s.DefaultVendorId).Returns((string)null);
+        _shipmentViewModelServiceMock
+            .Setup(v => v.PrepareShipments(It.IsAny<ShipmentListModel>(), 1, 10))
+            .ReturnsAsync((Enumerable.Empty<Shipment>(), 0));
+
+        var model = new ShipmentListModel { StoreId = "submitted-store", VendorId = "submitted-vendor" };
+        await _controller.ShipmentListSelect(new DataSourceRequest { Page = 1, PageSize = 10 }, model);
+
+        Assert.AreEqual("submitted-store", model.StoreId);
+        Assert.AreEqual("submitted-vendor", model.VendorId);
+    }
+
+    [TestMethod]
+    public async Task ShipmentListSelect_StoreScope_ForcesStoreId()
+    {
+        _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");
+        _scopeMock.Setup(s => s.DefaultVendorId).Returns((string)null);
+        _shipmentViewModelServiceMock
+            .Setup(v => v.PrepareShipments(It.IsAny<ShipmentListModel>(), 1, 10))
+            .ReturnsAsync((Enumerable.Empty<Shipment>(), 0));
+
+        var model = new ShipmentListModel { StoreId = "attacker-supplied" };
+        await _controller.ShipmentListSelect(new DataSourceRequest { Page = 1, PageSize = 10 }, model);
+
+        Assert.AreEqual("store-1", model.StoreId);
+    }
+
+    [TestMethod]
+    public async Task ShipmentListSelect_VendorScope_ForcesVendorId()
+    {
+        _scopeMock.Setup(s => s.DefaultStoreId).Returns((string)null);
+        _scopeMock.Setup(s => s.DefaultVendorId).Returns("vendor-1");
+        _shipmentViewModelServiceMock
+            .Setup(v => v.PrepareShipments(It.IsAny<ShipmentListModel>(), 1, 10))
+            .ReturnsAsync((Enumerable.Empty<Shipment>(), 0));
+
+        var model = new ShipmentListModel { VendorId = "attacker-supplied" };
+        await _controller.ShipmentListSelect(new DataSourceRequest { Page = 1, PageSize = 10 }, model);
+
+        Assert.AreEqual("vendor-1", model.VendorId);
+    }
+
+    [TestMethod]
+    public async Task ShipmentsByOrder_FiltersToAccessibleShipmentsOnly()
+    {
+        var order = new Order { Id = "o1" };
+        _orderServiceMock.Setup(s => s.GetOrderById("o1")).ReturnsAsync(order);
+
+        var accessibleShipment = new Shipment { Id = "s1", OrderId = "o1", CreatedOnUtc = DateTime.UtcNow };
+        var deniedShipment = new Shipment { Id = "s2", OrderId = "o1", CreatedOnUtc = DateTime.UtcNow.AddMinutes(1) };
+        _shipmentServiceMock.Setup(s => s.GetShipmentsByOrder("o1"))
+            .ReturnsAsync((IList<Shipment>)new List<Shipment> { accessibleShipment, deniedShipment });
+
+        _scopeMock.Setup(s => s.HasAccess(accessibleShipment)).ReturnsAsync(true);
+        _scopeMock.Setup(s => s.HasAccess(deniedShipment)).ReturnsAsync(false);
+
+        _shipmentViewModelServiceMock
+            .Setup(v => v.PrepareShipmentModel(accessibleShipment, false, false))
+            .ReturnsAsync(new ShipmentModel { Id = "s1" });
+
+        var result = await _controller.ShipmentsByOrder("o1", new DataSourceRequest());
+
+        var jsonResult = result as JsonResult;
+        Assert.IsNotNull(jsonResult);
+        var gridModel = jsonResult.Value as DataSourceResult;
+        Assert.IsNotNull(gridModel);
+        Assert.AreEqual(1, gridModel.Total);
+        var data = gridModel.Data as List<ShipmentModel>;
+        Assert.IsNotNull(data);
+        Assert.AreEqual(1, data.Count);
+        Assert.AreEqual("s1", data[0].Id);
+        _shipmentViewModelServiceMock.Verify(v => v.PrepareShipmentModel(deniedShipment, false, false), Times.Never);
+    }
+
+    [TestMethod]
+    public async Task ShipmentsItemsByShipmentId_DeniedAccess_Throws()
+    {
+        var shipment = new Shipment { Id = "s1", OrderId = "o1" };
+        _shipmentServiceMock.Setup(s => s.GetShipmentById("s1")).ReturnsAsync(shipment);
+        _scopeMock.Setup(s => s.HasAccess(shipment)).ReturnsAsync(false);
+
+        await Assert.ThrowsExactlyAsync<ArgumentException>(() =>
+            _controller.ShipmentsItemsByShipmentId("s1", new DataSourceRequest()));
+    }
+
+    [TestMethod]
+    public async Task AddShipmentGet_OrderNotFound_RedirectsToList()
+    {
+        _orderServiceMock.Setup(s => s.GetOrderById("o1")).ReturnsAsync((Order)null);
+
+        var result = await _controller.AddShipment("o1");
+
+        var redirect = result as RedirectToActionResult;
+        Assert.IsNotNull(redirect);
+        Assert.AreEqual("List", redirect.ActionName);
+        _shipmentViewModelServiceMock.Verify(v => v.PrepareShipmentModel(It.IsAny<Order>()), Times.Never);
+    }
+
+    [TestMethod]
+    public async Task AddShipmentGet_OrderDenied_RedirectsToList()
+    {
+        var order = new Order { Id = "o1" };
+        _orderServiceMock.Setup(s => s.GetOrderById("o1")).ReturnsAsync(order);
+        _orderScopeMock.Setup(s => s.HasAccess(order)).ReturnsAsync(false);
+
+        var result = await _controller.AddShipment("o1");
+
+        var redirect = result as RedirectToActionResult;
+        Assert.IsNotNull(redirect);
+        Assert.AreEqual("List", redirect.ActionName);
+        _shipmentViewModelServiceMock.Verify(v => v.PrepareShipmentModel(It.IsAny<Order>()), Times.Never);
+    }
+
+    [TestMethod]
+    public async Task AddShipmentPost_NoItemsSelected_ShowsErrorAndRedirects()
+    {
+        var order = new Order { Id = "o1" };
+        _orderServiceMock.Setup(s => s.GetOrderById("o1")).ReturnsAsync(order);
+        _orderScopeMock.Setup(s => s.HasAccess(order)).ReturnsAsync(true);
+        _scopeMock.Setup(s => s.FilterOrderItems(It.IsAny<IEnumerable<OrderItem>>()))
+            .Returns((IEnumerable<OrderItem> items) => items);
+
+        var emptyShipment = new Shipment { Id = "s1" };
+        _shipmentViewModelServiceMock
+            .Setup(v => v.PrepareShipment(order, It.IsAny<IEnumerable<OrderItem>>(), It.IsAny<AddShipmentModel>()))
+            .ReturnsAsync((emptyShipment, (double?)null));
+
+        var model = new AddShipmentModel { OrderId = "o1" };
+        var result = await _controller.AddShipment(model, false);
+
+        var redirect = result as RedirectToActionResult;
+        Assert.IsNotNull(redirect);
+        Assert.AreEqual("AddShipment", redirect.ActionName);
+        Assert.AreEqual("o1", redirect.RouteValues["orderId"]);
+        _shipmentServiceMock.Verify(s => s.InsertShipment(It.IsAny<Shipment>()), Times.Never);
+        _shipmentViewModelServiceMock.Verify(v => v.ValidStockShipment(It.IsAny<Shipment>()), Times.Never);
+    }
+
+    [TestMethod]
+    public async Task AddShipmentPost_OutOfStock_ShowsErrorAndRedirects()
+    {
+        var order = new Order { Id = "o1" };
+        _orderServiceMock.Setup(s => s.GetOrderById("o1")).ReturnsAsync(order);
+        _orderScopeMock.Setup(s => s.HasAccess(order)).ReturnsAsync(true);
+        _scopeMock.Setup(s => s.FilterOrderItems(It.IsAny<IEnumerable<OrderItem>>()))
+            .Returns((IEnumerable<OrderItem> items) => items);
+
+        var shipment = new Shipment { Id = "s1" };
+        shipment.ShipmentItems.Add(new ShipmentItem { OrderItemId = "oi1" });
+        _shipmentViewModelServiceMock
+            .Setup(v => v.PrepareShipment(order, It.IsAny<IEnumerable<OrderItem>>(), It.IsAny<AddShipmentModel>()))
+            .ReturnsAsync((shipment, (double?)10));
+        _shipmentViewModelServiceMock
+            .Setup(v => v.ValidStockShipment(shipment))
+            .ReturnsAsync((false, "Out of stock"));
+
+        var model = new AddShipmentModel { OrderId = "o1" };
+        var result = await _controller.AddShipment(model, false);
+
+        var redirect = result as RedirectToActionResult;
+        Assert.IsNotNull(redirect);
+        Assert.AreEqual("AddShipment", redirect.ActionName);
+        Assert.AreEqual("o1", redirect.RouteValues["orderId"]);
+        _shipmentServiceMock.Verify(s => s.InsertShipment(It.IsAny<Shipment>()), Times.Never);
+    }
+
+    [TestMethod]
+    public async Task AddShipmentPost_Success_ContinueEditing_RedirectsToShipmentDetails()
+    {
+        var order = new Order { Id = "o1" };
+        _orderServiceMock.Setup(s => s.GetOrderById("o1")).ReturnsAsync(order);
+        _orderScopeMock.Setup(s => s.HasAccess(order)).ReturnsAsync(true);
+        _scopeMock.Setup(s => s.FilterOrderItems(It.IsAny<IEnumerable<OrderItem>>()))
+            .Returns((IEnumerable<OrderItem> items) => items);
+
+        var shipment = new Shipment { Id = "s1" };
+        shipment.ShipmentItems.Add(new ShipmentItem { OrderItemId = "oi1" });
+        _shipmentViewModelServiceMock
+            .Setup(v => v.PrepareShipment(order, It.IsAny<IEnumerable<OrderItem>>(), It.IsAny<AddShipmentModel>()))
+            .ReturnsAsync((shipment, (double?)10));
+        _shipmentViewModelServiceMock
+            .Setup(v => v.ValidStockShipment(shipment))
+            .ReturnsAsync((true, (string)null));
+
+        var model = new AddShipmentModel { OrderId = "o1" };
+        var result = await _controller.AddShipment(model, true);
+
+        var redirect = result as RedirectToActionResult;
+        Assert.IsNotNull(redirect);
+        Assert.AreEqual("ShipmentDetails", redirect.ActionName);
+        Assert.AreEqual("s1", redirect.RouteValues["id"]);
+        Assert.AreEqual(10, shipment.TotalWeight);
+        _shipmentServiceMock.Verify(s => s.InsertShipment(shipment), Times.Once);
+        _orderServiceMock.Verify(s => s.InsertOrderNote(It.Is<OrderNote>(n => n.OrderId == "o1")), Times.Once);
+    }
+
+    [TestMethod]
+    public async Task AddShipmentPost_Success_NotContinueEditing_RedirectsToList()
+    {
+        var order = new Order { Id = "o1" };
+        _orderServiceMock.Setup(s => s.GetOrderById("o1")).ReturnsAsync(order);
+        _orderScopeMock.Setup(s => s.HasAccess(order)).ReturnsAsync(true);
+        _scopeMock.Setup(s => s.FilterOrderItems(It.IsAny<IEnumerable<OrderItem>>()))
+            .Returns((IEnumerable<OrderItem> items) => items);
+
+        var shipment = new Shipment { Id = "s1" };
+        shipment.ShipmentItems.Add(new ShipmentItem { OrderItemId = "oi1" });
+        _shipmentViewModelServiceMock
+            .Setup(v => v.PrepareShipment(order, It.IsAny<IEnumerable<OrderItem>>(), It.IsAny<AddShipmentModel>()))
+            .ReturnsAsync((shipment, (double?)10));
+        _shipmentViewModelServiceMock
+            .Setup(v => v.ValidStockShipment(shipment))
+            .ReturnsAsync((true, (string)null));
+
+        var model = new AddShipmentModel { OrderId = "o1" };
+        var result = await _controller.AddShipment(model, false);
+
+        var redirect = result as RedirectToActionResult;
+        Assert.IsNotNull(redirect);
+        Assert.AreEqual("List", redirect.ActionName);
+        _shipmentServiceMock.Verify(s => s.InsertShipment(shipment), Times.Once);
+    }
+
+    [TestMethod]
+    public async Task AddShipmentPost_FiltersOrderItemsThroughScope()
+    {
+        var itemKept = new OrderItem { Id = "oi1" };
+        var itemFiltered = new OrderItem { Id = "oi2" };
+        var order = new Order { Id = "o1" };
+        order.OrderItems.Add(itemKept);
+        order.OrderItems.Add(itemFiltered);
+        _orderServiceMock.Setup(s => s.GetOrderById("o1")).ReturnsAsync(order);
+        _orderScopeMock.Setup(s => s.HasAccess(order)).ReturnsAsync(true);
+
+        var filtered = new List<OrderItem> { itemKept };
+        _scopeMock.Setup(s => s.FilterOrderItems(order.OrderItems)).Returns(filtered);
+
+        var shipment = new Shipment { Id = "s1" };
+        _shipmentViewModelServiceMock
+            .Setup(v => v.PrepareShipment(order, filtered, It.IsAny<AddShipmentModel>()))
+            .ReturnsAsync((shipment, (double?)null));
+
+        var model = new AddShipmentModel { OrderId = "o1" };
+        await _controller.AddShipment(model, false);
+
+        _scopeMock.Verify(s => s.FilterOrderItems(order.OrderItems), Times.Once);
+        _shipmentViewModelServiceMock.Verify(
+            v => v.PrepareShipment(order, filtered, It.IsAny<AddShipmentModel>()), Times.Once);
+    }
+
+    [TestMethod]
+    public async Task ShipmentDetails_Denied_RedirectsToList()
+    {
+        _shipmentServiceMock.Setup(s => s.GetShipmentById("s1")).ReturnsAsync((Shipment)null);
+
+        var result = await _controller.ShipmentDetails("s1");
+
+        var redirect = result as RedirectToActionResult;
+        Assert.IsNotNull(redirect);
+        Assert.AreEqual("List", redirect.ActionName);
+    }
+
+    [TestMethod]
+    public async Task ShipmentDetails_Authorized_ReturnsViewWithModel()
+    {
+        var shipment = new Shipment { Id = "s1", OrderId = "o1" };
+        _shipmentServiceMock.Setup(s => s.GetShipmentById("s1")).ReturnsAsync(shipment);
+        _scopeMock.Setup(s => s.HasAccess(shipment)).ReturnsAsync(true);
+
+        var order = new Order { Id = "o1" };
+        _orderServiceMock.Setup(s => s.GetOrderById("o1")).ReturnsAsync(order);
+
+        var model = new ShipmentModel { Id = "s1" };
+        _shipmentViewModelServiceMock.Setup(v => v.PrepareShipmentModel(shipment, true, true)).ReturnsAsync(model);
+
+        var result = await _controller.ShipmentDetails("s1");
+
+        var viewResult = result as ViewResult;
+        Assert.IsNotNull(viewResult);
+        Assert.AreSame(model, viewResult.Model);
+    }
+
+    [TestMethod]
+    public async Task DeleteShipment_Authorized_DeletesAndAddsOrderNote()
+    {
+        var shipment = new Shipment { Id = "s1", OrderId = "o1", ShipmentNumber = 5 };
+        _shipmentServiceMock.Setup(s => s.GetShipmentById("s1")).ReturnsAsync(shipment);
+        _scopeMock.Setup(s => s.HasAccess(shipment)).ReturnsAsync(true);
+
+        var order = new Order { Id = "o1" };
+        _orderServiceMock.Setup(s => s.GetOrderById("o1")).ReturnsAsync(order);
+
+        var result = await _controller.DeleteShipment("s1");
+
+        var redirect = result as RedirectToActionResult;
+        Assert.IsNotNull(redirect);
+        Assert.AreEqual("Edit", redirect.ActionName);
+        Assert.AreEqual("Order", redirect.ControllerName);
+        Assert.AreEqual("o1", redirect.RouteValues["Id"]);
+        _shipmentServiceMock.Verify(s => s.DeleteShipment(shipment), Times.Once);
+        _orderServiceMock.Verify(s => s.InsertOrderNote(It.Is<OrderNote>(n => n.OrderId == "o1")), Times.Once);
+    }
+
+    [TestMethod]
+    public async Task SetTrackingNumber_Denied_RedirectsToList()
+    {
+        _shipmentServiceMock.Setup(s => s.GetShipmentById("s1")).ReturnsAsync((Shipment)null);
+
+        var result = await _controller.SetTrackingNumber(new ShipmentTrackingModel("s1", "TRACK1"));
+
+        var redirect = result as RedirectToActionResult;
+        Assert.IsNotNull(redirect);
+        Assert.AreEqual("List", redirect.ActionName);
+        _shipmentServiceMock.Verify(s => s.UpdateShipment(It.IsAny<Shipment>()), Times.Never);
+    }
+
+    [TestMethod]
+    public async Task SetTrackingNumber_Authorized_UpdatesShipment()
+    {
+        var shipment = new Shipment { Id = "s1", OrderId = "o1" };
+        _shipmentServiceMock.Setup(s => s.GetShipmentById("s1")).ReturnsAsync(shipment);
+        _scopeMock.Setup(s => s.HasAccess(shipment)).ReturnsAsync(true);
+
+        var result = await _controller.SetTrackingNumber(new ShipmentTrackingModel("s1", "TRACK1"));
+
+        var redirect = result as RedirectToActionResult;
+        Assert.IsNotNull(redirect);
+        Assert.AreEqual("ShipmentDetails", redirect.ActionName);
+        Assert.AreEqual("s1", redirect.RouteValues["id"]);
+        Assert.AreEqual("TRACK1", shipment.TrackingNumber);
+        _shipmentServiceMock.Verify(s => s.UpdateShipment(shipment), Times.Once);
+    }
+
+    [TestMethod]
+    public async Task SetShipmentAdminComment_Authorized_UpdatesShipment()
+    {
+        var shipment = new Shipment { Id = "s1", OrderId = "o1" };
+        _shipmentServiceMock.Setup(s => s.GetShipmentById("s1")).ReturnsAsync(shipment);
+        _scopeMock.Setup(s => s.HasAccess(shipment)).ReturnsAsync(true);
+
+        var result = await _controller.SetShipmentAdminComment(new ShipmentAdminCommentModel("s1", "a comment"));
+
+        var redirect = result as RedirectToActionResult;
+        Assert.IsNotNull(redirect);
+        Assert.AreEqual("ShipmentDetails", redirect.ActionName);
+        Assert.AreEqual("s1", redirect.RouteValues["id"]);
+        Assert.AreEqual("a comment", shipment.AdminComment);
+        _shipmentServiceMock.Verify(s => s.UpdateShipment(shipment), Times.Once);
+    }
+
+    [TestMethod]
+    public async Task SetAsShipped_MediatorThrows_ShowsErrorAndRedirects()
+    {
+        var shipment = new Shipment { Id = "s1", OrderId = "o1" };
+        _shipmentServiceMock.Setup(s => s.GetShipmentById("s1")).ReturnsAsync(shipment);
+        _scopeMock.Setup(s => s.HasAccess(shipment)).ReturnsAsync(true);
+
+        _mediatorMock.Setup(m => m.Send(It.IsAny<ShipCommand>(), It.IsAny<CancellationToken>())).ThrowsAsync(new Exception("boom"));
+
+        var result = await _controller.SetAsShipped("s1");
+
+        var redirect = result as RedirectToActionResult;
+        Assert.IsNotNull(redirect);
+        Assert.AreEqual("ShipmentDetails", redirect.ActionName);
+        Assert.AreEqual("s1", redirect.RouteValues["id"]);
+    }
+
+    [TestMethod]
+    public async Task SetAsShipped_Success_RedirectsToShipmentDetails()
+    {
+        var shipment = new Shipment { Id = "s1", OrderId = "o1" };
+        _shipmentServiceMock.Setup(s => s.GetShipmentById("s1")).ReturnsAsync(shipment);
+        _scopeMock.Setup(s => s.HasAccess(shipment)).ReturnsAsync(true);
+
+        _mediatorMock.Setup(m => m.Send(It.IsAny<ShipCommand>(), It.IsAny<CancellationToken>())).ReturnsAsync(true);
+
+        var result = await _controller.SetAsShipped("s1");
+
+        var redirect = result as RedirectToActionResult;
+        Assert.IsNotNull(redirect);
+        Assert.AreEqual("ShipmentDetails", redirect.ActionName);
+        Assert.AreEqual("s1", redirect.RouteValues["id"]);
+        _mediatorMock.Verify(m => m.Send(It.Is<ShipCommand>(c => c.Shipment == shipment && c.NotifyCustomer), It.IsAny<CancellationToken>()), Times.Once);
+    }
+
+    [TestMethod]
+    public async Task EditShippedDate_MissingDate_ShowsErrorAndRedirects()
+    {
+        var shipment = new Shipment { Id = "s1", OrderId = "o1" };
+        _shipmentServiceMock.Setup(s => s.GetShipmentById("s1")).ReturnsAsync(shipment);
+        _scopeMock.Setup(s => s.HasAccess(shipment)).ReturnsAsync(true);
+
+        var result = await _controller.EditShippedDate(new ShipmentShippedDateModel("s1", null));
+
+        var redirect = result as RedirectToActionResult;
+        Assert.IsNotNull(redirect);
+        Assert.AreEqual("ShipmentDetails", redirect.ActionName);
+        Assert.AreEqual("s1", redirect.RouteValues["id"]);
+        _shipmentServiceMock.Verify(s => s.UpdateShipment(It.IsAny<Shipment>()), Times.Never);
+    }
+
+    [TestMethod]
+    public async Task EditShippedDate_ValidDate_UpdatesAndRedirects()
+    {
+        var shipment = new Shipment { Id = "s1", OrderId = "o1" };
+        _shipmentServiceMock.Setup(s => s.GetShipmentById("s1")).ReturnsAsync(shipment);
+        _scopeMock.Setup(s => s.HasAccess(shipment)).ReturnsAsync(true);
+
+        var shippedDate = DateTime.UtcNow;
+        var result = await _controller.EditShippedDate(new ShipmentShippedDateModel("s1", shippedDate));
+
+        var redirect = result as RedirectToActionResult;
+        Assert.IsNotNull(redirect);
+        Assert.AreEqual("ShipmentDetails", redirect.ActionName);
+        Assert.AreEqual("s1", redirect.RouteValues["id"]);
+        Assert.AreEqual(shippedDate, shipment.ShippedDateUtc);
+        _shipmentServiceMock.Verify(s => s.UpdateShipment(shipment), Times.Once);
+    }
+
+    [TestMethod]
+    public async Task SetAsDelivered_Success_RedirectsToShipmentDetails()
+    {
+        var shipment = new Shipment { Id = "s1", OrderId = "o1" };
+        _shipmentServiceMock.Setup(s => s.GetShipmentById("s1")).ReturnsAsync(shipment);
+        _scopeMock.Setup(s => s.HasAccess(shipment)).ReturnsAsync(true);
+
+        _mediatorMock.Setup(m => m.Send(It.IsAny<DeliveryCommand>(), It.IsAny<CancellationToken>())).ReturnsAsync(true);
+
+        var result = await _controller.SetAsDelivered("s1");
+
+        var redirect = result as RedirectToActionResult;
+        Assert.IsNotNull(redirect);
+        Assert.AreEqual("ShipmentDetails", redirect.ActionName);
+        Assert.AreEqual("s1", redirect.RouteValues["id"]);
+        _mediatorMock.Verify(m => m.Send(It.Is<DeliveryCommand>(c => c.Shipment == shipment && c.NotifyCustomer), It.IsAny<CancellationToken>()), Times.Once);
+    }
+
+    [TestMethod]
+    public async Task EditDeliveryDate_ValidDate_UpdatesAndRedirects()
+    {
+        var shipment = new Shipment { Id = "s1", OrderId = "o1" };
+        _shipmentServiceMock.Setup(s => s.GetShipmentById("s1")).ReturnsAsync(shipment);
+        _scopeMock.Setup(s => s.HasAccess(shipment)).ReturnsAsync(true);
+
+        var deliveryDate = DateTime.UtcNow;
+        var result = await _controller.EditDeliveryDate(new ShipmentDeliveryDateModel("s1", deliveryDate));
+
+        var redirect = result as RedirectToActionResult;
+        Assert.IsNotNull(redirect);
+        Assert.AreEqual("ShipmentDetails", redirect.ActionName);
+        Assert.AreEqual("s1", redirect.RouteValues["id"]);
+        Assert.AreEqual(deliveryDate, shipment.DeliveryDateUtc);
+        _shipmentServiceMock.Verify(s => s.UpdateShipment(shipment), Times.Once);
+    }
+
+    [TestMethod]
+    public async Task PdfPackagingSlip_Denied_RedirectsToList()
+    {
+        _shipmentServiceMock.Setup(s => s.GetShipmentById("s1")).ReturnsAsync((Shipment)null);
+
+        var result = await _controller.PdfPackagingSlip("s1");
+
+        var redirect = result as RedirectToActionResult;
+        Assert.IsNotNull(redirect);
+        Assert.AreEqual("List", redirect.ActionName);
+        _orderServiceMock.Verify(s => s.GetOrderById(It.IsAny<string>()), Times.Never);
+    }
+
+    [TestMethod]
+    public async Task PdfPackagingSlipAll_NoShipments_ShowsErrorAndRedirects()
+    {
+        _shipmentViewModelServiceMock
+            .Setup(v => v.PrepareShipments(It.IsAny<ShipmentListModel>(), 1, 100))
+            .ReturnsAsync((Enumerable.Empty<Shipment>(), 0));
+
+        var result = await _controller.PdfPackagingSlipAll(new ShipmentListModel());
+
+        var redirect = result as RedirectToActionResult;
+        Assert.IsNotNull(redirect);
+        Assert.AreEqual("List", redirect.ActionName);
+    }
+
+    [TestMethod]
+    public async Task PdfPackagingSlipAll_ForcesStoreAndVendorIdConditionally()
+    {
+        _scopeMock.Setup(s => s.DefaultStoreId).Returns("store-1");
+        _scopeMock.Setup(s => s.DefaultVendorId).Returns("vendor-1");
+        _shipmentViewModelServiceMock
+            .Setup(v => v.PrepareShipments(It.IsAny<ShipmentListModel>(), 1, 100))
+            .ReturnsAsync((Enumerable.Empty<Shipment>(), 0));
+
+        var model = new ShipmentListModel { StoreId = "attacker-store", VendorId = "attacker-vendor" };
+        await _controller.PdfPackagingSlipAll(model);
+
+        Assert.AreEqual("store-1", model.StoreId);
+        Assert.AreEqual("vendor-1", model.VendorId);
+    }
+
+    [TestMethod]
+    public async Task PdfPackagingSlipSelected_FiltersToAccessibleShipments()
+    {
+        var accessibleShipment = new Shipment { Id = "s1" };
+        var deniedShipment = new Shipment { Id = "s2" };
+        _shipmentServiceMock
+            .Setup(s => s.GetShipmentsByIds(new[] { "s1", "s2" }))
+            .ReturnsAsync((IList<Shipment>)new List<Shipment> { accessibleShipment, deniedShipment });
+        _scopeMock.Setup(s => s.HasAccess(accessibleShipment)).ReturnsAsync(true);
+        _scopeMock.Setup(s => s.HasAccess(deniedShipment)).ReturnsAsync(false);
+
+        var result = await _controller.PdfPackagingSlipSelected("s1,s2");
+
+        var fileResult = result as FileContentResult;
+        Assert.IsNotNull(fileResult);
+        Assert.AreEqual("packagingslips.pdf", fileResult.FileDownloadName);
+        _scopeMock.Verify(s => s.HasAccess(accessibleShipment), Times.Once);
+        _scopeMock.Verify(s => s.HasAccess(deniedShipment), Times.Once);
+        _pdfServiceMock.Verify(
+            p => p.PrintPackagingSlipsToPdf(
+                It.IsAny<Stream>(),
+                It.Is<IList<Shipment>>(list => list.Count == 1 && list.Contains(accessibleShipment) && !list.Contains(deniedShipment)),
+                It.IsAny<string>()),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public async Task SetAsShippedSelected_FiltersToAccessibleShipments_IgnoresPerItemExceptions()
+    {
+        var accessibleShipment1 = new Shipment { Id = "s1" };
+        var accessibleShipment2 = new Shipment { Id = "s2" };
+        var deniedShipment = new Shipment { Id = "s3" };
+        _shipmentServiceMock
+            .Setup(s => s.GetShipmentsByIds(new[] { "s1", "s2", "s3" }))
+            .ReturnsAsync((IList<Shipment>)new List<Shipment> { accessibleShipment1, accessibleShipment2, deniedShipment });
+        _scopeMock.Setup(s => s.HasAccess(accessibleShipment1)).ReturnsAsync(true);
+        _scopeMock.Setup(s => s.HasAccess(accessibleShipment2)).ReturnsAsync(true);
+        _scopeMock.Setup(s => s.HasAccess(deniedShipment)).ReturnsAsync(false);
+
+        _mediatorMock
+            .Setup(m => m.Send(It.Is<ShipCommand>(c => c.Shipment == accessibleShipment1), It.IsAny<CancellationToken>()))
+            .ThrowsAsync(new Exception("boom"));
+        _mediatorMock
+            .Setup(m => m.Send(It.Is<ShipCommand>(c => c.Shipment == accessibleShipment2), It.IsAny<CancellationToken>()))
+            .ReturnsAsync(true);
+
+        var result = await _controller.SetAsShippedSelected(new List<string> { "s1", "s2", "s3" });
+
+        var jsonResult = result as JsonResult;
+        Assert.IsNotNull(jsonResult);
+        _mediatorMock.Verify(m => m.Send(It.Is<ShipCommand>(c => c.Shipment == accessibleShipment1), It.IsAny<CancellationToken>()), Times.Once);
+        _mediatorMock.Verify(m => m.Send(It.Is<ShipCommand>(c => c.Shipment == accessibleShipment2), It.IsAny<CancellationToken>()), Times.Once);
+        _mediatorMock.Verify(m => m.Send(It.Is<ShipCommand>(c => c.Shipment == deniedShipment), It.IsAny<CancellationToken>()), Times.Never);
+    }
+
+    [TestMethod]
+    public async Task SetAsDeliveredSelected_FiltersToAccessibleShipments()
+    {
+        var accessibleShipment = new Shipment { Id = "s1" };
+        var deniedShipment = new Shipment { Id = "s2" };
+        _shipmentServiceMock
+            .Setup(s => s.GetShipmentsByIds(new[] { "s1", "s2" }))
+            .ReturnsAsync((IList<Shipment>)new List<Shipment> { accessibleShipment, deniedShipment });
+        _scopeMock.Setup(s => s.HasAccess(accessibleShipment)).ReturnsAsync(true);
+        _scopeMock.Setup(s => s.HasAccess(deniedShipment)).ReturnsAsync(false);
+
+        _mediatorMock
+            .Setup(m => m.Send(It.IsAny<DeliveryCommand>(), It.IsAny<CancellationToken>()))
+            .ReturnsAsync(true);
+
+        var result = await _controller.SetAsDeliveredSelected(new List<string> { "s1", "s2" });
+
+        var jsonResult = result as JsonResult;
+        Assert.IsNotNull(jsonResult);
+        _mediatorMock.Verify(m => m.Send(It.Is<DeliveryCommand>(c => c.Shipment == accessibleShipment), It.IsAny<CancellationToken>()), Times.Once);
+        _mediatorMock.Verify(m => m.Send(It.Is<DeliveryCommand>(c => c.Shipment == deniedShipment), It.IsAny<CancellationToken>()), Times.Never);
+    }
+
+    [TestMethod]
+    public async Task ShipmentNotesSelect_Denied_Throws()
+    {
+        _shipmentServiceMock.Setup(s => s.GetShipmentById("s1")).ReturnsAsync((Shipment)null);
+
+        await Assert.ThrowsExactlyAsync<ArgumentException>(() =>
+            _controller.ShipmentNotesSelect("s1", new DataSourceRequest()));
+    }
+
+    [TestMethod]
+    public async Task ShipmentNotesSelect_Authorized_ReturnsNotes()
+    {
+        var shipment = new Shipment { Id = "s1", OrderId = "o1" };
+        _shipmentServiceMock.Setup(s => s.GetShipmentById("s1")).ReturnsAsync(shipment);
+        _scopeMock.Setup(s => s.HasAccess(shipment)).ReturnsAsync(true);
+
+        var notes = new List<ShipmentModel.ShipmentNote> { new() { Id = "n1" } };
+        _shipmentViewModelServiceMock.Setup(v => v.PrepareShipmentNotes(shipment)).ReturnsAsync(notes);
+
+        var result = await _controller.ShipmentNotesSelect("s1", new DataSourceRequest());
+
+        var jsonResult = result as JsonResult;
+        Assert.IsNotNull(jsonResult);
+        var gridModel = jsonResult.Value as DataSourceResult;
+        Assert.IsNotNull(gridModel);
+        Assert.AreEqual(1, gridModel.Total);
+        Assert.AreSame(notes, gridModel.Data);
+    }
+
+    [TestMethod]
+    public async Task ShipmentNoteAdd_Denied_ReturnsResultFalse()
+    {
+        _shipmentServiceMock.Setup(s => s.GetShipmentById("s1")).ReturnsAsync((Shipment)null);
+
+        var result = await _controller.ShipmentNoteAdd("s1", "download-1", true, "hello");
+
+        var jsonResult = result as JsonResult;
+        Assert.IsNotNull(jsonResult);
+        var value = jsonResult.Value;
+        var resultProperty = value.GetType().GetProperty("Result");
+        Assert.IsNotNull(resultProperty);
+        Assert.AreEqual(false, resultProperty.GetValue(value));
+        _shipmentViewModelServiceMock.Verify(
+            v => v.InsertShipmentNote(It.IsAny<Shipment>(), It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<string>()),
+            Times.Never);
+    }
+
+    [TestMethod]
+    public async Task ShipmentNoteAdd_Authorized_PassesDownloadIdThrough()
+    {
+        var shipment = new Shipment { Id = "s1", OrderId = "o1" };
+        _shipmentServiceMock.Setup(s => s.GetShipmentById("s1")).ReturnsAsync(shipment);
+        _scopeMock.Setup(s => s.HasAccess(shipment)).ReturnsAsync(true);
+
+        var result = await _controller.ShipmentNoteAdd("s1", "download-1", true, "hello");
+
+        var jsonResult = result as JsonResult;
+        Assert.IsNotNull(jsonResult);
+        var value = jsonResult.Value;
+        var resultProperty = value.GetType().GetProperty("Result");
+        Assert.IsNotNull(resultProperty);
+        Assert.AreEqual(true, resultProperty.GetValue(value));
+        _shipmentViewModelServiceMock.Verify(
+            v => v.InsertShipmentNote(shipment, "download-1", true, "hello"), Times.Once);
+    }
+
+    [TestMethod]
+    public async Task ShipmentNoteDelete_Denied_Throws()
+    {
+        _shipmentServiceMock.Setup(s => s.GetShipmentById("s1")).ReturnsAsync((Shipment)null);
+
+        await Assert.ThrowsExactlyAsync<ArgumentException>(() =>
+            _controller.ShipmentNoteDelete("n1", "s1"));
+    }
+
+    [TestMethod]
+    public async Task ShipmentNoteDelete_Authorized_DeletesNote()
+    {
+        var shipment = new Shipment { Id = "s1", OrderId = "o1" };
+        _shipmentServiceMock.Setup(s => s.GetShipmentById("s1")).ReturnsAsync(shipment);
+        _scopeMock.Setup(s => s.HasAccess(shipment)).ReturnsAsync(true);
+
+        var result = await _controller.ShipmentNoteDelete("n1", "s1");
+
+        var jsonResult = result as JsonResult;
+        Assert.IsNotNull(jsonResult);
+        Assert.AreEqual("", jsonResult.Value);
+        _shipmentViewModelServiceMock.Verify(v => v.DeleteShipmentNote(shipment, "n1"), Times.Once);
+    }
+
+    [TestMethod]
+    public async Task EditUserFields_Denied_RedirectsToList_UpdateShipmentNeverCalled()
+    {
+        _shipmentServiceMock.Setup(s => s.GetShipmentById("s1")).ReturnsAsync((Shipment)null);
+
+        var result = await _controller.EditUserFields("s1", new ShipmentModel { Id = "s1" });
+
+        var redirect = result as RedirectToActionResult;
+        Assert.IsNotNull(redirect);
+        Assert.AreEqual("List", redirect.ActionName);
+        _shipmentServiceMock.Verify(s => s.UpdateShipment(It.IsAny<Shipment>()), Times.Never);
+    }
+
+    [TestMethod]
+    public async Task EditUserFields_Authorized_UpdatesUserFieldsAndRedirectsToShipmentDetails()
+    {
+        var shipment = new Shipment { Id = "s1", OrderId = "o1" };
+        _shipmentServiceMock.Setup(s => s.GetShipmentById("s1")).ReturnsAsync(shipment);
+        _scopeMock.Setup(s => s.HasAccess(shipment)).ReturnsAsync(true);
+
+        var userFields = new List<UserField> { new() { Key = "k1", Value = "v1" } };
+        var model = new ShipmentModel { Id = "s1", UserFields = userFields };
+
+        // SaveSelectedTabIndex() reads Request.Form; give it a well-formed empty form body.
+        _controller.ControllerContext.HttpContext.Request.ContentType = "application/x-www-form-urlencoded";
+
+        var result = await _controller.EditUserFields("s1", model);
+
+        var redirect = result as RedirectToActionResult;
+        Assert.IsNotNull(redirect);
+        Assert.AreEqual("ShipmentDetails", redirect.ActionName);
+        Assert.AreEqual("s1", redirect.RouteValues["id"]);
+        Assert.AreSame(userFields, shipment.UserFields);
+        _shipmentServiceMock.Verify(s => s.UpdateShipment(shipment), Times.Once);
+    }
+}
diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/RoutedShipmentDataScopeTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/RoutedShipmentDataScopeTests.cs
new file mode 100644
index 000000000..1f01eaf51
--- /dev/null
+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/RoutedShipmentDataScopeTests.cs
@@ -0,0 +1,81 @@
+#nullable enable
+
+using Grand.Domain.Customers;
+using Grand.Domain.Shipping;
+using Grand.Domain.Vendors;
+using Grand.Infrastructure;
+using Grand.Web.AdminShared.Services;
+using Microsoft.AspNetCore.Http;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+
+namespace Grand.Web.Admin.Tests.Controllers;
+
+[TestClass]
+public class RoutedShipmentDataScopeTests
+{
+    private const string StaffStoreId = "store-1";
+    private const string VendorId = "vendor-1";
+
+    private GlobalAdminDataScope<Shipment> _adminScope = null!;
+    private StoreShipmentDataScope _storeScope = null!;
+    private VendorShipmentDataScope _vendorScope = null!;
+
+    [TestInitialize]
+    public void Setup()
+    {
+        var workContext = new Mock<IWorkContext>();
+        workContext.Setup(x => x.CurrentCustomer).Returns(new Customer { StaffStoreId = StaffStoreId });
+        workContext.Setup(x => x.CurrentVendor).Returns(new Vendor { Id = VendorId });
+        var contextAccessor = new Mock<IContextAccessor>();
+        contextAccessor.Setup(x => x.WorkContext).Returns(workContext.Object);
+
+        _adminScope = new GlobalAdminDataScope<Shipment>();
+        _storeScope = new StoreShipmentDataScope(contextAccessor.Object);
+        _vendorScope = new VendorShipmentDataScope(contextAccessor.Object);
+    }
+
+    private RoutedShipmentDataScope ResolverForArea(string? area)
+    {
+        var httpContext = new DefaultHttpContext();
+        if (area is not null) httpContext.Request.RouteValues["area"] = area;
+        var httpContextAccessor = new Mock<IHttpContextAccessor>();
+        httpContextAccessor.Setup(x => x.HttpContext).Returns(httpContext);
+        return new RoutedShipmentDataScope(httpContextAccessor.Object, _adminScope, _storeScope, _vendorScope);
+    }
+
+    [TestMethod]
+    public void AdminArea_ResolvesToAdminScope()
+    {
+        var resolver = ResolverForArea("Admin");
+        Assert.IsNull(resolver.DefaultStoreId);
+        Assert.IsNull(resolver.DefaultVendorId);
+    }
+
+    [TestMethod]
+    public void StoreArea_ResolvesToStoreScope()
+    {
+        var resolver = ResolverForArea("Store");
+        Assert.AreEqual(StaffStoreId, resolver.DefaultStoreId);
+        Assert.IsNull(resolver.DefaultVendorId);
+    }
+
+    [TestMethod]
+    public void VendorArea_ResolvesToVendorScope()
+    {
+        var resolver = ResolverForArea("Vendor");
+        Assert.AreEqual("Vendor", resolver.ResourceKeyPrefix);
+        Assert.AreEqual(VendorId, resolver.DefaultVendorId);
+        Assert.IsFalse(resolver.ShowStoreSelector);
+    }
+
+    [TestMethod]
+    public void UnrecognizedOrMissingArea_ThrowsFailClosed()
+    {
+        var resolver = ResolverForArea("Vue");
+        Assert.Throws<InvalidOperationException>(() => _ = resolver.ResourceKeyPrefix);
+
+        var resolverNoArea = ResolverForArea(null);
+        Assert.Throws<InvalidOperationException>(() => _ = resolverNoArea.ResourceKeyPrefix);
+    }
+}
diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/StoreShipmentDataScopeTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/StoreShipmentDataScopeTests.cs
new file mode 100644
index 000000000..9ba5e8f5f
--- /dev/null
+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/StoreShipmentDataScopeTests.cs
@@ -0,0 +1,65 @@
+using Grand.Domain.Customers;
+using Grand.Domain.Shipping;
+using Grand.Infrastructure;
+using Grand.Web.AdminShared.Services;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+
+namespace Grand.Web.Admin.Tests.Controllers;
+
+[TestClass]
+public class StoreShipmentDataScopeTests
+{
+    private static StoreShipmentDataScope Build(string staffStoreId)
+    {
+        var customer = new Customer { StaffStoreId = staffStoreId };
+        var workContextMock = new Mock<IWorkContext>();
+        workContextMock.Setup(w => w.CurrentCustomer).Returns(customer);
+        var contextAccessorMock = new Mock<IContextAccessor>();
+        contextAccessorMock.Setup(c => c.WorkContext).Returns(workContextMock.Object);
+        return new StoreShipmentDataScope(contextAccessorMock.Object);
+    }
+
+    [TestMethod]
+    public async Task HasAccess_MatchingStoreId_True()
+    {
+        var scope = Build("store-1");
+        Assert.IsTrue(await scope.HasAccess(new Shipment { StoreId = "store-1" }));
+    }
+
+    [TestMethod]
+    public async Task HasAccess_MismatchedStoreId_False()
+    {
+        var scope = Build("store-1");
+        Assert.IsFalse(await scope.HasAccess(new Shipment { StoreId = "store-2" }));
+    }
+
+    [TestMethod]
+    public async Task HasAccess_NullEntity_False()
+    {
+        var scope = Build("store-1");
+        Assert.IsFalse(await scope.HasAccess(null));
+    }
+
+    [TestMethod]
+    public async Task HasAccess_EmptyStaffStoreIdAndEmptyEntityStoreId_False()
+    {
+        var scope = Build(string.Empty);
+        Assert.IsFalse(await scope.HasAccess(new Shipment { StoreId = string.Empty }));
+    }
+
+    [TestMethod]
+    public async Task HasAccess_NullStaffStoreIdAndNullEntityStoreId_False()
+    {
+        var scope = Build(null);
+        Assert.IsFalse(await scope.HasAccess(new Shipment { StoreId = null }));
+    }
+
+    [TestMethod]
+    public void DefaultStoreId_ReturnsStaffStoreId()
+    {
+        var scope = Build("store-1");
+        Assert.AreEqual("store-1", scope.DefaultStoreId);
+        Assert.IsNull(scope.DefaultVendorId);
+    }
+}
diff --git a/src/Tests/Grand.Web.Admin.Tests/Controllers/VendorShipmentDataScopeTests.cs b/src/Tests/Grand.Web.Admin.Tests/Controllers/VendorShipmentDataScopeTests.cs
new file mode 100644
index 000000000..ffa3cea1d
--- /dev/null
+++ b/src/Tests/Grand.Web.Admin.Tests/Controllers/VendorShipmentDataScopeTests.cs
@@ -0,0 +1,81 @@
+using Grand.Domain.Orders;
+using Grand.Domain.Shipping;
+using Grand.Domain.Vendors;
+using Grand.Infrastructure;
+using Grand.Web.AdminShared.Services;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+
+namespace Grand.Web.Admin.Tests.Controllers;
+
+[TestClass]
+public class VendorShipmentDataScopeTests
+{
+    private static VendorShipmentDataScope Build(string currentVendorId)
+    {
+        var workContextMock = new Mock<IWorkContext>();
+        workContextMock.Setup(w => w.CurrentVendor).Returns(new Vendor { Id = currentVendorId });
+        var contextAccessorMock = new Mock<IContextAccessor>();
+        contextAccessorMock.Setup(c => c.WorkContext).Returns(workContextMock.Object);
+        return new VendorShipmentDataScope(contextAccessorMock.Object);
+    }
+
+    [TestMethod]
+    public async Task HasAccess_MatchingVendorId_True()
+    {
+        var scope = Build("vendor-A");
+        Assert.IsTrue(await scope.HasAccess(new Shipment { VendorId = "vendor-A" }));
+    }
+
+    [TestMethod]
+    public async Task HasAccess_MismatchedVendorId_False()
+    {
+        var scope = Build("vendor-A");
+        Assert.IsFalse(await scope.HasAccess(new Shipment { VendorId = "vendor-B" }));
+    }
+
+    [TestMethod]
+    public async Task HasAccess_NullEntity_False()
+    {
+        var scope = Build("vendor-A");
+        Assert.IsFalse(await scope.HasAccess(null));
+    }
+
+    [TestMethod]
+    public async Task HasAccess_EmptyCurrentVendorIdAndEmptyEntityVendorId_False()
+    {
+        var scope = Build(string.Empty);
+        Assert.IsFalse(await scope.HasAccess(new Shipment { VendorId = string.Empty }));
+    }
+
+    [TestMethod]
+    public async Task HasAccess_NullCurrentVendorIdAndNullEntityVendorId_False()
+    {
+        var scope = Build(null);
+        Assert.IsFalse(await scope.HasAccess(new Shipment { VendorId = null }));
+    }
+
+    [TestMethod]
+    public void FilterOrderItems_MixedVendorOrder_ReturnsOnlyOwnItems()
+    {
+        var scope = Build("vendor-A");
+        var itemA1 = new OrderItem { Id = "i1", VendorId = "vendor-A" };
+        var itemB = new OrderItem { Id = "i2", VendorId = "vendor-B" };
+        var itemA2 = new OrderItem { Id = "i3", VendorId = "vendor-A" };
+
+        var filtered = scope.FilterOrderItems([itemA1, itemB, itemA2]).ToList();
+
+        CollectionAssert.AreEqual(new[] { itemA1, itemA2 }, filtered);
+    }
+
+    [TestMethod]
+    public void ScopeDefaults_VendorScoped()
+    {
+        var scope = Build("vendor-A");
+        Assert.IsNull(scope.DefaultStoreId);
+        Assert.AreEqual("vendor-A", scope.DefaultVendorId);
+        Assert.AreEqual("Vendor", scope.ResourceKeyPrefix);
+        Assert.IsFalse(scope.ShowStoreSelector);
+        Assert.IsFalse(scope.CanFeatureOnHomepage);
+    }
+}
diff --git a/src/Tests/Grand.Web.Admin.Tests/Services/ShipmentViewModelServiceTests.cs b/src/Tests/Grand.Web.Admin.Tests/Services/ShipmentViewModelServiceTests.cs
new file mode 100644
index 000000000..3d9cf5d43
--- /dev/null
+++ b/src/Tests/Grand.Web.Admin.Tests/Services/ShipmentViewModelServiceTests.cs
@@ -0,0 +1,195 @@
+using Grand.Business.Core.Interfaces.Catalog.Directory;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Storage;
+using Grand.Domain.Catalog;
+using Grand.Domain.Directory;
+using Grand.Domain.Orders;
+using Grand.Domain.Shipping;
+using Grand.Infrastructure;
+using Grand.Web.AdminShared.Interfaces;
+using Grand.Web.AdminShared.Models.Orders;
+using Grand.Web.AdminShared.Services;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Assert = Microsoft.VisualStudio.TestTools.UnitTesting.Assert;
+
+namespace Grand.Web.Admin.Tests.Services;
+
+[TestClass]
+public class ShipmentViewModelServiceTests
+{
+    private Mock<IOrderService> _orderServiceMock;
+    private Mock<IProductService> _productServiceMock;
+    private Mock<IShipmentService> _shipmentServiceMock;
+    private Mock<IWarehouseService> _warehouseServiceMock;
+    private Mock<IMeasureService> _measureServiceMock;
+    private Mock<IAdminDataScope<Shipment>> _scopeMock;
+    private ShipmentViewModelService _service;
+
+    [TestInitialize]
+    public void Setup()
+    {
+        _orderServiceMock = new Mock<IOrderService>();
+        _productServiceMock = new Mock<IProductService>();
+        _shipmentServiceMock = new Mock<IShipmentService>();
+        _warehouseServiceMock = new Mock<IWarehouseService>();
+        _measureServiceMock = new Mock<IMeasureService>();
+        _scopeMock = new Mock<IAdminDataScope<Shipment>>();
+
+        _measureServiceMock.Setup(m => m.GetMeasureWeightById(It.IsAny<string>())).ReturnsAsync((MeasureWeight)null);
+        _measureServiceMock.Setup(m => m.GetMeasureDimensionById(It.IsAny<string>()))
+            .ReturnsAsync((MeasureDimension)null);
+
+        _warehouseServiceMock.Setup(w => w.GetWarehouseById(It.IsAny<string>())).ReturnsAsync((Warehouse)null);
+
+        // Default: Admin's Global scope - identity passthrough, no default vendor.
+        _scopeMock.Setup(s => s.FilterOrderItems(It.IsAny<IEnumerable<OrderItem>>()))
+            .Returns((IEnumerable<OrderItem> items) => items);
+        _scopeMock.Setup(s => s.DefaultVendorId).Returns((string)null);
+
+        _service = new ShipmentViewModelService(
+            _orderServiceMock.Object,
+            new Mock<IContextAccessor>().Object,
+            _productServiceMock.Object,
+            _shipmentServiceMock.Object,
+            _warehouseServiceMock.Object,
+            _measureServiceMock.Object,
+            new Mock<IDateTimeService>().Object,
+            new Mock<ICountryService>().Object,
+            new Mock<ITranslationService>().Object,
+            new Mock<IDownloadService>().Object,
+            new Mock<IShippingService>().Object,
+            new Mock<IStockQuantityService>().Object,
+            new MeasureSettings(),
+            new ShippingSettings(),
+            new ShippingProviderSettings(),
+            _scopeMock.Object);
+    }
+
+    [TestMethod]
+    public async Task PrepareShipmentModel_VendorScopeFiltersToOwnItems()
+    {
+        // Arrange
+        var order = new Order { Id = "order1" };
+        order.OrderItems.Add(new OrderItem { Id = "oi-A", ProductId = "p-A", VendorId = "vendor-A" });
+        order.OrderItems.Add(new OrderItem { Id = "oi-B", ProductId = "p-B", VendorId = "vendor-B" });
+        _orderServiceMock.Setup(o => o.GetOrderById(order.Id)).ReturnsAsync(order);
+
+        _scopeMock.Setup(s => s.FilterOrderItems(order.OrderItems))
+            .Returns(order.OrderItems.Where(i => i.VendorId == "vendor-A"));
+
+        var productA = new Product { Id = "p-A", Name = "Product A" };
+        _productServiceMock.Setup(p => p.GetProductByIdIncludeArch("p-A")).ReturnsAsync(productA);
+
+        var shipment = new Shipment { Id = "shipment1", OrderId = order.Id };
+        shipment.ShipmentItems.Add(new ShipmentItem { Id = "si-A", OrderItemId = "oi-A", Quantity = 1 });
+        shipment.ShipmentItems.Add(new ShipmentItem { Id = "si-B", OrderItemId = "oi-B", Quantity = 1 });
+
+        // Act
+        var model = await _service.PrepareShipmentModel(shipment, prepareProducts: true);
+
+        // Assert
+        Assert.AreEqual(1, model.Items.Count);
+        Assert.AreEqual("oi-A", model.Items[0].OrderItemId);
+        Assert.AreEqual("p-A", model.Items[0].ProductId);
+    }
+
+    [TestMethod]
+    public async Task PrepareShipmentModel_GlobalScopeDoesNotFilterItems()
+    {
+        // Arrange
+        var order = new Order { Id = "order1" };
+        order.OrderItems.Add(new OrderItem { Id = "oi-A", ProductId = "p-A", VendorId = "vendor-A" });
+        order.OrderItems.Add(new OrderItem { Id = "oi-B", ProductId = "p-B", VendorId = "vendor-B" });
+        _orderServiceMock.Setup(o => o.GetOrderById(order.Id)).ReturnsAsync(order);
+
+        // Default Setup() scope: identity passthrough (no filtering).
+
+        var productA = new Product { Id = "p-A", Name = "Product A" };
+        var productB = new Product { Id = "p-B", Name = "Product B" };
+        _productServiceMock.Setup(p => p.GetProductByIdIncludeArch("p-A")).ReturnsAsync(productA);
+        _productServiceMock.Setup(p => p.GetProductByIdIncludeArch("p-B")).ReturnsAsync(productB);
+
+        var shipment = new Shipment { Id = "shipment1", OrderId = order.Id };
+        shipment.ShipmentItems.Add(new ShipmentItem { Id = "si-A", OrderItemId = "oi-A", Quantity = 1 });
+        shipment.ShipmentItems.Add(new ShipmentItem { Id = "si-B", OrderItemId = "oi-B", Quantity = 1 });
+
+        // Act
+        var model = await _service.PrepareShipmentModel(shipment, prepareProducts: true);
+
+        // Assert
+        Assert.AreEqual(2, model.Items.Count);
+        Assert.IsTrue(model.Items.Any(i => i.OrderItemId == "oi-A"));
+        Assert.IsTrue(model.Items.Any(i => i.OrderItemId == "oi-B"));
+    }
+
+    [TestMethod]
+    public async Task PrepareShipment_SetsVendorIdFromScope()
+    {
+        // Arrange
+        _scopeMock.Setup(s => s.DefaultVendorId).Returns("vendor-A");
+
+        var order = new Order { Id = "order1", SeId = "se1", StoreId = "store1" };
+        var orderItem = new OrderItem {
+            Id = "oi-A",
+            ProductId = "p-A",
+            IsShipEnabled = true,
+            OpenQty = 1,
+            Quantity = 1
+        };
+
+        var product = new Product { Id = "p-A", IsShipEnabled = true };
+        _productServiceMock.Setup(p => p.GetProductById("p-A")).ReturnsAsync(product);
+
+        var model = new AddShipmentModel {
+            OrderId = order.Id,
+            Items = new List<AddShipmentModel.ShipmentItemModel> {
+                new() { OrderItemId = "oi-A", QuantityToAdd = 1 }
+            }
+        };
+
+        // Act
+        var (shipment, _) = await _service.PrepareShipment(order, new[] { orderItem }, model);
+
+        // Assert
+        Assert.IsNotNull(shipment);
+        Assert.AreEqual("vendor-A", shipment.VendorId);
+    }
+
+    [TestMethod]
+    public async Task PrepareShipment_NullDefaultVendorId_LeavesVendorIdNull()
+    {
+        // Arrange
+        _scopeMock.Setup(s => s.DefaultVendorId).Returns((string)null);
+
+        var order = new Order { Id = "order1", SeId = "se1", StoreId = "store1" };
+        var orderItem = new OrderItem {
+            Id = "oi-A",
+            ProductId = "p-A",
+            IsShipEnabled = true,
+            OpenQty = 1,
+            Quantity = 1
+        };
+
+        var product = new Product { Id = "p-A", IsShipEnabled = true };
+        _productServiceMock.Setup(p => p.GetProductById("p-A")).ReturnsAsync(product);
+
+        var model = new AddShipmentModel {
+            OrderId = order.Id,
+            Items = new List<AddShipmentModel.ShipmentItemModel> {
+                new() { OrderItemId = "oi-A", QuantityToAdd = 1 }
+            }
+        };
+
+        // Act
+        var (shipment, _) = await _service.PrepareShipment(order, new[] { orderItem }, model);
+
+        // Assert
+        Assert.IsNotNull(shipment);
+        Assert.IsNull(shipment.VendorId);
+    }
+}
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/List.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/List.cshtml
deleted file mode 100644
index 6d9e1d96b..000000000
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/List.cshtml
+++ /dev/null
@@ -1,404 +0,0 @@
-@model ShipmentListModel
-@inject AdminAreaSettings adminAreaSettings
-@{
-    ViewBag.Title = Loc["Admin.Orders.Shipments.List"];
-}
-
-<form asp-area="@Constants.AreaAdmin" asp-controller="Shipment" asp-action="List" method="post">
-
-    <div class="row">
-        <div class="col-md-12">
-            <div class="x_panel light form-fit popup-window">
-                <div class="x_title">
-                    <div class="caption">
-                        <i class="fa fa-truck"></i>
-                        @Loc["Admin.Orders.Shipments.List"]
-                    </div>
-                    <div class="actions">
-                        <div class="btn-group btn-group-devided util-btn-margin-bottom-5">
-                            <button type="submit" name="exportpackagingslips-all" asp-action="PdfPackagingSlipAll" class="btn purple">
-                                <i class="fa fa-file-pdf-o"></i>
-                                @Loc["Admin.Orders.Shipments.PrintPackagingSlip.All"]
-                            </button>
-                            <button type="submit" id="exportpackagingslips-selected" class="btn blue">
-                                <i class="fa fa-file-pdf-o"></i>
-                                @Loc["Admin.Orders.Shipments.PrintPackagingSlip.Selected"]
-                            </button>
-                            <button class="btn btn-success" type="submit" id="ship-selected">
-                                <i class="fa fa-check"></i> @Loc["Admin.Orders.Shipments.ShipSelected"]
-                            </button>
-                            <button class="btn btn-success" type="submit" id="deliver-selected">
-                                <i class="fa fa-check-circle"></i> @Loc["Admin.Orders.Shipments.DeliverySelected"]
-                            </button>
-                            <vc:admin-widget widget-zone="order_shipment_list_buttons" additional-data="null"/>
-                        </div>
-                    </div>
-                </div>
-                <div class="x_content form">
-                    <div class="form-horizontal">
-                        <div class="form-body">
-                            <div class="main-header col-12 px-0">
-                                <div class="row align-items-end">
-                                    <div class="col-md-8 col-ms-12 col-12">
-                                        <div class="form-group mb-0">
-                                            <admin-label asp-for="TrackingNumber" class="control-label"/>
-                                            <admin-input asp-for="TrackingNumber"/>
-                                        </div>
-                                    </div>
-                                    <div class="col-md-4 col-sm-12 col-12">
-                                        <div class="form-actions">
-                                            <div class="btn-group">
-                                                <button class="btn btn-success filter-submit" id="search-shipments">
-                                                    <i class="fa fa-search"></i> @Loc["Admin.Common.Search"]
-                                                </button>
-                                                <button class="btn btn-info" type="button" data-toggle="collapse" data-target="#filterCollapse" aria-expanded="false" aria-controls="filterCollapse">
-                                                    <i class="fa fa-filter"></i>&nbsp; @Loc["Admin.Common.Filters"]
-                                                </button>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="collapse" id="filterCollapse">
-                                <div class="drop-filters-container w-100">
-                                    <div class="form-group">
-                                        <admin-label asp-for="StartDate" class="col-sm-3 control-label"/>
-                                        <div class="col-md-9 col-sm-9">
-                                            <admin-input asp-for="StartDate"/>
-                                        </div>
-                                    </div>
-                                    <div class="form-group">
-                                        <admin-label asp-for="EndDate" class="col-sm-3 control-label"/>
-                                        <div class="col-md-9 col-sm-9">
-                                            <admin-input asp-for="EndDate"/>
-                                        </div>
-                                    </div>
-                                    <div class="form-group">
-                                        <admin-label asp-for="LoadNotShipped" class="col-sm-3 control-label"/>
-                                        <div class="col-md-9 col-sm-9">
-                                            <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
-                                                <admin-input asp-for="LoadNotShipped"/>
-                                                <div class="control__indicator"></div>
-                                            </label>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="x_content">
-                            <div id="shipments-grid"></div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <script>
-        $(document).ready(function () {
-            $("#shipments-grid").kendoGrid({
-                dataSource: {
-                    transport: {
-                        read: {
-                            url: "@Html.Raw(Url.Action("ShipmentListSelect", "Shipment", new { area = Constants.AreaAdmin }))",
-                            type: "POST",
-                            dataType: "json",
-                            data: additionalData
-                        }
-                    },
-                    schema: {
-                        data: "Data",
-                        total: "Total",
-                        errors: "Errors"
-                    },
-                    error: function(e) {
-                        display_kendoui_grid_error(e);
-                        // Cancel the changes
-                        this.cancelChanges();
-                    },
-                    pageSize: @(adminAreaSettings.DefaultGridPageSize),
-                    serverPaging: true,
-                    serverFiltering: true,
-                    serverSorting: true
-                },
-                pageable: {
-                    refresh: true,
-                    pageSizes: [@(adminAreaSettings.GridPageSizes)]
-                },
-                //details grid
-                detailInit: detailInit,
-                scrollable: false,
-                dataBound: onDataBound,
-                columns: [{
-                    field: "Id",
-                    headerTemplate: "<label class='mt-checkbox mt-checkbox-outline control control-checkbox'><input id='mastercheckbox' type='checkbox'/> <div class='control__indicator'></div></label>",
-                    template: "<label class='mt-checkbox mt-checkbox-outline control control-checkbox'><input type='checkbox' value='#=Id#' class='checkboxGroups'/> <div class='control__indicator'></div></label>",
-                    width: 40
-                }, {
-                    field: "ShipmentNumber",
-                    title: "@Loc["Admin.Orders.Shipments.ID"]",
-                    width: 100,
-                    template: '<a class="k-link" href="@Url.Action("ShipmentDetails", "Shipment", new { area = Constants.AreaAdmin })/#=Id#">#=ShipmentNumber#</a>'
-                }, {
-                    field: "OrderNumber",
-                    title: "@Loc["Admin.Orders.Shipments.OrderID"]",
-                    width: 100,
-                    template: '<a class="k-link" href="@Url.Action("Edit", "Order", new { area = Constants.AreaAdmin })/#=OrderId#">#=OrderNumber#</a>'
-                }, {
-                    field: "TrackingNumber",
-                    title: "@Loc["Admin.Orders.Shipments.TrackingNumber"]",
-                    width: 100,
-                    template: '<a class="k-link" href="@Url.Action("ShipmentDetails", "Shipment", new { area = Constants.AreaAdmin })/#=Id#">#=kendo.htmlEncode(TrackingNumber)#</a>'
-                }, {
-                    field: "TotalWeight",
-                    title: "@Loc["Admin.Orders.Shipments.TotalWeight"]",
-                    width: 80,
-                    minScreenWidth: 770,
-                }, {
-                    field: "ShippedDate",
-                    title: "@Loc["Admin.Orders.Shipments.ShippedDate"]",
-                    width: 180,
-                    type: "date",
-                    format: "{0:G}"
-                }, {
-                    field: "DeliveryDate",
-                    title: "@Loc["Admin.Orders.Shipments.DeliveryDate"]",
-                    width: 180,
-                    type: "date",
-                    format: "{0:G}"
-                }]
-            });
-        });
-
-        function detailInit(e) {
-            $("<div/>").appendTo(e.detailCell).kendoGrid({
-                dataSource: {
-                    transport: {
-                        read: {
-                            url: "@Html.Raw(Url.Action("ShipmentsItemsByShipmentId", "Shipment", new { area = Constants.AreaAdmin }))?shipmentId="+e.data.Id,
-                            type: "POST",
-                            dataType: "json",
-                            data: addAntiForgeryToken
-                        }
-                    },
-                    schema: {
-                        data: "Data",
-                        total: "Total",
-                        errors: "Errors"
-                    },
-                    error: function(e) {
-                        display_kendoui_grid_error(e);
-                        this.cancelChanges();
-                    },
-                    serverPaging: true,
-                    serverFiltering: true,
-                    serverSorting: true
-                },
-                scrollable: false,
-                sortable: true,
-                pageable: {
-                    refresh: true,
-                    numeric: false,
-                    previousNext: false,
-                    info: false
-                },
-                columns: [
-                    {
-                        field: "ProductName",
-                        title: "@Loc["Admin.Orders.Shipments.Products.ProductName"]",
-                        width: 400
-                    },{
-                        field: "ShippedFromWarehouse",
-                        title: "@Loc["Admin.Orders.Shipments.Products.Warehouse"]",
-                        width: 150
-                    },{
-                        field: "QuantityInThisShipment",
-                        title: "@Loc["Admin.Orders.Shipments.Products.QtyShipped"]",
-                        width: 150
-                    },{
-                        field: "ItemWeight",
-                        title: "@Loc["Admin.Orders.Shipments.Products.ItemWeight"]",
-                        width: 150
-                    },{
-                        field: "ItemDimensions",
-                        title: "@Loc["Admin.Orders.Shipments.Products.ItemDimensions"]",
-                        width: 150
-                    }
-                ]
-            });
-        }
-    </script>
-
-
-    <script>
-
-        var selectedIds = [];
-
-        $(document).ready(function () {
-
-            $("#@Html.IdFor(model => model.CountryId)").change(function () {
-                var selectedItem = $(this).val();
-                var ddlStates = $("#@Html.IdFor(model => model.StateProvinceId)");
-                $.ajax({
-                    cache: false,
-                    type: "GET",
-                    url: "@(Url.Action("GetStatesByCountryId", "Home", new { area = Constants.AreaAdmin }))",
-                    data: { "countryId": selectedItem, "addAsterisk": "true" },
-                    success: function (data) {
-                        ddlStates.html('');
-                        $.each(data, function (id, option) {
-                            ddlStates.append($('<option></option>').val(option.id).html(option.name));
-                        });
-                    },
-                    error: function (xhr, ajaxOptions, thrownError) {
-                        alert('Failed to retrieve states.');
-                    }
-                });
-            });
-
-            $("#@Html.IdFor(model => model.TrackingNumber)").keydown(function (event) {
-                if (event.keyCode == 13) {
-                    $("#search-shipments").click();
-                    return false;
-                }
-            });
-            $("#@Html.IdFor(model => model.City)").keydown(function (event) {
-                if (event.keyCode == 13) {
-                    $("#search-shipments").click();
-                    return false;
-                }
-            });
-
-            $('#search-shipments').click(function () {
-                var grid = $('#shipments-grid').data('kendoGrid');
-                grid.dataSource.page(1);
-                $('.checkboxGroups').prop('checked', false).change();
-                selectedIds = [];
-                return false;
-            });
-
-            $('#ship-selected').click(function(e) {
-                e.preventDefault();
-
-                var postData = {
-                    selectedIds: selectedIds
-                };
-                addAntiForgeryToken(postData);
-
-                $.ajax({
-                    cache: false,
-                    type: "POST",
-                    url: "@(Url.Action("SetAsShippedSelected", "Shipment", new { area = Constants.AreaAdmin }))",
-                    data: postData,
-                    complete: function(data) {
-                        var grid = $('#shipments-grid').data('kendoGrid');
-                        grid.dataSource.read();
-                    },
-                    error: function(xhr, ajaxOptions, thrownError) {
-                        alert(thrownError);
-                    },
-                    traditional: true
-                });
-                return false;
-            });
-
-            $('#deliver-selected').click(function(e) {
-                e.preventDefault();
-
-                var postData = {
-                    selectedIds: selectedIds
-                };
-                addAntiForgeryToken(postData);
-
-                $.ajax({
-                    cache: false,
-                    type: "POST",
-                    url: "@(Url.Action("SetAsDeliveredSelected", "Shipment", new { area = Constants.AreaAdmin }))",
-                    data: postData,
-                    complete: function(data) {
-                        var grid = $('#shipments-grid').data('kendoGrid');
-                        grid.dataSource.read();
-                    },
-                    error: function(xhr, ajaxOptions, thrownError) {
-                        alert(thrownError);
-                    },
-                    traditional: true
-                });
-                return false;
-            });
-
-
-            $('#mastercheckbox').click(function () {
-                $('.checkboxGroups').prop('checked', $(this).is(':checked')).change();
-            });
-
-            $('#shipments-grid').on('change', 'input[type=checkbox][id!=mastercheckbox]', function (e) {
-                var $check = $(this);
-                if ($check.is(":checked") == true) {
-                    var checked = jQuery.inArray($check.val(), selectedIds);
-                    if (checked == -1) {
-                        selectedIds.push($check.val());
-                    }
-                }
-                else {
-                    var checked = jQuery.inArray($check.val(), selectedIds);
-                    if (checked > -1) {
-                        selectedIds = $.grep(selectedIds, function (item, index) {
-                            return item != $check.val();
-                        });
-                    }
-                }
-                updateMasterCheckbox();
-            });
-        });
-
-        function additionalData() {
-            var data = {
-                StartDate: $('#@Html.IdFor(model => model.StartDate)').val(),
-                EndDate: $('#@Html.IdFor(model => model.EndDate)').val(),
-                TrackingNumber: $('#@Html.IdFor(model => model.TrackingNumber)').val(),
-                CountryId: $('#@Html.IdFor(model => model.CountryId)').val(),
-                StateProvinceId: $('#@Html.IdFor(model => model.StateProvinceId)').val(),
-                City: $('#@Html.IdFor(model => model.City)').val(),
-                WarehouseId: $('#@Html.IdFor(model => model.WarehouseId)').val(),
-                LoadNotShipped: $('#@Html.IdFor(model => model.LoadNotShipped)').is(':checked')
-            };
-            addAntiForgeryToken(data);
-            return data;
-        }
-
-        function onDataBound(e) {
-            $('#shipments-grid input[type=checkbox][id!=mastercheckbox]').each(function () {
-                var currentId = $(this).val();
-                var checked = jQuery.inArray(currentId, selectedIds);
-                $(this).prop('checked', checked > -1);
-            });
-
-            updateMasterCheckbox();
-        }
-
-        function updateMasterCheckbox() {
-            var numChkBoxes = $('#shipments-grid input[type=checkbox][id!=mastercheckbox]').length;
-            var numChkBoxesChecked = $('#shipments-grid input[type=checkbox][id!=mastercheckbox]:checked').length;
-            $('#mastercheckbox').prop('checked', numChkBoxes == numChkBoxesChecked && numChkBoxes > 0);
-        }
-    </script>
-
-</form>
-<form asp-area="@Constants.AreaAdmin" asp-controller="Shipment" asp-action="PdfPackagingSlipSelected" method="post" id="pdf-packaging-slip-selected-form">
-
-    <input type="hidden" id="selectedIds" name="selectedIds" value=""/>
-</form>
-
-<script>
-
-    $(document).ready(function () {
-        $('#exportpackagingslips-selected').click(function (e) {
-            e.preventDefault();
-            var ids = selectedIds.join(",");
-            $('#pdf-packaging-slip-selected-form #selectedIds').val(ids);
-            $('#pdf-packaging-slip-selected-form').submit();
-            return false;
-        });
-    });
-
-</script>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/Partials/Documents.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/Partials/Documents.cshtml
deleted file mode 100644
index e59b6db41..000000000
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/Partials/Documents.cshtml
+++ /dev/null
@@ -1,73 +0,0 @@
-@model ShipmentModel
-@inject AdminAreaSettings adminAreaSettings
-<div class="panel panel-default">
-    <vc:admin-widget widget-zone="order_shipment_details_documents_top" additional-data="Model"/>
-    <div class="panel-body">
-        <div id="shipment-documents-grid"></div>
-    </div>
-    <div class="panel-footer">
-        <button type="button" class="k-button" onclick="location.href='@Url.Action("CreateDocument", "Document", new { ObjectId = Model.Id, Reference = (int)Reference.Shipment, area = Constants.AreaAdmin })'"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Marketing.Document.Add"]</button>
-    </div>
-    <vc:admin-widget widget-zone="order_shipment_details_documents_bottom" additional-data="Model"/>
-</div>
-
-<script>
-$(document).ready(function () {
-    $("#shipment-documents-grid").kendoGrid({
-        dataSource: {
-            transport: {
-                read: {
-                    url: "@Html.Raw(Url.Action("ListDocuments", "Document", new { reference = (int)Reference.Shipment, ObjectId = Model.Id, StatusId = -1, area = Constants.AreaAdmin }))",
-                    type: "POST",
-                    dataType: "json",
-                    data: addAntiForgeryToken
-                },
-            },
-            schema: {
-                data: "Data",
-                total: "Total",
-                errors: "Errors",
-                model: {
-                    id: "Id"
-                }
-            },
-            error: function(e) {
-                display_kendoui_grid_error(e);
-                // Cancel the changes
-                this.cancelChanges();
-            },
-            pageSize: @(adminAreaSettings.DefaultGridPageSize),
-            serverPaging: true,
-            serverFiltering: true,
-            serverSorting: true
-        },
-        pageable: {
-            refresh: true,
-            pageSizes: [@(adminAreaSettings.GridPageSizes)]
-        },
-        editable: {
-            confirmation: true,
-            mode: "inline"
-        },
-        scrollable: false,
-        columns: [{
-                field: "Number",
-                title: "@Loc["Admin.Documents.Document.Fields.Number"]",
-                template: '<a class="k-link" href="@Url.Action("EditDocument", "Document", new { area = Constants.AreaAdmin })/#=Id#">#=kendo.htmlEncode(Number)#</a>',
-            },
-            {
-                field: "Name",
-                title: "@Loc["Admin.Documents.Document.Fields.Name"]",
-                template: '<a class="k-link" href="@Url.Action("EditDocument", "Document", new { area = Constants.AreaAdmin })/#=Id#">#=kendo.htmlEncode(Name)#</a>',
-            }, {
-                field: "Published",
-                title: "@Loc["Admin.Documents.Document.Fields.Published"]",
-                width: 100,
-                minScreenWidth: 500,
-                headerAttributes: { style: "text-align:center" },
-                attributes: { style: "text-align:center" },
-                template: '# if(Published) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'
-        }]
-    });
-});
-</script>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/Partials/WidgetZone.AddButtons.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/Partials/WidgetZone.AddButtons.cshtml
new file mode 100644
index 000000000..e8bec5d70
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/Partials/WidgetZone.AddButtons.cshtml
@@ -0,0 +1 @@
+<vc:admin-widget widget-zone="order_shipment_add_buttons" additional-data="null"/>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/Partials/WidgetZone.DetailsButtons.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/Partials/WidgetZone.DetailsButtons.cshtml
new file mode 100644
index 000000000..25b76f962
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/Partials/WidgetZone.DetailsButtons.cshtml
@@ -0,0 +1,2 @@
+@model ShipmentModel
+<vc:admin-widget widget-zone="order_shipment_details_buttons" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/Partials/WidgetZone.DetailsTabs.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/Partials/WidgetZone.DetailsTabs.cshtml
new file mode 100644
index 000000000..67b270354
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/Partials/WidgetZone.DetailsTabs.cshtml
@@ -0,0 +1,2 @@
+@model ShipmentModel
+<vc:admin-widget widget-zone="order_shipment_details_tabs" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/Partials/WidgetZone.Documents.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/Partials/WidgetZone.Documents.Bottom.cshtml
new file mode 100644
index 000000000..718eb3b6b
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/Partials/WidgetZone.Documents.Bottom.cshtml
@@ -0,0 +1,2 @@
+@model ShipmentModel
+<vc:admin-widget widget-zone="order_shipment_details_documents_bottom" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/Partials/WidgetZone.Documents.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/Partials/WidgetZone.Documents.Top.cshtml
new file mode 100644
index 000000000..117b570d7
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/Partials/WidgetZone.Documents.Top.cshtml
@@ -0,0 +1,2 @@
+@model ShipmentModel
+<vc:admin-widget widget-zone="order_shipment_details_documents_top" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/Partials/WidgetZone.ListButtons.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/Partials/WidgetZone.ListButtons.cshtml
new file mode 100644
index 000000000..5762141a4
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/Partials/WidgetZone.ListButtons.cshtml
@@ -0,0 +1 @@
+<vc:admin-widget widget-zone="order_shipment_list_buttons" additional-data="null"/>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/Partials/WidgetZone.Notes.Bottom.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/Partials/WidgetZone.Notes.Bottom.cshtml
new file mode 100644
index 000000000..03ba04ce8
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/Partials/WidgetZone.Notes.Bottom.cshtml
@@ -0,0 +1,2 @@
+@model ShipmentModel
+<vc:admin-widget widget-zone="order_shipment_details_notes_bottom" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/Partials/WidgetZone.Notes.Top.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/Partials/WidgetZone.Notes.Top.cshtml
new file mode 100644
index 000000000..7ad875e51
--- /dev/null
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/Partials/WidgetZone.Notes.Top.cshtml
@@ -0,0 +1,2 @@
+@model ShipmentModel
+<vc:admin-widget widget-zone="order_shipment_details_notes_top" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/ShipmentDetails.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/ShipmentDetails.cshtml
deleted file mode 100644
index 3a439f29e..000000000
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/ShipmentDetails.cshtml
+++ /dev/null
@@ -1,125 +0,0 @@
-@using Grand.Business.Core.Interfaces.Common.Security
-@using Grand.Domain.Permissions
-@model ShipmentModel
-@inject IPermissionService permissionService
-@{
-    //page title
-    ViewBag.Title = Loc["Admin.Orders.Shipments.ViewDetails"];
-    var canManageDocuments = await permissionService.Authorize(StandardPermission.ManageDocuments);
-}
-<form asp-area="@Constants.AreaAdmin" asp-controller="Shipment" asp-action="ShipmentDetails" method="post">
-    <input type="hidden" asp-for="Id"/>
-    <script>
-        $(document).ready(function () {
-            toggleShippedDate(false);
-            toggleDeliveryDate(false);
-        });
-
-        function toggleShippedDate(editmode) {
-            if (editmode) {
-                $('#lblShippedDate').hide();
-                $('#divShippedDate').show();
-                $('#btnEditShippedDate').hide();
-                $('#btnSaveShippedDate').show();
-                $('#btnCancelShippedDate').show();
-            }
-            else {
-                $('#lblShippedDate').show();
-                $('#divShippedDate').hide();
-                $('#btnEditShippedDate').show();
-                $('#btnSaveShippedDate').hide();
-                $('#btnCancelShippedDate').hide();
-            }
-        }
-
-        function toggleDeliveryDate(editmode) {
-            if (editmode) {
-                $('#lblDeliveryDate').hide();
-                $('#divDeliveryDate').show();
-                $('#btnEditDeliveryDate').hide();
-                $('#btnSaveDeliveryDate').show();
-                $('#btnCancelDeliveryDate').show();
-            }
-            else {
-                $('#lblDeliveryDate').show();
-                $('#divDeliveryDate').hide();
-                $('#btnEditDeliveryDate').show();
-                $('#btnSaveDeliveryDate').hide();
-                $('#btnCancelDeliveryDate').hide();
-            }
-        }
-    </script>
-    <div asp-validation-summary="All"></div>
-    <div class="row">
-        <div class="col-md-12">
-            <div class="x_panel light form-fit">
-                <div class="x_title">
-                    <div class="caption">
-                        <i class="fa fa-truck"></i>
-                        @Loc["Admin.Orders.Shipments.ViewDetails"] - @Model.ShipmentNumber
-                        <small>
-                            <i class="fa fa-arrow-circle-left"></i>
-                            @Html.ActionLink(Loc["Admin.Orders.Shipments.BackToList"], "List")
-                        </small>
-                    </div>
-                    <div class="actions">
-                        <div class="btn-group btn-group-devided">
-                            <a href="@Url.Action("PdfPackagingSlip", new { shipmentId = Model.Id, area = Constants.AreaAdmin })" class="btn purple">
-                                <i class="fa fa-file-pdf-o"></i> @Loc["Admin.Orders.Shipments.PrintPackagingSlip"]
-                            </a>
-                            <span id="shipment-delete" class="btn red">
-                                <i class="fa fa-trash-o"></i> @Loc["Admin.Common.Delete"]
-                            </span>
-                            <vc:admin-widget widget-zone="order_shipment_details_buttons" additional-data="Model"/>
-                        </div>
-                    </div>
-                </div>
-                <div class="x_content form">
-                    <admin-tabstrip name="shipment-edit" SetTabPos="true">
-                        <items>
-                            <tabstrip-item text="@Loc["Admin.Orders.Shipments.ViewDetails.Info"]" tab-index="0">
-                                <content>
-                                    <div>
-                                        <partial name="Partials/Info" model="Model"/>
-                                    </div>
-                                </content>
-                            </tabstrip-item>
-                            @if (canManageDocuments)
-                            {
-                                <tabstrip-item text="@Loc["Admin.Orders.Shipments.Documents"]" tab-index="1">
-                                    <content>
-                                        <div>
-                                            <partial name="Partials/Documents" model="Model"/>
-                                        </div>
-                                    </content>
-                                </tabstrip-item>
-                            }
-                            <tabstrip-item text="@Loc["Admin.Orders.Shipments.ShipmentNotes"]" tab-index="2">
-                                <content>
-                                    <div>
-                                        <partial name="Partials/ShipmentNotes" model="Model"/>
-                                    </div>
-                                </content>
-                            </tabstrip-item>
-                            <tabstrip-item text="@Loc["Admin.Common.UserFields.Tab"]" tab-index="3">
-                                <content>
-                                    <div>
-                                        <div class="form-actions">
-                                            <input type="submit" asp-action="EditUserFields" value="@Loc["Admin.Common.Save"]" id="btnSaveUserFields" name="save-generic-attributes" class="k-button"/>
-                                        </div>
-                                        <div class="form-horizontal">
-                                            <partial name="Partials/UserFields" model="Model"/>
-                                        </div>
-                                    </div>
-                                </content>
-                            </tabstrip-item>
-                            <vc:admin-widget widget-zone="order_shipment_details_tabs" additional-data="Model"/>
-                        </items>
-                    </admin-tabstrip>
-                </div>
-            </div>
-
-        </div>
-    </div>
-</form>
-<admin-delete-confirmation button-id="shipment-delete" action-name="DeleteShipment"/>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Controllers/ShipmentController.cs b/src/Web/Grand.Web.Admin/Controllers/ShipmentController.cs
index cd8348952..483fc6fd3 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ShipmentController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ShipmentController.cs
@@ -1,572 +1,40 @@
-using Grand.Business.Core.Commands.Checkout.Shipping;
 using Grand.Business.Core.Interfaces.Checkout.Orders;
 using Grand.Business.Core.Interfaces.Checkout.Shipping;
 using Grand.Business.Core.Interfaces.Common.Directory;
 using Grand.Business.Core.Interfaces.Common.Localization;
 using Grand.Business.Core.Interfaces.Common.Pdf;
 using Grand.Domain.Orders;
-using Grand.Domain.Permissions;
 using Grand.Domain.Shipping;
 using Grand.Infrastructure;
+using Grand.Mediator;
+using Grand.Web.Admin.Extensions;
+using Grand.Web.AdminShared.Controllers;
 using Grand.Web.AdminShared.Interfaces;
-using Grand.Web.AdminShared.Models.Orders;
-using Grand.Web.Common.DataSource;
-using Grand.Web.Common.Extensions;
 using Grand.Web.Common.Filters;
 using Grand.Web.Common.Security.Authorization;
-using Grand.Mediator;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Grand.Web.Admin.Controllers;
 
-[PermissionAuthorize(PermissionSystemName.Shipments)]
-public class ShipmentController : BaseAdminController
-{
-    public ShipmentController(
-        IShipmentViewModelService shipmentViewModelService,
-        IOrderService orderService,
-        ITranslationService translationService,
-        IContextAccessor contextAccessor,
-        IPdfService pdfService,
-        IShipmentService shipmentService,
-        IDateTimeService dateTimeService,
-        IMediator mediator)
-    {
-        _shipmentViewModelService = shipmentViewModelService;
-        _orderService = orderService;
-        _translationService = translationService;
-        _contextAccessor = contextAccessor;
-        _pdfService = pdfService;
-        _shipmentService = shipmentService;
-        _dateTimeService = dateTimeService;
-        _mediator = mediator;
-    }
-
-    #region Fields
-
-    private readonly IShipmentViewModelService _shipmentViewModelService;
-    private readonly IOrderService _orderService;
-    private readonly ITranslationService _translationService;
-    private readonly IContextAccessor _contextAccessor;
-    private readonly IPdfService _pdfService;
-    private readonly IShipmentService _shipmentService;
-    private readonly IDateTimeService _dateTimeService;
-    private readonly IMediator _mediator;
-
-    #endregion
-
-    #region Shipments
-
-    public async Task<IActionResult> List()
-    {
-        var model = await _shipmentViewModelService.PrepareShipmentListModel();
-        return View(model);
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.List)]
-    [HttpPost]
-    public async Task<IActionResult> ShipmentListSelect(DataSourceRequest command, ShipmentListModel model)
-    {
-        var shipments = await _shipmentViewModelService.PrepareShipments(model, command.Page, command.PageSize);
-        var items = new List<ShipmentModel>();
-        foreach (var item in shipments.shipments)
-            items.Add(await _shipmentViewModelService.PrepareShipmentModel(item, false));
-
-        var gridModel = new DataSourceResult {
-            Data = items,
-            Total = shipments.totalCount
-        };
-        return Json(gridModel);
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.List)]
-    [HttpPost]
-    public async Task<IActionResult> ShipmentsByOrder(string orderId, DataSourceRequest command)
-    {
-        var order = await _orderService.GetOrderById(orderId) ?? throw new ArgumentException("No order found with the specified id");
-
-        //shipments
-        var shipmentModels = new List<ShipmentModel>();
-        var shipments = (await _shipmentService.GetShipmentsByOrder(orderId))
-            .OrderBy(s => s.CreatedOnUtc)
-            .ToList();
-        foreach (var shipment in shipments)
-            shipmentModels.Add(await _shipmentViewModelService.PrepareShipmentModel(shipment, false));
-
-        var gridModel = new DataSourceResult {
-            Data = shipmentModels,
-            Total = shipmentModels.Count
-        };
-        return Json(gridModel);
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.List)]
-    [HttpPost]
-    public async Task<IActionResult> ShipmentsItemsByShipmentId(string shipmentId, DataSourceRequest command)
-    {
-        var shipment = await _shipmentService.GetShipmentById(shipmentId) ?? throw new ArgumentException("No shipment found with the specified id");
-        var order = await _orderService.GetOrderById(shipment.OrderId) ?? throw new ArgumentException("No order found with the specified id");
-
-        //shipments
-        var shipmentModel = await _shipmentViewModelService.PrepareShipmentModel(shipment, true);
-        var gridModel = new DataSourceResult {
-            Data = shipmentModel.Items,
-            Total = shipmentModel.Items.Count
-        };
-
-        return Json(gridModel);
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Create)]
-    public async Task<IActionResult> AddShipment(string orderId)
-    {
-        var order = await _orderService.GetOrderById(orderId);
-        if (order == null)
-            //No order found with the specified id
-            return RedirectToAction("List");
-
-        var model = await _shipmentViewModelService.PrepareShipmentModel(order);
-
-        return View(model);
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Edit)]
-    [HttpPost]
-    [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]
-    public async Task<IActionResult> AddShipment(AddShipmentModel model, bool continueEditing)
-    {
-        var order = await _orderService.GetOrderById(model.OrderId);
-        if (order == null)
-            //No order found with the specified id
-            return RedirectToAction("List");
-
-        var orderItems = order.OrderItems;
-
-        var sh = await _shipmentViewModelService.PrepareShipment(order, orderItems.ToList(), model);
-        if (sh.shipment == null)
-            return RedirectToAction("AddShipment", new { orderId = model.OrderId });
-
-        var shipment = sh.shipment;
-        //check stock
-        var (valid, message) = await _shipmentViewModelService.ValidStockShipment(shipment);
-        if (!valid)
-        {
-            Error(message);
-            return RedirectToAction("AddShipment", new { orderId = model.OrderId });
-        }
-
-        //if we have at least one item in the shipment, then save it
-        if (shipment.ShipmentItems.Count > 0)
-        {
-            shipment.TotalWeight = sh.totalWeight;
-            await _shipmentService.InsertShipment(shipment);
-
-            //add a note
-            await _orderService.InsertOrderNote(new OrderNote {
-                Note = $"A shipment #{shipment.ShipmentNumber} has been added",
-                DisplayToCustomer = false,
-                OrderId = order.Id
-            });
-
-            Success(_translationService.GetResource("Admin.Orders.Shipments.Added"));
-            return continueEditing
-                ? RedirectToAction("ShipmentDetails", new { id = shipment.Id })
-                : RedirectToAction("List", new { id = shipment.Id });
-        }
-
-        Error(_translationService.GetResource("Admin.Orders.Shipments.NoProductsSelected"));
-        return RedirectToAction("AddShipment", new { orderId = model.OrderId });
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Preview)]
-    public async Task<IActionResult> ShipmentDetails(string id)
-    {
-        var shipment = await _shipmentService.GetShipmentById(id);
-        if (shipment == null)
-            //No shipment found with the specified id
-            return RedirectToAction("List");
-
-        var orderId = shipment.OrderId;
-        var order = await _orderService.GetOrderById(orderId);
-        if (order == null)
-            //No order found with the specified id
-            return RedirectToAction("List");
-
-        var model = await _shipmentViewModelService.PrepareShipmentModel(shipment, true, true);
-        return View(model);
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Delete)]
-    [HttpPost]
-    public async Task<IActionResult> DeleteShipment(string id)
-    {
-        var shipment = await _shipmentService.GetShipmentById(id);
-        if (shipment == null)
-            //No shipment found with the specified id
-            return RedirectToAction("List");
-
-        var orderId = shipment.OrderId;
-        var order = await _orderService.GetOrderById(orderId);
-        if (order == null)
-            //No order found with the specified id
-            return RedirectToAction("List");
-
-        //delete shipment
-        await _shipmentService.DeleteShipment(shipment);
-
-        //add a note
-        await _orderService.InsertOrderNote(new OrderNote {
-            Note = $"A shipment #{shipment.ShipmentNumber} has been deleted",
-            DisplayToCustomer = false,
-            OrderId = order.Id
-        });
-
-        Success(_translationService.GetResource("Admin.Orders.Shipments.Deleted"));
-
-        return RedirectToAction("Edit", "Order", new { order.Id });
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Edit)]
-    [HttpPost]
-    public async Task<IActionResult> SetTrackingNumber(ShipmentModel model)
-    {
-        var shipment = await _shipmentService.GetShipmentById(model.Id);
-        if (shipment == null)
-            //No shipment found with the specified id
-            return RedirectToAction("List");
-
-        var order = await _orderService.GetOrderById(shipment.OrderId);
-        if (order == null)
-            //No order found with the specified id
-            return RedirectToAction("List");
-
-        shipment.TrackingNumber = model.TrackingNumber;
-        await _shipmentService.UpdateShipment(shipment);
-
-        return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Edit)]
-    [HttpPost]
-    public async Task<IActionResult> SetShipmentAdminComment(ShipmentModel model)
-    {
-        var shipment = await _shipmentService.GetShipmentById(model.Id);
-        if (shipment == null)
-            //No shipment found with the specified id
-            return RedirectToAction("List");
-
-        var order = await _orderService.GetOrderById(shipment.OrderId);
-        if (order == null)
-            //No order found with the specified id
-            return RedirectToAction("List");
-
-        shipment.AdminComment = model.AdminComment;
-        await _shipmentService.UpdateShipment(shipment);
-
-        return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Edit)]
-    [HttpPost]
-    public async Task<IActionResult> SetAsShipped(string id)
-    {
-        var shipment = await _shipmentService.GetShipmentById(id);
-        if (shipment == null)
-            //No shipment found with the specified id
-            return RedirectToAction("List");
-
-        var order = await _orderService.GetOrderById(shipment.OrderId);
-        if (order == null)
-            //No order found with the specified id
-            return RedirectToAction("List");
-        try
-        {
-            await _mediator.Send(new ShipCommand { Shipment = shipment, NotifyCustomer = true });
-            return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
-        }
-        catch (Exception exc)
-        {
-            //error
-            Error(exc);
-            return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
-        }
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Edit)]
-    [HttpPost]
-    public async Task<IActionResult> EditShippedDate(ShipmentModel model)
-    {
-        var shipment = await _shipmentService.GetShipmentById(model.Id);
-        if (shipment == null)
-            //No shipment found with the specified id
-            return RedirectToAction("List");
-
-        var order = await _orderService.GetOrderById(shipment.OrderId);
-        if (order == null)
-            //No order found with the specified id
-            return RedirectToAction("List");
-        try
-        {
-            if (!model.ShippedDate.HasValue) throw new Exception("Enter shipped date");
-
-            shipment.ShippedDateUtc = model.ShippedDate.ConvertToUtcTime(_dateTimeService);
-            await _shipmentService.UpdateShipment(shipment);
-            return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
-        }
-        catch (Exception exc)
-        {
-            //error
-            Error(exc);
-            return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
-        }
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Edit)]
-    [HttpPost]
-    public async Task<IActionResult> SetAsDelivered(string id)
-    {
-        var shipment = await _shipmentService.GetShipmentById(id);
-        if (shipment == null)
-            //No shipment found with the specified id
-            return RedirectToAction("List");
-
-        var order = await _orderService.GetOrderById(shipment.OrderId);
-        if (order == null)
-            //No order found with the specified id
-            return RedirectToAction("List");
-
-        try
-        {
-            await _mediator.Send(new DeliveryCommand { Shipment = shipment, NotifyCustomer = true });
-            return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
-        }
-        catch (Exception exc)
-        {
-            //error
-            Error(exc);
-            return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
-        }
-    }
-
-
-    [PermissionAuthorizeAction(PermissionActionName.Edit)]
-    [HttpPost]
-    public async Task<IActionResult> EditDeliveryDate(ShipmentModel model)
-    {
-        var shipment = await _shipmentService.GetShipmentById(model.Id);
-        if (shipment == null)
-            //No shipment found with the specified id
-            return RedirectToAction("List");
-
-        var order = await _orderService.GetOrderById(shipment.OrderId);
-        if (order == null)
-            //No order found with the specified id
-            return RedirectToAction("List");
-
-        try
-        {
-            if (!model.DeliveryDate.HasValue) throw new Exception("Enter delivery date");
-
-            shipment.DeliveryDateUtc = model.DeliveryDate.ConvertToUtcTime(_dateTimeService);
-            await _shipmentService.UpdateShipment(shipment);
-            return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
-        }
-        catch (Exception exc)
-        {
-            //error
-            Error(exc);
-            return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
-        }
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Edit)]
-    [HttpPost]
-    public async Task<IActionResult> EditUserFields(string id, ShipmentModel model)
-    {
-        var shipment = await _shipmentService.GetShipmentById(id);
-        if (shipment == null)
-            //No order found with the specified id
-            return RedirectToAction("List");
-
-        shipment.UserFields = model.UserFields;
-        await _shipmentService.UpdateShipment(shipment);
-
-        //selected tab
-        await SaveSelectedTabIndex();
-
-        return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Preview)]
-    public async Task<IActionResult> PdfPackagingSlip(string shipmentId)
-    {
-        var shipment = await _shipmentService.GetShipmentById(shipmentId);
-        if (shipment == null)
-            //no shipment found with the specified id
-            return RedirectToAction("List");
-
-        var order = await _orderService.GetOrderById(shipment.OrderId);
-        if (order == null)
-            //No order found with the specified id
-            return RedirectToAction("List");
-
-        var shipments = new List<Shipment> {
-            shipment
-        };
-
-        byte[] bytes;
-        using (var stream = new MemoryStream())
-        {
-            await _pdfService.PrintPackagingSlipsToPdf(stream, shipments, _contextAccessor.WorkContext.WorkingLanguage.Id);
-            bytes = stream.ToArray();
-        }
-
-        return File(bytes, "application/pdf", $"packagingslip_{shipment.Id}.pdf");
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Export)]
-    [HttpPost]
-    public async Task<IActionResult> PdfPackagingSlipAll(ShipmentListModel model)
-    {
-        //load shipments
-        var shipments = await _shipmentViewModelService.PrepareShipments(model, 1, 100);
-
-        //ensure that we at least one shipment selected
-        if (shipments.totalCount == 0)
-        {
-            Error(_translationService.GetResource("Admin.Orders.Shipments.NoShipmentsSelected"));
-            return RedirectToAction("List");
-        }
-
-        byte[] bytes;
-        using (var stream = new MemoryStream())
-        {
-            await _pdfService.PrintPackagingSlipsToPdf(stream, shipments.shipments.ToList(),
-                _contextAccessor.WorkContext.WorkingLanguage.Id);
-            bytes = stream.ToArray();
-        }
-
-        return File(bytes, "application/pdf", "packagingslips.pdf");
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Export)]
-    [HttpPost]
-    public async Task<IActionResult> PdfPackagingSlipSelected(string selectedIds)
-    {
-        var shipments = new List<Shipment>();
-        if (selectedIds != null)
-        {
-            var ids = selectedIds
-                .Split([','], StringSplitOptions.RemoveEmptyEntries)
-                .Select(x => x)
-                .ToArray();
-            shipments.AddRange(await _shipmentService.GetShipmentsByIds(ids));
-        }
-
-        //ensure that we at least one shipment selected
-        if (shipments.Count == 0)
-        {
-            Error(_translationService.GetResource("Admin.Orders.Shipments.NoShipmentsSelected"));
-            return RedirectToAction("List");
-        }
-
-        byte[] bytes;
-        using (var stream = new MemoryStream())
-        {
-            await _pdfService.PrintPackagingSlipsToPdf(stream, shipments, _contextAccessor.WorkContext.WorkingLanguage.Id);
-            bytes = stream.ToArray();
-        }
-
-        return File(bytes, "application/pdf", "packagingslips.pdf");
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Edit)]
-    [HttpPost]
-    public async Task<IActionResult> SetAsShippedSelected(ICollection<string> selectedIds)
-    {
-        var shipments = new List<Shipment>();
-
-        if (selectedIds != null) shipments.AddRange(await _shipmentService.GetShipmentsByIds(selectedIds.ToArray()));
-
-        foreach (var shipment in shipments)
-            try
-            {
-                await _mediator.Send(new ShipCommand { Shipment = shipment, NotifyCustomer = true });
-            }
-            catch
-            {
-                //ignore any exception
-            }
-
-        return Json(new { Result = true });
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Edit)]
-    [HttpPost]
-    public async Task<IActionResult> SetAsDeliveredSelected(ICollection<string> selectedIds)
-    {
-        var shipments = new List<Shipment>();
-        if (selectedIds != null) shipments.AddRange(await _shipmentService.GetShipmentsByIds(selectedIds.ToArray()));
-
-        foreach (var shipment in shipments)
-            try
-            {
-                await _mediator.Send(new DeliveryCommand { Shipment = shipment, NotifyCustomer = true });
-            }
-            catch
-            {
-                //ignore any exception
-            }
-
-        return Json(new { Result = true });
-    }
-
-    #region Shipment notes
-
-    [PermissionAuthorizeAction(PermissionActionName.Preview)]
-    [HttpPost]
-    public async Task<IActionResult> ShipmentNotesSelect(string shipmentId, DataSourceRequest command)
-    {
-        var shipment = await _shipmentService.GetShipmentById(shipmentId);
-        if (shipment == null)
-            throw new ArgumentException("No shipment found with the specified id");
-
-        //shipment notes
-        var shipmentNoteModels = await _shipmentViewModelService.PrepareShipmentNotes(shipment);
-        var gridModel = new DataSourceResult {
-            Data = shipmentNoteModels,
-            Total = shipmentNoteModels.Count
-        };
-        return Json(gridModel);
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Edit)]
-    public async Task<IActionResult> ShipmentNoteAdd(string shipmentId, string downloadId, bool displayToCustomer,
-        string message)
-    {
-        var shipment = await _shipmentService.GetShipmentById(shipmentId);
-        if (shipment == null)
-            return Json(new { Result = false });
-
-        await _shipmentViewModelService.InsertShipmentNote(shipment, downloadId, displayToCustomer, message);
-
-        return Json(new { Result = true });
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Delete)]
-    [HttpPost]
-    public async Task<IActionResult> ShipmentNoteDelete(string id, string shipmentId)
-    {
-        var shipment = await _shipmentService.GetShipmentById(shipmentId);
-        if (shipment == null)
-            throw new ArgumentException("No shipment found with the specified id");
-
-        await _shipmentViewModelService.DeleteShipmentNote(shipment, id);
-
-        return new JsonResult("");
-    }
-
-    #endregion
-
-    #endregion
-}
\ No newline at end of file
+// Concrete host subclass of BaseShipmentController (ARCH-001 Shipment consolidation). This class
+// supplies Admin's DI wiring plus the attributes that used to arrive transitively via
+// BaseAdminController - BaseShipmentController can't inherit any single host's base controller
+// (it's shared across Admin/Store/Vendor, each with a different [Area]/[Authorize*] pair), so each
+// subclass restates its own host's attribute set explicitly, same pattern as OrderController.
+[AuthorizeAdmin]
+[AutoValidateAntiforgeryToken]
+[Area(Constants.AreaAdmin)]
+[AuthorizeMenu]
+public class ShipmentController(
+    IShipmentViewModelService shipmentViewModelService,
+    IOrderService orderService,
+    ITranslationService translationService,
+    IContextAccessor contextAccessor,
+    IPdfService pdfService,
+    IShipmentService shipmentService,
+    IDateTimeService dateTimeService,
+    IMediator mediator,
+    IAdminDataScope<Shipment> scope,
+    IAdminDataScope<Order> orderScope)
+    : BaseShipmentController(shipmentViewModelService, orderService, translationService,
+        contextAccessor, pdfService, shipmentService, dateTimeService, mediator, scope, orderScope);
diff --git a/src/Web/Grand.Web.AdminShared/Controllers/BaseShipmentController.cs b/src/Web/Grand.Web.AdminShared/Controllers/BaseShipmentController.cs
new file mode 100644
index 000000000..5193a2f16
--- /dev/null
+++ b/src/Web/Grand.Web.AdminShared/Controllers/BaseShipmentController.cs
@@ -0,0 +1,573 @@
+using Grand.Business.Core.Commands.Checkout.Shipping;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Pdf;
+using Grand.Domain.Orders;
+using Grand.Domain.Permissions;
+using Grand.Domain.Shipping;
+using Grand.Infrastructure;
+using Grand.Mediator;
+using Grand.Web.AdminShared.Interfaces;
+using Grand.Web.AdminShared.Models.Orders;
+using Grand.Web.Common.Controllers;
+using Grand.Web.Common.DataSource;
+using Grand.Web.Common.Extensions;
+using Grand.Web.Common.Filters;
+using Grand.Web.Common.Security.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Grand.Web.AdminShared.Controllers;
+
+[PermissionAuthorize(PermissionSystemName.Shipments)]
+[AutoValidateAntiforgeryToken]
+public abstract class BaseShipmentController(
+    IShipmentViewModelService shipmentViewModelService,
+    IOrderService orderService,
+    ITranslationService translationService,
+    IContextAccessor contextAccessor,
+    IPdfService pdfService,
+    IShipmentService shipmentService,
+    IDateTimeService dateTimeService,
+    IMediator mediator,
+    IAdminDataScope<Shipment> scope,
+    IAdminDataScope<Order> orderScope)
+    : BaseController
+{
+    // Exposed for host-specific concrete subclasses (Admin's EditUserFields action needs these
+    // same fields — primary-constructor parameters aren't visible to derived classes by name in
+    // C#).
+    protected IShipmentViewModelService ShipmentViewModelService => shipmentViewModelService;
+    protected IOrderService OrderService => orderService;
+    protected ITranslationService TranslationService => translationService;
+    protected IContextAccessor ContextAccessor => contextAccessor;
+    protected IPdfService PdfService => pdfService;
+    protected IShipmentService ShipmentService => shipmentService;
+    protected IDateTimeService DateTimeService => dateTimeService;
+    protected IMediator Mediator => mediator;
+    protected IAdminDataScope<Shipment> Scope => scope;
+    protected IAdminDataScope<Order> OrderScope => orderScope;
+
+    /// <summary>DRY replacement for the repeated "load shipment, redirect to List if not found or
+    /// not authorized" pattern found in all 3 original controllers. Not a behavior change — every
+    /// call site below still individually returns RedirectToAction("List") exactly as the
+    /// originals did.</summary>
+    protected async Task<(Shipment shipment, IActionResult denied)> LoadAuthorizedShipment(string id)
+    {
+        var shipment = await shipmentService.GetShipmentById(id);
+        if (shipment == null) return (null, RedirectToAction("List"));
+        if (!await scope.HasAccess(shipment)) return (null, RedirectToAction("List"));
+        return (shipment, null);
+    }
+
+    #region Shipments
+
+    public async Task<IActionResult> List()
+    {
+        var model = await shipmentViewModelService.PrepareShipmentListModel();
+        return View(model);
+    }
+
+    [PermissionAuthorizeAction(PermissionActionName.List)]
+    [HttpPost]
+    public async Task<IActionResult> ShipmentListSelect(DataSourceRequest command, ShipmentListModel model)
+    {
+        if (scope.DefaultStoreId is not null) model.StoreId = scope.DefaultStoreId;
+        if (scope.DefaultVendorId is not null) model.VendorId = scope.DefaultVendorId;
+
+        var shipments = await shipmentViewModelService.PrepareShipments(model, command.Page, command.PageSize);
+        var items = new List<ShipmentModel>();
+        foreach (var item in shipments.shipments)
+            items.Add(await shipmentViewModelService.PrepareShipmentModel(item, false));
+
+        var gridModel = new DataSourceResult {
+            Data = items,
+            Total = shipments.totalCount
+        };
+        return Json(gridModel);
+    }
+
+    /// <summary>Filters per-shipment via scope.HasAccess rather than gating on the parent order.
+    /// Admin: GlobalAdminDataScope.HasAccess is always true, so this is a no-op filter — matches
+    /// Admin's original, which had no check at all. Store: every shipment under a given order
+    /// always shares that order's StoreId (PrepareShipment always sets StoreId = order.StoreId),
+    /// so per-shipment filtering produces the same user-visible result as Store's original
+    /// whole-order Content("") denial, with no possible mixed-store shipment set under one order.
+    /// Vendor: this is the literal mechanical equivalent of Vendor's original per-shipment
+    /// HasAccessToShipment loop.</summary>
+    [PermissionAuthorizeAction(PermissionActionName.List)]
+    [HttpPost]
+    public async Task<IActionResult> ShipmentsByOrder(string orderId, DataSourceRequest command)
+    {
+        var order = await orderService.GetOrderById(orderId);
+        if (order == null || order.Deleted)
+            throw new ArgumentException("No order found with the specified id");
+
+        //shipments
+        var shipmentModels = new List<ShipmentModel>();
+        var shipments = (await shipmentService.GetShipmentsByOrder(orderId))
+            .OrderBy(s => s.CreatedOnUtc)
+            .ToList();
+        var accessibleShipments = new List<Shipment>();
+        foreach (var shipment in shipments)
+            if (await scope.HasAccess(shipment))
+                accessibleShipments.Add(shipment);
+
+        foreach (var shipment in accessibleShipments)
+            shipmentModels.Add(await shipmentViewModelService.PrepareShipmentModel(shipment, false));
+
+        var gridModel = new DataSourceResult {
+            Data = shipmentModels,
+            Total = shipmentModels.Count
+        };
+        return Json(gridModel);
+    }
+
+    /// <summary>Deliberate behavior change for Store only: Store's original returned a soft
+    /// Content("") on a store mismatch; Admin/Vendor's originals both threw ArgumentException.
+    /// Unified on the throwing form (2 of 3 hosts' original shape) rather than using
+    /// LoadAuthorizedShipment (which redirects — wrong fit for a JSON-grid endpoint, since a
+    /// redirect response is meaningless to the AJAX grid caller expecting JSON).</summary>
+    [PermissionAuthorizeAction(PermissionActionName.List)]
+    [HttpPost]
+    public async Task<IActionResult> ShipmentsItemsByShipmentId(string shipmentId, DataSourceRequest command)
+    {
+        var shipment = await shipmentService.GetShipmentById(shipmentId) ?? throw new ArgumentException("No shipment found with the specified id");
+        if (!await scope.HasAccess(shipment))
+            throw new ArgumentException("No shipment found with the specified id");
+        var order = await orderService.GetOrderById(shipment.OrderId) ?? throw new ArgumentException("No order found with the specified id");
+
+        //shipments
+        var shipmentModel = await shipmentViewModelService.PrepareShipmentModel(shipment, true);
+        var gridModel = new DataSourceResult {
+            Data = shipmentModel.Items,
+            Total = shipmentModel.Items.Count
+        };
+
+        return Json(gridModel);
+    }
+
+    #endregion
+
+    #region AddShipment
+
+    [PermissionAuthorizeAction(PermissionActionName.Create)]
+    public async Task<IActionResult> AddShipment(string orderId)
+    {
+        var order = await orderService.GetOrderById(orderId);
+        if (order == null || order.Deleted || !await orderScope.HasAccess(order))
+            //No order found with the specified id
+            return RedirectToAction("List");
+
+        var model = await shipmentViewModelService.PrepareShipmentModel(order);
+        return View(model);
+    }
+
+    [PermissionAuthorizeAction(PermissionActionName.Edit)]
+    [HttpPost]
+    [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]
+    public async Task<IActionResult> AddShipment(AddShipmentModel model, bool continueEditing)
+    {
+        var order = await orderService.GetOrderById(model.OrderId);
+        if (order == null || order.Deleted || !await orderScope.HasAccess(order))
+            //No order found with the specified id
+            return RedirectToAction("List");
+
+        var orderItems = scope.FilterOrderItems(order.OrderItems).ToList();
+
+        var (shipment, totalWeight) = await shipmentViewModelService.PrepareShipment(order, orderItems, model);
+        if (shipment == null || !shipment.ShipmentItems.Any())
+        {
+            Error(translationService.GetResource("Admin.Orders.Shipments.NoProductsSelected"));
+            return RedirectToAction("AddShipment", new { orderId = model.OrderId });
+        }
+
+        //check stock
+        var (valid, message) = await shipmentViewModelService.ValidStockShipment(shipment);
+        if (!valid)
+        {
+            Error(message);
+            return RedirectToAction("AddShipment", new { orderId = model.OrderId });
+        }
+
+        shipment.TotalWeight = totalWeight;
+        await shipmentService.InsertShipment(shipment);
+
+        //add a note
+        await orderService.InsertOrderNote(new OrderNote {
+            Note = $"A shipment #{shipment.ShipmentNumber} has been added",
+            DisplayToCustomer = false,
+            OrderId = order.Id
+        });
+
+        Success(translationService.GetResource("Admin.Orders.Shipments.Added"));
+        return continueEditing
+            ? RedirectToAction("ShipmentDetails", new { id = shipment.Id })
+            : RedirectToAction("List", new { id = shipment.Id });
+    }
+
+    #endregion
+
+    #region Shipment details
+
+    [PermissionAuthorizeAction(PermissionActionName.Preview)]
+    public async Task<IActionResult> ShipmentDetails(string id)
+    {
+        var (shipment, denied) = await LoadAuthorizedShipment(id);
+        if (denied != null) return denied;
+
+        var order = await orderService.GetOrderById(shipment.OrderId);
+        if (order == null)
+            //No order found with the specified id
+            return RedirectToAction("List");
+
+        var model = await shipmentViewModelService.PrepareShipmentModel(shipment, true, true);
+        return View(model);
+    }
+
+    [PermissionAuthorizeAction(PermissionActionName.Delete)]
+    [HttpPost]
+    public async Task<IActionResult> DeleteShipment(string id)
+    {
+        var (shipment, denied) = await LoadAuthorizedShipment(id);
+        if (denied != null) return denied;
+
+        var order = await orderService.GetOrderById(shipment.OrderId);
+        if (order == null)
+            //No order found with the specified id
+            return RedirectToAction("List");
+
+        await shipmentService.DeleteShipment(shipment);
+
+        //add a note
+        await orderService.InsertOrderNote(new OrderNote {
+            Note = $"A shipment #{shipment.ShipmentNumber} has been deleted",
+            DisplayToCustomer = false,
+            OrderId = order.Id
+        });
+
+        Success(translationService.GetResource("Admin.Orders.Shipments.Deleted"));
+
+        return RedirectToAction("Edit", "Order", new { order.Id });
+    }
+
+    [PermissionAuthorizeAction(PermissionActionName.Edit)]
+    [HttpPost]
+    public async Task<IActionResult> SetTrackingNumber(ShipmentTrackingModel model)
+    {
+        var (shipment, denied) = await LoadAuthorizedShipment(model.Id);
+        if (denied != null) return denied;
+
+        shipment.TrackingNumber = model.TrackingNumber;
+        await shipmentService.UpdateShipment(shipment);
+
+        return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
+    }
+
+    [PermissionAuthorizeAction(PermissionActionName.Edit)]
+    [HttpPost]
+    public async Task<IActionResult> SetShipmentAdminComment(ShipmentAdminCommentModel model)
+    {
+        var (shipment, denied) = await LoadAuthorizedShipment(model.Id);
+        if (denied != null) return denied;
+
+        shipment.AdminComment = model.AdminComment;
+        await shipmentService.UpdateShipment(shipment);
+
+        return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
+    }
+
+    [PermissionAuthorizeAction(PermissionActionName.Edit)]
+    [HttpPost]
+    public async Task<IActionResult> SetAsShipped(string id)
+    {
+        var (shipment, denied) = await LoadAuthorizedShipment(id);
+        if (denied != null) return denied;
+
+        try
+        {
+            await mediator.Send(new ShipCommand { Shipment = shipment, NotifyCustomer = true });
+            return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
+        }
+        catch (Exception exc)
+        {
+            Error(exc);
+            return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
+        }
+    }
+
+    [PermissionAuthorizeAction(PermissionActionName.Edit)]
+    [HttpPost]
+    public async Task<IActionResult> EditShippedDate(ShipmentShippedDateModel model)
+    {
+        var (shipment, denied) = await LoadAuthorizedShipment(model.Id);
+        if (denied != null) return denied;
+
+        try
+        {
+            if (!model.ShippedDate.HasValue) throw new Exception("Enter shipped date");
+
+            shipment.ShippedDateUtc = model.ShippedDate.ConvertToUtcTime(dateTimeService);
+            await shipmentService.UpdateShipment(shipment);
+            return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
+        }
+        catch (Exception exc)
+        {
+            Error(exc);
+            return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
+        }
+    }
+
+    [PermissionAuthorizeAction(PermissionActionName.Edit)]
+    [HttpPost]
+    public async Task<IActionResult> SetAsDelivered(string id)
+    {
+        var (shipment, denied) = await LoadAuthorizedShipment(id);
+        if (denied != null) return denied;
+
+        try
+        {
+            await mediator.Send(new DeliveryCommand { Shipment = shipment, NotifyCustomer = true });
+            return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
+        }
+        catch (Exception exc)
+        {
+            Error(exc);
+            return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
+        }
+    }
+
+    [PermissionAuthorizeAction(PermissionActionName.Edit)]
+    [HttpPost]
+    public async Task<IActionResult> EditDeliveryDate(ShipmentDeliveryDateModel model)
+    {
+        var (shipment, denied) = await LoadAuthorizedShipment(model.Id);
+        if (denied != null) return denied;
+
+        try
+        {
+            if (!model.DeliveryDate.HasValue) throw new Exception("Enter delivery date");
+
+            shipment.DeliveryDateUtc = model.DeliveryDate.ConvertToUtcTime(dateTimeService);
+            await shipmentService.UpdateShipment(shipment);
+            return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
+        }
+        catch (Exception exc)
+        {
+            Error(exc);
+            return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
+        }
+    }
+
+    /// <summary>Shared across all 3 hosts: the "User fields" tab on ShipmentDetails.cshtml posts
+    /// here with no host gating, so Store and Vendor need this action too, not just Admin.</summary>
+    [PermissionAuthorizeAction(PermissionActionName.Edit)]
+    [HttpPost]
+    public async Task<IActionResult> EditUserFields(string id, ShipmentModel model)
+    {
+        var (shipment, denied) = await LoadAuthorizedShipment(id);
+        if (denied != null) return denied;
+
+        shipment.UserFields = model.UserFields;
+        await shipmentService.UpdateShipment(shipment);
+
+        //selected tab
+        await SaveSelectedTabIndex();
+
+        return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
+    }
+
+    #endregion
+
+    #region PDF export and bulk actions
+
+    [PermissionAuthorizeAction(PermissionActionName.Preview)]
+    public async Task<IActionResult> PdfPackagingSlip(string shipmentId)
+    {
+        var (shipment, denied) = await LoadAuthorizedShipment(shipmentId);
+        if (denied != null) return denied;
+
+        var order = await orderService.GetOrderById(shipment.OrderId);
+        if (order == null)
+            //No order found with the specified id
+            return RedirectToAction("List");
+
+        var shipments = new List<Shipment> { shipment };
+
+        byte[] bytes;
+        using (var stream = new MemoryStream())
+        {
+            await pdfService.PrintPackagingSlipsToPdf(stream, shipments, contextAccessor.WorkContext.WorkingLanguage.Id);
+            bytes = stream.ToArray();
+        }
+
+        return File(bytes, "application/pdf", $"packagingslip_{shipment.Id}.pdf");
+    }
+
+    [PermissionAuthorizeAction(PermissionActionName.Export)]
+    [HttpPost]
+    public async Task<IActionResult> PdfPackagingSlipAll(ShipmentListModel model)
+    {
+        if (scope.DefaultStoreId is not null) model.StoreId = scope.DefaultStoreId;
+        if (scope.DefaultVendorId is not null) model.VendorId = scope.DefaultVendorId;
+
+        //load shipments
+        var shipments = await shipmentViewModelService.PrepareShipments(model, 1, 100);
+
+        //ensure that we at least one shipment selected
+        if (shipments.totalCount == 0)
+        {
+            Error(translationService.GetResource($"{scope.ResourceKeyPrefix}.Orders.Shipments.NoShipmentsSelected"));
+            return RedirectToAction("List");
+        }
+
+        byte[] bytes;
+        using (var stream = new MemoryStream())
+        {
+            await pdfService.PrintPackagingSlipsToPdf(stream, shipments.shipments.ToList(),
+                contextAccessor.WorkContext.WorkingLanguage.Id);
+            bytes = stream.ToArray();
+        }
+
+        return File(bytes, "application/pdf", "packagingslips.pdf");
+    }
+
+    [PermissionAuthorizeAction(PermissionActionName.Export)]
+    [HttpPost]
+    public async Task<IActionResult> PdfPackagingSlipSelected(string selectedIds)
+    {
+        var shipments = new List<Shipment>();
+        if (selectedIds != null)
+        {
+            var ids = selectedIds
+                .Split([','], StringSplitOptions.RemoveEmptyEntries)
+                .Select(x => x)
+                .ToArray();
+            shipments.AddRange(await shipmentService.GetShipmentsByIds(ids));
+        }
+
+        var accessibleShipments = new List<Shipment>();
+        foreach (var s in shipments)
+            if (await scope.HasAccess(s))
+                accessibleShipments.Add(s);
+
+        //ensure that we at least one shipment selected — checks the unfiltered count (not
+        //accessibleShipments.Count) so a request that only names shipments the caller can't
+        //access reports "no shipments selected" rather than silently producing an empty PDF,
+        //matching all 3 originals' pre-existing (and slightly inconsistent) behavior
+        if (shipments.Count == 0)
+        {
+            Error(translationService.GetResource($"{scope.ResourceKeyPrefix}.Orders.Shipments.NoShipmentsSelected"));
+            return RedirectToAction("List");
+        }
+
+        byte[] bytes;
+        using (var stream = new MemoryStream())
+        {
+            await pdfService.PrintPackagingSlipsToPdf(stream, accessibleShipments, contextAccessor.WorkContext.WorkingLanguage.Id);
+            bytes = stream.ToArray();
+        }
+
+        return File(bytes, "application/pdf", "packagingslips.pdf");
+    }
+
+    [PermissionAuthorizeAction(PermissionActionName.Edit)]
+    [HttpPost]
+    public async Task<IActionResult> SetAsShippedSelected(ICollection<string> selectedIds)
+    {
+        var shipments = new List<Shipment>();
+        if (selectedIds != null) shipments.AddRange(await shipmentService.GetShipmentsByIds(selectedIds.ToArray()));
+
+        var accessibleShipments = new List<Shipment>();
+        foreach (var s in shipments)
+            if (await scope.HasAccess(s))
+                accessibleShipments.Add(s);
+
+        foreach (var shipment in accessibleShipments)
+            try
+            {
+                await mediator.Send(new ShipCommand { Shipment = shipment, NotifyCustomer = true });
+            }
+            catch
+            {
+                //ignore any exception
+            }
+
+        return Json(new { Result = true });
+    }
+
+    [PermissionAuthorizeAction(PermissionActionName.Edit)]
+    [HttpPost]
+    public async Task<IActionResult> SetAsDeliveredSelected(ICollection<string> selectedIds)
+    {
+        var shipments = new List<Shipment>();
+        if (selectedIds != null) shipments.AddRange(await shipmentService.GetShipmentsByIds(selectedIds.ToArray()));
+
+        var accessibleShipments = new List<Shipment>();
+        foreach (var s in shipments)
+            if (await scope.HasAccess(s))
+                accessibleShipments.Add(s);
+
+        foreach (var shipment in accessibleShipments)
+            try
+            {
+                await mediator.Send(new DeliveryCommand { Shipment = shipment, NotifyCustomer = true });
+            }
+            catch
+            {
+                //ignore any exception
+            }
+
+        return Json(new { Result = true });
+    }
+
+    #endregion
+
+    #region Shipment notes
+
+    [PermissionAuthorizeAction(PermissionActionName.Preview)]
+    [HttpPost]
+    public async Task<IActionResult> ShipmentNotesSelect(string shipmentId, DataSourceRequest command)
+    {
+        var shipment = await shipmentService.GetShipmentById(shipmentId);
+        if (shipment == null || !await scope.HasAccess(shipment))
+            throw new ArgumentException("No shipment found with the specified id");
+
+        //shipment notes
+        var shipmentNoteModels = await shipmentViewModelService.PrepareShipmentNotes(shipment);
+        var gridModel = new DataSourceResult {
+            Data = shipmentNoteModels,
+            Total = shipmentNoteModels.Count
+        };
+        return Json(gridModel);
+    }
+
+    [PermissionAuthorizeAction(PermissionActionName.Edit)]
+    public async Task<IActionResult> ShipmentNoteAdd(string shipmentId, string downloadId, bool displayToCustomer,
+        string message)
+    {
+        var shipment = await shipmentService.GetShipmentById(shipmentId);
+        if (shipment == null || !await scope.HasAccess(shipment))
+            return Json(new { Result = false });
+
+        await shipmentViewModelService.InsertShipmentNote(shipment, downloadId, displayToCustomer, message);
+
+        return Json(new { Result = true });
+    }
+
+    [PermissionAuthorizeAction(PermissionActionName.Delete)]
+    [HttpPost]
+    public async Task<IActionResult> ShipmentNoteDelete(string id, string shipmentId)
+    {
+        var shipment = await shipmentService.GetShipmentById(shipmentId);
+        if (shipment == null || !await scope.HasAccess(shipment))
+            throw new ArgumentException("No shipment found with the specified id");
+
+        await shipmentViewModelService.DeleteShipmentNote(shipment, id);
+
+        return new JsonResult("");
+    }
+
+    #endregion
+}
diff --git a/src/Web/Grand.Web.AdminShared/Interfaces/IAdminDataScope.cs b/src/Web/Grand.Web.AdminShared/Interfaces/IAdminDataScope.cs
index 9310c9829..32fcbaf95 100644
--- a/src/Web/Grand.Web.AdminShared/Interfaces/IAdminDataScope.cs
+++ b/src/Web/Grand.Web.AdminShared/Interfaces/IAdminDataScope.cs
@@ -54,7 +54,8 @@ public interface IAdminDataScope<TEntity>
     /// <summary>Order line items visible to the current host — e.g. Vendor sees only its own
     /// items within a mixed-vendor order. Identity (no filtering) for hosts with no such
     /// restriction (Admin, Store, and every non-Order entity). Only
-    /// <see cref="Grand.Web.AdminShared.Services.VendorOrderDataScope"/> overrides this. Lives on
+    /// <see cref="Grand.Web.AdminShared.Services.VendorOrderDataScope"/> and
+    /// <see cref="Grand.Web.AdminShared.Services.VendorShipmentDataScope"/> override this. Lives on
     /// the shared interface rather than a separate Order-only interface because
     /// IAdminDataScope&lt;TEntity&gt; is already the single per-host strategy object injected
     /// into BaseOrderController/OrderViewModelService — see ARCH-001 Order consolidation spec
diff --git a/src/Web/Grand.Web.Vendor/Models/Shipment/ShipmentAdminCommentModel.cs b/src/Web/Grand.Web.AdminShared/Models/Orders/ShipmentAdminCommentModel.cs
similarity index 53%
rename from src/Web/Grand.Web.Vendor/Models/Shipment/ShipmentAdminCommentModel.cs
rename to src/Web/Grand.Web.AdminShared/Models/Orders/ShipmentAdminCommentModel.cs
index 0d620da92..040b69f0e 100644
--- a/src/Web/Grand.Web.Vendor/Models/Shipment/ShipmentAdminCommentModel.cs
+++ b/src/Web/Grand.Web.AdminShared/Models/Orders/ShipmentAdminCommentModel.cs
@@ -1,3 +1,3 @@
-namespace Grand.Web.Vendor.Models.Shipment;
+namespace Grand.Web.AdminShared.Models.Orders;
 
-public record ShipmentAdminCommentModel(string Id, string AdminComment);
\ No newline at end of file
+public record ShipmentAdminCommentModel(string Id, string AdminComment);
diff --git a/src/Web/Grand.Web.Vendor/Models/Shipment/ShipmentDeliveryDateModel.cs b/src/Web/Grand.Web.AdminShared/Models/Orders/ShipmentDeliveryDateModel.cs
similarity index 52%
rename from src/Web/Grand.Web.Vendor/Models/Shipment/ShipmentDeliveryDateModel.cs
rename to src/Web/Grand.Web.AdminShared/Models/Orders/ShipmentDeliveryDateModel.cs
index 32b5543ea..4dd6411a2 100644
--- a/src/Web/Grand.Web.Vendor/Models/Shipment/ShipmentDeliveryDateModel.cs
+++ b/src/Web/Grand.Web.AdminShared/Models/Orders/ShipmentDeliveryDateModel.cs
@@ -1,3 +1,3 @@
-namespace Grand.Web.Vendor.Models.Shipment;
+namespace Grand.Web.AdminShared.Models.Orders;
 
-public record ShipmentDeliveryDateModel(string Id, DateTime? DeliveryDate);
\ No newline at end of file
+public record ShipmentDeliveryDateModel(string Id, DateTime? DeliveryDate);
diff --git a/src/Web/Grand.Web.Vendor/Models/Shipment/ShipmentShippedDateModel.cs b/src/Web/Grand.Web.AdminShared/Models/Orders/ShipmentShippedDateModel.cs
similarity index 53%
rename from src/Web/Grand.Web.Vendor/Models/Shipment/ShipmentShippedDateModel.cs
rename to src/Web/Grand.Web.AdminShared/Models/Orders/ShipmentShippedDateModel.cs
index 041d6888c..cb8328436 100644
--- a/src/Web/Grand.Web.Vendor/Models/Shipment/ShipmentShippedDateModel.cs
+++ b/src/Web/Grand.Web.AdminShared/Models/Orders/ShipmentShippedDateModel.cs
@@ -1,3 +1,3 @@
-namespace Grand.Web.Vendor.Models.Shipment;
+namespace Grand.Web.AdminShared.Models.Orders;
 
-public record ShipmentShippedDateModel(string Id, DateTime? ShippedDate);
\ No newline at end of file
+public record ShipmentShippedDateModel(string Id, DateTime? ShippedDate);
diff --git a/src/Web/Grand.Web.Vendor/Models/Shipment/ShipmentTrackingModel.cs b/src/Web/Grand.Web.AdminShared/Models/Orders/ShipmentTrackingModel.cs
similarity index 54%
rename from src/Web/Grand.Web.Vendor/Models/Shipment/ShipmentTrackingModel.cs
rename to src/Web/Grand.Web.AdminShared/Models/Orders/ShipmentTrackingModel.cs
index a29d76995..6641075cc 100644
--- a/src/Web/Grand.Web.Vendor/Models/Shipment/ShipmentTrackingModel.cs
+++ b/src/Web/Grand.Web.AdminShared/Models/Orders/ShipmentTrackingModel.cs
@@ -1,3 +1,3 @@
-namespace Grand.Web.Vendor.Models.Shipment;
+namespace Grand.Web.AdminShared.Models.Orders;
 
-public record ShipmentTrackingModel(string Id, string TrackingNumber);
\ No newline at end of file
+public record ShipmentTrackingModel(string Id, string TrackingNumber);
diff --git a/src/Web/Grand.Web.AdminShared/Services/RoutedShipmentDataScope.cs b/src/Web/Grand.Web.AdminShared/Services/RoutedShipmentDataScope.cs
new file mode 100644
index 000000000..30a916a64
--- /dev/null
+++ b/src/Web/Grand.Web.AdminShared/Services/RoutedShipmentDataScope.cs
@@ -0,0 +1,50 @@
+#nullable enable
+
+using Grand.Domain.Orders;
+using Grand.Domain.Shipping;
+using Grand.Web.AdminShared.Interfaces;
+using Microsoft.AspNetCore.Http;
+
+namespace Grand.Web.AdminShared.Services;
+
+/// <summary>
+///     Resolves the correct per-host <see cref="IAdminDataScope{Shipment}" /> implementation at
+///     request time, based on the current request's "area" route value — same fix and same reason
+///     as <see cref="RoutedOrderDataScope"/>/<see cref="RoutedProductDataScope"/>: <c>Grand.Web</c>
+///     (the combined host) loads all three hosts into one DI container, so a plain per-host
+///     registration would let whichever host's StartupApplication ran last win for every area in
+///     that process.
+/// </summary>
+public class RoutedShipmentDataScope(
+    IHttpContextAccessor httpContextAccessor,
+    GlobalAdminDataScope<Shipment> adminScope,
+    StoreShipmentDataScope storeScope,
+    VendorShipmentDataScope vendorScope) : IAdminDataScope<Shipment>
+{
+    private IAdminDataScope<Shipment> Resolved
+    {
+        get
+        {
+            var area = httpContextAccessor.HttpContext?.Request.RouteValues["area"] as string;
+            return area switch {
+                "Admin" => adminScope,
+                "Store" => storeScope,
+                "Vendor" => vendorScope,
+                //fail closed: this object fronts store/vendor tenant isolation, so an
+                //unrecognized or missing area must never silently resolve to any concrete scope
+                _ => throw new InvalidOperationException(
+                    $"RoutedShipmentDataScope: unrecognized or missing area '{area}'.")
+            };
+        }
+    }
+
+    public Task<bool> HasAccess(Shipment entity) => Resolved.HasAccess(entity);
+    public Task<bool> CanView(Shipment entity) => Resolved.CanView(entity);
+    public IEnumerable<OrderItem> FilterOrderItems(IEnumerable<OrderItem> orderItems) =>
+        Resolved.FilterOrderItems(orderItems);
+    public string? DefaultStoreId => Resolved.DefaultStoreId;
+    public string ResourceKeyPrefix => Resolved.ResourceKeyPrefix;
+    public bool ShowStoreSelector => Resolved.ShowStoreSelector;
+    public string? DefaultVendorId => Resolved.DefaultVendorId;
+    public bool CanFeatureOnHomepage => Resolved.CanFeatureOnHomepage;
+}
diff --git a/src/Web/Grand.Web.AdminShared/Services/ShipmentViewModelService.cs b/src/Web/Grand.Web.AdminShared/Services/ShipmentViewModelService.cs
index 88ecfc278..8acc461ef 100644
--- a/src/Web/Grand.Web.AdminShared/Services/ShipmentViewModelService.cs
+++ b/src/Web/Grand.Web.AdminShared/Services/ShipmentViewModelService.cs
@@ -34,6 +34,7 @@ public class ShipmentViewModelService : IShipmentViewModelService
     private readonly ITranslationService _translationService;
     private readonly IWarehouseService _warehouseService;
     private readonly IContextAccessor _contextAccessor;
+    private readonly IAdminDataScope<Shipment> _scope;
 
     public ShipmentViewModelService(
         IOrderService orderService,
@@ -50,7 +51,8 @@ public ShipmentViewModelService(
         IStockQuantityService stockQuantityService,
         MeasureSettings measureSettings,
         ShippingSettings shippingSettings,
-        ShippingProviderSettings shippingProviderSettings)
+        ShippingProviderSettings shippingProviderSettings,
+        IAdminDataScope<Shipment> scope)
     {
         _orderService = orderService;
         _contextAccessor = contextAccessor;
@@ -67,6 +69,7 @@ public ShipmentViewModelService(
         _measureSettings = measureSettings;
         _shippingSettings = shippingSettings;
         _shippingProviderSettings = shippingProviderSettings;
+        _scope = scope;
     }
 
     public virtual async Task<ShipmentModel> PrepareShipmentModel(Shipment shipment, bool prepareProducts,
@@ -102,9 +105,13 @@ public virtual async Task<ShipmentModel> PrepareShipmentModel(Shipment shipment,
         };
 
         if (prepareProducts)
+        {
+            var visibleOrderItems = order != null
+                ? _scope.FilterOrderItems(order.OrderItems).ToList()
+                : [];
             foreach (var shipmentItem in shipment.ShipmentItems)
             {
-                var orderItem = order?.OrderItems.FirstOrDefault(x => x.Id == shipmentItem.OrderItemId);
+                var orderItem = visibleOrderItems.FirstOrDefault(x => x.Id == shipmentItem.OrderItemId);
                 if (orderItem == null)
                     continue;
 
@@ -140,6 +147,7 @@ public virtual async Task<ShipmentModel> PrepareShipmentModel(Shipment shipment,
                     model.Items.Add(shipmentItemModel);
                 }
             }
+        }
 
         if (prepareShipmentEvent && !string.IsNullOrEmpty(shipment.TrackingNumber))
         {
@@ -331,7 +339,9 @@ public virtual async Task<ShipmentModel> PrepareShipmentModel(Order order)
         var baseDimension = await _measureService.GetMeasureDimensionById(_measureSettings.BaseDimensionId);
         var baseDimensionIn = baseDimension != null ? baseDimension.Name : "";
 
-        foreach (var orderItem in order.OrderItems)
+        var orderItems = _scope.FilterOrderItems(order.OrderItems);
+
+        foreach (var orderItem in orderItems)
         {
             var product = await _productService.GetProductByIdIncludeArch(orderItem.ProductId);
             //we can ship only shippable products
@@ -571,7 +581,8 @@ public virtual async Task<ShipmentModel> PrepareShipmentModel(Order order)
                     ShippedDateUtc = null,
                     DeliveryDateUtc = null,
                     AdminComment = adminComment,
-                    StoreId = order.StoreId
+                    StoreId = order.StoreId,
+                    VendorId = _scope.DefaultVendorId
                 };
             }
 
diff --git a/src/Web/Grand.Web.AdminShared/Services/StoreShipmentDataScope.cs b/src/Web/Grand.Web.AdminShared/Services/StoreShipmentDataScope.cs
new file mode 100644
index 000000000..2d1684726
--- /dev/null
+++ b/src/Web/Grand.Web.AdminShared/Services/StoreShipmentDataScope.cs
@@ -0,0 +1,33 @@
+#nullable enable
+
+using Grand.Domain.Shipping;
+using Grand.Infrastructure;
+using Grand.Web.AdminShared.Interfaces;
+
+namespace Grand.Web.AdminShared.Services;
+
+/// <summary>
+///     Store's <see cref="IAdminDataScope{Shipment}" />. Bespoke, not the generic
+///     <see cref="StoreAdminDataScope{TEntity}" />: <c>Shipment</c> is a plain <see cref="Grand.Domain.BaseEntity" />
+///     with a single <c>StoreId</c> field, not <c>IStoreLinkEntity</c> (no <c>Stores</c>/
+///     <c>LimitedToStores</c> list), so the generic class's <c>where TEntity : BaseEntity,
+///     IStoreLinkEntity</c> constraint doesn't apply. Mirrors Store's original controller's
+///     <c>shipment.StoreId != StaffStoreId</c> check, repeated at every action site in that file.
+///     No <see cref="IAdminDataScope{TEntity}.CanView" /> override: Store's original code has one
+///     uniform check for both viewing and mutating, unlike Category/Product's loose/strict split —
+///     <see cref="IAdminDataScope{TEntity}.CanView" /> is simply inherited from the interface
+///     default, which delegates to <see cref="HasAccess" />.
+/// </summary>
+public class StoreShipmentDataScope(IContextAccessor contextAccessor) : IAdminDataScope<Shipment>
+{
+    public Task<bool> HasAccess(Shipment entity) =>
+        Task.FromResult(entity is not null &&
+            !string.IsNullOrEmpty(contextAccessor.WorkContext.CurrentCustomer.StaffStoreId) &&
+            entity.StoreId == contextAccessor.WorkContext.CurrentCustomer.StaffStoreId);
+
+    public string? DefaultStoreId => contextAccessor.WorkContext.CurrentCustomer.StaffStoreId;
+    public string ResourceKeyPrefix => "Admin";
+    public bool ShowStoreSelector => true;
+    public string? DefaultVendorId => null;
+    public bool CanFeatureOnHomepage => true; // unused for Shipment; required interface member
+}
diff --git a/src/Web/Grand.Web.AdminShared/Services/VendorShipmentDataScope.cs b/src/Web/Grand.Web.AdminShared/Services/VendorShipmentDataScope.cs
new file mode 100644
index 000000000..b51bce154
--- /dev/null
+++ b/src/Web/Grand.Web.AdminShared/Services/VendorShipmentDataScope.cs
@@ -0,0 +1,38 @@
+#nullable enable
+
+using Grand.Domain.Orders;
+using Grand.Domain.Shipping;
+using Grand.Infrastructure;
+using Grand.Web.AdminShared.Interfaces;
+
+namespace Grand.Web.AdminShared.Services;
+
+/// <summary>
+///     Vendor's <see cref="IAdminDataScope{Shipment}" />. Bespoke: ownership is a flat
+///     <c>VendorId</c> field directly on the entity, simpler than Order's child-collection
+///     ownership — ports the existing <c>HasAccessToShipment</c>/<c>HasAccessToOrderItem</c>
+///     extension methods (<c>Grand.Web.Vendor/Extensions/HasAccess.cs</c>) inline, the same way
+///     <see cref="VendorOrderDataScope" />/<see cref="VendorProductDataScope" /> do — not imported
+///     directly, since <c>Grand.Web.Vendor</c> already references <c>Grand.Web.AdminShared</c> and
+///     a reference the other way would be circular. Also overrides <see cref="FilterOrderItems" />,
+///     reusing the interface member the Order phase already added: ports Vendor's original
+///     <c>order.OrderItems.Where(HasAccessToOrderItem)</c> filter (used when building the
+///     AddShipment order-item picker) so a vendor can only ship its own line items on a
+///     mixed-vendor order.
+/// </summary>
+public class VendorShipmentDataScope(IContextAccessor contextAccessor) : IAdminDataScope<Shipment>
+{
+    public Task<bool> HasAccess(Shipment entity) =>
+        Task.FromResult(entity is not null &&
+            !string.IsNullOrEmpty(contextAccessor.WorkContext.CurrentVendor.Id) &&
+            entity.VendorId == contextAccessor.WorkContext.CurrentVendor.Id);
+
+    public IEnumerable<OrderItem> FilterOrderItems(IEnumerable<OrderItem> orderItems) =>
+        orderItems.Where(i => i.VendorId == contextAccessor.WorkContext.CurrentVendor.Id);
+
+    public string? DefaultStoreId => null;
+    public string ResourceKeyPrefix => "Vendor";
+    public bool ShowStoreSelector => false;
+    public string? DefaultVendorId => contextAccessor.WorkContext.CurrentVendor.Id;
+    public bool CanFeatureOnHomepage => false;
+}
diff --git a/src/Web/Grand.Web.AdminShared/Startup/StartupApplication.cs b/src/Web/Grand.Web.AdminShared/Startup/StartupApplication.cs
index cd4355fcc..b3d250217 100644
--- a/src/Web/Grand.Web.AdminShared/Startup/StartupApplication.cs
+++ b/src/Web/Grand.Web.AdminShared/Startup/StartupApplication.cs
@@ -2,6 +2,7 @@
 using elFinder.Net.Drivers.FileSystem.Extensions;
 using Grand.Domain.Catalog;
 using Grand.Domain.Orders;
+using Grand.Domain.Shipping;
 using Grand.Infrastructure;
 using Grand.Web.AdminShared.Interfaces;
 using Grand.Web.AdminShared.Services;
@@ -90,6 +91,15 @@ public void ConfigureServices(IServiceCollection services, IConfiguration config
         services.AddScoped<StoreOrderDataScope>();
         services.AddScoped<VendorOrderDataScope>();
         services.AddScoped<IAdminDataScope<Order>, RoutedOrderDataScope>();
+
+        // IAdminDataScope<Shipment>: registered once here for the same reason as Order above — see
+        // RoutedShipmentDataScope's doc comment. Admin reuses the generic GlobalAdminDataScope<T>
+        // unmodified (no Sales-Manager restriction on Shipment); Store/Vendor are bespoke because
+        // Shipment isn't IStoreLinkEntity and Vendor ownership is a flat VendorId field.
+        services.AddScoped<GlobalAdminDataScope<Shipment>>();
+        services.AddScoped<StoreShipmentDataScope>();
+        services.AddScoped<VendorShipmentDataScope>();
+        services.AddScoped<IAdminDataScope<Shipment>, RoutedShipmentDataScope>();
     }
 
     public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment)
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/AddShipment.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/AddShipment.cshtml
similarity index 75%
rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/AddShipment.cshtml
rename to src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/AddShipment.cshtml
index cf0cd20ce..60bad230d 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/AddShipment.cshtml
+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/AddShipment.cshtml
@@ -1,9 +1,13 @@
-@model ShipmentModel
+@using Grand.Domain.Shipping
+@model ShipmentModel
+@inject IAdminDataScope<Shipment> Scope
 @{
     //page title
-    ViewBag.Title = string.Format(Loc["Admin.Orders.Shipments.AddNew.Title"], Model.OrderId);
+    var prefix = Scope.ResourceKeyPrefix;
+    var area = ViewContext.RouteData.Values["area"]?.ToString();
+    ViewBag.Title = string.Format(Loc[$"{prefix}.Orders.Shipments.AddNew.Title"], Model.OrderId);
 }
-<form asp-area="@Constants.AreaAdmin" asp-controller="Shipment" asp-action="AddShipment" method="post"
+<form asp-area="@area" asp-controller="Shipment" asp-action="AddShipment" method="post"
       asp-route-orderId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["orderId"])">
 
     <div asp-validation-summary="All"></div>
@@ -13,21 +17,21 @@
             <div class="x_title">
                 <div class="caption">
                     <i class="fa fa-truck"></i>
-                    @string.Format(Loc["Admin.Orders.Shipments.AddNew.Title"], Model.OrderNumber)
+                    @string.Format(Loc[$"{prefix}.Orders.Shipments.AddNew.Title"], Model.OrderNumber)
                     <small>
                         <i class="fa fa-arrow-circle-left"></i>
-                        @Html.ActionLink(Loc["Admin.Orders.Shipments.BackToOrder"], "Edit", "Order", new { Id = Model.OrderId })
+                        @Html.ActionLink(Loc[$"{prefix}.Orders.Shipments.BackToOrder"], "Edit", "Order", new { Id = Model.OrderId })
                     </small>
                 </div>
                 <div class="actions">
                     <div class="btn-group btn-group-devided">
                         <button class="btn btn-success" type="submit" id="shipment-save" name="save">
-                            <i class="fa fa-check"></i> @Loc["Admin.Common.Save"]
+                            <i class="fa fa-check"></i> @Loc[$"{prefix}.Common.Save"]
                         </button>
                         <button class="btn btn-success" type="submit" id="shipment-save-continue" name="save-continue">
-                            <i class="fa fa-check-circle"></i> @Loc["Admin.Common.SaveContinue"]
+                            <i class="fa fa-check-circle"></i> @Loc[$"{prefix}.Common.SaveContinue"]
                         </button>
-                        <vc:admin-widget widget-zone="order_shipment_add_buttons" additional-data="null"/>
+                        <partial name="Partials/WidgetZone.AddButtons" model="Model"/>
                     </div>
                 </div>
             </div>
@@ -54,7 +58,7 @@
 
 
     <h4>
-        <strong>@Loc["Admin.Orders.Shipments.Products"]</strong>
+        <strong>@Loc[$"{prefix}.Orders.Shipments.Products"]</strong>
     </h4>
 
     <div class="table-responsive visible-xs-block visible-sm-block visible-md-block visible-lg-block">
@@ -62,28 +66,28 @@
             <thead>
             <tr>
                 <th>
-                    @Loc["Admin.Orders.Shipments.Products.ProductName"]
+                    @Loc[$"{prefix}.Orders.Shipments.Products.ProductName"]
                 </th>
                 <th>
-                    @Loc["Admin.Orders.Shipments.Products.SKU"]
+                    @Loc[$"{prefix}.Orders.Shipments.Products.SKU"]
                 </th>
                 <th>
-                    @Loc["Admin.Orders.Shipments.Products.Warehouse"]
+                    @Loc[$"{prefix}.Orders.Shipments.Products.Warehouse"]
                 </th>
                 <th>
-                    @Loc["Admin.Orders.Shipments.Products.ItemWeight"]
+                    @Loc[$"{prefix}.Orders.Shipments.Products.ItemWeight"]
                 </th>
                 <th>
-                    @Loc["Admin.Orders.Shipments.Products.ItemDimensions"]
+                    @Loc[$"{prefix}.Orders.Shipments.Products.ItemDimensions"]
                 </th>
                 <th>
-                    @Loc["Admin.Orders.Shipments.Products.QtyOrdered"]
+                    @Loc[$"{prefix}.Orders.Shipments.Products.QtyOrdered"]
                 </th>
                 <th>
-                    @Loc["Admin.Orders.Shipments.Products.QtyShipped"]
+                    @Loc[$"{prefix}.Orders.Shipments.Products.QtyShipped"]
                 </th>
                 <th>
-                    @Loc["Admin.Orders.Shipments.Products.QtyToShip"]
+                    @Loc[$"{prefix}.Orders.Shipments.Products.QtyToShip"]
                 </th>
             </tr>
             </thead>
@@ -96,7 +100,7 @@
                     <td>
                         <div style="padding-left:10px;padding-right:10px;">
                             <em>
-                                <a href="@Url.Action("Edit", "Product", new { id = item.ProductId, area = Constants.AreaAdmin })">@item.ProductName</a>
+                                <a href="@Url.Action("Edit", "Product", new { id = item.ProductId, area = area })">@item.ProductName</a>
                             </em>
                             @if (!string.IsNullOrEmpty(item.AttributeInfo))
                             {
@@ -107,8 +111,8 @@
                             @if (item.ShipSeparately)
                             {
                                 <p>
-                                    <strong>@Loc["Admin.Orders.Shipments.Products.ShipSeparately.Warning"]</strong>
-                                    @Loc["Admin.Orders.Shipments.Products.ShipSeparately"]
+                                    <strong>@Loc[$"{prefix}.Orders.Shipments.Products.ShipSeparately.Warning"]</strong>
+                                    @Loc[$"{prefix}.Orders.Shipments.Products.ShipSeparately"]
                                 </p>
                             }
                         </div>
@@ -131,14 +135,14 @@
                                             <option value="@(warehouse.WarehouseId)" data-stock-qty="@(warehouse.StockQuantity)"
                                                     data-reserved-qty="@(warehouse.ReservedQuantity)"
                                                     selected="@selected">
-                                                @Loc["Admin.Orders.Shipments.Products.Warehouse.ChooseQty", warehouse.WarehouseName, warehouse.StockQuantity, warehouse.ReservedQuantity]
+                                                @Loc[$"{prefix}.Orders.Shipments.Products.Warehouse.ChooseQty", warehouse.WarehouseName, warehouse.StockQuantity, warehouse.ReservedQuantity]
                                             </option>
                                         }
                                     </select>
                                 }
                                 else
                                 {
-                                    <div>@Loc["Admin.Orders.Shipments.Products.Warehouse.NotAvailabe"]</div>
+                                    <div>@Loc[$"{prefix}.Orders.Shipments.Products.Warehouse.NotAvailabe"]</div>
                                 }
                             }
                             else
@@ -179,4 +183,4 @@
     </div>
 
 
-</form>
\ No newline at end of file
+</form>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/List.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/List.cshtml
similarity index 94%
rename from src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/List.cshtml
rename to src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/List.cshtml
index 0d65f4125..254e0f663 100644
--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/List.cshtml
+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/List.cshtml
@@ -1,10 +1,11 @@
-@model ShipmentListModel
+@model ShipmentListModel
 @inject AdminAreaSettings adminAreaSettings
 @{
     ViewBag.Title = Loc["Admin.Orders.Shipments.List"];
+    var area = ViewContext.RouteData.Values["area"]?.ToString();
 }
 
-<form asp-area="@Constants.AreaStore" asp-controller="Shipment" asp-action="List" method="post">
+<form asp-area="@area" asp-controller="Shipment" asp-action="List" method="post">
 
     <div class="row">
         <div class="col-md-12">
@@ -30,7 +31,7 @@
                             <button class="btn btn-success" type="submit" id="deliver-selected">
                                 <i class="fa fa-check-circle"></i> @Loc["Admin.Orders.Shipments.DeliverySelected"]
                             </button>
-                            <vc:admin-widget widget-zone="order_shipment_list_buttons" additional-data="null"/>
+                            <partial name="Partials/WidgetZone.ListButtons" model="Model"/>
                         </div>
                     </div>
                 </div>
@@ -99,7 +100,7 @@
                 dataSource: {
                     transport: {
                         read: {
-                            url: "@Html.Raw(Url.Action("ShipmentListSelect", "Shipment", new { area = Constants.AreaStore }))",
+                            url: "@Html.Raw(Url.Action("ShipmentListSelect", "Shipment", new { area = area }))",
                             type: "POST",
                             dataType: "json",
                             data: additionalData
@@ -137,17 +138,17 @@
                     field: "ShipmentNumber",
                     title: "@Loc["Admin.Orders.Shipments.ID"]",
                     width: 100,
-                    template: '<a class="k-link" href="@Url.Action("ShipmentDetails", "Shipment", new { area = Constants.AreaStore })/#=Id#">#=ShipmentNumber#</a>'
+                    template: '<a class="k-link" href="@Url.Action("ShipmentDetails", "Shipment", new { area = area })/#=Id#">#=ShipmentNumber#</a>'
                 }, {
                     field: "OrderNumber",
                     title: "@Loc["Admin.Orders.Shipments.OrderID"]",
                     width: 100,
-                    template: '<a class="k-link" href="@Url.Action("Edit", "Order", new { area = Constants.AreaStore })/#=OrderId#">#=OrderNumber#</a>'
+                    template: '<a class="k-link" href="@Url.Action("Edit", "Order", new { area = area })/#=OrderId#">#=OrderNumber#</a>'
                 }, {
                     field: "TrackingNumber",
                     title: "@Loc["Admin.Orders.Shipments.TrackingNumber"]",
                     width: 100,
-                    template: '<a class="k-link" href="@Url.Action("ShipmentDetails", "Shipment", new { area = Constants.AreaStore })/#=Id#">#=kendo.htmlEncode(TrackingNumber)#</a>'
+                    template: '<a class="k-link" href="@Url.Action("ShipmentDetails", "Shipment", new { area = area })/#=Id#">#=kendo.htmlEncode(TrackingNumber)#</a>'
                 }, {
                     field: "TotalWeight",
                     title: "@Loc["Admin.Orders.Shipments.TotalWeight"]",
@@ -174,7 +175,7 @@
                 dataSource: {
                     transport: {
                         read: {
-                            url: "@Html.Raw(Url.Action("ShipmentsItemsByShipmentId", "Shipment", new { area = Constants.AreaStore }))?shipmentId="+e.data.Id,
+                            url: "@Html.Raw(Url.Action("ShipmentsItemsByShipmentId", "Shipment", new { area = area }))?shipmentId="+e.data.Id,
                             type: "POST",
                             dataType: "json",
                             data: addAntiForgeryToken
@@ -241,7 +242,7 @@
                 $.ajax({
                     cache: false,
                     type: "GET",
-                    url: "@(Url.Action("GetStatesByCountryId", "Home", new { area = Constants.AreaStore }))",
+                    url: "@(Url.Action("GetStatesByCountryId", "Home", new { area = area }))",
                     data: { "countryId": selectedItem, "addAsterisk": "true" },
                     success: function (data) {
                         ddlStates.html('');
@@ -287,7 +288,7 @@
                 $.ajax({
                     cache: false,
                     type: "POST",
-                    url: "@(Url.Action("SetAsShippedSelected", "Shipment", new { area = Constants.AreaStore }))",
+                    url: "@(Url.Action("SetAsShippedSelected", "Shipment", new { area = area }))",
                     data: postData,
                     complete: function(data) {
                         var grid = $('#shipments-grid').data('kendoGrid');
@@ -312,7 +313,7 @@
                 $.ajax({
                     cache: false,
                     type: "POST",
-                    url: "@(Url.Action("SetAsDeliveredSelected", "Shipment", new { area = Constants.AreaStore }))",
+                    url: "@(Url.Action("SetAsDeliveredSelected", "Shipment", new { area = area }))",
                     data: postData,
                     complete: function(data) {
                         var grid = $('#shipments-grid').data('kendoGrid');
@@ -384,7 +385,7 @@
     </script>
 
 </form>
-<form asp-area="@Constants.AreaStore" asp-controller="Shipment" asp-action="PdfPackagingSlipSelected" method="post" id="pdf-packaging-slip-selected-form">
+<form asp-area="@area" asp-controller="Shipment" asp-action="PdfPackagingSlipSelected" method="post" id="pdf-packaging-slip-selected-form">
 
     <input type="hidden" id="selectedIds" name="selectedIds" value=""/>
 </form>
@@ -401,4 +402,4 @@
         });
     });
 
-</script>
\ No newline at end of file
+</script>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/Partials/Documents.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/Partials/Documents.cshtml
similarity index 79%
rename from src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/Partials/Documents.cshtml
rename to src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/Partials/Documents.cshtml
index 3a2255401..9a36db4df 100644
--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/Partials/Documents.cshtml
+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/Partials/Documents.cshtml
@@ -1,14 +1,17 @@
-@model ShipmentModel
+@model ShipmentModel
 @inject AdminAreaSettings adminAreaSettings
+@{
+    var area = ViewContext.RouteData.Values["area"]?.ToString();
+}
 <div class="panel panel-default">
-    <vc:admin-widget widget-zone="order_shipment_details_documents_top" additional-data="Model"/>
+    <partial name="Partials/WidgetZone.Documents.Top" model="Model"/>
     <div class="panel-body">
         <div id="shipment-documents-grid"></div>
     </div>
     <div class="panel-footer">
-        <button type="button" class="k-button" onclick="location.href='@Url.Action("CreateDocument", "Document", new { ObjectId = Model.Id, Reference = (int)Reference.Shipment, area = Constants.AreaStore })'"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Marketing.Document.Add"]</button>
+        <button type="button" class="k-button" onclick="location.href='@Url.Action("CreateDocument", "Document", new { ObjectId = Model.Id, Reference = (int)Reference.Shipment, area = area })'"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Marketing.Document.Add"]</button>
     </div>
-    <vc:admin-widget widget-zone="order_shipment_details_documents_bottom" additional-data="Model"/>
+    <partial name="Partials/WidgetZone.Documents.Bottom" model="Model"/>
 </div>
 
 <script>
@@ -17,7 +20,7 @@ $(document).ready(function () {
         dataSource: {
             transport: {
                 read: {
-                    url: "@Html.Raw(Url.Action("ListDocuments", "Document", new { reference = (int)Reference.Shipment, ObjectId = Model.Id, StatusId = -1, area = Constants.AreaStore }))",
+                    url: "@Html.Raw(Url.Action("ListDocuments", "Document", new { reference = (int)Reference.Shipment, ObjectId = Model.Id, StatusId = -1, area = area }))",
                     type: "POST",
                     dataType: "json",
                     data: addAntiForgeryToken
@@ -53,12 +56,12 @@ $(document).ready(function () {
         columns: [{
                 field: "Number",
                 title: "@Loc["Admin.Documents.Document.Fields.Number"]",
-                template: '<a class="k-link" href="@Url.Action("EditDocument", "Document", new { area = Constants.AreaStore })/#=Id#">#=kendo.htmlEncode(Number)#</a>',
+                template: '<a class="k-link" href="@Url.Action("EditDocument", "Document", new { area = area })/#=Id#">#=kendo.htmlEncode(Number)#</a>',
             },
             {
                 field: "Name",
                 title: "@Loc["Admin.Documents.Document.Fields.Name"]",
-                template: '<a class="k-link" href="@Url.Action("EditDocument", "Document", new { area = Constants.AreaStore })/#=Id#">#=kendo.htmlEncode(Name)#</a>',
+                template: '<a class="k-link" href="@Url.Action("EditDocument", "Document", new { area = area })/#=Id#">#=kendo.htmlEncode(Name)#</a>',
             }, {
                 field: "Published",
                 title: "@Loc["Admin.Documents.Document.Fields.Published"]",
@@ -70,4 +73,4 @@ $(document).ready(function () {
         }]
     });
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/Partials/Info.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/Partials/Info.cshtml
similarity index 97%
rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/Partials/Info.cshtml
rename to src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/Partials/Info.cshtml
index ba7dcd41f..342b12855 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/Partials/Info.cshtml
+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/Partials/Info.cshtml
@@ -1,4 +1,7 @@
-@model ShipmentModel
+@model ShipmentModel
+@{
+    var area = ViewContext.RouteData.Values["area"]?.ToString();
+}
 <div>
     <div class="form-horizontal">
         <div class="form-body">
@@ -6,7 +9,7 @@
                 <admin-label asp-for="OrderId"/>
                 <div class="col-md-9 col-sm-9">
                     <label class="control-label">
-                        <a href="@Url.Action("Edit", "Order", new { Id = Model.OrderId, area = Constants.AreaAdmin })">@Model.OrderNumber - @Loc["Admin.Common.View"]</a>
+                        <a href="@Url.Action("Edit", "Order", new { Id = Model.OrderId, area = area })">@Model.OrderNumber - @Loc["Admin.Common.View"]</a>
                     </label>
                 </div>
             </div>
@@ -140,7 +143,7 @@
                         <td>
                             <div style="padding-left: 10px; padding-right: 10px;">
                                 <em>
-                                    <a href="@Url.Action("Edit", "Product", new { id = item.ProductId, area = Constants.AreaAdmin })">@item.ProductName</a>
+                                    <a href="@Url.Action("Edit", "Product", new { id = item.ProductId, area = area })">@item.ProductName</a>
                                 </em>
                                 @if (!string.IsNullOrEmpty(item.AttributeInfo))
                                 {
@@ -242,4 +245,4 @@
             </div>
         </div>
     </div>
-}
\ No newline at end of file
+}
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/Partials/ShipmentNotes.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/Partials/ShipmentNotes.cshtml
similarity index 92%
rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/Partials/ShipmentNotes.cshtml
rename to src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/Partials/ShipmentNotes.cshtml
index 0eb0d57a4..3788bf1ef 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/Partials/ShipmentNotes.cshtml
+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/Partials/ShipmentNotes.cshtml
@@ -1,15 +1,16 @@
-@using Grand.Domain.Media
+@using Grand.Domain.Media
 @model ShipmentModel
 @{
     ViewData["DownloadType"] = DownloadType.Shipment;
     ViewData["ReferenceId"] = Model.Id;
+    var area = ViewContext.RouteData.Values["area"]?.ToString();
 }
 <div class="panel panel-default">
-    <vc:admin-widget widget-zone="order_shipment_details_notes_top" additional-data="Model"/>
+    <partial name="Partials/WidgetZone.Notes.Top" model="Model"/>
     <div class="panel-body">
         <div id="shipmentnotes-grid"></div>
     </div>
-    <vc:admin-widget widget-zone="order_shipment_details_notes_bottom" additional-data="Model"/>
+    <partial name="Partials/WidgetZone.Notes.Bottom" model="Model"/>
 </div>
 <script>
         $(document).ready(function () {
@@ -17,13 +18,13 @@
                 dataSource: {
                     transport: {
                         read: {
-                            url: "@Html.Raw(Url.Action("ShipmentNotesSelect", "Shipment", new { shipmentId = Model.Id, area = Constants.AreaAdmin }))",
+                            url: "@Html.Raw(Url.Action("ShipmentNotesSelect", "Shipment", new { shipmentId = Model.Id, area = area }))",
                             type: "POST",
                             dataType: "json",
                             data: addAntiForgeryToken
                         },
                         destroy: {
-                            url: "@Html.Raw(Url.Action("ShipmentNoteDelete", "Shipment", new { shipmentId = Model.Id, area = Constants.AreaAdmin }))",
+                            url: "@Html.Raw(Url.Action("ShipmentNoteDelete", "Shipment", new { shipmentId = Model.Id, area = area }))",
                             type: "POST",
                             dataType: "json",
                             data: addAntiForgeryToken
@@ -78,7 +79,7 @@
                     field: "DownloadId",
                     title: "@Loc["Admin.Orders.Shipments.ShipmentNotes.Download"]",
                     width: 100,
-                    template: '# if(DownloadId != "") {# <a href="@Url.Action("DownloadFile", "Download", new { area = Constants.AreaAdmin })/?downloadGuid=#=DownloadGuid#">@Loc["Admin.Orders.OrderNotes.Fields.Download.Link"]</a> #} else {# @Loc["Admin.Orders.OrderNotes.Fields.Download.Link.No"] #} #'
+                    template: '# if(DownloadId != "") {# <a href="@Url.Action("DownloadFile", "Download", new { area = area })/?downloadGuid=#=DownloadGuid#">@Loc["Admin.Orders.OrderNotes.Fields.Download.Link"]</a> #} else {# @Loc["Admin.Orders.OrderNotes.Fields.Download.Link.No"] #} #'
                 }, {
                     field: "CreatedByCustomer",
                     title: "@Loc["Admin.Orders.Shipments.ShipmentNotes.CreatedByCustomer"]",
@@ -187,7 +188,7 @@
             $.ajax({
                 cache:false,
                 type: "POST",
-                url: "@(Url.Action("ShipmentNoteAdd", "Shipment", new { area = Constants.AreaAdmin }))",
+                url: "@(Url.Action("ShipmentNoteAdd", "Shipment", new { area = area }))",
                 data: postData,
                 success: function (data) {
                     var grid = $("#shipmentnotes-grid").data('kendoGrid');
@@ -201,4 +202,4 @@
             });
         });
     });
-</script>
\ No newline at end of file
+</script>
diff --git a/src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/Partials/WidgetZone.AddButtons.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/Partials/WidgetZone.AddButtons.cshtml
new file mode 100644
index 000000000..691131b1a
--- /dev/null
+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/Partials/WidgetZone.AddButtons.cshtml
@@ -0,0 +1 @@
+@* Unreachable in practice: Admin, Store, and Vendor (where applicable) all carry their own real override of this file, which wins by view-location precedence. Kept as the documented fallback for a future host with no widget component of its own - see ARCH-001 Phase 6 spec. *@
diff --git a/src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/Partials/WidgetZone.DetailsButtons.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/Partials/WidgetZone.DetailsButtons.cshtml
new file mode 100644
index 000000000..691131b1a
--- /dev/null
+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/Partials/WidgetZone.DetailsButtons.cshtml
@@ -0,0 +1 @@
+@* Unreachable in practice: Admin, Store, and Vendor (where applicable) all carry their own real override of this file, which wins by view-location precedence. Kept as the documented fallback for a future host with no widget component of its own - see ARCH-001 Phase 6 spec. *@
diff --git a/src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/Partials/WidgetZone.DetailsTabs.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/Partials/WidgetZone.DetailsTabs.cshtml
new file mode 100644
index 000000000..691131b1a
--- /dev/null
+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/Partials/WidgetZone.DetailsTabs.cshtml
@@ -0,0 +1 @@
+@* Unreachable in practice: Admin, Store, and Vendor (where applicable) all carry their own real override of this file, which wins by view-location precedence. Kept as the documented fallback for a future host with no widget component of its own - see ARCH-001 Phase 6 spec. *@
diff --git a/src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/Partials/WidgetZone.Documents.Bottom.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/Partials/WidgetZone.Documents.Bottom.cshtml
new file mode 100644
index 000000000..691131b1a
--- /dev/null
+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/Partials/WidgetZone.Documents.Bottom.cshtml
@@ -0,0 +1 @@
+@* Unreachable in practice: Admin, Store, and Vendor (where applicable) all carry their own real override of this file, which wins by view-location precedence. Kept as the documented fallback for a future host with no widget component of its own - see ARCH-001 Phase 6 spec. *@
diff --git a/src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/Partials/WidgetZone.Documents.Top.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/Partials/WidgetZone.Documents.Top.cshtml
new file mode 100644
index 000000000..691131b1a
--- /dev/null
+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/Partials/WidgetZone.Documents.Top.cshtml
@@ -0,0 +1 @@
+@* Unreachable in practice: Admin, Store, and Vendor (where applicable) all carry their own real override of this file, which wins by view-location precedence. Kept as the documented fallback for a future host with no widget component of its own - see ARCH-001 Phase 6 spec. *@
diff --git a/src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/Partials/WidgetZone.ListButtons.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/Partials/WidgetZone.ListButtons.cshtml
new file mode 100644
index 000000000..691131b1a
--- /dev/null
+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/Partials/WidgetZone.ListButtons.cshtml
@@ -0,0 +1 @@
+@* Unreachable in practice: Admin, Store, and Vendor (where applicable) all carry their own real override of this file, which wins by view-location precedence. Kept as the documented fallback for a future host with no widget component of its own - see ARCH-001 Phase 6 spec. *@
diff --git a/src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/Partials/WidgetZone.Notes.Bottom.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/Partials/WidgetZone.Notes.Bottom.cshtml
new file mode 100644
index 000000000..691131b1a
--- /dev/null
+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/Partials/WidgetZone.Notes.Bottom.cshtml
@@ -0,0 +1 @@
+@* Unreachable in practice: Admin, Store, and Vendor (where applicable) all carry their own real override of this file, which wins by view-location precedence. Kept as the documented fallback for a future host with no widget component of its own - see ARCH-001 Phase 6 spec. *@
diff --git a/src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/Partials/WidgetZone.Notes.Top.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/Partials/WidgetZone.Notes.Top.cshtml
new file mode 100644
index 000000000..691131b1a
--- /dev/null
+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/Partials/WidgetZone.Notes.Top.cshtml
@@ -0,0 +1 @@
+@* Unreachable in practice: Admin, Store, and Vendor (where applicable) all carry their own real override of this file, which wins by view-location precedence. Kept as the documented fallback for a future host with no widget component of its own - see ARCH-001 Phase 6 spec. *@
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/ShipmentDetails.cshtml b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/ShipmentDetails.cshtml
similarity index 91%
rename from src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/ShipmentDetails.cshtml
rename to src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/ShipmentDetails.cshtml
index 67fa15e92..13f0e27b6 100644
--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/ShipmentDetails.cshtml
+++ b/src/Web/Grand.Web.AdminShared/Views/AdminShared/Shipment/ShipmentDetails.cshtml
@@ -1,4 +1,4 @@
-@using Grand.Business.Core.Interfaces.Common.Security
+@using Grand.Business.Core.Interfaces.Common.Security
 @using Grand.Domain.Permissions
 @model ShipmentModel
 @inject IPermissionService permissionService
@@ -6,8 +6,9 @@
     //page title
     ViewBag.Title = Loc["Admin.Orders.Shipments.ViewDetails"];
     var canManageDocuments = await permissionService.Authorize(StandardPermission.ManageDocuments);
+    var area = ViewContext.RouteData.Values["area"]?.ToString();
 }
-<form asp-area="@Constants.AreaStore" asp-controller="Shipment" asp-action="ShipmentDetails" method="post">
+<form asp-area="@area" asp-controller="Shipment" asp-action="ShipmentDetails" method="post">
     <input type="hidden" asp-for="Id"/>
     <script>
         $(document).ready(function () {
@@ -64,13 +65,13 @@
                     </div>
                     <div class="actions">
                         <div class="btn-group btn-group-devided">
-                            <a href="@Url.Action("PdfPackagingSlip", new { shipmentId = Model.Id, area = Constants.AreaStore })" class="btn purple">
+                            <a href="@Url.Action("PdfPackagingSlip", new { shipmentId = Model.Id, area = area })" class="btn purple">
                                 <i class="fa fa-file-pdf-o"></i> @Loc["Admin.Orders.Shipments.PrintPackagingSlip"]
                             </a>
                             <span id="shipment-delete" class="btn red">
                                 <i class="fa fa-trash-o"></i> @Loc["Admin.Common.Delete"]
                             </span>
-                            <vc:admin-widget widget-zone="order_shipment_details_buttons" additional-data="Model"/>
+                            <partial name="Partials/WidgetZone.DetailsButtons" model="Model"/>
                         </div>
                     </div>
                 </div>
@@ -113,7 +114,7 @@
                                     </div>
                                 </content>
                             </tabstrip-item>
-                            <vc:admin-widget widget-zone="order_shipment_details_tabs" additional-data="Model"/>
+                            <partial name="Partials/WidgetZone.DetailsTabs" model="Model"/>
                         </items>
                     </admin-tabstrip>
                 </div>
@@ -122,4 +123,4 @@
         </div>
     </div>
 </form>
-<admin-delete-confirmation button-id="shipment-delete" action-name="DeleteShipment"/>
\ No newline at end of file
+<admin-delete-confirmation button-id="shipment-delete" action-name="DeleteShipment"/>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/AddShipment.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/AddShipment.cshtml
deleted file mode 100644
index df73af52b..000000000
--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/AddShipment.cshtml
+++ /dev/null
@@ -1,182 +0,0 @@
-@model ShipmentModel
-@{
-    //page title
-    ViewBag.Title = string.Format(Loc["Admin.Orders.Shipments.AddNew.Title"], Model.OrderId);
-}
-<form asp-area="@Constants.AreaStore" asp-controller="Shipment" asp-action="AddShipment" method="post"
-      asp-route-orderId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["orderId"])">
-
-    <div asp-validation-summary="All"></div>
-    <input type="hidden" asp-for="@Model.OrderId"/>
-    <div class="col-md-12">
-        <div class="x_panel light form-fit">
-            <div class="x_title">
-                <div class="caption">
-                    <i class="fa fa-truck"></i>
-                    @string.Format(Loc["Admin.Orders.Shipments.AddNew.Title"], Model.OrderNumber)
-                    <small>
-                        <i class="fa fa-arrow-circle-left"></i>
-                        @Html.ActionLink(Loc["Admin.Orders.Shipments.BackToOrder"], "Edit", "Order", new { Id = Model.OrderId })
-                    </small>
-                </div>
-                <div class="actions">
-                    <div class="btn-group btn-group-devided">
-                        <button class="btn btn-success" type="submit" id="shipment-save" name="save">
-                            <i class="fa fa-check"></i> @Loc["Admin.Common.Save"]
-                        </button>
-                        <button class="btn btn-success" type="submit" id="shipment-save-continue" name="save-continue">
-                            <i class="fa fa-check-circle"></i> @Loc["Admin.Common.SaveContinue"]
-                        </button>
-                        <vc:admin-widget widget-zone="order_shipment_add_buttons" additional-data="null"/>
-                    </div>
-                </div>
-            </div>
-            <div class="x_content form">
-                <div class="form-horizontal">
-                    <div class="form-body">
-                        <div class="form-group">
-                            <admin-label asp-for="TrackingNumber"/>
-                            <div class="col-md-9 col-sm-9">
-                                <admin-input asp-for="TrackingNumber"/>
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <admin-label asp-for="AdminComment"/>
-                            <div class="col-md-9 col-sm-9">
-                                <admin-input asp-for="AdminComment"/>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-
-    <h4>
-        <strong>@Loc["Admin.Orders.Shipments.Products"]</strong>
-    </h4>
-
-    <div class="table-responsive visible-xs-block visible-sm-block visible-md-block visible-lg-block">
-        <table class="table table-bordered table-striped table-hover">
-            <thead>
-            <tr>
-                <th>
-                    @Loc["Admin.Orders.Shipments.Products.ProductName"]
-                </th>
-                <th>
-                    @Loc["Admin.Orders.Shipments.Products.SKU"]
-                </th>
-                <th>
-                    @Loc["Admin.Orders.Shipments.Products.Warehouse"]
-                </th>
-                <th>
-                    @Loc["Admin.Orders.Shipments.Products.ItemWeight"]
-                </th>
-                <th>
-                    @Loc["Admin.Orders.Shipments.Products.ItemDimensions"]
-                </th>
-                <th>
-                    @Loc["Admin.Orders.Shipments.Products.QtyOrdered"]
-                </th>
-                <th>
-                    @Loc["Admin.Orders.Shipments.Products.QtyShipped"]
-                </th>
-                <th>
-                    @Loc["Admin.Orders.Shipments.Products.QtyToShip"]
-                </th>
-            </tr>
-            </thead>
-            <tbody>
-            @for (var j = 0; j < Model.Items.Count; j++)
-            {
-                var item = Model.Items[j];
-                <input asp-for="@Model.Items[j].OrderItemId" type="hidden"/>
-                <tr>
-                    <td>
-                        <div style="padding-left:10px;padding-right:10px;">
-                            <em>
-                                <a href="@Url.Action("Edit", "Product", new { id = item.ProductId, area = Constants.AreaStore })">@item.ProductName</a>
-                            </em>
-                            @if (!string.IsNullOrEmpty(item.AttributeInfo))
-                            {
-                                <p>
-                                    @Html.Raw(item.AttributeInfo)
-                                </p>
-                            }
-                            @if (item.ShipSeparately)
-                            {
-                                <p>
-                                    <strong>@Loc["Admin.Orders.Shipments.Products.ShipSeparately.Warning"]</strong>
-                                    @Loc["Admin.Orders.Shipments.Products.ShipSeparately"]
-                                </p>
-                            }
-                        </div>
-                    </td>
-                    <td>
-                        <div style="padding-left:10px;padding-right:10px;">
-                            @item.Sku
-                        </div>
-                    </td>
-                    <td>
-                        <div>
-                            @if (item.AllowToChooseWarehouse)
-                            {
-                                if (item.AvailableWarehouses.Count > 0)
-                                {
-                                    <select asp-for="@Model.Items[j].WarehouseId">
-                                        @foreach (var warehouse in item.AvailableWarehouses)
-                                        {
-                                            var selected = warehouse.WarehouseId == item.WarehouseId;
-                                            <option value="@(warehouse.WarehouseId)" data-stock-qty="@(warehouse.StockQuantity)"
-                                                    data-reserved-qty="@(warehouse.ReservedQuantity)"
-                                                    selected="@selected">
-                                                @Loc["Admin.Orders.Shipments.Products.Warehouse.ChooseQty", warehouse.WarehouseName, warehouse.StockQuantity, warehouse.ReservedQuantity]
-                                            </option>
-                                        }
-                                    </select>
-                                }
-                                else
-                                {
-                                    <div>@Loc["Admin.Orders.Shipments.Products.Warehouse.NotAvailabe"]</div>
-                                }
-                            }
-                            else
-                            {
-                                //display warehouses
-                                for (var i = 0; i < item.AvailableWarehouses.Count; i++)
-                                {
-                                    var warehouse = item.AvailableWarehouses[i];
-                                    @warehouse.WarehouseName
-                                    if (i != item.AvailableWarehouses.Count - 1)
-                                    {
-                                        <br/>
-                                    }
-                                }
-                            }
-                        </div>
-                    </td>
-                    <td>
-                        @item.ItemWeight
-                    </td>
-                    <td>
-                        @item.ItemDimensions
-                    </td>
-                    <td>
-                        @item.QuantityOrdered
-                    </td>
-                    <td>
-                        @item.QuantityInAllShipments
-                    </td>
-                    <td>
-                        <input asp-for="@Model.Items[j].QuantityToAdd" type="number" value="@item.QuantityToAdd"
-                               class="form-control" style="width:100px;" max="@item.QuantityToAdd"/>
-                    </td>
-                </tr>
-            }
-            </tbody>
-        </table>
-    </div>
-
-
-</form>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/Partials/Info.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/Partials/Info.cshtml
deleted file mode 100644
index 624d85621..000000000
--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/Partials/Info.cshtml
+++ /dev/null
@@ -1,245 +0,0 @@
-@model ShipmentModel
-<div>
-    <div class="form-horizontal">
-        <div class="form-body">
-            <div class="form-group">
-                <admin-label asp-for="OrderId"/>
-                <div class="col-md-9 col-sm-9">
-                    <label class="control-label">
-                        <a href="@Url.Action("Edit", "Order", new { Id = Model.OrderId, area = Constants.AreaStore })">@Model.OrderNumber - @Loc["Admin.Common.View"]</a>
-                    </label>
-                </div>
-            </div>
-            <div class="form-group">
-                <admin-label asp-for="TrackingNumber"/>
-                <div class="col-md-6">
-                    <div class="input-group">
-                        <div class="input-group-control">
-                            <admin-input asp-for="TrackingNumber"/>
-                        </div>
-                        <div class="input-group-append">
-                            <input type="submit" name="settrackingnumber" asp-action="SetTrackingNumber" value="@Loc["Admin.Orders.Shipments.TrackingNumber.Button"]" class="btn default"/>
-                            @if (!string.IsNullOrEmpty(Model.TrackingNumberUrl))
-                            {
-                                <a href="@Model.TrackingNumberUrl" target="_blank" class="tracking-url">@Loc["Admin.Orders.Shipments.TrackingNumber.ViewOnline"]</a>
-                            }
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">
-                <admin-label asp-for="AdminComment"/>
-                <div class="col-md-6">
-                    <div class="input-group">
-                        <div class="input-group-control">
-                            <admin-input asp-for="AdminComment"/>
-                        </div>
-                        <div class="input-group-append">
-                            <input type="submit" name="setadmincomment" asp-action="SetShipmentAdminComment" value="@Loc["Admin.Orders.Shipments.AdminComment.Button"]" class="btn default"/>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">
-                <admin-label asp-for="TotalWeight"/>
-                <div class="col-md-9 col-sm-9">
-                    <label class="control-label">@Model.TotalWeight</label>
-                </div>
-            </div>
-            <div class="form-group">
-                <admin-label asp-for="ShippedDate"/>
-                <div class="col-md-9 col-sm-9">
-                    <span id="lblShippedDate">
-                        @if (Model.ShippedDate.HasValue)
-                        {
-                            @Model.ShippedDate.Value.ToString(CultureInfo.InvariantCulture)
-                        }
-                        else
-                        {
-                            <text>@Loc["Admin.Orders.Shipments.ShippedDate.NotYet"]</text>
-                        }
-                    </span>
-                    @if (Model.CanShip)
-                    {
-                        <input type="submit" name="setasshipped" asp-action="SetAsShipped" value="@Loc["Admin.Orders.Shipments.ShippedDate.Button"]" id="setasshipped" class="btn default"/>
-                    }
-                    @if (Model.ShippedDateUtc.HasValue)
-                    {
-                        <div id="divShippedDate" style="display: inline-block;"><admin-input asp-for="ShippedDate"/> &nbsp;@Loc["Admin.Orders.Shipments.ShippedDate.Enter"]</div>
-                        <button type="submit" id="btnEditShippedDate" onclick=" toggleShippedDate(true);return false; " class="k-button"><span class="k-icon k-i-edit"></span>&nbsp;@Loc["Admin.Common.Edit"]</button>
-                        <button type="submit" id="btnSaveShippedDate" asp-action="EditShippedDate" name="saveshippeddate" onclick=" return confirm('@Loc["Admin.Common.AreYouSure"]'); " class="k-button"><span class="k-icon k-i-save"></span>&nbsp;@Loc["Admin.Common.Save"]</button>
-                        <button type="submit" id="btnCancelShippedDate" onclick=" toggleShippedDate(false);return false; " class="k-button"><span class="k-icon k-i-cancel"></span>&nbsp;@Loc["Admin.Common.Cancel"]</button>
-                    }
-                </div>
-            </div>
-            <div class="form-group">
-                <admin-label asp-for="DeliveryDate"/>
-                <div class="col-md-9 col-sm-9">
-                    <span id="lblDeliveryDate">
-                        @if (Model.DeliveryDate.HasValue)
-                        {
-                            @Model.DeliveryDate.Value.ToString(CultureInfo.InvariantCulture)
-                        }
-                        else
-                        {
-                            <text>@Loc["Admin.Orders.Shipments.DeliveryDate.NotYet"]</text>
-                        }
-                    </span>
-                    @if (Model.CanDeliver)
-                    {
-                        <input type="submit" name="setasdelivered" asp-action="SetAsDelivered" value="@Loc["Admin.Orders.Shipments.DeliveryDate.Button"]" id="setasdelivered" class="btn default"/>
-                    }
-                    @if (Model.DeliveryDateUtc.HasValue)
-                    {
-                        <div id="divDeliveryDate" style="display: inline-block;"><admin-input asp-for="DeliveryDate"/> &nbsp;@Loc["Admin.Orders.Shipments.DeliveryDate.Enter"]</div>
-                        <button type="submit" id="btnEditDeliveryDate" onclick=" toggleDeliveryDate(true);return false; " class="k-button"><span class="k-icon k-i-edit"></span>&nbsp;@Loc["Admin.Common.Edit"]</button>
-                        <button type="submit" id="btnSaveDeliveryDate" asp-action="EditDeliveryDate" name="savedeliverydate" onclick=" return confirm('@Loc["Admin.Common.AreYouSure"]'); " class="k-button"><span class="k-icon k-i-save"></span>&nbsp;@Loc["Admin.Common.Save"]</button>
-                        <button type="submit" id="btnCancelDeliveryDate" onclick=" toggleDeliveryDate(false);return false; " class="k-button"><span class="k-icon k-i-cancel"></span>&nbsp;@Loc["Admin.Common.Cancel"]</button>
-                    }
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-<table class="table table-striped table-hover">
-    <tr>
-        <td>
-            <strong>@Loc["Admin.Orders.Shipments.Products"]</strong>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <table class="table table-bordered table-striped table-hover">
-                <thead>
-                <tr>
-                    <th>
-                        @Loc["Admin.Orders.Shipments.Products.ProductName"]
-                    </th>
-                    <th>
-                        @Loc["Admin.Orders.Shipments.Products.SKU"]
-                    </th>
-                    <th>
-                        @Loc["Admin.Orders.Shipments.Products.Warehouse"]
-                    </th>
-                    <th>
-                        @Loc["Admin.Orders.Shipments.Products.ItemWeight"]
-                    </th>
-                    <th>
-                        @Loc["Admin.Orders.Shipments.Products.ItemDimensions"]
-                    </th>
-                    <th>
-                        @Loc["Admin.Orders.Shipments.Products.QtyShipped"]
-                    </th>
-                </tr>
-                </thead>
-                <tbody>
-                @foreach (var item in Model.Items)
-                {
-                    <tr>
-                        <td>
-                            <div style="padding-left: 10px; padding-right: 10px;">
-                                <em>
-                                        <a href="@Url.Action("Edit", "Product", new { id = item.ProductId, area = Constants.AreaStore })">@item.ProductName</a>
-                                </em>
-                                @if (!string.IsNullOrEmpty(item.AttributeInfo))
-                                {
-                                    <p>
-                                        @Html.Raw(item.AttributeInfo)
-                                    </p>
-                                }
-                                @if (!string.IsNullOrEmpty(item.RentalInfo))
-                                {
-                                    <p>
-                                        @Html.Raw(item.RentalInfo)
-                                    </p>
-                                }
-                            </div>
-                        </td>
-                        <td>
-                            <div style="padding-left: 10px; padding-right: 10px;">
-                                @item.Sku
-                            </div>
-                        </td>
-                        <td>
-                            <div style="padding-left: 10px; padding-right: 10px;">
-                                @item.ShippedFromWarehouse
-                            </div>
-                        </td>
-                        <td>
-                            @item.ItemWeight
-                        </td>
-                        <td>
-                            @item.ItemDimensions
-                        </td>
-                        <td>
-                            @item.QuantityInThisShipment
-                        </td>
-                    </tr>
-                }
-                </tbody>
-            </table>
-        </td>
-    </tr>
-</table>
-
-@if (Model.ShipmentStatusEvents.Count > 0)
-{
-    <div class="form-horizontal">
-        <div class="note note-info">
-            @Loc["Admin.Orders.Shipments.ShipmentStatusEvents"]
-        </div>
-        <div class="form-body">
-            <div class="form-group">
-                <table class="table table-bordered table-striped table-hover">
-                    <thead>
-                    <tr>
-                        <th align="center">
-                            @Loc["Admin.Orders.Shipments.ShipmentStatusEvents.Event"]
-                        </th>
-                        <th align="center">
-                            @Loc["Admin.Orders.Shipments.ShipmentStatusEvents.Location"]
-                        </th>
-                        <th align="center">
-                            @Loc["Admin.Orders.Shipments.ShipmentStatusEvents.Country"]
-                        </th>
-                        <th align="center">
-                            @Loc["Admin.Orders.Shipments.ShipmentStatusEvents.Date"]
-                        </th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    @foreach (var item in Model.ShipmentStatusEvents)
-                    {
-                        <tr>
-                            <td style="width:40%;">
-                                <div style="padding-left: 10px; padding-right: 10px;">
-                                    @item.EventName
-                                </div>
-                            </td>
-                            <td style="width:20%;">
-                                <div style="padding-left: 10px; padding-right: 10px;">
-                                    @item.Location
-                                </div>
-                            </td>
-                            <td style="width:20%;">
-                                <div style="padding-left: 10px; padding-right: 10px;">
-                                    @item.Country
-                                </div>
-                            </td>
-                            <td style="width:20%;">
-                                <div style="padding-left: 10px; padding-right: 10px;">
-                                    @if (item.Date.HasValue)
-                                    {
-                                        @item.Date.Value.ToString("D")
-                                    }
-                                </div>
-                            </td>
-                        </tr>
-                    }
-                    </tbody>
-                </table>
-            </div>
-        </div>
-    </div>
-}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/Partials/ShipmentNotes.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/Partials/ShipmentNotes.cshtml
deleted file mode 100644
index e3860d968..000000000
--- a/src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/Partials/ShipmentNotes.cshtml
+++ /dev/null
@@ -1,204 +0,0 @@
-@using Grand.Domain.Media
-@model ShipmentModel
-@{
-    ViewData["DownloadType"] = DownloadType.Shipment;
-    ViewData["ReferenceId"] = Model.Id;
-}
-<div class="panel panel-default">
-    <vc:admin-widget widget-zone="order_shipment_details_notes_top" additional-data="Model"/>
-    <div class="panel-body">
-        <div id="shipmentnotes-grid"></div>
-    </div>
-    <vc:admin-widget widget-zone="order_shipment_details_notes_bottom" additional-data="Model"/>
-</div>
-<script>
-        $(document).ready(function () {
-            $("#shipmentnotes-grid").kendoGrid({
-                dataSource: {
-                    transport: {
-                        read: {
-                        url: "@Html.Raw(Url.Action("ShipmentNotesSelect", "Shipment", new { shipmentId = Model.Id, area = Constants.AreaStore }))",
-                            type: "POST",
-                            dataType: "json",
-                            data: addAntiForgeryToken
-                        },
-                        destroy: {
-                        url: "@Html.Raw(Url.Action("ShipmentNoteDelete", "Shipment", new { shipmentId = Model.Id, area = Constants.AreaStore }))",
-                            type: "POST",
-                            dataType: "json",
-                            data: addAntiForgeryToken
-                        }
-                    },
-                    schema: {
-                        data: "Data",
-                        total: "Total",
-                        errors: "Errors",
-                        model: {
-                            id: "Id",
-                            fields: {
-                                //do not implicitly specify all fields
-                                //we do it only for fields which implicitly require it
-                                //otherwise, they'll be formatted wrong way
-                                CreatedOn: {type: "date" }
-                            }
-                        }
-                    },
-                    error: function(e) {
-                        display_kendoui_grid_error(e);
-                        // Cancel the changes
-                        this.cancelChanges();
-                    },
-                    serverPaging: true,
-                    serverFiltering: true,
-                    serverSorting: true
-                },
-                pageable: {
-                    refresh: true,
-                    numeric: false,
-                    previousNext: false,
-                    info: false
-                },
-                editable: {
-                    confirmation: false,
-                    mode: "inline"
-                },
-                scrollable: false,
-                columns: [{
-                    field: "CreatedOn",
-                    title: "@Loc["Admin.Orders.Shipments.ShipmentNotes.CreatedOn"]",
-                    width: 180,
-                    type: "date",
-                    format: "{0:G}"
-                }, {
-                    field: "Note",
-                    title: "@Loc["Admin.Orders.Shipments.ShipmentNotes.Note"]",
-                    width: 350,
-                    encoded: false
-                }, {
-                    field: "DownloadId",
-                    title: "@Loc["Admin.Orders.Shipments.ShipmentNotes.Download"]",
-                    width: 100,
-                template: '# if(DownloadId != "") {# <a href="@Url.Action("DownloadFile", "Download", new { area = Constants.AreaStore })/?downloadGuid=#=DownloadGuid#">@Loc["Admin.Orders.OrderNotes.Fields.Download.Link"]</a> #} else {# @Loc["Admin.Orders.OrderNotes.Fields.Download.Link.No"] #} #'
-                }, {
-                    field: "CreatedByCustomer",
-                    title: "@Loc["Admin.Orders.Shipments.ShipmentNotes.CreatedByCustomer"]",
-                    width: 100,
-                    headerAttributes: { style: "text-align:center" },
-                    attributes: { style: "text-align:center" },
-                    template: '# if(CreatedByCustomer) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'
-                }, {
-                    field: "DisplayToCustomer",
-                    title: "@Loc["Admin.Orders.Shipments.ShipmentNotes.Fields.DisplayToCustomer"]",
-                    width: 100,
-                    headerAttributes: { style: "text-align:center" },
-                    attributes: { style: "text-align:center" },
-                    template: '# if(DisplayToCustomer) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'
-                }, {
-                    command: { name: "destroy", text: "@Loc["Admin.Common.Delete"]" },
-                    title: "@Loc["Admin.Common.Delete"]",
-                    width: 100
-                }]
-            });
-        });
-</script>
-<p>
-    <strong>
-        @Loc["Admin.Orders.Shipments.ShipmentNotes.AddTitle"]
-    </strong>
-</p>
-<script>
-    $(document).ready(function () {
-        $("#@Html.IdFor(model => model.AddShipmentNoteHasDownload)").change(toggleAddShipmentNoteHasDownload);
-        toggleAddShipmentNoteHasDownload();
-    });
-    function toggleAddShipmentNoteHasDownload() {
-        if ($('#@Html.IdFor(model => model.AddShipmentNoteHasDownload)').is(':checked')) {
-            $('#pnlAddShipmentNoteDownloadId').show();
-        }
-        else {
-            $('#pnlAddShipmentNoteDownloadId').hide();
-        }
-    }
-
-</script>
-
-<div class="form-horizontal">
-    <div class="form-body">
-        <div class="form-group">
-            <admin-label asp-for="AddShipmentNoteMessage"/>
-            <div class="col-md-9 col-sm-9">
-                <admin-textarea asp-for="AddShipmentNoteMessage"></admin-textarea>
-                <span asp-validation-for="AddShipmentNoteMessage"></span>
-            </div>
-        </div>
-        <div class="form-group">
-            <admin-label asp-for="AddShipmentNoteDownloadId"/>
-            <div class="col-md-9 col-sm-9">
-                <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
-                    <admin-input asp-for="AddShipmentNoteHasDownload"/>
-                    <div class="control__indicator"></div>
-                </label>
-                <div id="pnlAddShipmentNoteDownloadId">
-                    <admin-input asp-for="AddShipmentNoteDownloadId"/>
-                    <span asp-validation-for="AddShipmentNoteDownloadId"></span>
-                </div>
-            </div>
-        </div>
-        <div class="form-group">
-            <admin-label asp-for="AddShipmentNoteDisplayToCustomer"/>
-            <div class="col-md-9 col-sm-9">
-                <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
-                    <admin-input asp-for="AddShipmentNoteDisplayToCustomer"/>
-                    <div class="control__indicator"></div>
-                </label>
-                <span asp-validation-for="AddShipmentNoteDisplayToCustomer"></span>
-            </div>
-        </div>
-        <div class="form-actions">
-            <div class="offset-md-3 col-md-9 col-sm-9">
-                <button type="button" id="addShipmentNote" class="k-button"><i class="fa fa-plus"></i>&nbsp;@Loc["Admin.Orders.Shipments.ShipmentNotes.AddButton"]</button>
-            </div>
-        </div>
-    </div>
-</div>
-
-<script>
-    $(document).ready(function () {
-        $('#addShipmentNote').click(function () {
-            var shipmentNoteMessage = $("#@Html.IdFor(model => model.AddShipmentNoteMessage)").val();
-            if (shipmentNoteMessage.length == 0) {
-                alert('Message text is required');
-                return;
-            }
-            var shipmentNoteDownloadId = '';
-            if ($('#@Html.IdFor(model => model.AddShipmentNoteHasDownload)').is(':checked')) {
-                shipmentNoteDownloadId = $("#@Html.IdFor(model => model.AddShipmentNoteDownloadId)").val();
-            }
-            var shipmentNoteDisplayToCustomer = $("#@Html.IdFor(model => model.AddShipmentNoteDisplayToCustomer)").is(':checked');
-            $('#addShipmentNote').attr('disabled', true);
-            var postData = {
-                DisplayToCustomer: shipmentNoteDisplayToCustomer,
-                message: shipmentNoteMessage,
-                downloadId: shipmentNoteDownloadId,
-                shipmentId: '@Model.Id'
-            };
-            addAntiForgeryToken(postData);
-
-            $.ajax({
-                cache:false,
-                type: "POST",
-                url: "@(Url.Action("ShipmentNoteAdd", "Shipment", new { area = Constants.AreaStore }))",
-                data: postData,
-                success: function (data) {
-                    var grid = $("#shipmentnotes-grid").data('kendoGrid');
-                    grid.dataSource.read();
-                    $('#addShipmentNote').attr('disabled', false);
-                },
-                error:function (xhr, ajaxOptions, thrownError){
-                    alert('Failed to add shipment note.');
-                    $('#addShipmentNote').attr('disabled', false);
-                }
-            });
-        });
-    });
-</script>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/Partials/WidgetZone.AddButtons.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/Partials/WidgetZone.AddButtons.cshtml
new file mode 100644
index 000000000..cedcdc6c1
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/Partials/WidgetZone.AddButtons.cshtml
@@ -0,0 +1 @@
+<vc:store-widget widget-zone="store_order_shipment_add_buttons" additional-data="null"/>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/Partials/WidgetZone.DetailsButtons.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/Partials/WidgetZone.DetailsButtons.cshtml
new file mode 100644
index 000000000..25940a822
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/Partials/WidgetZone.DetailsButtons.cshtml
@@ -0,0 +1,2 @@
+@model ShipmentModel
+<vc:store-widget widget-zone="store_order_shipment_details_buttons" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/Partials/WidgetZone.DetailsTabs.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/Partials/WidgetZone.DetailsTabs.cshtml
new file mode 100644
index 000000000..37276fbad
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/Partials/WidgetZone.DetailsTabs.cshtml
@@ -0,0 +1,2 @@
+@model ShipmentModel
+<vc:store-widget widget-zone="store_order_shipment_details_tabs" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/Partials/WidgetZone.Documents.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/Partials/WidgetZone.Documents.Bottom.cshtml
new file mode 100644
index 000000000..feab39f96
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/Partials/WidgetZone.Documents.Bottom.cshtml
@@ -0,0 +1,2 @@
+@model ShipmentModel
+<vc:store-widget widget-zone="store_order_shipment_details_documents_bottom" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/Partials/WidgetZone.Documents.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/Partials/WidgetZone.Documents.Top.cshtml
new file mode 100644
index 000000000..d70a24d3b
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/Partials/WidgetZone.Documents.Top.cshtml
@@ -0,0 +1,2 @@
+@model ShipmentModel
+<vc:store-widget widget-zone="store_order_shipment_details_documents_top" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/Partials/WidgetZone.ListButtons.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/Partials/WidgetZone.ListButtons.cshtml
new file mode 100644
index 000000000..6837cee21
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/Partials/WidgetZone.ListButtons.cshtml
@@ -0,0 +1 @@
+<vc:store-widget widget-zone="store_order_shipment_list_buttons" additional-data="null"/>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/Partials/WidgetZone.Notes.Bottom.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/Partials/WidgetZone.Notes.Bottom.cshtml
new file mode 100644
index 000000000..d11bb8837
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/Partials/WidgetZone.Notes.Bottom.cshtml
@@ -0,0 +1,2 @@
+@model ShipmentModel
+<vc:store-widget widget-zone="store_order_shipment_details_notes_bottom" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/Partials/WidgetZone.Notes.Top.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/Partials/WidgetZone.Notes.Top.cshtml
new file mode 100644
index 000000000..8cc575437
--- /dev/null
+++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Shipment/Partials/WidgetZone.Notes.Top.cshtml
@@ -0,0 +1,2 @@
+@model ShipmentModel
+<vc:store-widget widget-zone="store_order_shipment_details_notes_top" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Store/Controllers/ShipmentController.cs b/src/Web/Grand.Web.Store/Controllers/ShipmentController.cs
index 0e9c542ae..f632e9dfe 100644
--- a/src/Web/Grand.Web.Store/Controllers/ShipmentController.cs
+++ b/src/Web/Grand.Web.Store/Controllers/ShipmentController.cs
@@ -1,630 +1,39 @@
-using Grand.Business.Core.Commands.Checkout.Shipping;
 using Grand.Business.Core.Interfaces.Checkout.Orders;
 using Grand.Business.Core.Interfaces.Checkout.Shipping;
 using Grand.Business.Core.Interfaces.Common.Directory;
 using Grand.Business.Core.Interfaces.Common.Localization;
 using Grand.Business.Core.Interfaces.Common.Pdf;
 using Grand.Domain.Orders;
-using Grand.Domain.Permissions;
 using Grand.Domain.Shipping;
 using Grand.Infrastructure;
+using Grand.Mediator;
+using Grand.Web.AdminShared.Controllers;
 using Grand.Web.AdminShared.Interfaces;
-using Grand.Web.AdminShared.Models.Orders;
-using Grand.Web.Common.DataSource;
-using Grand.Web.Common.Extensions;
 using Grand.Web.Common.Filters;
-using Grand.Web.Common.Security.Authorization;
-using Grand.Mediator;
+using Grand.Web.Store.Extensions;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Grand.Web.Store.Controllers;
 
-[PermissionAuthorize(PermissionSystemName.Shipments)]
-public class ShipmentController : BaseStoreController
-{
-    public ShipmentController(
-        IShipmentViewModelService shipmentViewModelService,
-        IOrderService orderService,
-        ITranslationService translationService,
-        IContextAccessor contextAccessor,
-        IPdfService pdfService,
-        IShipmentService shipmentService,
-        IDateTimeService dateTimeService,
-        IMediator mediator)
-    {
-        _shipmentViewModelService = shipmentViewModelService;
-        _orderService = orderService;
-        _translationService = translationService;
-        _contextAccessor = contextAccessor;
-        _pdfService = pdfService;
-        _shipmentService = shipmentService;
-        _dateTimeService = dateTimeService;
-        _mediator = mediator;
-    }
-
-    #region Fields
-
-    private readonly IShipmentViewModelService _shipmentViewModelService;
-    private readonly IOrderService _orderService;
-    private readonly ITranslationService _translationService;
-    private readonly IContextAccessor _contextAccessor;
-    private readonly IPdfService _pdfService;
-    private readonly IShipmentService _shipmentService;
-    private readonly IDateTimeService _dateTimeService;
-    private readonly IMediator _mediator;
-
-    #endregion
-
-    #region Shipments
-
-    public async Task<IActionResult> List()
-    {
-        var model = await _shipmentViewModelService.PrepareShipmentListModel();
-        return View(model);
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.List)]
-    [HttpPost]
-    public async Task<IActionResult> ShipmentListSelect(DataSourceRequest command, ShipmentListModel model)
-    {
-        model.StoreId = _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId;
-        var shipments = await _shipmentViewModelService.PrepareShipments(model, command.Page, command.PageSize);
-        var items = new List<ShipmentModel>();
-        foreach (var item in shipments.shipments)
-            items.Add(await _shipmentViewModelService.PrepareShipmentModel(item, false));
-
-        var gridModel = new DataSourceResult {
-            Data = items,
-            Total = shipments.totalCount
-        };
-        return Json(gridModel);
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.List)]
-    [HttpPost]
-    public async Task<IActionResult> ShipmentsByOrder(string orderId, DataSourceRequest command)
-    {
-        var order = await _orderService.GetOrderById(orderId) ?? throw new ArgumentException("No order found with the specified id");
-        if (order.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)
-            return Content("");
-
-        //shipments
-        var shipmentModels = new List<ShipmentModel>();
-        var shipments = (await _shipmentService.GetShipmentsByOrder(orderId))
-            .OrderBy(s => s.CreatedOnUtc)
-            .ToList();
-        foreach (var shipment in shipments)
-            shipmentModels.Add(await _shipmentViewModelService.PrepareShipmentModel(shipment, false));
-
-        var gridModel = new DataSourceResult {
-            Data = shipmentModels,
-            Total = shipmentModels.Count
-        };
-        return Json(gridModel);
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.List)]
-    [HttpPost]
-    public async Task<IActionResult> ShipmentsItemsByShipmentId(string shipmentId, DataSourceRequest command)
-    {
-        var shipment = await _shipmentService.GetShipmentById(shipmentId) ?? throw new ArgumentException("No shipment found with the specified id");
-        var order = await _orderService.GetOrderById(shipment.OrderId) ?? throw new ArgumentException("No order found with the specified id");
-
-        if (shipment.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)
-            return Content("");
-
-        //shipments
-        var shipmentModel = await _shipmentViewModelService.PrepareShipmentModel(shipment, true);
-        var gridModel = new DataSourceResult {
-            Data = shipmentModel.Items,
-            Total = shipmentModel.Items.Count
-        };
-
-        return Json(gridModel);
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Create)]
-    public async Task<IActionResult> AddShipment(string orderId)
-    {
-        var order = await _orderService.GetOrderById(orderId);
-        if (order == null)
-            //No order found with the specified id
-            return RedirectToAction("List");
-
-        if (order.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)
-            return RedirectToAction("List");
-
-        var model = await _shipmentViewModelService.PrepareShipmentModel(order);
-
-        return View(model);
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Edit)]
-    [HttpPost]
-    [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]
-    public async Task<IActionResult> AddShipment(AddShipmentModel model, bool continueEditing)
-    {
-        var order = await _orderService.GetOrderById(model.OrderId);
-        if (order == null)
-            //No order found with the specified id
-            return RedirectToAction("List");
-
-        if (order.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)
-            return RedirectToAction("List");
-
-        var orderItems = order.OrderItems;
-
-        var sh = await _shipmentViewModelService.PrepareShipment(order, orderItems.ToList(), model);
-        if (sh.shipment == null)
-            return RedirectToAction("AddShipment", new { orderId = model.OrderId });
-
-        var shipment = sh.shipment;
-        //check stock
-        var (valid, message) = await _shipmentViewModelService.ValidStockShipment(shipment);
-        if (!valid)
-        {
-            Error(message);
-            return RedirectToAction("AddShipment", new { orderId = model.OrderId });
-        }
-
-        //if we have at least one item in the shipment, then save it
-        if (shipment.ShipmentItems.Count > 0)
-        {
-            shipment.TotalWeight = sh.totalWeight;
-            await _shipmentService.InsertShipment(shipment);
-
-            //add a note
-            await _orderService.InsertOrderNote(new OrderNote {
-                Note = $"A shipment #{shipment.ShipmentNumber} has been added",
-                DisplayToCustomer = false,
-                OrderId = order.Id
-            });
-
-            Success(_translationService.GetResource("Admin.Orders.Shipments.Added"));
-            return continueEditing
-                ? RedirectToAction("ShipmentDetails", new { id = shipment.Id })
-                : RedirectToAction("List", new { id = shipment.Id });
-        }
-
-        Error(_translationService.GetResource("Admin.Orders.Shipments.NoProductsSelected"));
-        return RedirectToAction("AddShipment", new { orderId = model.OrderId });
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Preview)]
-    public async Task<IActionResult> ShipmentDetails(string id)
-    {
-        var shipment = await _shipmentService.GetShipmentById(id);
-        if (shipment == null)
-            //No shipment found with the specified id
-            return RedirectToAction("List");
-
-        if (shipment.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)
-            return RedirectToAction("List");
-
-        var orderId = shipment.OrderId;
-        var order = await _orderService.GetOrderById(orderId);
-        if (order == null)
-            //No order found with the specified id
-            return RedirectToAction("List");
-
-        var model = await _shipmentViewModelService.PrepareShipmentModel(shipment, true, true);
-        return View(model);
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Delete)]
-    [HttpPost]
-    public async Task<IActionResult> DeleteShipment(string id)
-    {
-        var shipment = await _shipmentService.GetShipmentById(id);
-        if (shipment == null)
-            //No shipment found with the specified id
-            return RedirectToAction("List");
-
-        if (shipment.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)
-            return RedirectToAction("List");
-
-        var orderId = shipment.OrderId;
-        var order = await _orderService.GetOrderById(orderId);
-        if (order == null)
-            //No order found with the specified id
-            return RedirectToAction("List");
-
-        //delete shipment
-        await _shipmentService.DeleteShipment(shipment);
-
-        //add a note
-        await _orderService.InsertOrderNote(new OrderNote {
-            Note = $"A shipment #{shipment.ShipmentNumber} has been deleted",
-            DisplayToCustomer = false,
-            OrderId = order.Id
-        });
-
-        Success(_translationService.GetResource("Admin.Orders.Shipments.Deleted"));
-
-        return RedirectToAction("Edit", "Order", new { order.Id });
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Edit)]
-    [HttpPost]
-    public async Task<IActionResult> SetTrackingNumber(ShipmentModel model)
-    {
-        var shipment = await _shipmentService.GetShipmentById(model.Id);
-        if (shipment == null)
-            //No shipment found with the specified id
-            return RedirectToAction("List");
-
-        if (shipment.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)
-            return RedirectToAction("List");
-
-        var order = await _orderService.GetOrderById(shipment.OrderId);
-        if (order == null)
-            //No order found with the specified id
-            return RedirectToAction("List");
-
-        shipment.TrackingNumber = model.TrackingNumber;
-        await _shipmentService.UpdateShipment(shipment);
-
-        return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Edit)]
-    [HttpPost]
-    public async Task<IActionResult> SetShipmentAdminComment(ShipmentModel model)
-    {
-        var shipment = await _shipmentService.GetShipmentById(model.Id);
-        if (shipment == null)
-            //No shipment found with the specified id
-            return RedirectToAction("List");
-
-        if (shipment.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)
-            return RedirectToAction("List");
-
-        var order = await _orderService.GetOrderById(shipment.OrderId);
-        if (order == null)
-            //No order found with the specified id
-            return RedirectToAction("List");
-
-        shipment.AdminComment = model.AdminComment;
-        await _shipmentService.UpdateShipment(shipment);
-
-        return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Edit)]
-    [HttpPost]
-    public async Task<IActionResult> SetAsShipped(string id)
-    {
-        var shipment = await _shipmentService.GetShipmentById(id);
-        if (shipment == null)
-            //No shipment found with the specified id
-            return RedirectToAction("List");
-
-        if (shipment.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)
-            return RedirectToAction("List");
-
-        var order = await _orderService.GetOrderById(shipment.OrderId);
-        if (order == null)
-            //No order found with the specified id
-            return RedirectToAction("List");
-        try
-        {
-            await _mediator.Send(new ShipCommand { Shipment = shipment, NotifyCustomer = true });
-            return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
-        }
-        catch (Exception exc)
-        {
-            //error
-            Error(exc);
-            return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
-        }
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Edit)]
-    [HttpPost]
-    public async Task<IActionResult> EditShippedDate(ShipmentModel model)
-    {
-        var shipment = await _shipmentService.GetShipmentById(model.Id);
-        if (shipment == null)
-            //No shipment found with the specified id
-            return RedirectToAction("List");
-
-        if (shipment.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)
-            return RedirectToAction("List");
-
-        var order = await _orderService.GetOrderById(shipment.OrderId);
-        if (order == null)
-            //No order found with the specified id
-            return RedirectToAction("List");
-        try
-        {
-            if (!model.ShippedDate.HasValue) throw new Exception("Enter shipped date");
-
-            shipment.ShippedDateUtc = model.ShippedDate.ConvertToUtcTime(_dateTimeService);
-            await _shipmentService.UpdateShipment(shipment);
-            return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
-        }
-        catch (Exception exc)
-        {
-            //error
-            Error(exc);
-            return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
-        }
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Edit)]
-    [HttpPost]
-    public async Task<IActionResult> SetAsDelivered(string id)
-    {
-        var shipment = await _shipmentService.GetShipmentById(id);
-        if (shipment == null)
-            //No shipment found with the specified id
-            return RedirectToAction("List");
-
-        if (shipment.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)
-            return RedirectToAction("List");
-
-        var order = await _orderService.GetOrderById(shipment.OrderId);
-        if (order == null)
-            //No order found with the specified id
-            return RedirectToAction("List");
-
-        try
-        {
-            await _mediator.Send(new DeliveryCommand { Shipment = shipment, NotifyCustomer = true });
-            return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
-        }
-        catch (Exception exc)
-        {
-            //error
-            Error(exc);
-            return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
-        }
-    }
-
-
-    [PermissionAuthorizeAction(PermissionActionName.Edit)]
-    [HttpPost]
-    public async Task<IActionResult> EditDeliveryDate(ShipmentModel model)
-    {
-        var shipment = await _shipmentService.GetShipmentById(model.Id);
-        if (shipment == null)
-            //No shipment found with the specified id
-            return RedirectToAction("List");
-
-        if (shipment.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)
-            return RedirectToAction("List");
-
-        var order = await _orderService.GetOrderById(shipment.OrderId);
-        if (order == null)
-            //No order found with the specified id
-            return RedirectToAction("List");
-
-        try
-        {
-            if (!model.DeliveryDate.HasValue) throw new Exception("Enter delivery date");
-
-            shipment.DeliveryDateUtc = model.DeliveryDate.ConvertToUtcTime(_dateTimeService);
-            await _shipmentService.UpdateShipment(shipment);
-            return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
-        }
-        catch (Exception exc)
-        {
-            //error
-            Error(exc);
-            return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
-        }
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Edit)]
-    [HttpPost]
-    public async Task<IActionResult> EditUserFields(string id, ShipmentModel model)
-    {
-        var shipment = await _shipmentService.GetShipmentById(id);
-        if (shipment == null)
-            //No order found with the specified id
-            return RedirectToAction("List");
-
-        if (shipment.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)
-            return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
-
-        shipment.UserFields = model.UserFields;
-        await _shipmentService.UpdateShipment(shipment);
-
-        //selected tab
-        await SaveSelectedTabIndex();
-
-        return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Preview)]
-    public async Task<IActionResult> PdfPackagingSlip(string shipmentId)
-    {
-        var shipment = await _shipmentService.GetShipmentById(shipmentId);
-        if (shipment == null)
-            //no shipment found with the specified id
-            return RedirectToAction("List");
-
-        if (shipment.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)
-            return RedirectToAction("List");
-
-        var order = await _orderService.GetOrderById(shipment.OrderId);
-        if (order == null)
-            //No order found with the specified id
-            return RedirectToAction("List");
-
-        var shipments = new List<Shipment> {
-            shipment
-        };
-
-        byte[] bytes;
-        using (var stream = new MemoryStream())
-        {
-            await _pdfService.PrintPackagingSlipsToPdf(stream, shipments, _contextAccessor.WorkContext.WorkingLanguage.Id);
-            bytes = stream.ToArray();
-        }
-
-        return File(bytes, "application/pdf", $"packagingslip_{shipment.Id}.pdf");
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Export)]
-    [HttpPost]
-    public async Task<IActionResult> PdfPackagingSlipAll(ShipmentListModel model)
-    {
-        model.StoreId = _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId;
-
-        //load shipments
-        var shipments = await _shipmentViewModelService.PrepareShipments(model, 1, 100);
-
-        //ensure that we at least one shipment selected
-        if (shipments.totalCount == 0)
-        {
-            Error(_translationService.GetResource("Admin.Orders.Shipments.NoShipmentsSelected"));
-            return RedirectToAction("List");
-        }
-
-        byte[] bytes;
-        using (var stream = new MemoryStream())
-        {
-            await _pdfService.PrintPackagingSlipsToPdf(stream, shipments.shipments.ToList(),
-                _contextAccessor.WorkContext.WorkingLanguage.Id);
-            bytes = stream.ToArray();
-        }
-
-        return File(bytes, "application/pdf", "packagingslips.pdf");
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Export)]
-    [HttpPost]
-    public async Task<IActionResult> PdfPackagingSlipSelected(string selectedIds)
-    {
-        var shipments = new List<Shipment>();
-        var shipments_access = new List<Shipment>();
-        if (selectedIds != null)
-        {
-            var ids = selectedIds
-                .Split([','], StringSplitOptions.RemoveEmptyEntries)
-                .Select(x => x)
-                .ToArray();
-            shipments.AddRange(await _shipmentService.GetShipmentsByIds(ids));
-        }
-
-        shipments_access = shipments.Where(x => x.StoreId == _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId).ToList();
-        //ensure that we at least one shipment selected
-        if (shipments.Count == 0)
-        {
-            Error(_translationService.GetResource("Admin.Orders.Shipments.NoShipmentsSelected"));
-            return RedirectToAction("List");
-        }
-
-        byte[] bytes;
-        using (var stream = new MemoryStream())
-        {
-            await _pdfService.PrintPackagingSlipsToPdf(stream, shipments_access, _contextAccessor.WorkContext.WorkingLanguage.Id);
-            bytes = stream.ToArray();
-        }
-
-        return File(bytes, "application/pdf", "packagingslips.pdf");
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Edit)]
-    [HttpPost]
-    public async Task<IActionResult> SetAsShippedSelected(ICollection<string> selectedIds)
-    {
-        var shipments = new List<Shipment>();
-        var shipments_access = new List<Shipment>();
-        if (selectedIds != null) shipments.AddRange(await _shipmentService.GetShipmentsByIds(selectedIds.ToArray()));
-
-        shipments_access = shipments.Where(x => x.StoreId == _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId).ToList();
-        foreach (var shipment in shipments_access)
-            try
-            {
-                await _mediator.Send(new ShipCommand { Shipment = shipment, NotifyCustomer = true });
-            }
-            catch
-            {
-                //ignore any exception
-            }
-
-        return Json(new { Result = true });
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Edit)]
-    [HttpPost]
-    public async Task<IActionResult> SetAsDeliveredSelected(ICollection<string> selectedIds)
-    {
-        var shipments = new List<Shipment>();
-        var shipments_access = new List<Shipment>();
-        if (selectedIds != null) shipments.AddRange(await _shipmentService.GetShipmentsByIds(selectedIds.ToArray()));
-
-        shipments_access = shipments.Where(x => x.StoreId == _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId).ToList();
-        foreach (var shipment in shipments_access)
-            try
-            {
-                await _mediator.Send(new DeliveryCommand { Shipment = shipment, NotifyCustomer = true });
-            }
-            catch
-            {
-                //ignore any exception
-            }
-
-        return Json(new { Result = true });
-    }
-
-    #region Shipment notes
-
-    [PermissionAuthorizeAction(PermissionActionName.Preview)]
-    [HttpPost]
-    public async Task<IActionResult> ShipmentNotesSelect(string shipmentId, DataSourceRequest command)
-    {
-        var shipment = await _shipmentService.GetShipmentById(shipmentId);
-        if (shipment == null)
-            throw new ArgumentException("No shipment found with the specified id");
-
-        if (shipment.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)
-            return Content("");
-
-        //shipment notes
-        var shipmentNoteModels = await _shipmentViewModelService.PrepareShipmentNotes(shipment);
-        var gridModel = new DataSourceResult {
-            Data = shipmentNoteModels,
-            Total = shipmentNoteModels.Count
-        };
-        return Json(gridModel);
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Edit)]
-    public async Task<IActionResult> ShipmentNoteAdd(string shipmentId, string downloadId, bool displayToCustomer,
-        string message)
-    {
-        var shipment = await _shipmentService.GetShipmentById(shipmentId);
-        if (shipment == null)
-            return Json(new { Result = false });
-
-        if (shipment.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)
-            return Json(new { Result = false });
-
-        await _shipmentViewModelService.InsertShipmentNote(shipment, downloadId, displayToCustomer, message);
-
-        return Json(new { Result = true });
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Delete)]
-    [HttpPost]
-    public async Task<IActionResult> ShipmentNoteDelete(string id, string shipmentId)
-    {
-        var shipment = await _shipmentService.GetShipmentById(shipmentId);
-        if (shipment == null)
-            throw new ArgumentException("No shipment found with the specified id");
-
-        if (shipment.StoreId != _contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)
-            return Json(new { Result = false });
-
-        await _shipmentViewModelService.DeleteShipmentNote(shipment, id);
-
-        return new JsonResult("");
-    }
-
-    #endregion
-
-    #endregion
-}
\ No newline at end of file
+// Concrete host subclass of BaseShipmentController (ARCH-001 Shipment consolidation). This class
+// supplies Store's DI wiring plus the attributes that used to arrive transitively via
+// BaseStoreController - BaseShipmentController can't inherit any single host's base controller
+// (it's shared across Admin/Store/Vendor, each with a different [Area]/[Authorize*] pair), so each
+// subclass restates its own host's attribute set explicitly, same pattern as OrderController.
+[AutoValidateAntiforgeryToken]
+[Area(Constants.AreaStore)]
+[AuthorizeStore]
+[AuthorizeMenu]
+public class ShipmentController(
+    IShipmentViewModelService shipmentViewModelService,
+    IOrderService orderService,
+    ITranslationService translationService,
+    IContextAccessor contextAccessor,
+    IPdfService pdfService,
+    IShipmentService shipmentService,
+    IDateTimeService dateTimeService,
+    IMediator mediator,
+    IAdminDataScope<Shipment> scope,
+    IAdminDataScope<Order> orderScope)
+    : BaseShipmentController(shipmentViewModelService, orderService, translationService,
+        contextAccessor, pdfService, shipmentService, dateTimeService, mediator, scope, orderScope);
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shipment/AddShipment.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shipment/AddShipment.cshtml
deleted file mode 100644
index 9f9c1bf91..000000000
--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shipment/AddShipment.cshtml
+++ /dev/null
@@ -1,182 +0,0 @@
-@model ShipmentModel
-@{
-    //page title
-    ViewBag.Title = string.Format(Loc["Vendor.Orders.Shipments.AddNew.Title"], Model.OrderId);
-}
-<form asp-area="@Constants.AreaVendor" asp-controller="Shipment" asp-action="AddShipment" method="post"
-      asp-route-orderId="@HtmlExtensions.HtmlEncodeSafe(Context.Request.Query["orderId"])">
-
-    <div asp-validation-summary="All"></div>
-    <input type="hidden" asp-for="@Model.OrderId"/>
-    <div class="col-md-12">
-        <div class="x_panel light form-fit">
-            <div class="x_title">
-                <div class="caption">
-                    <i class="fa fa-truck"></i>
-                    @string.Format(Loc["Vendor.Orders.Shipments.AddNew.Title"], Model.OrderNumber)
-                    <small>
-                        <i class="fa fa-arrow-circle-left"></i>
-                        @Html.ActionLink(Loc["Vendor.Orders.Shipments.BackToOrder"], "Edit", "Order", new { Id = Model.OrderId })
-                    </small>
-                </div>
-                <div class="actions">
-                    <div class="btn-group btn-group-devided">
-                        <button class="btn btn-success" type="submit" id="shipment-save" name="save">
-                            <i class="fa fa-check"></i> @Loc["Vendor.Common.Save"]
-                        </button>
-                        <button class="btn btn-success" type="submit" id="shipment-save-continue" name="save-continue">
-                            <i class="fa fa-check-circle"></i> @Loc["Vendor.Common.SaveContinue"]
-                        </button>
-                        <vc:vendor-widget widget-zone="vendor_order_shipment_add_buttons" additional-data="null"/>
-                    </div>
-                </div>
-            </div>
-            <div class="x_content form">
-                <div class="form-horizontal">
-                    <div class="form-body">
-                        <div class="form-group">
-                            <admin-label asp-for="TrackingNumber"/>
-                            <div class="col-md-9 col-sm-9">
-                                <admin-input asp-for="TrackingNumber"/>
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <admin-label asp-for="AdminComment"/>
-                            <div class="col-md-9 col-sm-9">
-                                <admin-input asp-for="AdminComment"/>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-
-    <h4>
-        <strong>@Loc["Vendor.Orders.Shipments.Products"]</strong>
-    </h4>
-
-    <div class="table-responsive visible-xs-block visible-sm-block visible-md-block visible-lg-block">
-        <table class="table table-bordered table-striped table-hover">
-            <thead>
-            <tr>
-                <th>
-                    @Loc["Vendor.Orders.Shipments.Products.ProductName"]
-                </th>
-                <th>
-                    @Loc["Vendor.Orders.Shipments.Products.SKU"]
-                </th>
-                <th>
-                    @Loc["Vendor.Orders.Shipments.Products.Warehouse"]
-                </th>
-                <th>
-                    @Loc["Vendor.Orders.Shipments.Products.ItemWeight"]
-                </th>
-                <th>
-                    @Loc["Vendor.Orders.Shipments.Products.ItemDimensions"]
-                </th>
-                <th>
-                    @Loc["Vendor.Orders.Shipments.Products.QtyOrdered"]
-                </th>
-                <th>
-                    @Loc["Vendor.Orders.Shipments.Products.QtyShipped"]
-                </th>
-                <th>
-                    @Loc["Vendor.Orders.Shipments.Products.QtyToShip"]
-                </th>
-            </tr>
-            </thead>
-            <tbody>
-            @for (var j = 0; j < Model.Items.Count; j++)
-            {
-                var item = Model.Items[j];
-                <input asp-for="@Model.Items[j].OrderItemId" type="hidden"/>
-                <tr>
-                    <td>
-                        <div style="padding-left:10px;padding-right:10px;">
-                            <em>
-                                <a href="@Url.Action("Edit", "Product", new { id = item.ProductId, area = Constants.AreaVendor })">@item.ProductName</a>
-                            </em>
-                            @if (!string.IsNullOrEmpty(item.AttributeInfo))
-                            {
-                                <p>
-                                    @Html.Raw(item.AttributeInfo)
-                                </p>
-                            }
-                            @if (item.ShipSeparately)
-                            {
-                                <p>
-                                    <strong>@Loc["Vendor.Orders.Shipments.Products.ShipSeparately.Warning"]</strong>
-                                    @Loc["Vendor.Orders.Shipments.Products.ShipSeparately"]
-                                </p>
-                            }
-                        </div>
-                    </td>
-                    <td>
-                        <div style="padding-left:10px;padding-right:10px;">
-                            @item.Sku
-                        </div>
-                    </td>
-                    <td>
-                        <div>
-                            @if (item.AllowToChooseWarehouse)
-                            {
-                                if (item.AvailableWarehouses.Count > 0)
-                                {
-                                    <select asp-for="@Model.Items[j].WarehouseId">
-                                        @foreach (var warehouse in item.AvailableWarehouses)
-                                        {
-                                            var selected = warehouse.WarehouseId == item.WarehouseId;
-                                            <option value="@(warehouse.WarehouseId)" data-stock-qty="@(warehouse.StockQuantity)"
-                                                    data-reserved-qty="@(warehouse.ReservedQuantity)"
-                                                    selected="@selected">
-                                                @Loc["Vendor.Orders.Shipments.Products.Warehouse.ChooseQty", warehouse.WarehouseName, warehouse.StockQuantity, warehouse.ReservedQuantity]
-                                            </option>
-                                        }
-                                    </select>
-                                }
-                                else
-                                {
-                                    <div>@Loc["Vendor.Orders.Shipments.Products.Warehouse.NotAvailable"]</div>
-                                }
-                            }
-                            else
-                            {
-                                //display warehouses
-                                for (var i = 0; i < item.AvailableWarehouses.Count; i++)
-                                {
-                                    var warehouse = item.AvailableWarehouses[i];
-                                    @warehouse.WarehouseName
-                                    if (i != item.AvailableWarehouses.Count - 1)
-                                    {
-                                        <br/>
-                                    }
-                                }
-                            }
-                        </div>
-                    </td>
-                    <td>
-                        @item.ItemWeight
-                    </td>
-                    <td>
-                        @item.ItemDimensions
-                    </td>
-                    <td>
-                        @item.QuantityOrdered
-                    </td>
-                    <td>
-                        @item.QuantityInAllShipments
-                    </td>
-                    <td>
-                        <input asp-for="@Model.Items[j].QuantityToAdd" type="number" value="@item.QuantityToAdd"
-                               class="form-control" style="width:100px;" max="@item.QuantityToAdd"/>
-                    </td>
-                </tr>
-            }
-            </tbody>
-        </table>
-    </div>
-
-
-</form>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shipment/List.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shipment/List.cshtml
index 1ab7a552d..509fc682b 100644
--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shipment/List.cshtml
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shipment/List.cshtml
@@ -30,7 +30,7 @@
                             <button class="btn btn-success" type="submit" id="deliver-selected">
                                 <i class="fa fa-check-circle"></i> @Loc["Vendor.Orders.Shipments.DeliverySelected"]
                             </button>
-                            <vc:vendor-widget widget-zone="vendor_order_shipment_list_buttons" additional-data="null"/>
+                            <partial name="Partials/WidgetZone.ListButtons" model="Model"/>
                         </div>
                     </div>
                 </div>
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shipment/Partials/ShipmentNotes.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shipment/Partials/ShipmentNotes.cshtml
index 267595e1e..e365dfd6d 100644
--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shipment/Partials/ShipmentNotes.cshtml
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shipment/Partials/ShipmentNotes.cshtml
@@ -1,11 +1,11 @@
 @model ShipmentModel
 
 <div class="panel panel-default">
-    <vc:vendor-widget widget-zone="vendor_order_shipment_details_notes_top" additional-data="Model"/>
+    <partial name="Partials/WidgetZone.Notes.Top" model="Model"/>
     <div class="panel-body">
         <div id="shipmentnotes-grid"></div>
     </div>
-    <vc:vendor-widget widget-zone="vendor_order_shipment_details_notes_bottom" additional-data="Model"/>
+    <partial name="Partials/WidgetZone.Notes.Bottom" model="Model"/>
 </div>
 <script>
         $(document).ready(function () {
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shipment/Partials/WidgetZone.AddButtons.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shipment/Partials/WidgetZone.AddButtons.cshtml
new file mode 100644
index 000000000..c8e32831e
--- /dev/null
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shipment/Partials/WidgetZone.AddButtons.cshtml
@@ -0,0 +1 @@
+<vc:vendor-widget widget-zone="vendor_order_shipment_add_buttons" additional-data="null"/>
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shipment/Partials/WidgetZone.DetailsButtons.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shipment/Partials/WidgetZone.DetailsButtons.cshtml
new file mode 100644
index 000000000..2bd14fd4f
--- /dev/null
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shipment/Partials/WidgetZone.DetailsButtons.cshtml
@@ -0,0 +1,2 @@
+@model ShipmentModel
+<vc:vendor-widget widget-zone="vendor_order_shipment_details_buttons" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shipment/Partials/WidgetZone.DetailsTabs.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shipment/Partials/WidgetZone.DetailsTabs.cshtml
new file mode 100644
index 000000000..ee1ed9e90
--- /dev/null
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shipment/Partials/WidgetZone.DetailsTabs.cshtml
@@ -0,0 +1,2 @@
+@model ShipmentModel
+<vc:vendor-widget widget-zone="vendor_order_shipment_details_tabs" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shipment/Partials/WidgetZone.ListButtons.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shipment/Partials/WidgetZone.ListButtons.cshtml
new file mode 100644
index 000000000..ff7f7d470
--- /dev/null
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shipment/Partials/WidgetZone.ListButtons.cshtml
@@ -0,0 +1 @@
+<vc:vendor-widget widget-zone="vendor_order_shipment_list_buttons" additional-data="null"/>
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shipment/Partials/WidgetZone.Notes.Bottom.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shipment/Partials/WidgetZone.Notes.Bottom.cshtml
new file mode 100644
index 000000000..96f07ec31
--- /dev/null
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shipment/Partials/WidgetZone.Notes.Bottom.cshtml
@@ -0,0 +1,2 @@
+@model ShipmentModel
+<vc:vendor-widget widget-zone="vendor_order_shipment_details_notes_bottom" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shipment/Partials/WidgetZone.Notes.Top.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shipment/Partials/WidgetZone.Notes.Top.cshtml
new file mode 100644
index 000000000..f4291b45f
--- /dev/null
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shipment/Partials/WidgetZone.Notes.Top.cshtml
@@ -0,0 +1,2 @@
+@model ShipmentModel
+<vc:vendor-widget widget-zone="vendor_order_shipment_details_notes_top" additional-data="Model"/>
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shipment/ShipmentDetails.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shipment/ShipmentDetails.cshtml
index 2ff0753d9..d536881f2 100644
--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shipment/ShipmentDetails.cshtml
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shipment/ShipmentDetails.cshtml
@@ -66,7 +66,7 @@
                             <span id="shipment-delete" class="btn red">
                                 <i class="fa fa-trash-o"></i> @Loc["Vendor.Common.Delete"]
                             </span>
-                            <vc:vendor-widget widget-zone="vendor_order_shipment_details_buttons" additional-data="Model"/>
+                            <partial name="Partials/WidgetZone.DetailsButtons" model="Model"/>
                         </div>
                     </div>
                 </div>
@@ -87,7 +87,7 @@
                                     </div>
                                 </content>
                             </tabstrip-item>
-                            <vc:vendor-widget widget-zone="vendor_order_shipment_details_tabs" additional-data="Model"/>
+                            <partial name="Partials/WidgetZone.DetailsTabs" model="Model"/>
                         </items>
                     </admin-tabstrip>
                 </div>
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/_ViewImports.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/_ViewImports.cshtml
index 7459fba57..65a6de0cc 100644
--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/_ViewImports.cshtml
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/_ViewImports.cshtml
@@ -30,17 +30,23 @@
    Grand.Web.Vendor.Models.Catalog's own ProductModel etc. are no longer used by any controller/view
    and importing both would make bare "ProductModel" ambiguous. *@
 @using Grand.Web.AdminShared.Models.Catalog;
-@* Order views bind to Grand.Web.AdminShared's OrderModel/OrderListModel (ARCH-001 Phase 5 Order
-   consolidation) - Grand.Web.Vendor.Models.Orders's own OrderModel/OrderListModel are no longer
-   used by any controller/view. Unlike the ProductModel case above, this can't be a blanket
-   "@using Grand.Web.AdminShared.Models.Orders" - that namespace also holds ShipmentModel,
-   MerchandiseReturnModel, *ReportModel etc., which Vendor's Shipment/MerchandiseReturn/Reports
-   views still bind to their own Grand.Web.Vendor.Models.* equivalents (not yet consolidated), so
-   a wildcard import here would make those bare names ambiguous instead. Alias just the two types
-   that are actually consolidated. *@
+@* Order and Shipment views bind to Grand.Web.AdminShared's Order/Shipment model families
+   (ARCH-001 Phase 5 Order, Phase 6 Shipment consolidation) - Grand.Web.Vendor.Models.Orders's own
+   OrderModel/OrderListModel and Grand.Web.Vendor.Models.Shipment (the whole namespace) are no
+   longer used by any controller/view. This can't be a blanket
+   "@using Grand.Web.AdminShared.Models.Orders" - that namespace also holds MerchandiseReturnModel/
+   *ReportModel etc., which Vendor's MerchandiseReturn/Reports views still bind to their own
+   Grand.Web.Vendor.Models.* equivalents (not yet consolidated), so a wildcard import here would
+   make those bare names ambiguous instead. Alias just the types that are actually consolidated. *@
 @using OrderModel = Grand.Web.AdminShared.Models.Orders.OrderModel;
 @using OrderListModel = Grand.Web.AdminShared.Models.Orders.OrderListModel;
-@using Grand.Web.Vendor.Models.Shipment;
+@using ShipmentModel = Grand.Web.AdminShared.Models.Orders.ShipmentModel;
+@using ShipmentListModel = Grand.Web.AdminShared.Models.Orders.ShipmentListModel;
+@using AddShipmentModel = Grand.Web.AdminShared.Models.Orders.AddShipmentModel;
+@using ShipmentTrackingModel = Grand.Web.AdminShared.Models.Orders.ShipmentTrackingModel;
+@using ShipmentAdminCommentModel = Grand.Web.AdminShared.Models.Orders.ShipmentAdminCommentModel;
+@using ShipmentDeliveryDateModel = Grand.Web.AdminShared.Models.Orders.ShipmentDeliveryDateModel;
+@using ShipmentShippedDateModel = Grand.Web.AdminShared.Models.Orders.ShipmentShippedDateModel;
 @using Grand.Web.Vendor.Models.MerchandiseReturn;
 @using Grand.Web.Vendor.Models.Vendor;
 @using Grand.Web.Vendor.Models.VendorReview;
diff --git a/src/Web/Grand.Web.Vendor/Controllers/ShipmentController.cs b/src/Web/Grand.Web.Vendor/Controllers/ShipmentController.cs
index 7f23e0dd1..3a5d10106 100644
--- a/src/Web/Grand.Web.Vendor/Controllers/ShipmentController.cs
+++ b/src/Web/Grand.Web.Vendor/Controllers/ShipmentController.cs
@@ -1,542 +1,39 @@
-using Grand.Business.Core.Commands.Checkout.Shipping;
 using Grand.Business.Core.Interfaces.Checkout.Orders;
 using Grand.Business.Core.Interfaces.Checkout.Shipping;
 using Grand.Business.Core.Interfaces.Common.Directory;
 using Grand.Business.Core.Interfaces.Common.Localization;
 using Grand.Business.Core.Interfaces.Common.Pdf;
-using Grand.Domain.Permissions;
 using Grand.Domain.Orders;
 using Grand.Domain.Shipping;
 using Grand.Infrastructure;
-using Grand.Web.Common.DataSource;
-using Grand.Web.Common.Extensions;
+using Grand.Mediator;
+using Grand.Web.AdminShared.Controllers;
+using Grand.Web.AdminShared.Interfaces;
 using Grand.Web.Common.Filters;
-using Grand.Web.Common.Security.Authorization;
 using Grand.Web.Vendor.Extensions;
-using Grand.Web.Vendor.Interfaces;
-using Grand.Web.Vendor.Models.Shipment;
-using Grand.Mediator;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Grand.Web.Vendor.Controllers;
 
-[PermissionAuthorize(PermissionSystemName.Shipments)]
-public class ShipmentController : BaseVendorController
-{
-    public ShipmentController(
-        IShipmentViewModelService shipmentViewModelService,
-        IOrderService orderService,
-        ITranslationService translationService,
-        IContextAccessor contextAccessor,
-        IPdfService pdfService,
-        IShipmentService shipmentService,
-        IDateTimeService dateTimeService,
-        IMediator mediator)
-    {
-        _shipmentViewModelService = shipmentViewModelService;
-        _orderService = orderService;
-        _translationService = translationService;
-        _contextAccessor = contextAccessor;
-        _pdfService = pdfService;
-        _shipmentService = shipmentService;
-        _dateTimeService = dateTimeService;
-        _mediator = mediator;
-    }
-
-    #region Fields
-
-    private readonly IShipmentViewModelService _shipmentViewModelService;
-    private readonly IOrderService _orderService;
-    private readonly ITranslationService _translationService;
-    private readonly IContextAccessor _contextAccessor;
-    private readonly IPdfService _pdfService;
-    private readonly IShipmentService _shipmentService;
-    private readonly IDateTimeService _dateTimeService;
-    private readonly IMediator _mediator;
-
-    #endregion
-
-    #region Shipments
-
-    public async Task<IActionResult> List()
-    {
-        var model = await _shipmentViewModelService.PrepareShipmentListModel();
-        return View(model);
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.List)]
-    [HttpPost]
-    public async Task<IActionResult> ShipmentListSelect(DataSourceRequest command, ShipmentListModel model)
-    {
-        var shipments = await _shipmentViewModelService.PrepareShipments(model, command.Page, command.PageSize);
-        var items = new List<ShipmentModel>();
-        foreach (var item in shipments.shipments)
-            items.Add(await _shipmentViewModelService.PrepareShipmentModel(item, false));
-
-        var gridModel = new DataSourceResult {
-            Data = items,
-            Total = shipments.totalCount
-        };
-        return Json(gridModel);
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.List)]
-    [HttpPost]
-    public async Task<IActionResult> ShipmentsByOrder(string orderId)
-    {
-        var order = await _orderService.GetOrderById(orderId);
-        if (order == null || order.Deleted || !_contextAccessor.WorkContext.HasAccessToOrder(order))
-            throw new ArgumentException("No order found with the specified id");
-
-        //shipments
-        var shipmentModels = new List<ShipmentModel>();
-        var shipments = (await _shipmentService.GetShipmentsByOrder(orderId))
-            //a vendor should have access only to his products
-            .Where(s => _contextAccessor.WorkContext.HasAccessToShipment(s))
-            .OrderBy(s => s.CreatedOnUtc)
-            .ToList();
-
-        foreach (var shipment in shipments)
-            shipmentModels.Add(await _shipmentViewModelService.PrepareShipmentModel(shipment, false));
-
-        var gridModel = new DataSourceResult {
-            Data = shipmentModels,
-            Total = shipmentModels.Count
-        };
-        return Json(gridModel);
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.List)]
-    [HttpPost]
-    public async Task<IActionResult> ShipmentsItemsByShipmentId(string shipmentId)
-    {
-        var shipment = await _shipmentService.GetShipmentById(shipmentId);
-        if (shipment == null || !_contextAccessor.WorkContext.HasAccessToShipment(shipment))
-            throw new ArgumentException("No shipment found with the specified id");
-
-        //shipments
-        var shipmentModel = await _shipmentViewModelService.PrepareShipmentModel(shipment, true);
-        var gridModel = new DataSourceResult {
-            Data = shipmentModel.Items,
-            Total = shipmentModel.Items.Count
-        };
-
-        return Json(gridModel);
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Create)]
-    public async Task<IActionResult> AddShipment(string orderId)
-    {
-        var order = await _orderService.GetOrderById(orderId);
-        if (order == null || order.Deleted || !_contextAccessor.WorkContext.HasAccessToOrder(order))
-            //No order found with the specified id
-            return RedirectToAction("List");
-
-        var model = await _shipmentViewModelService.PrepareShipmentModel(order);
-        return View(model);
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Edit)]
-    [HttpPost]
-    [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]
-    public async Task<IActionResult> AddShipment(AddShipmentModel model, bool continueEditing)
-    {
-        if (!ModelState.IsValid)
-            return RedirectToAction("AddShipment", new { orderId = model.OrderId });
-
-        var order = await _orderService.GetOrderById(model.OrderId);
-        if (order == null || order.Deleted || !_contextAccessor.WorkContext.HasAccessToOrder(order))
-            //No order found with the specified id
-            return RedirectToAction("List");
-
-        //a vendor should have access only to his products
-        var orderItems = order.OrderItems.Where(_contextAccessor.WorkContext.HasAccessToOrderItem).ToList();
-
-        var (shipment, totalWeight) =
-            await _shipmentViewModelService.PrepareShipment(order, orderItems.ToList(), model);
-        if (!shipment.ShipmentItems.Any())
-        {
-            Error(_translationService.GetResource("Admin.Orders.Shipments.NoProductsSelected"));
-            return RedirectToAction("AddShipment", new { orderId = model.OrderId });
-        }
-
-        //check stock
-        var (valid, message) = await _shipmentViewModelService.ValidStockShipment(shipment);
-        if (!valid)
-        {
-            Error(message);
-            return RedirectToAction("AddShipment", new { orderId = model.OrderId });
-        }
-
-        shipment.TotalWeight = totalWeight;
-        await _shipmentService.InsertShipment(shipment);
-
-        //add a note
-        await _orderService.InsertOrderNote(new OrderNote {
-            Note = $"A shipment #{shipment.ShipmentNumber} has been added",
-            DisplayToCustomer = false,
-            OrderId = order.Id
-        });
-        Success(_translationService.GetResource("Admin.Orders.Shipments.Added"));
-        return continueEditing
-            ? RedirectToAction("ShipmentDetails", new { id = shipment.Id })
-            : RedirectToAction("List", new { id = shipment.Id });
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Preview)]
-    public async Task<IActionResult> ShipmentDetails(string id)
-    {
-        var shipment = await _shipmentService.GetShipmentById(id);
-        if (shipment == null || !_contextAccessor.WorkContext.HasAccessToShipment(shipment))
-            //No shipment found with the specified id
-            return RedirectToAction("List");
-
-        var model = await _shipmentViewModelService.PrepareShipmentModel(shipment, true, true);
-        return View(model);
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Delete)]
-    [HttpPost]
-    public async Task<IActionResult> DeleteShipment(string id)
-    {
-        var shipment = await _shipmentService.GetShipmentById(id);
-        if (shipment == null || !_contextAccessor.WorkContext.HasAccessToShipment(shipment))
-            //No shipment found with the specified id
-            return RedirectToAction("List");
-
-        await _shipmentService.DeleteShipment(shipment);
-
-        //add a note
-        await _orderService.InsertOrderNote(new OrderNote {
-            Note = $"A shipment #{shipment.ShipmentNumber} has been deleted",
-            DisplayToCustomer = false,
-            OrderId = shipment.OrderId
-        });
-        Success(_translationService.GetResource("Admin.Orders.Shipments.Deleted"));
-
-        return RedirectToAction("Edit", "Order", new { Id = shipment.OrderId });
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Edit)]
-    [HttpPost]
-    public async Task<IActionResult> SetTrackingNumber(ShipmentTrackingModel model)
-    {
-        if (!ModelState.IsValid)
-            return RedirectToAction("ShipmentDetails", new { id = model.Id });
-
-        var shipment = await _shipmentService.GetShipmentById(model.Id);
-        if (shipment == null || !_contextAccessor.WorkContext.HasAccessToShipment(shipment))
-            //No shipment found with the specified id
-            return RedirectToAction("List");
-
-        shipment.TrackingNumber = model.TrackingNumber;
-        await _shipmentService.UpdateShipment(shipment);
-
-        return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Edit)]
-    [HttpPost]
-    public async Task<IActionResult> SetShipmentAdminComment(ShipmentAdminCommentModel model)
-    {
-        if (!ModelState.IsValid)
-            return RedirectToAction("ShipmentDetails", new { id = model.Id });
-
-        var shipment = await _shipmentService.GetShipmentById(model.Id);
-        if (shipment == null || !_contextAccessor.WorkContext.HasAccessToShipment(shipment))
-            //No shipment found with the specified id
-            return RedirectToAction("List");
-
-        shipment.AdminComment = model.AdminComment;
-        await _shipmentService.UpdateShipment(shipment);
-
-        return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Edit)]
-    [HttpPost]
-    public async Task<IActionResult> SetAsShipped(string id)
-    {
-        var shipment = await _shipmentService.GetShipmentById(id);
-        if (shipment == null || !_contextAccessor.WorkContext.HasAccessToShipment(shipment))
-            //No shipment found with the specified id
-            return RedirectToAction("List");
-
-        try
-        {
-            await _mediator.Send(new ShipCommand { Shipment = shipment, NotifyCustomer = true });
-            return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
-        }
-        catch (Exception exc)
-        {
-            //error
-            Error(exc);
-            return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
-        }
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Edit)]
-    [HttpPost]
-    public async Task<IActionResult> EditShippedDate(ShipmentShippedDateModel model)
-    {
-        if (!ModelState.IsValid)
-            return RedirectToAction("ShipmentDetails", new { id = model.Id });
-
-        var shipment = await _shipmentService.GetShipmentById(model.Id);
-        if (shipment == null || !_contextAccessor.WorkContext.HasAccessToShipment(shipment))
-            //No shipment found with the specified id
-            return RedirectToAction("List");
-
-        try
-        {
-            if (!model.ShippedDate.HasValue) throw new Exception("Enter shipped date");
-
-            shipment.ShippedDateUtc = model.ShippedDate.ConvertToUtcTime(_dateTimeService);
-            await _shipmentService.UpdateShipment(shipment);
-            return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
-        }
-        catch (Exception exc)
-        {
-            //error
-            Error(exc);
-            return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
-        }
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Edit)]
-    [HttpPost]
-    public async Task<IActionResult> SetAsDelivered(string id)
-    {
-        var shipment = await _shipmentService.GetShipmentById(id);
-        if (shipment == null || !_contextAccessor.WorkContext.HasAccessToShipment(shipment))
-            //No shipment found with the specified id
-            return RedirectToAction("List");
-
-        try
-        {
-            await _mediator.Send(new DeliveryCommand { Shipment = shipment, NotifyCustomer = true });
-            return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
-        }
-        catch (Exception exc)
-        {
-            //error
-            Error(exc);
-            return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
-        }
-    }
-
-
-    [PermissionAuthorizeAction(PermissionActionName.Edit)]
-    [HttpPost]
-    public async Task<IActionResult> EditDeliveryDate(ShipmentDeliveryDateModel model)
-    {
-        if (!ModelState.IsValid)
-            return RedirectToAction("ShipmentDetails", new { id = model.Id });
-
-        var shipment = await _shipmentService.GetShipmentById(model.Id);
-        if (shipment == null || !_contextAccessor.WorkContext.HasAccessToShipment(shipment))
-            //No shipment found with the specified id
-            return RedirectToAction("List");
-
-        try
-        {
-            if (!model.DeliveryDate.HasValue) throw new Exception("Enter delivery date");
-
-            shipment.DeliveryDateUtc = model.DeliveryDate.ConvertToUtcTime(_dateTimeService);
-            await _shipmentService.UpdateShipment(shipment);
-            return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
-        }
-        catch (Exception exc)
-        {
-            //error
-            Error(exc);
-            return RedirectToAction("ShipmentDetails", new { id = shipment.Id });
-        }
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Preview)]
-    public async Task<IActionResult> PdfPackagingSlip(string shipmentId)
-    {
-        var shipment = await _shipmentService.GetShipmentById(shipmentId);
-        if (shipment == null || !_contextAccessor.WorkContext.HasAccessToShipment(shipment))
-            //no shipment found with the specified id
-            return RedirectToAction("List");
-
-        var shipments = new List<Shipment> {
-            shipment
-        };
-
-        byte[] bytes;
-        using (var stream = new MemoryStream())
-        {
-            await _pdfService.PrintPackagingSlipsToPdf(stream, shipments, _contextAccessor.WorkContext.WorkingLanguage.Id);
-            bytes = stream.ToArray();
-        }
-
-        return File(bytes, "application/pdf", $"packagingslip_{shipment.Id}.pdf");
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Export)]
-    [HttpPost]
-    public async Task<IActionResult> PdfPackagingSlipAll(ShipmentListModel model)
-    {
-        //load shipments
-        var shipments = await _shipmentViewModelService.PrepareShipments(model, 1, 100);
-
-        //ensure that we at least one shipment selected
-        if (shipments.totalCount == 0)
-        {
-            Error(_translationService.GetResource("Admin.Orders.Shipments.NoShipmentsSelected"));
-            return RedirectToAction("List");
-        }
-
-        byte[] bytes;
-        using (var stream = new MemoryStream())
-        {
-            await _pdfService.PrintPackagingSlipsToPdf(stream, shipments.shipments.ToList(),
-                _contextAccessor.WorkContext.WorkingLanguage.Id);
-            bytes = stream.ToArray();
-        }
-
-        return File(bytes, "application/pdf", "packagingslips.pdf");
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Export)]
-    [HttpPost]
-    public async Task<IActionResult> PdfPackagingSlipSelected(string selectedIds)
-    {
-        var shipments = new List<Shipment>();
-        if (selectedIds != null)
-        {
-            var ids = selectedIds
-                .Split([','], StringSplitOptions.RemoveEmptyEntries)
-                .Select(x => x)
-                .ToArray();
-            shipments.AddRange(await _shipmentService.GetShipmentsByIds(ids));
-        }
-
-        //a vendor should have access only to his shipments
-        var shipmentsAccess =
-            (from item in shipments
-                where _contextAccessor.WorkContext.HasAccessToShipment(item)
-                select item).ToList();
-
-        //ensure that we at least one shipment selected
-        if (shipments.Count == 0)
-        {
-            Error(_translationService.GetResource("Vendor.Orders.Shipments.NoShipmentsSelected"));
-            return RedirectToAction("List");
-        }
-
-        byte[] bytes;
-        using (var stream = new MemoryStream())
-        {
-            await _pdfService.PrintPackagingSlipsToPdf(stream, shipmentsAccess, _contextAccessor.WorkContext.WorkingLanguage.Id);
-            bytes = stream.ToArray();
-        }
-
-        return File(bytes, "application/pdf", "packagingslips.pdf");
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Edit)]
-    [HttpPost]
-    public async Task<IActionResult> SetAsShippedSelected(ICollection<string> selectedIds)
-    {
-        var shipments = new List<Shipment>();
-        var shipmentsAccess = new List<Shipment>();
-        if (selectedIds != null) shipments.AddRange(await _shipmentService.GetShipmentsByIds(selectedIds.ToArray()));
-
-        //a vendor should have access only to his shipments
-        shipmentsAccess.AddRange(from item in shipments
-            where _contextAccessor.WorkContext.HasAccessToShipment(item)
-            select item);
-
-        foreach (var shipment in shipmentsAccess)
-            try
-            {
-                await _mediator.Send(new ShipCommand { Shipment = shipment, NotifyCustomer = true });
-            }
-            catch
-            {
-                //ignore any exception
-            }
-
-        return Json(new { Result = true });
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Edit)]
-    [HttpPost]
-    public async Task<IActionResult> SetAsDeliveredSelected(ICollection<string> selectedIds)
-    {
-        var shipments = new List<Shipment>();
-        var shipmentsAccess = new List<Shipment>();
-        if (selectedIds != null) shipments.AddRange(await _shipmentService.GetShipmentsByIds(selectedIds.ToArray()));
-
-        //a vendor should have access only to his shipments
-        shipmentsAccess.AddRange(
-            from item in shipments
-            where _contextAccessor.WorkContext.HasAccessToShipment(item)
-            select item);
-
-        foreach (var shipment in shipmentsAccess)
-            try
-            {
-                await _mediator.Send(new DeliveryCommand { Shipment = shipment, NotifyCustomer = true });
-            }
-            catch
-            {
-                //ignore any exception
-            }
-
-        return Json(new { Result = true });
-    }
-
-    #region Shipment notes
-
-    [PermissionAuthorizeAction(PermissionActionName.Preview)]
-    [HttpPost]
-    public async Task<IActionResult> ShipmentNotesSelect(string shipmentId)
-    {
-        var shipment = await _shipmentService.GetShipmentById(shipmentId);
-        if (shipment == null || !_contextAccessor.WorkContext.HasAccessToShipment(shipment))
-            throw new ArgumentException("No shipment found with the specified id");
-
-        //shipment notes
-        var shipmentNoteModels = await _shipmentViewModelService.PrepareShipmentNotes(shipment);
-        var gridModel = new DataSourceResult {
-            Data = shipmentNoteModels,
-            Total = shipmentNoteModels.Count
-        };
-        return Json(gridModel);
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Edit)]
-    public async Task<IActionResult> ShipmentNoteAdd(string shipmentId, bool displayToCustomer,
-        string message)
-    {
-        var shipment = await _shipmentService.GetShipmentById(shipmentId);
-        if (shipment == null || !_contextAccessor.WorkContext.HasAccessToShipment(shipment))
-            return Json(new { Result = false });
-
-        await _shipmentViewModelService.InsertShipmentNote(shipment, displayToCustomer, message);
-
-        return Json(new { Result = true });
-    }
-
-    [PermissionAuthorizeAction(PermissionActionName.Delete)]
-    [HttpPost]
-    public async Task<IActionResult> ShipmentNoteDelete(string id, string shipmentId)
-    {
-        var shipment = await _shipmentService.GetShipmentById(shipmentId);
-        if (shipment == null || !_contextAccessor.WorkContext.HasAccessToShipment(shipment))
-            throw new ArgumentException("No shipment found with the specified id");
-
-        await _shipmentViewModelService.DeleteShipmentNote(shipment, id);
-
-        return new JsonResult("");
-    }
-
-    #endregion
-
-    #endregion
-}
\ No newline at end of file
+// Concrete host subclass of BaseShipmentController (ARCH-001 Shipment consolidation). This class
+// supplies Vendor's DI wiring plus the attributes that used to arrive transitively via
+// BaseVendorController - BaseShipmentController can't inherit any single host's base controller
+// (it's shared across Admin/Store/Vendor, each with a different [Area]/[Authorize*] pair), so each
+// subclass restates its own host's attribute set explicitly, same pattern as OrderController.
+[AutoValidateAntiforgeryToken]
+[Area(Constants.AreaVendor)]
+[AuthorizeVendor]
+[AuthorizeMenu]
+public class ShipmentController(
+    IShipmentViewModelService shipmentViewModelService,
+    IOrderService orderService,
+    ITranslationService translationService,
+    IContextAccessor contextAccessor,
+    IPdfService pdfService,
+    IShipmentService shipmentService,
+    IDateTimeService dateTimeService,
+    IMediator mediator,
+    IAdminDataScope<Shipment> scope,
+    IAdminDataScope<Order> orderScope)
+    : BaseShipmentController(shipmentViewModelService, orderService, translationService,
+        contextAccessor, pdfService, shipmentService, dateTimeService, mediator, scope, orderScope);
diff --git a/src/Web/Grand.Web.Vendor/Interfaces/IShipmentViewModelService.cs b/src/Web/Grand.Web.Vendor/Interfaces/IShipmentViewModelService.cs
deleted file mode 100644
index 6c24adf6a..000000000
--- a/src/Web/Grand.Web.Vendor/Interfaces/IShipmentViewModelService.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Grand.Domain.Catalog;
-using Grand.Domain.Orders;
-using Grand.Domain.Shipping;
-using Grand.Web.Vendor.Models.Shipment;
-
-namespace Grand.Web.Vendor.Interfaces;
-
-public interface IShipmentViewModelService
-{
-    Task<ShipmentModel> PrepareShipmentModel(Shipment shipment, bool prepareProducts,
-        bool prepareShipmentEvent = false);
-
-    Task<int> GetStockQty(Product product, string warehouseId);
-    Task<int> GetReservedQty(Product product, string warehouseId);
-    Task<IList<ShipmentModel.ShipmentNote>> PrepareShipmentNotes(Shipment shipment);
-    Task InsertShipmentNote(Shipment shipment, bool displayToCustomer, string message);
-    Task DeleteShipmentNote(Shipment shipment, string id);
-    Task<ShipmentListModel> PrepareShipmentListModel();
-    Task<ShipmentModel> PrepareShipmentModel(Order order);
-
-    Task<(Shipment shipment, double? totalWeight)> PrepareShipment(Order order, IEnumerable<OrderItem> orderItems,
-        AddShipmentModel model);
-
-    Task<(bool valid, string message)> ValidStockShipment(Shipment shipment);
-
-    Task<(IEnumerable<Shipment> shipments, int totalCount)> PrepareShipments(ShipmentListModel model, int pageIndex,
-        int pageSize);
-}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Vendor/Models/Shipment/AddShipmentModel.cs b/src/Web/Grand.Web.Vendor/Models/Shipment/AddShipmentModel.cs
deleted file mode 100644
index 53aeee068..000000000
--- a/src/Web/Grand.Web.Vendor/Models/Shipment/AddShipmentModel.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Grand.Infrastructure.Validators;
-namespace Grand.Web.Vendor.Models.Shipment;
-
-public class AddShipmentModel
-{
-    public string OrderId { get; set; }
-    public string TrackingNumber { get; set; }
-    [NoHtml]
-    public string AdminComment { get; set; }
-
-    public IList<ShipmentItemModel> Items { get; set; } = new List<ShipmentItemModel>();
-
-    public class ShipmentItemModel
-    {
-        public string OrderItemId { get; set; }
-        public int QuantityToAdd { get; set; }
-        public string WarehouseId { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Vendor/Models/Shipment/ShipmentListModel.cs b/src/Web/Grand.Web.Vendor/Models/Shipment/ShipmentListModel.cs
deleted file mode 100644
index b99871d9d..000000000
--- a/src/Web/Grand.Web.Vendor/Models/Shipment/ShipmentListModel.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Grand.Infrastructure.ModelBinding;
-using Grand.Infrastructure.Models;
-using Microsoft.AspNetCore.Mvc.Rendering;
-using System.ComponentModel.DataAnnotations;
-
-namespace Grand.Web.Vendor.Models.Shipment;
-
-public class ShipmentListModel : BaseModel
-{
-    [GrandResourceDisplayName("Vendor.Orders.Shipments.List.StartDate")]
-    [UIHint("DateNullable")]
-    public DateTime? StartDate { get; set; }
-
-    [GrandResourceDisplayName("Vendor.Orders.Shipments.List.EndDate")]
-    [UIHint("DateNullable")]
-    public DateTime? EndDate { get; set; }
-
-    [GrandResourceDisplayName("Vendor.Orders.Shipments.List.TrackingNumber")]
-
-    public string TrackingNumber { get; set; }
-
-
-    [GrandResourceDisplayName("Vendor.Orders.Shipments.List.City")]
-
-    public string City { get; set; }
-
-    [GrandResourceDisplayName("Vendor.Orders.Shipments.List.LoadNotShipped")]
-    public bool LoadNotShipped { get; set; }
-
-
-    [GrandResourceDisplayName("Vendor.Orders.Shipments.List.Warehouse")]
-    public string WarehouseId { get; set; }
-
-    public IList<SelectListItem> AvailableWarehouses { get; set; } = new List<SelectListItem>();
-}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Vendor/Models/Shipment/ShipmentModel.cs b/src/Web/Grand.Web.Vendor/Models/Shipment/ShipmentModel.cs
deleted file mode 100644
index 837a37be7..000000000
--- a/src/Web/Grand.Web.Vendor/Models/Shipment/ShipmentModel.cs
+++ /dev/null
@@ -1,134 +0,0 @@
-using Grand.Infrastructure.ModelBinding;
-using Grand.Infrastructure.Models;
-using Grand.Infrastructure.Validators;
-
-namespace Grand.Web.Vendor.Models.Shipment;
-
-public class ShipmentModel : BaseEntityModel
-{
-    [GrandResourceDisplayName("Vendor.Orders.Shipments.ID")]
-    public override string Id { get; set; }
-
-    public int ShipmentNumber { get; set; }
-
-    [GrandResourceDisplayName("Vendor.Orders.Shipments.OrderID")]
-    public string OrderId { get; set; }
-
-    public int OrderNumber { get; set; }
-    public string OrderCode { get; set; }
-
-    [GrandResourceDisplayName("Vendor.Orders.Shipments.TotalWeight")]
-    public string TotalWeight { get; set; }
-
-    [GrandResourceDisplayName("Vendor.Orders.Shipments.TrackingNumber")]
-    public string TrackingNumber { get; set; }
-
-    public string TrackingNumberUrl { get; set; }
-
-    [GrandResourceDisplayName("Vendor.Orders.Shipments.ShippedDate")]
-    public DateTime? ShippedDate { get; set; }
-
-    public bool CanShip { get; set; }
-    public DateTime? ShippedDateUtc { get; set; }
-
-    [GrandResourceDisplayName("Vendor.Orders.Shipments.DeliveryDate")]
-    public DateTime? DeliveryDate { get; set; }
-
-    public bool CanDeliver { get; set; }
-    public DateTime? DeliveryDateUtc { get; set; }
-
-    [NoHtml]
-    [GrandResourceDisplayName("Vendor.Orders.Shipments.AdminComment")]
-    public string AdminComment { get; set; }
-
-    public List<ShipmentItemModel> Items { get; set; } = new();
-
-    public IList<ShipmentStatusEventModel> ShipmentStatusEvents { get; set; } = new List<ShipmentStatusEventModel>();
-
-    //shipment notes
-    [GrandResourceDisplayName("Vendor.Orders.Shipments.ShipmentNotes.Fields.DisplayToCustomer")]
-    public bool AddShipmentNoteDisplayToCustomer { get; set; }
-
-    [GrandResourceDisplayName("Vendor.Orders.Shipments.ShipmentNotes.Fields.Note")]
-    [NoHtml]
-    public string AddShipmentNoteMessage { get; set; }
-
-
-    #region Nested classes
-
-    public class ShipmentItemModel : BaseEntityModel
-    {
-        public string OrderItemId { get; set; }
-        public string ProductId { get; set; }
-
-        [GrandResourceDisplayName("Vendor.Orders.Shipments.Products.ProductName")]
-        public string ProductName { get; set; }
-
-        public string Sku { get; set; }
-        public string AttributeInfo { get; set; }
-        public string RentalInfo { get; set; }
-        public bool ShipSeparately { get; set; }
-
-        //weight of one item (product)
-        [GrandResourceDisplayName("Vendor.Orders.Shipments.Products.ItemWeight")]
-        public string ItemWeight { get; set; }
-
-        [GrandResourceDisplayName("Vendor.Orders.Shipments.Products.ItemDimensions")]
-        public string ItemDimensions { get; set; }
-
-        public int QuantityToAdd { get; set; }
-        public int QuantityOrdered { get; set; }
-
-        [GrandResourceDisplayName("Vendor.Orders.Shipments.Products.QtyShipped")]
-        public int QuantityInThisShipment { get; set; }
-
-        public int QuantityInAllShipments { get; set; }
-
-        public string ShippedFromWarehouse { get; set; }
-
-        public bool AllowToChooseWarehouse { get; set; }
-
-        //used before a shipment is created
-        public List<WarehouseInfo> AvailableWarehouses { get; set; } = new();
-        public string WarehouseId { get; set; }
-
-        #region Nested Classes
-
-        public class WarehouseInfo : BaseModel
-        {
-            public string WarehouseId { get; set; }
-            public string WarehouseCode { get; set; }
-            public string WarehouseName { get; set; }
-            public int StockQuantity { get; set; }
-            public int ReservedQuantity { get; set; }
-        }
-
-        #endregion
-    }
-
-    public class ShipmentNote : BaseEntityModel
-    {
-        public string ShipmentId { get; set; }
-
-        [GrandResourceDisplayName("Vendor.Orders.Shipments.ShipmentNotes.Fields.DisplayToCustomer")]
-        public bool DisplayToCustomer { get; set; }
-
-        [GrandResourceDisplayName("Vendor.Orders.Shipments.ShipmentNotes.Fields.Note")]
-        public string Note { get; set; }
-
-        [GrandResourceDisplayName("Vendor.Orders.Shipments.ShipmentNotes.Fields.CreatedOn")]
-        public DateTime CreatedOn { get; set; }
-
-        [GrandResourceDisplayName("Vendor.Orders.Shipments.ShipmentNotes.Fields.CreatedByCustomer")]
-        public bool CreatedByCustomer { get; set; }
-    }
-
-    public class ShipmentStatusEventModel : BaseModel
-    {
-        public string EventName { get; set; }
-        public string Location { get; set; }
-        public DateTime? Date { get; set; }
-    }
-
-    #endregion
-}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Vendor/Services/ShipmentViewModelService.cs b/src/Web/Grand.Web.Vendor/Services/ShipmentViewModelService.cs
deleted file mode 100644
index de40c522c..000000000
--- a/src/Web/Grand.Web.Vendor/Services/ShipmentViewModelService.cs
+++ /dev/null
@@ -1,557 +0,0 @@
-using Grand.Business.Core.Extensions;
-using Grand.Business.Core.Interfaces.Catalog.Directory;
-using Grand.Business.Core.Interfaces.Catalog.Products;
-using Grand.Business.Core.Interfaces.Checkout.Orders;
-using Grand.Business.Core.Interfaces.Checkout.Shipping;
-using Grand.Business.Core.Interfaces.Common.Directory;
-using Grand.Business.Core.Interfaces.Common.Localization;
-using Grand.Domain.Catalog;
-using Grand.Domain.Directory;
-using Grand.Domain.Orders;
-using Grand.Domain.Shipping;
-using Grand.Infrastructure;
-using Grand.Web.Vendor.Extensions;
-using Grand.Web.Vendor.Interfaces;
-using Grand.Web.Vendor.Models.Shipment;
-using Microsoft.AspNetCore.Mvc.Rendering;
-
-namespace Grand.Web.Vendor.Services;
-
-public class ShipmentViewModelService : IShipmentViewModelService
-{
-    private readonly IDateTimeService _dateTimeService;
-    private readonly IGroupService _groupService;
-    private readonly IMeasureService _measureService;
-    private readonly MeasureSettings _measureSettings;
-    private readonly IOrderService _orderService;
-    private readonly IProductService _productService;
-    private readonly IShipmentService _shipmentService;
-    private readonly ShippingProviderSettings _shippingProviderSettings;
-    private readonly IShippingService _shippingService;
-    private readonly ShippingSettings _shippingSettings;
-    private readonly IStockQuantityService _stockQuantityService;
-    private readonly ITranslationService _translationService;
-    private readonly IWarehouseService _warehouseService;
-    private readonly IContextAccessor _contextAccessor;
-
-    public ShipmentViewModelService(
-        IOrderService orderService,
-        IContextAccessor contextAccessor,
-        IGroupService groupService,
-        IProductService productService,
-        IShipmentService shipmentService,
-        IWarehouseService warehouseService,
-        IMeasureService measureService,
-        IDateTimeService dateTimeService,
-        ITranslationService translationService,
-        IShippingService shippingService,
-        IStockQuantityService stockQuantityService,
-        MeasureSettings measureSettings,
-        ShippingSettings shippingSettings,
-        ShippingProviderSettings shippingProviderSettings)
-    {
-        _orderService = orderService;
-        _contextAccessor = contextAccessor;
-        _groupService = groupService;
-        _productService = productService;
-        _shipmentService = shipmentService;
-        _warehouseService = warehouseService;
-        _measureService = measureService;
-        _dateTimeService = dateTimeService;
-        _translationService = translationService;
-        _shippingService = shippingService;
-        _stockQuantityService = stockQuantityService;
-        _measureSettings = measureSettings;
-        _shippingSettings = shippingSettings;
-        _shippingProviderSettings = shippingProviderSettings;
-    }
-
-    public virtual async Task<ShipmentModel> PrepareShipmentModel(Shipment shipment, bool prepareProducts,
-        bool prepareShipmentEvent = false)
-    {
-        //measures
-        var baseWeight = await _measureService.GetMeasureWeightById(_measureSettings.BaseWeightId);
-        var baseWeightIn = baseWeight != null ? baseWeight.Name : "";
-        var baseDimension = await _measureService.GetMeasureDimensionById(_measureSettings.BaseDimensionId);
-        var baseDimensionIn = baseDimension != null ? baseDimension.Name : "";
-        var order = await _orderService.GetOrderById(shipment.OrderId);
-        
-        var model = new ShipmentModel {
-            Id = shipment.Id,
-            ShipmentNumber = shipment.ShipmentNumber,
-            OrderId = shipment.OrderId,
-            OrderNumber = order?.OrderNumber ?? 0,
-            OrderCode = order != null ? order.Code : "",
-            TrackingNumber = shipment.TrackingNumber,
-            TotalWeight = shipment.TotalWeight.HasValue ? $"{shipment.TotalWeight:F2} [{baseWeightIn}]" : "",
-            ShippedDate = shipment.ShippedDateUtc.HasValue
-                ? _dateTimeService.ConvertToUserTime(shipment.ShippedDateUtc.Value, DateTimeKind.Utc)
-                : new DateTime?(),
-            ShippedDateUtc = shipment.ShippedDateUtc,
-            CanShip = !shipment.ShippedDateUtc.HasValue,
-            DeliveryDate = shipment.DeliveryDateUtc.HasValue
-                ? _dateTimeService.ConvertToUserTime(shipment.DeliveryDateUtc.Value, DateTimeKind.Utc)
-                : new DateTime?(),
-            DeliveryDateUtc = shipment.DeliveryDateUtc,
-            CanDeliver = shipment.ShippedDateUtc.HasValue && !shipment.DeliveryDateUtc.HasValue,
-            AdminComment = shipment.AdminComment
-        };
-
-        if (prepareProducts)
-            foreach (var shipmentItem in shipment.ShipmentItems)
-            {
-                var orderItem = order?.OrderItems.FirstOrDefault(x => x.Id == shipmentItem.OrderItemId);
-                if (orderItem == null)
-                    continue;
-
-                if (!_contextAccessor.WorkContext.HasAccessToOrderItem(orderItem))
-                    continue;
-
-                //quantities
-                var qtyInThisShipment = shipmentItem.Quantity;
-                var maxQtyToAdd = orderItem.OpenQty;
-                var qtyOrdered = shipmentItem.Quantity;
-                var qtyInAllShipments = orderItem.ShipQty;
-                var product = await _productService.GetProductByIdIncludeArch(orderItem.ProductId);
-                if (product != null)
-                {
-                    var warehouse = await _warehouseService.GetWarehouseById(shipmentItem.WarehouseId);
-                    var shipmentItemModel = new ShipmentModel.ShipmentItemModel {
-                        Id = shipmentItem.Id,
-                        OrderItemId = orderItem.Id,
-                        ProductId = orderItem.ProductId,
-                        ProductName = product.Name,
-                        Sku = product.FormatSku(orderItem.Attributes),
-                        AttributeInfo = orderItem.AttributeDescription,
-                        ShippedFromWarehouse = warehouse?.Name,
-                        ShipSeparately = product.ShipSeparately,
-                        ItemWeight = orderItem.ItemWeight.HasValue
-                            ? $"{orderItem.ItemWeight:F2} [{baseWeightIn}]"
-                            : "",
-                        ItemDimensions =
-                            $"{product.Length:F2} x {product.Width:F2} x {product.Height:F2} [{baseDimensionIn}]",
-                        QuantityOrdered = qtyOrdered,
-                        QuantityInThisShipment = qtyInThisShipment,
-                        QuantityInAllShipments = qtyInAllShipments,
-                        QuantityToAdd = maxQtyToAdd
-                    };
-
-                    model.Items.Add(shipmentItemModel);
-                }
-            }
-
-        if (prepareShipmentEvent && !string.IsNullOrEmpty(shipment.TrackingNumber))
-        {
-            var srcm = _shippingService.LoadShippingRateCalculationProviderBySystemName(order?.ShippingRateProviderSystemName);
-            if (srcm != null &&
-                srcm.IsShippingRateMethodActive(_shippingProviderSettings))
-            {
-                var shipmentTracker = srcm.ShipmentTracker;
-                if (shipmentTracker != null)
-                {
-                    model.TrackingNumberUrl = await shipmentTracker.GetUrl(shipment.TrackingNumber);
-                    if (_shippingSettings.DisplayShipmentEventsToStoreOwner)
-                    {
-                        var shipmentEvents = await shipmentTracker.GetShipmentEvents(shipment.TrackingNumber);
-                        if (shipmentEvents != null)
-                            foreach (var shipmentEvent in shipmentEvents)
-                            {
-                                var shipmentStatusEventModel = new ShipmentModel.ShipmentStatusEventModel {
-                                    Date = shipmentEvent.Date,
-                                    EventName = shipmentEvent.EventName,
-                                    Location = shipmentEvent.Location
-                                };
-                                model.ShipmentStatusEvents.Add(shipmentStatusEventModel);
-                            }
-                    }
-                }
-            }
-        }
-
-        return model;
-    }
-
-
-    public virtual async Task<int> GetStockQty(Product product, string warehouseId)
-    {
-        var qty = new List<int>();
-        foreach (var item in product.BundleProducts)
-        {
-            var p1 = await _productService.GetProductById(item.ProductId);
-            if (p1.UseMultipleWarehouses)
-            {
-                var stock = p1.ProductWarehouseInventory.FirstOrDefault(x => x.WarehouseId == warehouseId);
-                if (stock != null) qty.Add(stock.StockQuantity / item.Quantity);
-            }
-            else
-            {
-                qty.Add(p1.StockQuantity / item.Quantity);
-            }
-        }
-
-        return qty.Count > 0 ? qty.Min() : 0;
-    }
-
-    public virtual async Task<int> GetReservedQty(Product product, string warehouseId)
-    {
-        var qty = new List<int>();
-        foreach (var item in product.BundleProducts)
-        {
-            var p1 = await _productService.GetProductById(item.ProductId);
-            if (p1.UseMultipleWarehouses)
-            {
-                var stock = p1.ProductWarehouseInventory.FirstOrDefault(x => x.WarehouseId == warehouseId);
-                if (stock != null) qty.Add(stock.ReservedQuantity / item.Quantity);
-            }
-        }
-
-        return qty.Count > 0 ? qty.Min() : 0;
-    }
-
-    public virtual async Task<IList<ShipmentModel.ShipmentNote>> PrepareShipmentNotes(Shipment shipment)
-    {
-        //shipment notes
-        var shipmentNoteModels = new List<ShipmentModel.ShipmentNote>();
-        foreach (var shipmentNote in (await _shipmentService.GetShipmentNotes(shipment.Id))
-                 .OrderByDescending(on => on.CreatedOnUtc))
-            shipmentNoteModels.Add(new ShipmentModel.ShipmentNote {
-                Id = shipmentNote.Id,
-                ShipmentId = shipment.Id,
-                DisplayToCustomer = shipmentNote.DisplayToCustomer,
-                Note = shipmentNote.Note,
-                CreatedOn = _dateTimeService.ConvertToUserTime(shipmentNote.CreatedOnUtc, DateTimeKind.Utc),
-                CreatedByCustomer = shipmentNote.CreatedByCustomer
-            });
-
-        return shipmentNoteModels;
-    }
-
-    public virtual async Task InsertShipmentNote(Shipment shipment, bool displayToCustomer,
-        string message)
-    {
-        var shipmentNote = new ShipmentNote {
-            DisplayToCustomer = displayToCustomer,
-            Note = message,
-            ShipmentId = shipment.Id
-        };
-        await _shipmentService.InsertShipmentNote(shipmentNote);
-    }
-
-    public virtual async Task DeleteShipmentNote(Shipment shipment, string id)
-    {
-        var shipmentNote = (await _shipmentService.GetShipmentNotes(shipment.Id)).FirstOrDefault(on => on.Id == id);
-        if (shipmentNote == null)
-            throw new ArgumentException("No shipment note found with the specified id");
-
-        shipmentNote.ShipmentId = shipment.Id;
-        await _shipmentService.DeleteShipmentNote(shipmentNote);
-    }
-
-    public virtual async Task<(IEnumerable<Shipment> shipments, int totalCount)> PrepareShipments(
-        ShipmentListModel model, int pageIndex, int pageSize)
-    {
-        DateTime? startDateValue = model.StartDate == null
-            ? null
-            : _dateTimeService.ConvertToUtcTime(model.StartDate.Value, _dateTimeService.CurrentTimeZone);
-
-        DateTime? endDateValue = model.EndDate == null
-            ? null
-            : _dateTimeService.ConvertToUtcTime(model.EndDate.Value, _dateTimeService.CurrentTimeZone).AddDays(1);
-
-        //load shipments
-        var shipments = await _shipmentService.GetAllShipments(
-            vendorId: _contextAccessor.WorkContext.CurrentVendor.Id,
-            warehouseId: model.WarehouseId,
-            shippingCity: model.City,
-            trackingNumber: model.TrackingNumber,
-            loadNotShipped: model.LoadNotShipped,
-            createdFromUtc: startDateValue,
-            createdToUtc: endDateValue,
-            pageIndex: pageIndex - 1,
-            pageSize: pageSize);
-
-        return (shipments.ToList(), shipments.TotalCount);
-    }
-
-    public virtual async Task<ShipmentListModel> PrepareShipmentListModel()
-    {
-        var model = new ShipmentListModel();
-        //warehouses
-        model.AvailableWarehouses.Add(new SelectListItem
-            { Text = _translationService.GetResource("Admin.Common.All"), Value = "" });
-        foreach (var w in await _warehouseService.GetAllWarehouses())
-            model.AvailableWarehouses.Add(new SelectListItem { Text = w.Name, Value = w.Id });
-
-        return model;
-    }
-
-    public virtual async Task<ShipmentModel> PrepareShipmentModel(Order order)
-    {
-        var model = new ShipmentModel {
-            OrderId = order.Id,
-            OrderNumber = order.OrderNumber
-        };
-
-        //measures
-        var baseWeight = await _measureService.GetMeasureWeightById(_measureSettings.BaseWeightId);
-        var baseWeightIn = baseWeight != null ? baseWeight.Name : "";
-        var baseDimension = await _measureService.GetMeasureDimensionById(_measureSettings.BaseDimensionId);
-        var baseDimensionIn = baseDimension != null ? baseDimension.Name : "";
-
-        var orderItems = order.OrderItems;
-        //a vendor should have access only to his products
-        if (_contextAccessor.WorkContext.CurrentVendor != null && !await _groupService.IsStoreManager(_contextAccessor.WorkContext.CurrentCustomer))
-            orderItems = orderItems.Where(_contextAccessor.WorkContext.HasAccessToOrderItem).ToList();
-
-        foreach (var orderItem in orderItems)
-        {
-            var product = await _productService.GetProductByIdIncludeArch(orderItem.ProductId);
-            //we can ship only shippable products
-            if (!product.IsShipEnabled)
-                continue;
-
-            //quantities
-            var qtyInThisShipment = 0;
-            var maxQtyToAdd = orderItem.OpenQty;
-            var qtyOrdered = orderItem.Quantity;
-            var qtyInAllShipments = orderItem.ShipQty;
-
-            //ensure that this product can be added to a shipment
-            if (maxQtyToAdd <= 0)
-                continue;
-
-            var shipmentItemModel = new ShipmentModel.ShipmentItemModel {
-                OrderItemId = orderItem.Id,
-                ProductId = orderItem.ProductId,
-                ProductName = product.Name,
-                WarehouseId = orderItem.WarehouseId,
-                Sku = product.FormatSku(orderItem.Attributes),
-                AttributeInfo = orderItem.AttributeDescription,
-                ShipSeparately = product.ShipSeparately,
-                ItemWeight = orderItem.ItemWeight.HasValue ? $"{orderItem.ItemWeight:F2} [{baseWeightIn}]" : "",
-                ItemDimensions =
-                    $"{product.Length:F2} x {product.Width:F2} x {product.Height:F2} [{baseDimensionIn}]",
-                QuantityOrdered = qtyOrdered,
-                QuantityInThisShipment = qtyInThisShipment,
-                QuantityInAllShipments = qtyInAllShipments,
-                QuantityToAdd = maxQtyToAdd
-            };
-
-            switch (product.ManageInventoryMethodId)
-            {
-                case ManageInventoryMethod.ManageStock when product.UseMultipleWarehouses:
-                {
-                    //multiple warehouses supported
-                    shipmentItemModel.AllowToChooseWarehouse = true;
-                    foreach (var pwi in product.ProductWarehouseInventory
-                                 .OrderBy(w => w.WarehouseId).ToList())
-                    {
-                        var warehouse = await _warehouseService.GetWarehouseById(pwi.WarehouseId);
-                        if (warehouse != null)
-                            shipmentItemModel.AvailableWarehouses.Add(
-                                new ShipmentModel.ShipmentItemModel.WarehouseInfo {
-                                    WarehouseId = warehouse.Id,
-                                    WarehouseName = warehouse.Name,
-                                    WarehouseCode = warehouse.Code,
-                                    StockQuantity = pwi.StockQuantity,
-                                    ReservedQuantity = pwi.ReservedQuantity
-                                });
-                    }
-
-                    break;
-                }
-                case ManageInventoryMethod.ManageStock:
-                {
-                    //multiple warehouses are not supported
-                    var warehouse = await _warehouseService.GetWarehouseById(product.WarehouseId);
-                    if (warehouse != null)
-                        shipmentItemModel.AvailableWarehouses.Add(new ShipmentModel.ShipmentItemModel.WarehouseInfo {
-                            WarehouseId = warehouse.Id,
-                            WarehouseName = warehouse.Name,
-                            WarehouseCode = warehouse.Code,
-                            StockQuantity = product.StockQuantity
-                        });
-
-                    break;
-                }
-                case ManageInventoryMethod.ManageStockByAttributes when product.UseMultipleWarehouses:
-                {
-                    //multiple warehouses supported
-                    shipmentItemModel.AllowToChooseWarehouse = true;
-                    var comb = product.FindProductAttributeCombination(orderItem.Attributes);
-                    if (comb != null)
-                        foreach (var pwi in comb.WarehouseInventory
-                                     .OrderBy(w => w.WarehouseId).ToList())
-                        {
-                            var warehouse = await _warehouseService.GetWarehouseById(pwi.WarehouseId);
-                            if (warehouse != null)
-                                shipmentItemModel.AvailableWarehouses.Add(
-                                    new ShipmentModel.ShipmentItemModel.WarehouseInfo {
-                                        WarehouseId = warehouse.Id,
-                                        WarehouseName = warehouse.Name,
-                                        StockQuantity = pwi.StockQuantity,
-                                        WarehouseCode = warehouse.Code,
-                                        ReservedQuantity = pwi.ReservedQuantity
-                                    });
-                        }
-
-                    break;
-                }
-                case ManageInventoryMethod.ManageStockByAttributes:
-                {
-                    //multiple warehouses are not supported
-                    var warehouse = await _warehouseService.GetWarehouseById(product.WarehouseId);
-                    if (warehouse != null)
-                        shipmentItemModel.AvailableWarehouses.Add(new ShipmentModel.ShipmentItemModel.WarehouseInfo {
-                            WarehouseId = warehouse.Id,
-                            WarehouseName = warehouse.Name,
-                            WarehouseCode = warehouse.Code,
-                            StockQuantity = product.StockQuantity
-                        });
-
-                    break;
-                }
-            }
-
-            if (product.ManageInventoryMethodId == ManageInventoryMethod.ManageStockByBundleProducts)
-            {
-                if (!string.IsNullOrEmpty(orderItem.WarehouseId))
-                {
-                    var warehouse = await _warehouseService.GetWarehouseById(product.WarehouseId);
-                    if (warehouse != null)
-                        shipmentItemModel.AvailableWarehouses.Add(new ShipmentModel.ShipmentItemModel.WarehouseInfo {
-                            WarehouseId = warehouse.Id,
-                            WarehouseName = warehouse.Name,
-                            WarehouseCode = warehouse.Code,
-                            StockQuantity = await GetStockQty(product, orderItem.WarehouseId),
-                            ReservedQuantity = await GetReservedQty(product, orderItem.WarehouseId)
-                        });
-                }
-                else
-                {
-                    shipmentItemModel.AllowToChooseWarehouse = false;
-                    if (shipmentItemModel.AllowToChooseWarehouse)
-                    {
-                        var warehouses = await _warehouseService.GetAllWarehouses();
-                        foreach (var warehouse in warehouses)
-                            shipmentItemModel.AvailableWarehouses.Add(
-                                new ShipmentModel.ShipmentItemModel.WarehouseInfo {
-                                    WarehouseId = warehouse.Id,
-                                    WarehouseName = warehouse.Name,
-                                    WarehouseCode = warehouse.Code,
-                                    StockQuantity = await GetStockQty(product, warehouse.Id),
-                                    ReservedQuantity = await GetReservedQty(product, warehouse.Id)
-                                });
-                    }
-                }
-            }
-
-            model.Items.Add(shipmentItemModel);
-        }
-
-        return model;
-    }
-
-    public virtual async Task<(bool valid, string message)> ValidStockShipment(Shipment shipment)
-    {
-        foreach (var item in shipment.ShipmentItems)
-        {
-            var product = await _productService.GetProductById(item.ProductId);
-            switch (product.ManageInventoryMethodId)
-            {
-                case ManageInventoryMethod.ManageStock:
-                {
-                    var stock = _stockQuantityService.GetTotalStockQuantity(product, false,
-                        item.WarehouseId);
-                    if (stock - item.Quantity < 0)
-                        return (false, $"Out of stock for product {product.Name}");
-                    break;
-                }
-                case ManageInventoryMethod.ManageStockByAttributes:
-                {
-                    var combination = product.FindProductAttributeCombination(item.Attributes);
-                    if (combination == null)
-                        return (false, $"Can't find combination for product {product.Name}");
-
-                    var stock = _stockQuantityService.GetTotalStockQuantityForCombination(product, combination,
-                        false, item.WarehouseId);
-                    if (stock - item.Quantity < 0)
-                        return (false, $"Out of stock for product {product.Name}");
-                    break;
-                }
-            }
-        }
-
-        return (true, string.Empty);
-    }
-
-    public virtual async Task<(Shipment shipment, double? totalWeight)> PrepareShipment(Order order,
-        IEnumerable<OrderItem> orderItems, AddShipmentModel model)
-    {
-        var shipment = new Shipment {
-            OrderId = order.Id,
-            SeId = order.SeId,
-            TrackingNumber = model.TrackingNumber,
-            TotalWeight = null,
-            ShippedDateUtc = null,
-            DeliveryDateUtc = null,
-            AdminComment = model.AdminComment,
-            StoreId = order.StoreId,
-            VendorId = _contextAccessor.WorkContext.CurrentVendor.Id
-        };
-        double? totalWeight = null;
-        foreach (var orderItem in orderItems)
-        {
-            //is shippable
-            if (!orderItem.IsShipEnabled)
-                continue;
-
-            //ensure that this product can be shipped (have at least one item to ship)
-            if (orderItem.OpenQty <= 0)
-                continue;
-
-            var shipmentItemModel = model.Items.FirstOrDefault(x => x.OrderItemId == orderItem.Id);
-            if (shipmentItemModel == null)
-                continue;
-
-            var product = await _productService.GetProductById(orderItem.ProductId);
-            string warehouseId;
-            if (product != null && ((product.ManageInventoryMethodId is ManageInventoryMethod.ManageStock
-                                         or ManageInventoryMethod.ManageStockByAttributes &&
-                                     product.UseMultipleWarehouses) || product.ManageInventoryMethodId ==
-                    ManageInventoryMethod.ManageStockByBundleProducts))
-                //multiple warehouses supported
-                //warehouse is chosen by a store owner
-                warehouseId = shipmentItemModel.WarehouseId;
-            else
-                //multiple warehouses are not supported
-                warehouseId = orderItem.WarehouseId;
-
-            //validate quantity
-            if (shipmentItemModel.QuantityToAdd <= 0)
-                continue;
-            if (shipmentItemModel.QuantityToAdd > orderItem.OpenQty)
-                shipmentItemModel.QuantityToAdd = orderItem.OpenQty;
-
-            //ok. we have at least one item. create a shipment (if it does not exist)
-            var orderItemTotalWeight = orderItem.ItemWeight * shipmentItemModel.QuantityToAdd;
-            if (orderItemTotalWeight.HasValue)
-            {
-                totalWeight ??= 0;
-                totalWeight += orderItemTotalWeight.Value;
-            }
-
-            //create a shipment item
-            var shipmentItem = new ShipmentItem {
-                ProductId = orderItem.ProductId,
-                OrderItemId = orderItem.Id,
-                Quantity = shipmentItemModel.QuantityToAdd,
-                WarehouseId = warehouseId,
-                Attributes = orderItem.Attributes
-            };
-            shipment.ShipmentItems.Add(shipmentItem);
-        }
-
-        return (shipment, totalWeight);
-    }
-}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Vendor/Startup/StartupApplication.cs b/src/Web/Grand.Web.Vendor/Startup/StartupApplication.cs
index 3bcacfa8c..08f735ef8 100644
--- a/src/Web/Grand.Web.Vendor/Startup/StartupApplication.cs
+++ b/src/Web/Grand.Web.Vendor/Startup/StartupApplication.cs
@@ -24,7 +24,7 @@ public void ConfigureServices(IServiceCollection services, IConfiguration config
         // host too via the IStartupApplication assembly scan in StartupBase, since Vendor references
         // AdminShared. Registering it again here would just be a redundant duplicate of that line.
         // IOrderViewModelService is likewise registered by Grand.Web.AdminShared's StartupApplication.
-        services.AddScoped<IShipmentViewModelService, ShipmentViewModelService>();
+        // IShipmentViewModelService is likewise registered by Grand.Web.AdminShared's StartupApplication.
         services.AddScoped<IMerchandiseReturnViewModelService, MerchandiseReturnViewModelService>();
         services.AddScoped<IVendorReviewViewModelService, VendorReviewViewModelService>();
     }