Add ShippingController to Grand.Web.Store and StoreId support to Admin Shipping for delivery dates, warehouses, pickup points, and shipping methods by Copilot · Pull Request #702 · grandnode/grandnode2

Copilot · 2026-05-25T17:29:12Z

Adds full CRUD support for warehouses, delivery dates, pickup points, and shipping methods in Grand.Web.Store, with store-owner data isolation so each store owner only sees and manages their own records. Also adds StoreId support to the existing Grand.Web.Admin shipping management for all four entities. Adds shipping settings and provider management to Grand.Web.Store, both scoped to the current store.

Service Layer Changes

IDeliveryDateService.GetAllDeliveryDates, IWarehouseService.GetAllWarehouses, and IPickupPointService.GetAllPickupPoints updated with storeId parameter, pageIndex/pageSize pagination parameters, and IPagedList<T> return type
Cache removed from all three GetAll* methods — each now queries the repository directly with filtering applied to the IQueryable before pagination (no in-memory filtering)
Implementations use PagedList<T>.Create(query, pageIndex, pageSize) following the existing ShipmentService pattern
IShippingMethodService.GetAllShippingMethods updated with a storeId parameter; the implementation filters by store from the cached list

Controller & Views (Grand.Web.Store)

New ShippingController with full CRUD (list, create, edit, delete) for warehouses, delivery dates, pickup points, and shipping methods
Settings() GET and POST actions added to the Store ShippingController, loading and saving ShippingSettings scoped exclusively to CurrentStoreId
New Settings.cshtml view mirrors the admin shipping settings view but targets AreaStore and omits the global store-scope selector
Providers() GET/POST and ProviderUpdate POST actions added to the Store ShippingController, loading ShippingProviderSettings scoped to CurrentStoreId and toggling provider active/inactive state per store
New Providers.cshtml view mirrors the admin providers view but targets AreaStore and omits the global store-scope selector
Store isolation enforced: store owners can only access records where StoreId == CurrentStoreId
_ViewImports.cshtml updated with Grand.Web.AdminShared.Models.Shipping namespace
18 Razor views added (list, create, edit, partial for each entity, plus Settings and Providers)

Admin (Grand.Web.Admin) — StoreId Support

WarehouseModel, DeliveryDateModel, and ShippingMethodModel extended with StoreId and AvailableStores properties
ShippingController (Admin) updated: new PrepareDeliveryDateModel, PrepareShippingMethodModel helpers and updated PrepareAddressWarehouseModel now populate the store dropdown for create/edit forms
CreateOrUpdateWarehouse.cshtml, CreateOrUpdateDeliveryDate.cshtml, and CreateOrUpdateMethod.cshtml partial views now render a store selector dropdown
Resource keys added: Admin.Configuration.Shipping.Warehouses.Fields.Store, Admin.Configuration.Shipping.Warehouses.SelectStore, Admin.Configuration.Shipping.DeliveryDates.Fields.Store, Admin.Configuration.Shipping.DeliveryDates.SelectStore, Admin.Configuration.Shipping.Methods.Fields.Store, Admin.Configuration.Shipping.Methods.SelectStore

Cleanup

Removed obsolete StoreDeliveryDateModel, StoreWarehouseModel, StorePickupPointModel
Test mocks in ProductImportDataObjectTests updated to match new signatures and IPagedList<T> return types

…ses, and pickup points per store Agent-Logs-Url: https://github.com/grandnode/grandnode2/sessions/6f46e96f-0a47-461a-b122-306c82c07139 Co-authored-by: KrzysztofPajak <16772986+KrzysztofPajak@users.noreply.github.com>

Agent-Logs-Url: https://github.com/grandnode/grandnode2/sessions/6f46e96f-0a47-461a-b122-306c82c07139 Co-authored-by: KrzysztofPajak <16772986+KrzysztofPajak@users.noreply.github.com>

