Compare commits
No commits in common. "9b4099d1e3afa9aba6d3067620fe8330f3c2719b" and "567c4fe750fc3fdec41a3030ca32731d0aaf5c3b" have entirely different histories.
9b4099d1e3
...
567c4fe750
|
|
@ -1,7 +0,0 @@
|
||||||
using FruitBank.Common.Interfaces;
|
|
||||||
|
|
||||||
namespace FruitBank.Common.Server.Interfaces;
|
|
||||||
|
|
||||||
public interface ICustomOrderSignalREndpointServer : ICustomOrderSignalREndpointCommon
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
@ -1,9 +0,0 @@
|
||||||
using FruitBank.Common.Interfaces;
|
|
||||||
using Mango.Nop.Core.Models;
|
|
||||||
|
|
||||||
namespace FruitBank.Common.Server.Interfaces;
|
|
||||||
|
|
||||||
|
|
||||||
public interface IFruitBankDataControllerServer : IFruitBankDataControllerCommon
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
@ -3,7 +3,6 @@ using AyCode.Models.Server.DynamicMethods;
|
||||||
using AyCode.Services.SignalRs;
|
using AyCode.Services.SignalRs;
|
||||||
using FruitBank.Common.Interfaces;
|
using FruitBank.Common.Interfaces;
|
||||||
using FruitBank.Common.Loggers;
|
using FruitBank.Common.Loggers;
|
||||||
using FruitBank.Common.Server.Interfaces;
|
|
||||||
using FruitBank.Common.SignalRs;
|
using FruitBank.Common.SignalRs;
|
||||||
using Mango.Nop.Core.Loggers;
|
using Mango.Nop.Core.Loggers;
|
||||||
using Microsoft.Extensions.Configuration;
|
using Microsoft.Extensions.Configuration;
|
||||||
|
|
@ -28,12 +27,10 @@ namespace FruitBank.Common.Server.Services.SignalRs;
|
||||||
|
|
||||||
public class DevAdminSignalRHub : AcWebSignalRHubWithSessionBase<SignalRTags, Logger<DevAdminSignalRHub>>
|
public class DevAdminSignalRHub : AcWebSignalRHubWithSessionBase<SignalRTags, Logger<DevAdminSignalRHub>>
|
||||||
{
|
{
|
||||||
public DevAdminSignalRHub(IConfiguration configuration, IFruitBankDataControllerServer fruitBankDataController/*, SessionService sessionService*/,
|
public DevAdminSignalRHub(IConfiguration configuration, IFruitBankDataControllerServer fruitBankDataController/*, SessionService sessionService*/, IEnumerable<IAcLogWriterBase> logWriters)
|
||||||
ICustomOrderSignalREndpointServer customOrderSignalREndpoint, IEnumerable<IAcLogWriterBase> logWriters)
|
|
||||||
: base(configuration, new Logger<DevAdminSignalRHub>(logWriters.ToArray()))
|
: base(configuration, new Logger<DevAdminSignalRHub>(logWriters.ToArray()))
|
||||||
{
|
{
|
||||||
DynamicMethodCallModels.Add(new AcDynamicMethodCallModel<SignalRAttribute>(fruitBankDataController));
|
DynamicMethodCallModels.Add(new AcDynamicMethodCallModel<SignalRAttribute>(fruitBankDataController));
|
||||||
DynamicMethodCallModels.Add(new AcDynamicMethodCallModel<SignalRAttribute>(customOrderSignalREndpoint));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//public override Task OnReceiveMessage(int messageTag, byte[]? message, int? requestId)
|
//public override Task OnReceiveMessage(int messageTag, byte[]? message, int? requestId)
|
||||||
|
|
|
||||||
|
|
@ -1,15 +0,0 @@
|
||||||
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)
|
|
||||||
{ }
|
|
||||||
}
|
|
||||||
|
|
@ -1,15 +0,0 @@
|
||||||
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)
|
|
||||||
{ }
|
|
||||||
}
|
|
||||||
|
|
@ -13,8 +13,6 @@ public abstract class MeasuringItemPalletBase : MgEntityBase, IMeasuringItemPall
|
||||||
|
|
||||||
[NotColumn]
|
[NotColumn]
|
||||||
protected int ForeignItemId;
|
protected int ForeignItemId;
|
||||||
[NotColumn]
|
|
||||||
public int ForeignKey => ForeignItemId;
|
|
||||||
|
|
||||||
public int Quantity { get; set; }
|
public int Quantity { get; set; }
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
namespace FruitBank.Common.Interfaces;
|
|
||||||
|
|
||||||
public interface ICustomOrderSignalREndpointClient : ICustomOrderSignalREndpointCommon
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
using Mango.Nop.Core.Models;
|
|
||||||
|
|
||||||
namespace FruitBank.Common.Interfaces;
|
|
||||||
|
|
||||||
public interface ICustomOrderSignalREndpointCommon
|
|
||||||
{
|
|
||||||
//Task<OrderListModelExtended> GetPendingOrderModels();
|
|
||||||
}
|
|
||||||
|
|
@ -0,0 +1,7 @@
|
||||||
|
using Mango.Nop.Core.Models;
|
||||||
|
|
||||||
|
namespace FruitBank.Common.Interfaces;
|
||||||
|
|
||||||
|
public interface IFruitBankDataControllerServer : IFruitBankDataControllerCommon
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
@ -1,11 +1,10 @@
|
||||||
using AyCode.Interfaces;
|
using AyCode.Interfaces.Entities;
|
||||||
using AyCode.Interfaces.Entities;
|
|
||||||
using AyCode.Interfaces.TimeStampInfo;
|
using AyCode.Interfaces.TimeStampInfo;
|
||||||
using FruitBank.Common.Entities;
|
using FruitBank.Common.Entities;
|
||||||
|
|
||||||
namespace FruitBank.Common.Interfaces;
|
namespace FruitBank.Common.Interfaces;
|
||||||
|
|
||||||
public interface IMeasuringItemPalletBase : IEntityInt, IMeasuringQuantity, IMeasuringGrossWeight, IMeasured, ITimeStampInfo, ICustomForeignKeyInt
|
public interface IMeasuringItemPalletBase : IEntityInt, IMeasuringQuantity, IMeasuringGrossWeight, IMeasured, ITimeStampInfo
|
||||||
{
|
{
|
||||||
public double TareWeight { get; set; }
|
public double TareWeight { get; set; }
|
||||||
public double PalletWeight { get; set; }
|
public double PalletWeight { get; set; }
|
||||||
|
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
using Mango.Nop.Core.Interfaces;
|
|
||||||
|
|
||||||
namespace FruitBank.Common.Interfaces;
|
|
||||||
|
|
||||||
public interface IOrderDto : IMgOrderDto
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
using Mango.Nop.Core.Interfaces;
|
|
||||||
|
|
||||||
namespace FruitBank.Common.Interfaces;
|
|
||||||
|
|
||||||
public interface IProductDto : IMgProductDto
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
//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; }
|
|
||||||
// }
|
|
||||||
//}
|
|
||||||
|
|
||||||
|
|
@ -45,8 +45,6 @@ public class SignalRTags : AcSignalRTags
|
||||||
public const int AddOrUpdateMeasuredShippingItemPallet = 97;
|
public const int AddOrUpdateMeasuredShippingItemPallet = 97;
|
||||||
public const int AddOrUpdateMeasuredShippingItemPallets = 98;
|
public const int AddOrUpdateMeasuredShippingItemPallets = 98;
|
||||||
|
|
||||||
public const int GetPendingOrderModels = 115;
|
|
||||||
|
|
||||||
public const int AuthenticateUser = 160;
|
public const int AuthenticateUser = 160;
|
||||||
public const int RefreshToken = 200;
|
public const int RefreshToken = 200;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue