From 4b8a1dc03cf38718e5be2903770fb1ed21e716a5 Mon Sep 17 00:00:00 2001
From: masoodafar-web <masoud.afarin.moghaddam@outlook.com>
Date: Wed, 12 Nov 2025 02:27:26 +0330
Subject: [PATCH] Merge branch 'newmain'

---
 .../GetAllUserOrderByFilterQuery.cs            | 18 +++++++++---------
 .../GetAllUserOrderByFilterResponseDto.cs      | 18 +++++++++---------
 .../Protos/userorder.proto                     |  4 ++--
 .../Common/Mappings/GeneralMapping.cs          |  3 +++
 4 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterQuery.cs b/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterQuery.cs
index 8fdee62..2ffbccd 100644
--- a/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterQuery.cs
+++ b/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterQuery.cs
@@ -10,20 +10,20 @@ public record GetAllUserOrderByFilterQuery : IRequest<GetAllUserOrderByFilterRes
 
 }public class GetAllUserOrderByFilterFilter
 {
-    //شناسه 
+    //شناسه
     public long? Id { get; set; }
-    //قیمت 
+    //قیمت
     public long? Price { get; set; }
-    //شناسه پکیج 
+    //شناسه پکیج
     public long? PackageId { get; set; }
-    //شناسه تراکنش 
+    //شناسه تراکنش
     public long? TransactionId { get; set; }
-    //وضعیت پرداخت 
-    public bool? PaymentStatus { get; set; }
-    //تاریخ پرداخت 
+    //وضعیت پرداخت
+    public int? PaymentStatus { get; set; }
+    //تاریخ پرداخت
     public DateTime? PaymentDate { get; set; }
-    //شناسه کاربر 
+    //شناسه کاربر
     public long? UserId { get; set; }
-    //شناسه آدرس کاربر 
+    //شناسه آدرس کاربر
     public long? UserAddressId { get; set; }
 }
diff --git a/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterResponseDto.cs b/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterResponseDto.cs
index 0d68dff..18b7353 100644
--- a/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterResponseDto.cs
+++ b/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterResponseDto.cs
@@ -8,20 +8,20 @@ public class GetAllUserOrderByFilterResponseDto
 
 }public class GetAllUserOrderByFilterResponseModel
 {
-    //شناسه 
+    //شناسه
     public long Id { get; set; }
-    //قیمت 
+    //قیمت
     public long Price { get; set; }
-    //شناسه پکیج 
+    //شناسه پکیج
     public long PackageId { get; set; }
-    //شناسه تراکنش 
+    //شناسه تراکنش
     public long? TransactionId { get; set; }
-    //وضعیت پرداخت 
-    public bool PaymentStatus { get; set; }
-    //تاریخ پرداخت 
+    //وضعیت پرداخت
+    public int PaymentStatus { get; set; }
+    //تاریخ پرداخت
     public DateTime? PaymentDate { get; set; }
-    //شناسه کاربر 
+    //شناسه کاربر
     public long UserId { get; set; }
-    //شناسه آدرس کاربر 
+    //شناسه آدرس کاربر
     public long UserAddressId { get; set; }
 }
diff --git a/src/CMSMicroservice.Protobuf/Protos/userorder.proto b/src/CMSMicroservice.Protobuf/Protos/userorder.proto
index b8f64b4..4779505 100644
--- a/src/CMSMicroservice.Protobuf/Protos/userorder.proto
+++ b/src/CMSMicroservice.Protobuf/Protos/userorder.proto
@@ -100,7 +100,7 @@ message GetAllUserOrderByFilterFilter
     google.protobuf.Int64Value price = 2;
     google.protobuf.Int64Value package_id = 3;
     google.protobuf.Int64Value transaction_id = 4;
-    google.protobuf.BoolValue payment_status = 5;
+    google.protobuf.Int32Value payment_status = 5;
     google.protobuf.Timestamp payment_date = 6;
     google.protobuf.Int64Value user_id = 7;
     google.protobuf.Int64Value user_address_id = 8;
@@ -116,7 +116,7 @@ message GetAllUserOrderByFilterResponseModel
     int64 price = 2;
     int64 package_id = 3;
     google.protobuf.Int64Value transaction_id = 4;
-    bool payment_status = 5;
+    int32 payment_status = 5;
     google.protobuf.Timestamp payment_date = 6;
     int64 user_id = 7;
     int64 user_address_id = 8;
diff --git a/src/CMSMicroservice.WebApi/Common/Mappings/GeneralMapping.cs b/src/CMSMicroservice.WebApi/Common/Mappings/GeneralMapping.cs
index abf4c10..78fd50f 100644
--- a/src/CMSMicroservice.WebApi/Common/Mappings/GeneralMapping.cs
+++ b/src/CMSMicroservice.WebApi/Common/Mappings/GeneralMapping.cs
@@ -50,6 +50,9 @@ public class GeneralMapping : IRegister
         config.NewConfig<TimeSpan?, Duration>()
             .MapWith(src => src.HasValue ? Duration.FromTimeSpan(src.Value) : null);
 
+        config.NewConfig<DateTimeOffset?, DateTime?>()
+            .MapWith(src => src.HasValue ? src.Value.DateTime : (DateTime?)null);
+
         config.Default
             .UseDestinationValue(member => member.SetterModifier == AccessModifier.None &&
                                            member.Type.IsGenericType &&