…add storeId filter to GetAllWarehouses/GetAllDeliveryDates Agent-Logs-Url: https://github.com/grandnode/grandnode2/sessions/7619c4f6-ba72-4fd8-94d2-76228b83d336 Co-authored-by: KrzysztofPajak <16772986+KrzysztofPajak@users.noreply.github.com>

…oller pickup points section Agent-Logs-Url: https://github.com/grandnode/grandnode2/sessions/7619c4f6-ba72-4fd8-94d2-76228b83d336 Co-authored-by: KrzysztofPajak <16772986+KrzysztofPajak@users.noreply.github.com>

…up point in Store area; store owners see only their own data Agent-Logs-Url: https://github.com/grandnode/grandnode2/sessions/3cbffee5-4776-46b3-9e36-9f2c6fb8a13c Co-authored-by: KrzysztofPajak <16772986+KrzysztofPajak@users.noreply.github.com>

…ix WarehouseId validation span in pickup point partial Agent-Logs-Url: https://github.com/grandnode/grandnode2/sessions/3cbffee5-4776-46b3-9e36-9f2c6fb8a13c Co-authored-by: KrzysztofPajak <16772986+KrzysztofPajak@users.noreply.github.com>

KrzysztofPajak · 2026-05-27T15:22:03Z

@copilot remove cache from:
GetAllDeliveryDates(string storeId = "")
Task<IList> GetAllPickupPoints(string storeId = "")
Task<IList> GetAllWarehouses(string storeId = "")
Add pagination to this methods

Co-authored-by: KrzysztofPajak <16772986+KrzysztofPajak@users.noreply.github.com>

Copilot · 2026-05-27T15:24:22Z

@copilot remove cache from:
GetAllDeliveryDates(string storeId = "")
Task<IList> GetAllPickupPoints(string storeId = "")
...

Done — cache removed from GetAllDeliveryDates in 259c519. The method now queries the repository directly.

KrzysztofPajak · 2026-05-27T15:27:36Z

@copilot remove cache from:
GetAllDeliveryDates(string storeId = "")
Task GetAllPickupPoints(string storeId = "")
...

Done — cache removed from GetAllDeliveryDates in 259c519. The method now queries the repository directly.
Use best practice and Where should be before ToList.
You didn remove from all suggested methods from other services.
You forgot to add pagination

…ore ToList; add pagination to all three GetAll methods Co-authored-by: KrzysztofPajak <16772986+KrzysztofPajak@users.noreply.github.com>

Copilot · 2026-05-27T15:36:03Z

@copilot remove cache from:
GetAllDeliveryDates(string storeId = "")
Task GetAllPickupPoints(string storeId = "")
...

Done in c3e5885:

Cache removed from GetAllWarehouses and GetAllPickupPoints as well
Where is now applied to the IQueryable before pagination (filters in DB, not in-memory)
All three GetAll* methods now accept pageIndex/pageSize and return IPagedList<T>; test mocks updated accordingly

KrzysztofPajak · 2026-05-27T16:32:14Z

@copilot Grand.Web.Admin - Add support for StoreId to Warehouse/DeliveryDate/PickupPoint in Shipping

…ing views Co-authored-by: KrzysztofPajak <16772986+KrzysztofPajak@users.noreply.github.com>

Copilot · 2026-05-27T16:41:37Z

@copilot Grand.Web.Admin - Add support for StoreId to Warehouse/DeliveryDate/PickupPoint in Shipping

Done in the latest commit. Here's what was changed:

WarehouseModel and DeliveryDateModel now have StoreId and AvailableStores properties (matching the existing PickupPointModel pattern)
PrepareAddressWarehouseModel in ShippingController (Admin) now populates AvailableStores with all stores
New PrepareDeliveryDateModel helper populates AvailableStores for delivery dates
CreateOrUpdateWarehouse.cshtml and CreateOrUpdateDeliveryDate.cshtml partials now render the store selector dropdown
Resource keys added: Admin.Configuration.Shipping.Warehouses.Fields.Store, Admin.Configuration.Shipping.Warehouses.SelectStore, Admin.Configuration.Shipping.DeliveryDates.Fields.Store, Admin.Configuration.Shipping.DeliveryDates.SelectStore

