improvements, etc

FruitBank.Common.Server/Interfaces/ICustomOrderSignalREndpointServer.cs

@@ -0,0 +1,7 @@
+using FruitBank.Common.Interfaces;
+
+namespace FruitBank.Common.Server.Interfaces;
+
+public interface ICustomOrderSignalREndpointServer : ICustomOrderSignalREndpointCommon
+{
+}

FruitBank.Common.Server/Interfaces/IFruitBankDataControllerServer.cs

@@ -0,0 +1,9 @@
+using FruitBank.Common.Interfaces;
+using Mango.Nop.Core.Models;
+
+namespace FruitBank.Common.Server.Interfaces;
+
+
+public interface IFruitBankDataControllerServer : IFruitBankDataControllerCommon
+{
+}

FruitBank.Common.Server/Services/SignalRs/DevAdminSignalRhub.cs

@@ -3,6 +3,7 @@ using AyCode.Models.Server.DynamicMethods;
 using AyCode.Services.SignalRs;
 using FruitBank.Common.Interfaces;
 using FruitBank.Common.Loggers;
+using FruitBank.Common.Server.Interfaces;
 using FruitBank.Common.SignalRs;
 using Mango.Nop.Core.Loggers;
 using Microsoft.Extensions.Configuration;
@@ -27,10 +28,12 @@ namespace FruitBank.Common.Server.Services.SignalRs;
 
 public class DevAdminSignalRHub : AcWebSignalRHubWithSessionBase<SignalRTags, Logger<DevAdminSignalRHub>>
 {
-    public DevAdminSignalRHub(IConfiguration configuration, IFruitBankDataControllerServer fruitBankDataController/*, SessionService sessionService*/, IEnumerable<IAcLogWriterBase> logWriters)
+    public DevAdminSignalRHub(IConfiguration configuration, IFruitBankDataControllerServer fruitBankDataController/*, SessionService sessionService*/, 
+        ICustomOrderSignalREndpointServer customOrderSignalREndpoint, IEnumerable<IAcLogWriterBase> logWriters)
         : base(configuration, new Logger<DevAdminSignalRHub>(logWriters.ToArray()))
     {
         DynamicMethodCallModels.Add(new AcDynamicMethodCallModel<SignalRAttribute>(fruitBankDataController));
+        DynamicMethodCallModels.Add(new AcDynamicMethodCallModel<SignalRAttribute>(customOrderSignalREndpoint));
     }
 
     //public override Task OnReceiveMessage(int messageTag, byte[]? message, int? requestId)

FruitBank.Common/Dtos/OrderDto.cs

@@ -0,0 +1,15 @@
+using FruitBank.Common.Interfaces;
+using Mango.Nop.Core.Dtos;
+using Nop.Core.Domain.Orders;
+
+namespace FruitBank.Common.Dtos;
+
+public class OrderDto : MgOrderDto, IOrderDto
+{
+    public OrderDto() :base()
+    { }
+    public OrderDto(int orderId) : base(orderId)
+    { }
+    public OrderDto(Order order) : base(order)
+    { }
+}

FruitBank.Common/Dtos/ProductDto.cs

@@ -0,0 +1,15 @@
+using FruitBank.Common.Interfaces;
+using Mango.Nop.Core.Dtos;
+using Nop.Core.Domain.Catalog;
+
+namespace FruitBank.Common.Dtos;
+
+public class ProductDto : MgProductDto, IProductDto
+{
+    public ProductDto() :base()
+    { }
+    public ProductDto(int productId) : base(productId)
+    { }
+    public ProductDto(Product product) : base(product)
+    { }
+}

FruitBank.Common/Entities/MeasuringItemPalletBase.cs

@@ -13,6 +13,8 @@ public abstract class MeasuringItemPalletBase : MgEntityBase, IMeasuringItemPall
 
     [NotColumn]
     protected int ForeignItemId;
+    [NotColumn]
+    public int ForeignKey => ForeignItemId;
 
     public int Quantity { get; set; }
     

FruitBank.Common/Interfaces/ICustomOrderSignalREndpointClient.cs

@@ -0,0 +1,5 @@
+namespace FruitBank.Common.Interfaces;
+
+public interface ICustomOrderSignalREndpointClient : ICustomOrderSignalREndpointCommon
+{
+}

FruitBank.Common/Interfaces/ICustomOrderSignalREndpointCommon.cs

@@ -0,0 +1,8 @@
+using Mango.Nop.Core.Models;
+
+namespace FruitBank.Common.Interfaces;
+
+public interface ICustomOrderSignalREndpointCommon
+{
+    //Task<OrderListModelExtended> GetPendingOrderModels();
+}

FruitBank.Common/Interfaces/IFruitBankDataControllerServer.cs

@@ -1,7 +0,0 @@
-using Mango.Nop.Core.Models;
-
-namespace FruitBank.Common.Interfaces;
-
-public interface IFruitBankDataControllerServer : IFruitBankDataControllerCommon
-{
-}

FruitBank.Common/Interfaces/IMeasuringItemPalletBase.cs

@@ -1,10 +1,11 @@
-using AyCode.Interfaces.Entities;
+using AyCode.Interfaces;
+using AyCode.Interfaces.Entities;
 using AyCode.Interfaces.TimeStampInfo;
 using FruitBank.Common.Entities;
 
 namespace FruitBank.Common.Interfaces;
 
-public interface IMeasuringItemPalletBase : IEntityInt, IMeasuringQuantity, IMeasuringGrossWeight, IMeasured, ITimeStampInfo
+public interface IMeasuringItemPalletBase : IEntityInt, IMeasuringQuantity, IMeasuringGrossWeight, IMeasured, ITimeStampInfo, ICustomForeignKeyInt
 {
     public double TareWeight { get; set; }
     public double PalletWeight { get; set; }

FruitBank.Common/Interfaces/IOrderDto.cs

@@ -0,0 +1,8 @@
+using Mango.Nop.Core.Interfaces;
+
+namespace FruitBank.Common.Interfaces;
+
+public interface IOrderDto : IMgOrderDto
+{
+    
+}

FruitBank.Common/Interfaces/IProductDto.cs

@@ -0,0 +1,8 @@
+using Mango.Nop.Core.Interfaces;
+
+namespace FruitBank.Common.Interfaces;
+
+public interface IProductDto : IMgProductDto
+{
+    
+}

FruitBank.Common/Models/OrderListModelExtended.cs

@@ -0,0 +1,11 @@
+//using Nop.Web.Areas.Admin.Models.Orders;
+//using Nop.Web.Framework.Models;
+
+//namespace FruitBank.Common.Models
+//{
+//    public partial record OrderListModelExtended : BasePagedListModel<OrderModelExtended>, IOrderListModelExtended<OrderModelExtended>
+//    {
+//        public bool? NeedsMeasurement { get; set; }
+//    }    
+//}
+

FruitBank.Common/SignalRs/SignalRTags.cs

@@ -45,6 +45,8 @@ public class SignalRTags : AcSignalRTags
     public const int AddOrUpdateMeasuredShippingItemPallet = 97;
     public const int AddOrUpdateMeasuredShippingItemPallets = 98;
 
+    public const int GetPendingOrderModels = 115;
+
     public const int AuthenticateUser = 160;
     public const int RefreshToken = 200;