From 9a94bc6c066ca2cdb81e0d84767eb8520fb8b99c Mon Sep 17 00:00:00 2001
From: Loretta <jozsef.b@aycode.com>
Date: Sun, 26 Oct 2025 08:38:00 +0100
Subject: [PATCH] implement AvailableQuantity; ui improvements

---
 .../Areas/Admin/Views/Order/List.cshtml       |  2 +-
 .../Areas/Admin/Views/Product/List.cshtml     | 22 ++++++++++++++-----
 .../Factories/CustomOrderModelFactory.cs      |  1 +
 .../Factories/CustomProductModelFactory.cs    |  1 +
 .../Models/MgBase/IMgModelExtended.cs         |  6 +++--
 .../Models/Orders/IOrderModelExtended.cs      |  5 ++---
 .../Models/Orders/OrderModelExtended.cs       |  1 +
 .../Models/Products/IProductModelExtended.cs  |  5 +++--
 .../Models/Products/ProductModelExtended.cs   |  5 ++++-
 .../Services/CustomPriceCalculationService.cs |  2 +-
 10 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Views/Order/List.cshtml b/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Views/Order/List.cshtml
index a7814ef..4727a6c 100644
--- a/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Views/Order/List.cshtml
+++ b/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Views/Order/List.cshtml
@@ -339,7 +339,7 @@
 														IsMasterCheckBox = true,
 														Render = new RenderCheckBox("checkbox_orders"),
 														ClassName =  NopColumnClassDefaults.CenterAll,
-														Width = "50"
+														Width = "30"
 														},
 														new ColumnProperty(nameof(OrderModel.CustomOrderNumber))
 														{
diff --git a/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Views/Product/List.cshtml b/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Views/Product/List.cshtml
index 131142f..7dfa726 100644
--- a/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Views/Product/List.cshtml
+++ b/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Views/Product/List.cshtml
@@ -241,7 +241,12 @@
 														IsMasterCheckBox = true,
 														Render = new RenderCheckBox("checkbox_products"),
 														ClassName =  NopColumnClassDefaults.CenterAll,
-														Width = "40"
+														Width = "30"
+														},
+														new ColumnProperty(nameof(ProductModel.Id))
+														{
+															Title = "Id", //T("Admin.Catalog.Products.Fields.Id").Text
+															Width = "30"
 														},
 														new ColumnProperty(nameof(ProductModel.PictureThumbnailUrl))
 														{
@@ -261,12 +266,21 @@
 														},
 														new ColumnProperty(nameof(ProductModel.FormattedPrice))
 														{
-														Title = T("Admin.Catalog.Products.Fields.Price").Text
+														Title = T("Admin.Catalog.Products.Fields.Price").Text,
+														Width = "100",
+														},
+														new ColumnProperty(nameof(ProductModelExtended.AvailableQuantity))
+														{
+															Title = "Elérhető"//T("Admin.Catalog.Products.Fields.Tare").Text
 														},
 														new ColumnProperty(nameof(ProductModel.StockQuantityStr))
 														{
 														Title = T("Admin.Catalog.Products.Fields.StockQuantity").Text
 														},