…tro' of https://github.com/grandnode/grandnode2 into copilot/add-delivery-dates-warehouses-pickup-points-contro

KrzysztofPajak · 2026-05-27T16:47:37Z

@copilot Grand.Web.Store - Add Shipping -> Settings, copy method from Grand.Web.Admin - but limited only for the current store

… combined' Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com>

Co-authored-by: KrzysztofPajak <16772986+KrzysztofPajak@users.noreply.github.com>

Copilot · 2026-05-27T16:54:33Z

@copilot Grand.Web.Store - Add Shipping -> Settings, copy method from Grand.Web.Admin - but limited only for the current store

Done in the latest commit (4a4af4c). Added Settings() GET and POST methods to the Store ShippingController, scoped to CurrentStoreId. The GET method loads ShippingSettings for the store, populates the shipping origin address model (countries/states dropdowns), and passes it to the view. The POST saves the settings back to the store scope. A new Settings.cshtml view mirrors the admin view but uses AreaStore and omits the store-scope selector widget.

KrzysztofPajak · 2026-05-27T17:02:12Z

@copilot Grand.Web.Store Add Shipping->Providers copy method from Grand.Web.Admin - but limited only for the current store

…null' Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com>

Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com>

Co-authored-by: KrzysztofPajak <16772986+KrzysztofPajak@users.noreply.github.com>

Copilot · 2026-05-27T17:09:44Z

@copilot Grand.Web.Store Add Shipping->Providers copy method from Grand.Web.Admin - but limited only for the current store

Done in cc9c849. Added Providers() GET/POST and ProviderUpdate POST to the Store ShippingController, all scoped to CurrentStoreId. The POST loads ShippingProviderSettings for the store and lists all available providers with their active/inactive status. ProviderUpdate toggles a provider's enabled state scoped to the current store. A new Providers.cshtml view mirrors the admin view but targets AreaStore and omits the global store-scope selector.

Replaced the `storeScope` variable with `CurrentStoreId` for loading shipping settings and assigning the active store. This change simplifies the code and reduces redundancy.

…tro' of https://github.com/grandnode/grandnode2 into copilot/add-delivery-dates-warehouses-pickup-points-contro

KrzysztofPajak · 2026-05-27T17:37:50Z

@copilot improve Shipping restrictions - Add support per store in Grand.Web.Admin - add Grand.Web.Store by current store

Agent-Logs-Url: https://github.com/grandnode/grandnode2/sessions/de700b2e-fb8c-4f54-aef1-881c2c24f7cc Co-authored-by: KrzysztofPajak <16772986+KrzysztofPajak@users.noreply.github.com>

This reverts commit 382b65f.

KrzysztofPajak · 2026-05-27T18:45:18Z

@copilot Grand.Web.Store - Add Shipping methods action from Grand.Web.Admin - Add support shippingmethod by storeId (add new field StoreId)

…d.Web.Admin Co-authored-by: KrzysztofPajak <16772986+KrzysztofPajak@users.noreply.github.com>

Copilot · 2026-05-27T19:04:06Z

@copilot Grand.Web.Store - Add Shipping methods action from Grand.Web.Admin - Add support shippingmethod by storeId (add new field StoreId)

Done in the latest commit. Here's what was changed:

Domain/Service layer:

StoreId added to ShippingMethod domain model
IShippingMethodService.GetAllShippingMethods updated with a storeId parameter; the implementation filters the cached list by store (matching records where StoreId == storeId or StoreId is empty)

Admin (Grand.Web.Admin):

ShippingMethodModel extended with StoreId and AvailableStores properties
ShippingMethodProfile updated to ignore AvailableStores and RestrictedGroups in mapping
New PrepareShippingMethodModel helper in the Admin ShippingController populates the store dropdown; called from CreateMethod and EditMethod
CreateOrUpdateMethod.cshtml partial now renders the store selector dropdown

Store (Grand.Web.Store):

