From de8d1158a80a88e86b73031ab4758c5be7043d5f Mon Sep 17 00:00:00 2001
From: masoodafar-web <masoud.afarin.moghaddam@outlook.com>
Date: Thu, 27 Nov 2025 23:25:53 +0330
Subject: [PATCH] Update user order page and payment date format

---
 .../Pages/UserOrder/UserOrderMainPage.razor   | 14 +++++---
 .../UserOrder/UserOrderMainPage.razor.cs      | 32 ++-----------------
 2 files changed, 12 insertions(+), 34 deletions(-)

diff --git a/src/BackOffice/Pages/UserOrder/UserOrderMainPage.razor b/src/BackOffice/Pages/UserOrder/UserOrderMainPage.razor
index 0220ef2..28cc3b1 100644
--- a/src/BackOffice/Pages/UserOrder/UserOrderMainPage.razor
+++ b/src/BackOffice/Pages/UserOrder/UserOrderMainPage.razor
@@ -28,8 +28,8 @@
                    Variant="Variant.Outlined"
                    Margin="Margin.Dense"
                    @bind-Value="_paymentMethodFilter">
-            <MudSelectItem T="int?" Value="@((int?)0)">درگاه پرداخت</MudSelectItem>
-            <MudSelectItem T="int?" Value="@((int?)1)">کیف پول</MudSelectItem>
+            <MudSelectItem T="int?" Value="@(0)">درگاه پرداخت</MudSelectItem>
+            <MudSelectItem T="int?" Value="@(1)">کیف پول</MudSelectItem>
         </MudSelect>
 
         <MudSelect T="int?"
@@ -38,8 +38,8 @@
                    Variant="Variant.Outlined"
                    Margin="Margin.Dense"
                    @bind-Value="_paymentStatusFilter">
-            <MudSelectItem T="int?" Value="@(1)">پرداخت شده</MudSelectItem>
-            <MudSelectItem T="int?" Value="@(0)">پرداخت نشده</MudSelectItem>
+            <MudSelectItem T="int?" Value="@(0)">پرداخت شده</MudSelectItem>
+            <MudSelectItem T="int?" Value="@(1)">پرداخت نشده</MudSelectItem>
         </MudSelect>
 
         <MudSelect T="int?"
@@ -93,7 +93,11 @@
                     </CellTemplate>
                 </PropertyColumn>
                 <PropertyColumn Property="x => x.TransactionId" Title="شناسه پرداخت" CellStyle="text-wrap: nowrap;" HeaderStyle="text-wrap: nowrap;" />
-                <PropertyColumn Property="x => x.PaymentDate" Title="تاریخ پرداخت" CellStyle="text-wrap: nowrap;" HeaderStyle="text-wrap: nowrap;" />
+                <TemplateColumn Title="تاریخ پرداخت" CellStyle="text-wrap: nowrap;" HeaderStyle="text-wrap: nowrap;">
+                    <CellTemplate>
+                        @(context.Item.PaymentDate.ToDateTime().MiladiToJalaliWithTime())
+                    </CellTemplate>
+                </TemplateColumn>
                 <TemplateColumn Title="آدرس">
                     <CellTemplate>
                         <MudTooltip Text="@context.Item.UserAddressText">
diff --git a/src/BackOffice/Pages/UserOrder/UserOrderMainPage.razor.cs b/src/BackOffice/Pages/UserOrder/UserOrderMainPage.razor.cs
index 7e020d5..7ab7427 100644
--- a/src/BackOffice/Pages/UserOrder/UserOrderMainPage.razor.cs
+++ b/src/BackOffice/Pages/UserOrder/UserOrderMainPage.razor.cs
@@ -22,14 +22,11 @@ public partial class UserOrderMainPage
     private DateTime? _paymentDateFrom;
 
     private GetAllUserOrderByFilterRequest _request = new() { Filter = new() };
-    protected override Task OnInitializedAsync()
-    {
-        _request.Filter ??= new();
-        return base.OnInitializedAsync();
-    }
+
 
     private async Task<GridData<DataModel>> ServerReload(GridState<DataModel> state)
     {
+        Console.WriteLine("ServerReload");
         _request.Filter ??= new();
         _request.PaginationState ??= new();
         _request.PaginationState.PageNumber = state.Page + 1;
@@ -81,16 +78,6 @@ public partial class UserOrderMainPage
             _request.Filter.PaymentMethod = null;
         }
 
-
-        if (IsEmptyFilter(_request.Filter))
-        {
-            _request.Filter = null;
-        }
-        else
-        {
-            Console.WriteLine(JsonSerializer.Serialize(_request.Filter));
-        }
-
         var result = await UserOrderContract.GetAllUserOrderByFilterAsync(_request);
         if (result != null && result.Models != null && result.Models.Any())
         {
@@ -101,19 +88,6 @@ public partial class UserOrderMainPage
         return new GridData<DataModel>();
     }
 
-    private static bool IsEmptyFilter(GetAllUserOrderByFilterFilter src)
-    {
-        return src.Id == null
-               && src.Price == null
-               && src.PackageId == null
-               && src.TransactionId == null
-               && src.PaymentStatus == null
-               && src.PaymentDate == null
-               && src.UserId == null
-               && src.DeliveryStatus == null
-               && src.PaymentMethod == null;
-    }
-
     private async Task OpenDetails(DataModel model)
     {
         var parameters = new DialogParameters
@@ -210,4 +184,4 @@ public partial class UserOrderMainPage
             _ => "درگاه پرداخت"
         };
     }
-}
\ No newline at end of file
+}