+														new ColumnProperty(nameof(ProductModelExtended.IncomingQuantity))
+														{
+															Title = "Bejövő"//T("Admin.Catalog.Products.Fields.Tare").Text
+														},
 														new ColumnProperty(nameof(ProductModelExtended.NetWeight))
 														{
 														Title = "Súly(kg)"//T("Admin.Catalog.Products.Fields.NetWeight").Text
@@ -275,10 +289,6 @@
 														{
 														Title = "Tára(kg)"//T("Admin.Catalog.Products.Fields.Tare").Text
 														},
-														new ColumnProperty(nameof(ProductModelExtended.IncomingQuantity))
-														{
-														Title = "Bejövő"//T("Admin.Catalog.Products.Fields.Tare").Text
-														},
 														new ColumnProperty(nameof(ProductModelExtended.IsMeasurable))
 														{
 														Title = "Mérendő?",//T("Admin.Catalog.Products.Fields.Tare").Text
diff --git a/Nop.Plugin.Misc.AIPlugin/Factories/CustomOrderModelFactory.cs b/Nop.Plugin.Misc.AIPlugin/Factories/CustomOrderModelFactory.cs
index 7a44453..695893a 100644
--- a/Nop.Plugin.Misc.AIPlugin/Factories/CustomOrderModelFactory.cs
+++ b/Nop.Plugin.Misc.AIPlugin/Factories/CustomOrderModelFactory.cs
@@ -212,6 +212,7 @@ namespace Nop.Plugin.Misc.FruitBankPlugin.Factories
                 orderItemModelExtended.NetWeight = (decimal)orderItemDto.NetWeight;
                 orderItemModelExtended.ProductStockQuantity = orderItemDto.ProductDto!.StockQuantity;
                 orderItemModelExtended.ProductIncomingQuantity = orderItemDto.ProductDto.IncomingQuantity;
+                orderItemModelExtended.ProductAvailableQuantity = orderItemDto.ProductDto.AvailableQuantity;
                 //orderItemModelExtended.SubTotalInclTax = !orderDto.IsComplete && orderItemDto.IsMeasurable ? "kalkuláció alatt..." : orderItemModelExtended.SubTotalInclTax;
 
                 orderModelExtended.ItemExtendeds ??= new List<OrderItemModelExtended>();
diff --git a/Nop.Plugin.Misc.AIPlugin/Factories/CustomProductModelFactory.cs b/Nop.Plugin.Misc.AIPlugin/Factories/CustomProductModelFactory.cs
index 9bb3a9b..0617f9d 100644
--- a/Nop.Plugin.Misc.AIPlugin/Factories/CustomProductModelFactory.cs
+++ b/Nop.Plugin.Misc.AIPlugin/Factories/CustomProductModelFactory.cs
@@ -59,6 +59,7 @@ public class CustomProductModelFactory : MgProductModelFactory<ProductListModelE
             productModelExtended.NetWeight = productDto.NetWeight;
             productModelExtended.IsMeasurable = productDto.IsMeasurable;
             productModelExtended.IncomingQuantity = productDto.IncomingQuantity;
+            productModelExtended.AvailableQuantity = productDto.AvailableQuantity;
 
             productModelExtended.StockQuantityStr = productModelExtended.StockQuantity.ToString();
         });
diff --git a/Nop.Plugin.Misc.AIPlugin/Models/MgBase/IMgModelExtended.cs b/Nop.Plugin.Misc.AIPlugin/Models/MgBase/IMgModelExtended.cs
index 0a4418c..55c7efb 100644
--- a/Nop.Plugin.Misc.AIPlugin/Models/MgBase/IMgModelExtended.cs
+++ b/Nop.Plugin.Misc.AIPlugin/Models/MgBase/IMgModelExtended.cs
@@ -1,5 +1,7 @@
-namespace Nop.Plugin.Misc.FruitBankPlugin.Models.MgBase;
+using AyCode.Interfaces.Entities;
 
-public interface IMgModelExtended
+namespace Nop.Plugin.Misc.FruitBankPlugin.Models.MgBase;
+
+public interface IMgModelExtended //: IEntityInt
 {
 }
\ No newline at end of file
diff --git a/Nop.Plugin.Misc.AIPlugin/Models/Orders/IOrderModelExtended.cs b/Nop.Plugin.Misc.AIPlugin/Models/Orders/IOrderModelExtended.cs
index c244092..5939175 100644
--- a/Nop.Plugin.Misc.AIPlugin/Models/Orders/IOrderModelExtended.cs
+++ b/Nop.Plugin.Misc.AIPlugin/Models/Orders/IOrderModelExtended.cs
@@ -3,13 +3,12 @@ using Nop.Plugin.Misc.FruitBankPlugin.Models.MgBase.OrderModels;
 
 namespace Nop.Plugin.Misc.FruitBankPlugin.Models.Orders;
 
-public interface IOrderItemModelExtended //: IMgOrderItemModelExtended, IMeasurable, IMeasured
+public interface IOrderItemModelExtended : /*IMgOrderItemModelExtended,*/ IMeasurable, IMeasured
 {
-    bool IsMeasured { get; set; }
-    bool IsMeasurable { get; set; }
     decimal NetWeight { get; set; }
     int ProductStockQuantity { get; set; }
     int ProductIncomingQuantity { get; set; }
+    int ProductAvailableQuantity { get; set; }
 }
 
 public interface IOrderModelExtended : IMgOrderModelExtended, IMeasurable, IMeasured