Full CRUD added to the Store ShippingController: Methods, MethodsListData, CreateMethod, EditMethod, DeleteMethod — all scoped to CurrentStoreId
4 Razor views added: Methods.cshtml, CreateMethod.cshtml, EditMethod.cshtml, Partials/CreateOrUpdateMethod.cshtml

Resource keys added:

Admin.Configuration.Shipping.Methods.Fields.Store
Admin.Configuration.Shipping.Methods.SelectStore

Copilot AI and others added 2 commits May 25, 2026 16:34

Address code review: clarify PickupPoint CanManage logic with comments

398a544

Agent-Logs-Url: https://github.com/grandnode/grandnode2/sessions/6f46e96f-0a47-461a-b122-306c82c07139 Co-authored-by: KrzysztofPajak <16772986+KrzysztofPajak@users.noreply.github.com>

Copilot AI assigned Copilot and KrzysztofPajak May 25, 2026

Copilot created this pull request from a session on behalf of KrzysztofPajak May 25, 2026 17:29 View session

Copilot started work on behalf of KrzysztofPajak May 25, 2026 17:31 View session

Copilot AI and others added 2 commits May 25, 2026 17:47

Copilot finished work on behalf of KrzysztofPajak May 25, 2026 17:49

Copilot AI requested a review from KrzysztofPajak May 25, 2026 17:49

Copilot started work on behalf of KrzysztofPajak May 25, 2026 17:53 View session

Copilot AI and others added 2 commits May 25, 2026 18:06

Copilot finished work on behalf of KrzysztofPajak May 25, 2026 18:09

Copilot started work on behalf of KrzysztofPajak May 27, 2026 15:22 View session

Remove cache from GetAllDeliveryDates

259c519

Co-authored-by: KrzysztofPajak <16772986+KrzysztofPajak@users.noreply.github.com>

Copilot finished work on behalf of KrzysztofPajak May 27, 2026 15:24

Copilot started work on behalf of KrzysztofPajak May 27, 2026 15:27 View session

Remove cache from GetAllWarehouses/GetAllPickupPoints; move Where bef…

c3e5885

…ore ToList; add pagination to all three GetAll methods Co-authored-by: KrzysztofPajak <16772986+KrzysztofPajak@users.noreply.github.com>

Copilot finished work on behalf of KrzysztofPajak May 27, 2026 15:36

Refactor storeId filtering and pagination logic

df69743

Copilot started work on behalf of KrzysztofPajak May 27, 2026 16:32 View session

Add StoreId support to Admin Warehouse/DeliveryDate/PickupPoint shipp…

88a4c54

…ing views Co-authored-by: KrzysztofPajak <16772986+KrzysztofPajak@users.noreply.github.com>

Copilot AI changed the title ~~Add ShippingController to Grand.Web.Store for delivery dates, warehouses, and pickup points per store~~ Add ShippingController to Grand.Web.Store and StoreId support to Admin Shipping for delivery dates, warehouses, and pickup points May 27, 2026

Merge branch 'copilot/add-delivery-dates-warehouses-pickup-points-con…

d34747a

…tro' of https://github.com/grandnode/grandnode2 into copilot/add-delivery-dates-warehouses-pickup-points-contro

Copilot started work on behalf of KrzysztofPajak May 27, 2026 16:47 View session

github-code-quality Bot found potential problems May 27, 2026

View reviewed changes

Comment thread src/Web/Grand.Web.Store/Controllers/HomeController.cs Fixed

KrzysztofPajak and others added 2 commits May 27, 2026 18:51

Potential fix for pull request finding 'Nested 'if' statements can be…

d5e3c3f

… combined' Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com>

Add Shipping Settings to Grand.Web.Store ShippingController

4a4af4c

Co-authored-by: KrzysztofPajak <16772986+KrzysztofPajak@users.noreply.github.com>

Copilot finished work on behalf of KrzysztofPajak May 27, 2026 16:55

github-code-quality Bot found potential problems May 27, 2026

