Add ShippingController to Grand.Web.Store and StoreId support to Admin Shipping for delivery dates, warehouses, pickup points, shipping methods, and restrictions

src/Business/Grand.Business.Checkout/Services/Shipping/DeliveryDateService.cs

@@ -1,5 +1,6 @@
 using Grand.Business.Core.Interfaces.Checkout.Shipping;
 using Grand.Data;
+using Grand.Domain;
 using Grand.Domain.Shipping;
 using Grand.Infrastructure.Caching;
 using Grand.Infrastructure.Caching.Constants;
@@ -51,16 +52,19 @@ public virtual Task<DeliveryDate> GetDeliveryDateById(string deliveryDateId)
     /// <summary>
     ///     Gets all delivery dates
     /// </summary>
+    /// <param name="storeId">Store identifier; empty to return all delivery dates</param>
+    /// <param name="pageIndex">Page index</param>
+    /// <param name="pageSize">Page size</param>
     /// <returns>Delivery dates</returns>
-    public virtual async Task<IList<DeliveryDate>> GetAllDeliveryDates()
+    public virtual async Task<IPagedList<DeliveryDate>> GetAllDeliveryDates(string storeId = "", int pageIndex = 0, int pageSize = int.MaxValue)
     {
-        return await _cacheBase.GetAsync(CacheKey.DELIVERYDATE_ALL, async () =>
-        {
-            var query = from dd in _deliveryDateRepository.Table
-                orderby dd.DisplayOrder
-                select dd;
-            return await Task.FromResult(query.ToList());
-        });
+        var query = _deliveryDateRepository.Table;
+
+        if (!string.IsNullOrEmpty(storeId))
+            query = query.Where(dd => dd.StoreId == storeId);
+        query = query.OrderBy(dd => dd.DisplayOrder);
+
+        return await PagedList<DeliveryDate>.Create(query, pageIndex, pageSize);
     }
 
     /// <summary>

src/Business/Grand.Business.Checkout/Services/Shipping/PickupPointService.cs

@@ -1,5 +1,6 @@
 using Grand.Business.Core.Interfaces.Checkout.Shipping;
 using Grand.Data;
+using Grand.Domain;
 using Grand.Domain.Shipping;
 using Grand.Infrastructure.Caching;
 using Grand.Infrastructure.Caching.Constants;
@@ -51,16 +52,19 @@ public virtual Task<PickupPoint> GetPickupPointById(string pickupPointId)
     /// <summary>
     ///     Gets all pickup points
     /// </summary>
+    /// <param name="storeId">Store identifier; empty to return all pickup points</param>
+    /// <param name="pageIndex">Page index</param>
+    /// <param name="pageSize">Page size</param>
     /// <returns>Warehouses</returns>
-    public virtual async Task<IList<PickupPoint>> GetAllPickupPoints()
+    public virtual async Task<IPagedList<PickupPoint>> GetAllPickupPoints(string storeId = "", int pageIndex = 0, int pageSize = int.MaxValue)
     {
-        return await _cacheBase.GetAsync(CacheKey.PICKUPPOINTS_ALL, async () =>
-        {
-            var query = from pp in _pickupPointsRepository.Table
-                orderby pp.DisplayOrder
-                select pp;
-            return await Task.FromResult(query.ToList());
-        });
+        var query = _pickupPointsRepository.Table;
+
+        if (!string.IsNullOrEmpty(storeId))
+            query = query.Where(pp => pp.StoreId == storeId);
+
+        query = query.OrderBy(pp => pp.DisplayOrder);
+        return await PagedList<PickupPoint>.Create(query, pageIndex, pageSize);
     }
 
     /// <summary>

src/Business/Grand.Business.Checkout/Services/Shipping/ShippingMethodService.cs

