Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

Merge branch 'develop' into arch001/phase7-paymenttransaction-consolidation

KrzysztofPajaka198d69a83f6
diff --cc src/Web/Grand.Web.AdminShared/Startup/StartupApplication.cs
index 6d43b4875,b3d250217..da6afbdde
--- a/src/Web/Grand.Web.AdminShared/Startup/StartupApplication.cs
+++ b/src/Web/Grand.Web.AdminShared/Startup/StartupApplication.cs
@@@ -2,7 -2,7 +2,8 @@@ using elFinder.Net.AspNetCore.Extension
using elFinder.Net.Drivers.FileSystem.Extensions;
using Grand.Domain.Catalog;
using Grand.Domain.Orders;
+using Grand.Domain.Payments;
+ using Grand.Domain.Shipping;
using Grand.Infrastructure;
using Grand.Web.AdminShared.Interfaces;
using Grand.Web.AdminShared.Services;
@@@ -92,12 -92,14 +93,21 @@@ public class StartupApplication : IStar
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>();
++
+ // IAdminDataScope<PaymentTransaction>: registered once here for the same reason as
+ // Product/Category/Collection/Order above — see RoutedPaymentTransactionDataScope's doc
+ // comment. No Vendor scope: PaymentTransaction has no Vendor screen.
+ services.AddScoped<GlobalAdminDataScope<PaymentTransaction>>();
+ services.AddScoped<StorePaymentTransactionDataScope>();
+ services.AddScoped<IAdminDataScope<PaymentTransaction>, RoutedPaymentTransactionDataScope>();
}
public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment)