Update user order page and payment date format

This commit is contained in:
masoodafar-web
2025-11-27 23:25:53 +03:30
parent bc1eafd5a1
commit de8d1158a8
2 changed files with 12 additions and 34 deletions

View File

@@ -28,8 +28,8 @@
Variant="Variant.Outlined" Variant="Variant.Outlined"
Margin="Margin.Dense" Margin="Margin.Dense"
@bind-Value="_paymentMethodFilter"> @bind-Value="_paymentMethodFilter">
<MudSelectItem T="int?" Value="@((int?)0)">درگاه پرداخت</MudSelectItem> <MudSelectItem T="int?" Value="@(0)">درگاه پرداخت</MudSelectItem>
<MudSelectItem T="int?" Value="@((int?)1)">کیف پول</MudSelectItem> <MudSelectItem T="int?" Value="@(1)">کیف پول</MudSelectItem>
</MudSelect> </MudSelect>
<MudSelect T="int?" <MudSelect T="int?"
@@ -38,8 +38,8 @@
Variant="Variant.Outlined" Variant="Variant.Outlined"
Margin="Margin.Dense" Margin="Margin.Dense"
@bind-Value="_paymentStatusFilter"> @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>
<MudSelect T="int?" <MudSelect T="int?"
@@ -93,7 +93,11 @@
</CellTemplate> </CellTemplate>
</PropertyColumn> </PropertyColumn>
<PropertyColumn Property="x => x.TransactionId" Title="شناسه پرداخت" CellStyle="text-wrap: nowrap;" HeaderStyle="text-wrap: nowrap;" /> <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="آدرس"> <TemplateColumn Title="آدرس">
<CellTemplate> <CellTemplate>
<MudTooltip Text="@context.Item.UserAddressText"> <MudTooltip Text="@context.Item.UserAddressText">

View File

@@ -22,14 +22,11 @@ public partial class UserOrderMainPage
private DateTime? _paymentDateFrom; private DateTime? _paymentDateFrom;
private GetAllUserOrderByFilterRequest _request = new() { Filter = new() }; 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) private async Task<GridData<DataModel>> ServerReload(GridState<DataModel> state)
{ {
Console.WriteLine("ServerReload");
_request.Filter ??= new(); _request.Filter ??= new();
_request.PaginationState ??= new(); _request.PaginationState ??= new();
_request.PaginationState.PageNumber = state.Page + 1; _request.PaginationState.PageNumber = state.Page + 1;
@@ -81,16 +78,6 @@ public partial class UserOrderMainPage
_request.Filter.PaymentMethod = null; _request.Filter.PaymentMethod = null;
} }
if (IsEmptyFilter(_request.Filter))
{
_request.Filter = null;
}
else
{
Console.WriteLine(JsonSerializer.Serialize(_request.Filter));
}
var result = await UserOrderContract.GetAllUserOrderByFilterAsync(_request); var result = await UserOrderContract.GetAllUserOrderByFilterAsync(_request);
if (result != null && result.Models != null && result.Models.Any()) if (result != null && result.Models != null && result.Models.Any())
{ {
@@ -101,19 +88,6 @@ public partial class UserOrderMainPage
return new GridData<DataModel>(); 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) private async Task OpenDetails(DataModel model)
{ {
var parameters = new DialogParameters var parameters = new DialogParameters
@@ -210,4 +184,4 @@ public partial class UserOrderMainPage
_ => "درگاه پرداخت" _ => "درگاه پرداخت"
}; };
} }
} }