@@ -72,17 +72,19 @@ public virtual Task<ShippingMethod> GetShippingMethodById(string shippingMethodI
     /// </summary>
     /// <param name="filterByCountryId">The country ident to filter by</param>
     /// <param name="customer"></param>
+    /// <param name="storeId">The store identifier to filter by</param>
     /// <returns>Shipping methods</returns>
     public virtual async Task<IList<ShippingMethod>> GetAllShippingMethods(string filterByCountryId = "",
-        Customer customer = null)
+        Customer customer = null, string storeId = "")
     {
-        var shippingMethods = await _cacheBase.GetAsync(CacheKey.SHIPPINGMETHOD_ALL, async () =>
-        {
-            var query = from sm in _shippingMethodRepository.Table
-                orderby sm.DisplayOrder
-                select sm;
-            return await Task.FromResult(query.ToList());
-        });
+        var query = _shippingMethodRepository.Table;
+
+        if (!string.IsNullOrEmpty(storeId))
+            query = query.Where(sm => sm.StoreId == storeId || string.IsNullOrEmpty(sm.StoreId));
+
+        query = query.OrderBy(sm => sm.DisplayOrder);
+
+        var shippingMethods = await Task.FromResult(query.ToList());
 
         if (!string.IsNullOrEmpty(filterByCountryId))
             shippingMethods = shippingMethods.Where(x => !x.CountryRestrictionExists(filterByCountryId)).ToList();

src/Business/Grand.Business.Checkout/Services/Shipping/WarehouseService.cs

@@ -1,5 +1,6 @@
 using Grand.Business.Core.Interfaces.Checkout.Shipping;
 using Grand.Data;
+using Grand.Domain;
 using Grand.Domain.Shipping;
 using Grand.Infrastructure.Caching;
 using Grand.Infrastructure.Caching.Constants;
@@ -51,16 +52,19 @@ public virtual Task<Warehouse> GetWarehouseById(string warehouseId)
     /// <summary>
     ///     Gets all warehouses
     /// </summary>
+    /// <param name="storeId">Store identifier; empty to return all warehouses</param>
+    /// <param name="pageIndex">Page index</param>
+    /// <param name="pageSize">Page size</param>
     /// <returns>Warehouses</returns>
-    public virtual async Task<IList<Warehouse>> GetAllWarehouses()
+    public virtual async Task<IPagedList<Warehouse>> GetAllWarehouses(string storeId = "", int pageIndex = 0, int pageSize = int.MaxValue)
     {
-        return await _cacheBase.GetAsync(CacheKey.WAREHOUSES_ALL, async () =>
-        {
-            var query = from wh in _warehouseRepository.Table
-                orderby wh.DisplayOrder
-                select wh;
-            return await Task.FromResult(query.ToList());
-        });
+        var query = _warehouseRepository.Table;
+
+        if (!string.IsNullOrEmpty(storeId))
+            query = query.Where(wh => wh.StoreId == storeId);
+        query = query.OrderBy(wh => wh.DisplayOrder);
+
+        return await PagedList<Warehouse>.Create(query, pageIndex, pageSize);
     }
 
     /// <summary>

src/Business/Grand.Business.Core/Interfaces/Checkout/Shipping/IDeliveryDateService.cs

@@ -1,4 +1,5 @@
-using Grand.Domain.Shipping;
+using Grand.Domain;
+using Grand.Domain.Shipping;
 
 namespace Grand.Business.Core.Interfaces.Checkout.Shipping;
 
@@ -14,8 +15,11 @@ public interface IDeliveryDateService
     /// <summary>
     ///     Gets all delivery dates
     /// </summary>
+    /// <param name="storeId">Store identifier; empty to return all delivery dates</param>
+    /// <param name="pageIndex">Page index</param>
+    /// <param name="pageSize">Page size</param>
     /// <returns>Delivery dates</returns>
-    Task<IList<DeliveryDate>> GetAllDeliveryDates();
+    Task<IPagedList<DeliveryDate>> GetAllDeliveryDates(string storeId = "", int pageIndex = 0, int pageSize = int.MaxValue);
 
     /// <summary>
     ///     Inserts a delivery date

src/Business/Grand.Business.Core/Interfaces/Checkout/Shipping/IPickupPointService.cs

@@ -1,4 +1,5 @@
-using Grand.Domain.Shipping;
+using Grand.Domain;
+using Grand.Domain.Shipping;
 
 namespace Grand.Business.Core.Interfaces.Checkout.Shipping;
 
@@ -14,8 +15,11 @@ public interface IPickupPointService
     /// <summary>
     ///     Gets all pickup points
     /// </summary>
+    /// <param name="storeId">Store identifier; empty to return all pickup points</param>
+    /// <param name="pageIndex">Page index</param>
+    /// <param name="pageSize">Page size</param>
     /// <returns>PickupPoints</returns>
-    Task<IList<PickupPoint>> GetAllPickupPoints();
+    Task<IPagedList<PickupPoint>> GetAllPickupPoints(string storeId = "", int pageIndex = 0, int pageSize = int.MaxValue);
 
     /// <summary>
     ///     Gets active pickup points

src/Business/Grand.Business.Core/Interfaces/Checkout/Shipping/IShippingMethodService.cs

@@ -18,8 +18,9 @@ public interface IShippingMethodService
     /// </summary>
     /// <param name="filterByCountryId">The country identifier to filter by</param>
     /// <param name="customer"></param>
+    /// <param name="storeId">The store identifier to filter by</param>
     /// <returns>Shipping methods</returns>
-    Task<IList<ShippingMethod>> GetAllShippingMethods(string filterByCountryId = "", Customer customer = null);
+    Task<IList<ShippingMethod>> GetAllShippingMethods(string filterByCountryId = "", Customer customer = null, string storeId = "");
 
     /// <summary>
     ///     Inserts a shipping method

src/Business/Grand.Business.Core/Interfaces/Checkout/Shipping/IWarehouseService.cs

@@ -1,4 +1,5 @@
-using Grand.Domain.Shipping;
+using Grand.Domain;
+using Grand.Domain.Shipping;
 
 namespace Grand.Business.Core.Interfaces.Checkout.Shipping;
 
@@ -14,8 +15,11 @@ public interface IWarehouseService
     /// <summary>
     ///     Gets all warehouses
     /// </summary>
+    /// <param name="storeId">Store identifier; empty to return all warehouses</param>
+    /// <param name="pageIndex">Page index</param>
+    /// <param name="pageSize">Page size</param>
     /// <returns>Warehouses</returns>
-    Task<IList<Warehouse>> GetAllWarehouses();
+    Task<IPagedList<Warehouse>> GetAllWarehouses(string storeId = "", int pageIndex = 0, int pageSize = int.MaxValue);
 
     /// <summary>
     ///     Inserts a warehouse

src/Core/Grand.Domain/Shipping/DeliveryDate.cs

@@ -26,4 +26,9 @@ public class DeliveryDate : BaseEntity, ITranslationEntity
     ///     Gets or sets the collection of locales
     /// </summary>
     public IList<TranslationEntity> Locales { get; set; } = new List<TranslationEntity>();
+
+    /// <summary>
+    ///     Gets or sets the store identifier. Empty means available to all stores.
+    /// </summary>
+    public string StoreId { get; set; }
 }

