diff --git a/src/BackOffice.BFF.Application/Common/Mappings/UserOrderProfile.cs b/src/BackOffice.BFF.Application/Common/Mappings/UserOrderProfile.cs
index 501d760..6069960 100644
--- a/src/BackOffice.BFF.Application/Common/Mappings/UserOrderProfile.cs
+++ b/src/BackOffice.BFF.Application/Common/Mappings/UserOrderProfile.cs
@@ -16,7 +16,13 @@ public class UserOrderProfile : IRegister
                 PageSize = src.PaginationState.PageSize
             })
             .Map(dest => dest.SortBy, src => src.SortBy)
-            .Map(dest => dest.Filter, src => src.Filter == null || IsEmptyFilter(src.Filter) ? null : BuildFilter(src.Filter));
+            .IgnoreIf((src, dest) => src.Filter.DeliveryStatus==null,dest => dest.Filter.DeliveryStatus)
+            .IgnoreIf((src, dest) => src.Filter.PaymentMethod==null,dest => dest.Filter.PaymentMethod)
+            .IgnoreIf((src, dest) => src.Filter.PaymentStatus==null,dest => dest.Filter.PaymentStatus)
+            .Map(dest => dest.Filter, src => src.Filter == null || IsEmptyFilter(src.Filter) ? null : BuildFilter(src.Filter));   
+        
+        
+            
     }
 
     private static bool IsEmptyFilter(GetAllUserOrderByFilterFilter src)
@@ -50,7 +56,7 @@ public class UserOrderProfile : IRegister
 
         if (src.PaymentDate.HasValue)
         {
-            filter.PaymentDate = Timestamp.FromDateTime(DateTime.SpecifyKind(src.PaymentDate.Value, DateTimeKind.Utc));
+            filter.PaymentDate = Timestamp.FromDateTime(DateTime.SpecifyKind(src.PaymentDate.Value, DateTimeKind.Local));
         }
 
         if (src.UserId.HasValue)
@@ -58,9 +64,7 @@ public class UserOrderProfile : IRegister
 
         if (src.PaymentStatus.HasValue)
         {
-            filter.PaymentStatus = src.PaymentStatus.Value
-                ? CMSMicroservice.Protobuf.Protos.PaymentStatus.Success
-                : CMSMicroservice.Protobuf.Protos.PaymentStatus.Reject;
+            filter.PaymentStatus = (CMSMicroservice.Protobuf.Protos.PaymentStatus)src.PaymentStatus.Value;
         }
 
         if (src.DeliveryStatus.HasValue)
diff --git a/src/BackOffice.BFF.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterQuery.cs b/src/BackOffice.BFF.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterQuery.cs
index 76aa964..6313d8d 100644
--- a/src/BackOffice.BFF.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterQuery.cs
+++ b/src/BackOffice.BFF.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterQuery.cs
@@ -18,8 +18,8 @@ public record GetAllUserOrderByFilterQuery : IRequest<GetAllUserOrderByFilterRes
     public long? PackageId { get; set; }
     //شناسه تراکنش 
     public long? TransactionId { get; set; }
-    //وضعیت پرداخت 
-    public bool? PaymentStatus { get; set; }
+    //وضعیت پرداخت (کد enum PaymentStatus)
+    public int? PaymentStatus { get; set; }
     //تاریخ پرداخت 
     public DateTime? PaymentDate { get; set; }
     //شناسه کاربر 
diff --git a/src/BackOffice.BFF.WebApi/appsettings.json b/src/BackOffice.BFF.WebApi/appsettings.json
index 1df342f..72cc74f 100644
--- a/src/BackOffice.BFF.WebApi/appsettings.json
+++ b/src/BackOffice.BFF.WebApi/appsettings.json
@@ -12,6 +12,7 @@
   "GrpcChannelOptions": {
     "FMSMSAddress": "https://dl.afrino.co",
     "CMSMSAddress": "https://cms.kbs1.ir"
+//    "CMSMSAddress": "https://localhost:32846"
   },
   "Authentication": {
     "Authority": "https://ids.domain.com/",