From 434a058efc7b22f521c26c8d70efca74c2324d67 Mon Sep 17 00:00:00 2001 From: Loretta Date: Mon, 20 Oct 2025 22:42:22 +0200 Subject: [PATCH] fixes, improvements, etc... --- .../Domains/DataLayer/FruitBankDbContext.cs | 5 +++++ .../Domains/DataLayer/MeasuringItemPalletBaseDbTable.cs | 6 +++++- .../Domains/DataLayer/OrderDtoDbTable.cs | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/FruitBankDbContext.cs b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/FruitBankDbContext.cs index ab669c2..eb58570 100644 --- a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/FruitBankDbContext.cs +++ b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/FruitBankDbContext.cs @@ -406,6 +406,11 @@ public class FruitBankDbContext : MgDbContextBase, foreach (var orderItemDto in orderDto.OrderItemDtos) { + if (orderItemDto.TrayQuantity != orderItemDto.Quantity) return null; + + //orderItemDto.ProductDto!.StockQuantity -= orderItemDto.TrayQuantity; + //await ProductDtos.UpdateAsync(orderItemDto.ProductDto); + if (!orderItemDto.IsMeasurable) continue; var gaNetWeight = CommonHelper.To(orderItemDto.GenericAttributes.FirstOrDefault(x => x.Key == nameof(IMeasuringNetWeight.NetWeight))?.Value ?? "0"); diff --git a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/MeasuringItemPalletBaseDbTable.cs b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/MeasuringItemPalletBaseDbTable.cs index f2d6746..0b78fc1 100644 --- a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/MeasuringItemPalletBaseDbTable.cs +++ b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/MeasuringItemPalletBaseDbTable.cs @@ -9,7 +9,7 @@ using Nop.Services.Logging; namespace Nop.Plugin.Misc.FruitBankPlugin.Domains.DataLayer; -public class MeasuringItemPalletBaseDbTable(IEventPublisher eventPublisher, INopDataProvider dataProvider, IShortTermCacheManager shortTermCacheManager, IStaticCacheManager staticCacheManager, AppSettings appSettings, ILogger logger) : MgDbTableBase(eventPublisher, dataProvider, shortTermCacheManager, staticCacheManager, appSettings, logger) where TEntity +public class MeasuringItemPalletBaseDbTable(IEventPublisher eventPublisher, INopDataProvider dataProvider, IShortTermCacheManager shortTermCacheManager, IStaticCacheManager staticCacheManager, AppSettings appSettings, ILogger logger) : MgDbTableBase(eventPublisher, dataProvider, shortTermCacheManager, staticCacheManager, appSettings, logger) where TEntity : MgEntityBase, IMeasuringItemPalletBase { protected override void OnUpdate(TEntity entity) @@ -26,6 +26,10 @@ public class MeasuringItemPalletBaseDbTable(IEventPublisher eventPublis protected virtual void BeforeInsertOrUpdate(TEntity measuringItemPalletBase) { + measuringItemPalletBase.GrossWeight = double.Round(measuringItemPalletBase.GrossWeight, 1); + measuringItemPalletBase.TareWeight = double.Round(measuringItemPalletBase.TareWeight, 1); + measuringItemPalletBase.PalletWeight = double.Round(measuringItemPalletBase.PalletWeight, 0); + if (measuringItemPalletBase.IsValidSafeMeasuringValues()) return; throw new Exception($"MeasuringItemPalletBaseDbTable->BeforeInsertOrUpdate(); Invalid measuring value(s); {measuringItemPalletBase}"); diff --git a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/OrderDtoDbTable.cs b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/OrderDtoDbTable.cs index 7168056..359a5c4 100644 --- a/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/OrderDtoDbTable.cs +++ b/Nop.Plugin.Misc.AIPlugin/Domains/DataLayer/OrderDtoDbTable.cs @@ -31,7 +31,7 @@ public class OrderDtoDbTable : MgDtoDbTableBase public Task GetByIdAsync(int orderId, bool loadRelations) => GetAll(loadRelations).Where(x => x.Id == orderId).FirstOrDefaultAsync(null); public IQueryable GetAllByOrderStatus(OrderStatus orderStatus, bool loadRelations = true) - => GetAll(loadRelations);//.Where(o => o.OrderStatusId == (int)orderStatus); + => GetAll(loadRelations).Where(o => o.OrderStatusId == (int)orderStatus); public IQueryable GetAllByIds(IEnumerable orderIds, bool loadRelations = true) => GetAll(loadRelations).Where(o => orderIds.Contains(o.Id)); }