src/Core/Grand.Domain/Shipping/ShippingMethod.cs

@@ -46,4 +46,9 @@ public virtual ICollection<string> RestrictedGroups {
     ///     Gets or sets the collection of locales
     /// </summary>
     public IList<TranslationEntity> Locales { get; set; } = new List<TranslationEntity>();
+
+    /// <summary>
+    ///     Gets or sets the store identifier. Empty means available to all stores.
+    /// </summary>
+    public string StoreId { get; set; }
 }

src/Core/Grand.Domain/Shipping/Warehouse.cs

@@ -41,4 +41,9 @@ public class Warehouse : BaseEntity
     ///     Gets or sets the display order
     /// </summary>
     public int DisplayOrder { get; set; }
+
+    /// <summary>
+    ///     Gets or sets the store identifier. Empty means available to all stores.
+    /// </summary>
+    public string StoreId { get; set; }
 }

src/Tests/Grand.Business.Catalog.Tests/Services/ExportImport/ProductImportDataObjectTests.cs

@@ -16,6 +16,7 @@
 using Grand.Business.Core.Interfaces.Storage;
 using Grand.Data;
 using Grand.Data.Tests.MongoDb;
+using Grand.Domain;
 using Grand.Domain.Catalog;
 using Grand.Domain.Customers;
 using Grand.Domain.Directory;
@@ -117,8 +118,8 @@ public async Task ExecuteTest_Import_Insert()
 
         _deliveryDateServiceMock.Setup(c => c.GetDeliveryDateById(It.IsAny<string>()))
             .Returns(Task.FromResult(new DeliveryDate()));
-        _deliveryDateServiceMock.Setup(c => c.GetAllDeliveryDates())
-            .Returns(Task.FromResult<IList<DeliveryDate>>(new List<DeliveryDate> { new() }));
+        _deliveryDateServiceMock.Setup(c => c.GetAllDeliveryDates(It.IsAny<string>(), It.IsAny<int>(), It.IsAny<int>()))
+            .Returns(Task.FromResult<IPagedList<DeliveryDate>>(new PagedList<DeliveryDate>(new List<DeliveryDate> { new() }, 0, int.MaxValue)));
 
         _taxServiceMock.Setup(c => c.GetTaxCategoryById(It.IsAny<string>()))
             .Returns(Task.FromResult(new TaxCategory()));
