diff --git a/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Controllers/CustomOrderSignalREndpoint.cs b/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Controllers/CustomOrderSignalREndpoint.cs index c6249cd..d4b9657 100644 --- a/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Controllers/CustomOrderSignalREndpoint.cs +++ b/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Controllers/CustomOrderSignalREndpoint.cs @@ -24,7 +24,7 @@ public class CustomOrderSignalREndpoint(FruitBankDbContext ctx) : ICustomOrderSi [SignalR(SignalRTags.GetPendingOrderDtos)] public async Task> GetPendingOrderDtos() { - return await ctx.OrderDtos.GetAllByStatus(OrderStatus.Pending).ToListAsync(); + return await ctx.OrderDtos.GetAllByOrderStatus(OrderStatus.Pending).ToListAsync(); } [SignalR(SignalRTags.GetAllByIdList)] @@ -32,5 +32,4 @@ public class CustomOrderSignalREndpoint(FruitBankDbContext ctx) : ICustomOrderSi { return await ctx.OrderDtos.GetAllByIds(orderIds).ToListAsync(); } - } \ No newline at end of file diff --git a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/FruitBankDbContext.cs b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/FruitBankDbContext.cs index ad05ec2..edae232 100644 --- a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/FruitBankDbContext.cs +++ b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/FruitBankDbContext.cs @@ -275,7 +275,7 @@ public class FruitBankDbContext : MgDbContextBase, foreach (var shippingItemPallet in shippingItem.ShippingItemPallets!.Where(x => x.IsMeasured && x.IsValidMeasuringValues(shippingItem.IsMeasurable))) { - shippingItem.MeasuredQuantity += shippingItemPallet.Quantity; + shippingItem.MeasuredQuantity += shippingItemPallet.TrayQuantity; if (!shippingItem.IsMeasurable) continue; shippingItem.MeasuredNetWeight += shippingItemPallet.NetWeight; diff --git a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/OrderDtoDbTable.cs b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/OrderDtoDbTable.cs index 684c88e..96e4e10 100644 --- a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/OrderDtoDbTable.cs +++ b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/OrderDtoDbTable.cs @@ -33,7 +33,7 @@ public class OrderDtoDbTable : MgDbTableBase return GetAll(true).Where(x => x.Id == orderId).FirstOrDefaultAsync(null); } - public IQueryable GetAllByStatus(OrderStatus orderStatus) + public IQueryable GetAllByOrderStatus(OrderStatus orderStatus) => GetAll(true).Where(o => o.OrderStatusId == (int)orderStatus); public IQueryable GetAllByIds(IEnumerable orderIds) diff --git a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/OrderItemPalletDbTable.cs b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/OrderItemPalletDbTable.cs index 43a8c48..7d32143 100644 --- a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/OrderItemPalletDbTable.cs +++ b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/OrderItemPalletDbTable.cs @@ -32,7 +32,7 @@ public class OrderItemPalletDbTable : MeasuringItemPalletBaseDbTable GetAll(bool loadRelations) { return loadRelations - ? GetAll().LoadWith(oip => oip.OrderItem) + ? GetAll().LoadWith(oip => oip.OrderItemDto).ThenLoad(oi => oi.ProductDto) : GetAll(); }