From ec71f81d4cc3af5ff1f48af5c3ccd4832d2f933b Mon Sep 17 00:00:00 2001
From: Loretta <jozsef.b@aycode.com>
Date: Thu, 30 Oct 2025 14:54:33 +0100
Subject: [PATCH] SignalR improvements; etc...

---
 Mango.Nop.Core/Dtos/MgOrderDto.cs              | 7 +++++++
 Mango.Nop.Core/Dtos/MgProductDto.cs            | 1 +
 Mango.Nop.Core/Interfaces/IMgProductDto.cs     | 1 +
 Mango.Nop.Core/Repositories/MgDbContextBase.cs | 2 +-
 Mango.Nop.Core/Services/IMgLockService.cs      | 2 +-
 Mango.Nop.Services/MgLockServiceBase.cs        | 4 +++-
 6 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Mango.Nop.Core/Dtos/MgOrderDto.cs b/Mango.Nop.Core/Dtos/MgOrderDto.cs
index 01e9909..ff924b5 100644
--- a/Mango.Nop.Core/Dtos/MgOrderDto.cs
+++ b/Mango.Nop.Core/Dtos/MgOrderDto.cs
@@ -8,6 +8,7 @@ using Nop.Core.Domain.Catalog;
 using Nop.Core.Domain.Common;
 using Nop.Core.Domain.Customers;
 using Nop.Core.Domain.Orders;
+using Nop.Core.Domain.Payments;
 using Nop.Core.Domain.Shipping;
 
 namespace Mango.Nop.Core.Dtos;
@@ -23,6 +24,7 @@ public abstract class MgOrderDto<TOrderItemDto, TProductDto> : MgEntityBase, IMo
     public decimal OrderTotal { get; set; }
     public DateTime CreatedOnUtc { get; set; }
     public DateTime? PaidDateUtc { get; set; }
+    public int PaymentStatusId { get; set; }
     public string ShippingMethod { get; set; }
     public string CustomOrderNumber { get; set; }
     public string CustomValuesXml { get; set; }
@@ -44,6 +46,11 @@ public abstract class MgOrderDto<TOrderItemDto, TProductDto> : MgEntityBase, IMo
         get => (ShippingStatus)ShippingStatusId;
         set => ShippingStatusId = (int)value;
     }
+    public PaymentStatus PaymentStatus
+    {
+        get => (PaymentStatus)PaymentStatusId;
+        set => PaymentStatusId = (int)value;
+    }
 
     protected MgOrderDto() :base()
     { }
diff --git a/Mango.Nop.Core/Dtos/MgProductDto.cs b/Mango.Nop.Core/Dtos/MgProductDto.cs
index 7b4bcc7..9d67870 100644
--- a/Mango.Nop.Core/Dtos/MgProductDto.cs
+++ b/Mango.Nop.Core/Dtos/MgProductDto.cs
@@ -17,6 +17,7 @@ public abstract class MgProductDto : MgEntityBase, IModelDtoBase<Product>, IMgPr
     public string FullDescription { get; set; }
 
     public int WarehouseId { get; set; }
+    public decimal Price { get; set; }
     public int StockQuantity { get; set; }
     public decimal ProductCost { get; set; }
 
diff --git a/Mango.Nop.Core/Interfaces/IMgProductDto.cs b/Mango.Nop.Core/Interfaces/IMgProductDto.cs
index 3988994..f8c5169 100644
--- a/Mango.Nop.Core/Interfaces/IMgProductDto.cs
+++ b/Mango.Nop.Core/Interfaces/IMgProductDto.cs
@@ -18,6 +18,7 @@ public interface IMgProductDto : IEntityInt, ILocalizedEntity, ISlugSupported, I
     string FullDescription { get; set; }
 
     int WarehouseId { get; set; }
+    decimal Price { get; set; }
     int StockQuantity { get; set; }
     decimal ProductCost { get; set; }
 
diff --git a/Mango.Nop.Core/Repositories/MgDbContextBase.cs b/Mango.Nop.Core/Repositories/MgDbContextBase.cs
index c55f111..d867a55 100644
--- a/Mango.Nop.Core/Repositories/MgDbContextBase.cs
+++ b/Mango.Nop.Core/Repositories/MgDbContextBase.cs
@@ -5,7 +5,7 @@ using AyCode.Core.Loggers;
 using AyCode.Utils.Extensions;
 using Mango.Nop.Core.Interfaces;
 using Mango.Nop.Core.Loggers;
-using Mango.Nop.Services;
+using Mango.Nop.Core.Services;
 using Nop.Core.Caching;
 using Nop.Core.Domain.Catalog;
 using Nop.Core.Domain.Orders;
diff --git a/Mango.Nop.Core/Services/IMgLockService.cs b/Mango.Nop.Core/Services/IMgLockService.cs
index 53e3163..00a438d 100644
--- a/Mango.Nop.Core/Services/IMgLockService.cs
+++ b/Mango.Nop.Core/Services/IMgLockService.cs
@@ -1,4 +1,4 @@
-namespace Mango.Nop.Services;
+namespace Mango.Nop.Core.Services;
 
 public interface IMgLockService
 {
diff --git a/Mango.Nop.Services/MgLockServiceBase.cs b/Mango.Nop.Services/MgLockServiceBase.cs
index 29316a7..e476bcc 100644
--- a/Mango.Nop.Services/MgLockServiceBase.cs
+++ b/Mango.Nop.Services/MgLockServiceBase.cs
@@ -1,4 +1,6 @@
-namespace Mango.Nop.Services;
+using Mango.Nop.Core.Services;
+
+namespace Mango.Nop.Services;
 
 public abstract class MgLockServiceBase : IMgLockService
 {