@@ -127,8 +128,8 @@ public async Task ExecuteTest_Import_Insert()
 
         _warehouseServiceMock.Setup(c => c.GetWarehouseById(It.IsAny<string>()))
             .Returns(Task.FromResult(new Warehouse()));
-        _warehouseServiceMock.Setup(c => c.GetAllWarehouses())
-            .Returns(Task.FromResult<IList<Warehouse>>(new List<Warehouse> { new() }));
+        _warehouseServiceMock.Setup(c => c.GetAllWarehouses(It.IsAny<string>(), It.IsAny<int>(), It.IsAny<int>()))
+            .Returns(Task.FromResult<IPagedList<Warehouse>>(new PagedList<Warehouse>(new List<Warehouse> { new() }, 0, int.MaxValue)));
 
         _measureServiceMock.Setup(c => c.GetMeasureUnitById(It.IsAny<string>()))
             .Returns(Task.FromResult(new MeasureUnit()));
@@ -180,8 +181,8 @@ public async Task ExecuteTest_Import_Update()
 
         _deliveryDateServiceMock.Setup(c => c.GetDeliveryDateById(It.IsAny<string>()))
             .Returns(Task.FromResult(new DeliveryDate()));
-        _deliveryDateServiceMock.Setup(c => c.GetAllDeliveryDates())
-            .Returns(Task.FromResult<IList<DeliveryDate>>(new List<DeliveryDate> { new() }));
+        _deliveryDateServiceMock.Setup(c => c.GetAllDeliveryDates(It.IsAny<string>(), It.IsAny<int>(), It.IsAny<int>()))
+            .Returns(Task.FromResult<IPagedList<DeliveryDate>>(new PagedList<DeliveryDate>(new List<DeliveryDate> { new() }, 0, int.MaxValue)));
 
         _taxServiceMock.Setup(c => c.GetTaxCategoryById(It.IsAny<string>()))
             .Returns(Task.FromResult(new TaxCategory()));
@@ -190,8 +191,8 @@ public async Task ExecuteTest_Import_Update()
 
         _warehouseServiceMock.Setup(c => c.GetWarehouseById(It.IsAny<string>()))
             .Returns(Task.FromResult(new Warehouse()));
-        _warehouseServiceMock.Setup(c => c.GetAllWarehouses())
-            .Returns(Task.FromResult<IList<Warehouse>>(new List<Warehouse> { new() }));
+        _warehouseServiceMock.Setup(c => c.GetAllWarehouses(It.IsAny<string>(), It.IsAny<int>(), It.IsAny<int>()))
+            .Returns(Task.FromResult<IPagedList<Warehouse>>(new PagedList<Warehouse>(new List<Warehouse> { new() }, 0, int.MaxValue)));
 
         _measureServiceMock.Setup(c => c.GetMeasureUnitById(It.IsAny<string>()))
             .Returns(Task.FromResult(new MeasureUnit()));
@@ -234,8 +235,8 @@ public async Task ExecuteTest_Import_Insert_Update()
 
         _deliveryDateServiceMock.Setup(c => c.GetDeliveryDateById(It.IsAny<string>()))
             .Returns(Task.FromResult(new DeliveryDate()));
-        _deliveryDateServiceMock.Setup(c => c.GetAllDeliveryDates())
-            .Returns(Task.FromResult<IList<DeliveryDate>>(new List<DeliveryDate> { new() }));
+        _deliveryDateServiceMock.Setup(c => c.GetAllDeliveryDates(It.IsAny<string>(), It.IsAny<int>(), It.IsAny<int>()))
+            .Returns(Task.FromResult<IPagedList<DeliveryDate>>(new PagedList<DeliveryDate>(new List<DeliveryDate> { new() }, 0, int.MaxValue)));
 
         _taxServiceMock.Setup(c => c.GetTaxCategoryById(It.IsAny<string>()))
             .Returns(Task.FromResult(new TaxCategory()));
@@ -244,8 +245,8 @@ public async Task ExecuteTest_Import_Insert_Update()
 
         _warehouseServiceMock.Setup(c => c.GetWarehouseById(It.IsAny<string>()))
             .Returns(Task.FromResult(new Warehouse()));