View reviewed changes

Comment thread src/Web/Grand.Web.Store/Controllers/ShippingController.cs Fixed

Comment thread src/Web/Grand.Web.Store/Controllers/ShippingController.cs Fixed

Copilot started work on behalf of KrzysztofPajak May 27, 2026 17:02 View session

KrzysztofPajak and others added 3 commits May 27, 2026 19:03

Potential fix for pull request finding 'Dereferenced variable may be …

42aaa67

…null' Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com>

Potential fix for pull request finding 'Missed ternary opportunity'

c769562

Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com>

Add Shipping Providers to Grand.Web.Store ShippingController

cc9c849

Co-authored-by: KrzysztofPajak <16772986+KrzysztofPajak@users.noreply.github.com>

Copilot finished work on behalf of KrzysztofPajak May 27, 2026 17:10

KrzysztofPajak added 2 commits May 27, 2026 19:25

Refactor ShippingController to use CurrentStoreId

f631067

Replaced the `storeScope` variable with `CurrentStoreId` for loading shipping settings and assigning the active store. This change simplifies the code and reduces redundancy.

Merge branch 'copilot/add-delivery-dates-warehouses-pickup-points-con…

eaaddf6

…tro' of https://github.com/grandnode/grandnode2 into copilot/add-delivery-dates-warehouses-pickup-points-contro

Copilot started work on behalf of KrzysztofPajak May 27, 2026 17:38 View session

Changes before error encountered

382b65f

Agent-Logs-Url: https://github.com/grandnode/grandnode2/sessions/de700b2e-fb8c-4f54-aef1-881c2c24f7cc Co-authored-by: KrzysztofPajak <16772986+KrzysztofPajak@users.noreply.github.com>

Copilot stopped work on behalf of KrzysztofPajak due to an error May 27, 2026 17:52
Execution failed: CAPIError: 400 {"error":{"message":"The requested model is not supported.","code":"model_not_supported","param":"model","type":"invalid_request_error"}} (Request ID: AC20:32DB71:38E6...

github-code-quality Bot found potential problems May 27, 2026

View reviewed changes

Comment thread src/Web/Grand.Web.Store/Areas/Store/Views/Shipping/Partials/Restrictions.TabCountry.cshtml Fixed

Comment thread src/Web/Grand.Web.Store/Areas/Store/Views/Shipping/Partials/Restrictions.TabGroup.cshtml Fixed

Revert "Changes before error encountered"

55c7849

This reverts commit 382b65f.

Copilot started work on behalf of KrzysztofPajak May 27, 2026 18:45 View session

Add shipping methods with StoreId support to Grand.Web.Store and Gran…

d6d21ea

…d.Web.Admin Co-authored-by: KrzysztofPajak <16772986+KrzysztofPajak@users.noreply.github.com>

Copilot finished work on behalf of KrzysztofPajak May 27, 2026 19:04

Conversation

Copilot AI commented May 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Service Layer Changes

Controller & Views (Grand.Web.Store)

Admin (Grand.Web.Admin) — StoreId Support

Cleanup

Uh oh!

KrzysztofPajak commented May 27, 2026

Uh oh!

Copilot AI commented May 27, 2026

Uh oh!

KrzysztofPajak commented May 27, 2026

Uh oh!

Copilot AI commented May 27, 2026

Uh oh!

KrzysztofPajak commented May 27, 2026

Uh oh!

Copilot AI commented May 27, 2026

Uh oh!

KrzysztofPajak commented May 27, 2026

Uh oh!

Uh oh!

Copilot AI commented May 27, 2026

Uh oh!

KrzysztofPajak commented May 27, 2026

Uh oh!

Uh oh!

Uh oh!

Copilot AI commented May 27, 2026

Uh oh!

KrzysztofPajak commented May 27, 2026

Uh oh!

Uh oh!

Uh oh!

KrzysztofPajak commented May 27, 2026

Uh oh!

Copilot AI commented May 27, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Copilot AI commented May 25, 2026 •

edited

Loading