diff --git a/Nop.Plugin.Misc.AIPlugin/Models/Orders/OrderModelExtended.cs b/Nop.Plugin.Misc.AIPlugin/Models/Orders/OrderModelExtended.cs
index ad6e4f0..3490243 100644
--- a/Nop.Plugin.Misc.AIPlugin/Models/Orders/OrderModelExtended.cs
+++ b/Nop.Plugin.Misc.AIPlugin/Models/Orders/OrderModelExtended.cs
@@ -10,6 +10,7 @@ namespace Nop.Plugin.Misc.FruitBankPlugin.Models.Orders
         public decimal NetWeight { get; set; }
         public int ProductStockQuantity { get; set; }
         public int ProductIncomingQuantity { get; set; }
+        public int ProductAvailableQuantity { get; set; }
     }
 
     public partial record OrderModelExtended : MgOrderModelExtended, IOrderModelExtended
diff --git a/Nop.Plugin.Misc.AIPlugin/Models/Products/IProductModelExtended.cs b/Nop.Plugin.Misc.AIPlugin/Models/Products/IProductModelExtended.cs
index 5ab6a82..6b6908d 100644
--- a/Nop.Plugin.Misc.AIPlugin/Models/Products/IProductModelExtended.cs
+++ b/Nop.Plugin.Misc.AIPlugin/Models/Products/IProductModelExtended.cs
@@ -1,9 +1,10 @@
-using FruitBank.Common.Interfaces;
+using AyCode.Interfaces.Entities;
+using FruitBank.Common.Interfaces;
 using Nop.Plugin.Misc.FruitBankPlugin.Models.MgBase.OrderModels;
 using Nop.Plugin.Misc.FruitBankPlugin.Models.MgBase.ProductModels;
 
 namespace Nop.Plugin.Misc.FruitBankPlugin.Models.Products;
 
-public interface IProductModelExtended : IMgProductModelExtended, IMeasurable, ITare, IMeasuringNetWeight, IIncomingQuantity
+public interface IProductModelExtended : IMgProductModelExtended, IMeasurable, ITare, IMeasuringNetWeight, IIncomingQuantity, IAvailableQuantity
 {
 }
\ No newline at end of file
diff --git a/Nop.Plugin.Misc.AIPlugin/Models/Products/ProductModelExtended.cs b/Nop.Plugin.Misc.AIPlugin/Models/Products/ProductModelExtended.cs
index 44ddbaa..07559a9 100644
--- a/Nop.Plugin.Misc.AIPlugin/Models/Products/ProductModelExtended.cs
+++ b/Nop.Plugin.Misc.AIPlugin/Models/Products/ProductModelExtended.cs
@@ -1,4 +1,5 @@
-using Nop.Plugin.Misc.FruitBankPlugin.Models.MgBase.OrderModels;
+using FruitBank.Common.Interfaces;
+using Nop.Plugin.Misc.FruitBankPlugin.Models.MgBase.OrderModels;
 using Nop.Plugin.Misc.FruitBankPlugin.Models.MgBase.ProductModels;
 
 namespace Nop.Plugin.Misc.FruitBankPlugin.Models.Products
@@ -10,6 +11,8 @@ namespace Nop.Plugin.Misc.FruitBankPlugin.Models.Products
         public double Tare { get; set; }
         public double NetWeight { get; set; }
         public int IncomingQuantity { get; set; }
+
+        public int AvailableQuantity { get; set; }
     }
 }
 
diff --git a/Nop.Plugin.Misc.AIPlugin/Services/CustomPriceCalculationService.cs b/Nop.Plugin.Misc.AIPlugin/Services/CustomPriceCalculationService.cs
index 1103af1..152ad48 100644
--- a/Nop.Plugin.Misc.AIPlugin/Services/CustomPriceCalculationService.cs
+++ b/Nop.Plugin.Misc.AIPlugin/Services/CustomPriceCalculationService.cs
@@ -132,7 +132,7 @@ public class CustomPriceCalculationService : PriceCalculationService
 
         if (order.OrderTotal == prevOrderTotal) return false;
 
-        _logger.Error($"order.OrderTotal({order.OrderTotal}) == prevOrderTotal({prevOrderTotal})");
+        _logger.Info($"order.OrderTotal({order.OrderTotal}) == prevOrderTotal({prevOrderTotal})");
 
         order.OrderSubtotalInclTax = order.OrderTotal;
         order.OrderSubtotalExclTax = order.OrderTotal;