-        _warehouseServiceMock.Setup(c => c.GetAllWarehouses())
-            .Returns(Task.FromResult<IList<Warehouse>>(new List<Warehouse> { new() }));
+        _warehouseServiceMock.Setup(c => c.GetAllWarehouses(It.IsAny<string>(), It.IsAny<int>(), It.IsAny<int>()))
+            .Returns(Task.FromResult<IPagedList<Warehouse>>(new PagedList<Warehouse>(new List<Warehouse> { new() }, 0, int.MaxValue)));
 
         _measureServiceMock.Setup(c => c.GetMeasureUnitById(It.IsAny<string>()))
             .Returns(Task.FromResult(new MeasureUnit()));

src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipping/DeliveryDates.cshtml

@@ -74,6 +74,10 @@
                 title: "@Loc["Admin.Configuration.Shipping.DeliveryDates.Fields.Name"]",
                 width: 300,
                 template: '<a class="k-link" href="EditDeliveryDate/#=Id#">#=kendo.htmlEncode(Name)#</a>',
+            }, {
+                field: "StoreName",
+                title: "@Loc["Admin.Configuration.Shipping.DeliveryDates.Fields.Store"]",
+                width: 200
             }, {
                 field: "DisplayOrder",
                 title: "@Loc["Admin.Configuration.Shipping.DeliveryDates.Fields.DisplayOrder"]",

src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipping/Methods.cshtml

@@ -78,6 +78,10 @@
                 field: "Description",
                 title: "@Loc["Admin.Configuration.Shipping.Methods.Fields.Description"]",
                 width: 400
+            }, {
+                field: "StoreName",
+                title: "@Loc["Admin.Configuration.Shipping.Methods.Fields.Store"]",
+                width: 200
             },{
                 field: "DisplayOrder",
                 title: "@Loc["Admin.Configuration.Shipping.Methods.Fields.DisplayOrder"]",

src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipping/Partials/CreateOrUpdateDeliveryDate.cshtml

@@ -59,6 +59,13 @@
                                     <span asp-validation-for="DisplayOrder"></span>
                                 </div>
                             </div>
+                            <div class="form-group">
+                                <admin-label asp-for="StoreId"/>
+                                <div class="col-md-9 col-sm-9">
+                                    <admin-select asp-for="StoreId" asp-items="Model.AvailableStores"/>
+                                    <span asp-validation-for="StoreId"></span>
+                                </div>
+                            </div>
                         </div>
                     </div>
                     <vc:admin-widget widget-zone="delivery_date_details_bottom" additional-data="Model"/>

src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipping/Partials/CreateOrUpdateMethod.cshtml

@@ -55,6 +55,13 @@
                 <span asp-validation-for="DisplayOrder"></span>
             </div>
         </div>
+        <div class="form-group">
+            <admin-label asp-for="StoreId"/>
+            <div class="col-md-9 col-sm-9">
+                <admin-select asp-for="StoreId" asp-items="Model.AvailableStores"/>
+                <span asp-validation-for="StoreId"></span>
+            </div>
+        </div>
     </div>
 </div>
 <vc:admin-widget widget-zone="shipping_method_details_bottom" additional-data="Model"/>

src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipping/Partials/CreateOrUpdateWarehouse.cshtml

@@ -50,6 +50,13 @@
                 <span asp-validation-for="DisplayOrder"></span>
             </div>
         </div>
+        <div class="form-group">
+            <admin-label asp-for="StoreId"/>
+            <div class="col-md-9 col-sm-9">
+                <admin-select asp-for="StoreId" asp-items="Model.AvailableStores"/>
+                <span asp-validation-for="StoreId"></span>
+            </div>
+        </div>
     </div>
     <vc:admin-widget widget-zone="warehouse_details_bottom" additional-data="Model"/>
 </div>

src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipping/PickupPoints.cshtml

@@ -73,6 +73,10 @@
                 title: "@Loc["Admin.Configuration.Shipping.PickupPoint.Fields.Name"]",
                 template: '<a class="k-link" href="EditPickupPoint/#=Id#">#=kendo.htmlEncode(Name)#</a>',
             },
+            {
+                field: "StoreName",
+                title: "@Loc["Admin.Configuration.Shipping.PickupPoint.Fields.Stores"]",
+            },
             {
                 field: "Description",
                 title: "@Loc["Admin.Configuration.Shipping.PickupPoint.Fields.Description"]"