admin/BackOffice
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update payment status and amount fields in user orders

Browse Source
This commit is contained in:
masoodafar-web
2025-11-28 04:04:33 +03:30
parent de8d1158a8
commit 1bce6f3198
6 changed files with 61 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/BackOffice/Pages/Index.razor
View File

@@ -98,7 +98,7 @@
<RowTemplate> <RowTemplate>
<MudTd>@context.Id</MudTd> <MudTd>@context.Id</MudTd>
<MudTd>@context.UserFullName (@context.UserNationalCode)</MudTd> <MudTd>@context.UserFullName (@context.UserNationalCode)</MudTd>
<MudTd>@context.Price.ToString("N0")</MudTd> <MudTd>@context.Amount.ToString("N0")</MudTd>
<MudTd>@context.PaymentDate.ToDateTime().ToLocalTime().ToString("yyyy/MM/dd HH:mm")</MudTd> <MudTd>@context.PaymentDate.ToDateTime().ToLocalTime().ToString("yyyy/MM/dd HH:mm")</MudTd>
</RowTemplate> </RowTemplate>
</MudTable> </MudTable>
@@ -137,10 +137,10 @@
if (orderResult != null && orderResult.Models != null) if (orderResult != null && orderResult.Models != null)
{ {
_totalOrders = orderResult.MetaData?.TotalCount ?? 0; _totalOrders = orderResult.MetaData?.TotalCount ?? 0;
_paidOrders = orderResult.Models.Count(m => m.PaymentStatus); _paidOrders = orderResult.Models.Count(m => m.PaymentStatus==PaymentStatus.Success);
_totalPaidAmount = orderResult.Models _totalPaidAmount = orderResult.Models
.Where(m => m.PaymentStatus) .Where(m => m.PaymentStatus==PaymentStatus.Success)
.Aggregate(0L, (sum, m) => sum + m.Price); .Aggregate(0L, (sum, m) => sum + m.Amount);
foreach (var item in orderResult.Models.OrderByDescending(m => m.PaymentDate).Take(5)) foreach (var item in orderResult.Models.OrderByDescending(m => m.PaymentDate).Take(5))
{ {

12
src/BackOffice/Pages/Products/Components/GalleryDialog.razor
View File

@@ -1,4 +1,5 @@
@using BackOffice.BFF.Products.Protobuf.Protos.Products @using BackOffice.BFF.Products.Protobuf.Protos.Products
@using BackOffice.Common.BaseComponents
@using Microsoft.AspNetCore.Components.Forms @using Microsoft.AspNetCore.Components.Forms
<MudDialog> <MudDialog>
@@ -78,9 +79,14 @@
<MudPaper Class="pa-2"> <MudPaper Class="pa-2">
<div style="position:relative; cursor:pointer;" <div style="position:relative; cursor:pointer;"
@onclick="@(() => OpenPreview(item))"> @onclick="@(() => OpenPreview(item))">
<img src="@item.ImageThumbnailPath" @* <img src="@item.ImageThumbnailPath" *@
alt="@item.Title" @* alt="@item.Title" *@
style="width:100%; height:120px; object-fit:cover; border-radius:4px;" /> @* style="width:100%; height:120px; object-fit:cover; border-radius:4px;" /> *@
<Image Src="@item.ImageThumbnailPath"
Width="25"
Height="25"
ObjectPosition="ObjectPosition.Center"
ObjectFit="ObjectFit.Fill" />
<MudIconButton Icon="@Icons.Material.Filled.DeleteOutline" <MudIconButton Icon="@Icons.Material.Filled.DeleteOutline"
Color="Color.Error" Color="Color.Error"
Size="Size.Small" Size="Size.Small"

11
src/BackOffice/Pages/UserOrder/Components/UserOrderDetailsDialog.razor
View File

@@ -26,21 +26,24 @@
<MudStack Spacing="1"> <MudStack Spacing="1">
<MudText Typo="Typo.subtitle2">خلاصه سفارش</MudText> <MudText Typo="Typo.subtitle2">خلاصه سفارش</MudText>
<MudDivider /> <MudDivider />
<MudText Typo="Typo.body2">مبلغ: @_model.Price.ToString("N0") تومان</MudText> <MudText Typo="Typo.body2">مبلغ: @_model.Amount.ToString("N0") تومان</MudText>
<MudText Typo="Typo.body2">شناسه پرداخت: @_model.TransactionId</MudText> <MudText Typo="Typo.body2">شناسه پرداخت: @_model.TransactionId</MudText>
<MudText Typo="Typo.body2"> <MudText Typo="Typo.body2">
تاریخ پرداخت: تاریخ پرداخت:
@_model.PaymentDate.ToDateTime().ToLocalTime().ToString("yyyy/MM/dd HH:mm") @_model.PaymentDate.ToDateTime().ToLocalTime().MiladiToJalaliWithTime()
</MudText> </MudText>
<MudText Typo="Typo.body2"> <MudText Typo="Typo.body2">
روش پرداخت: روش پرداخت:
@GetPaymentMethodText(_model.PaymentMethod) @GetPaymentMethodText(_model.PaymentMethod.GetHashCode())
</MudText> </MudText>
<MudText Typo="Typo.body2"> <MudText Typo="Typo.body2">
وضعیت پرداخت: وضعیت پرداخت:
@if (_model.PaymentStatus) @if (_model.PaymentStatus==PaymentStatus.Success)
{ {
<MudChip T="string" Color="Color.Success" Size="Size.Small">پرداخت شده</MudChip> <MudChip T="string" Color="Color.Success" Size="Size.Small">پرداخت شده</MudChip>
}else if (_model.PaymentStatus==PaymentStatus.Pending)
{
<MudChip T="string" Color="Color.Success" Size="Size.Small">در انتظار پرداخت</MudChip>
} }
else else
{ {

2
src/BackOffice/Pages/UserOrder/Components/UserOrderDetailsDialog.razor.cs
View File

@@ -29,7 +29,7 @@ public partial class UserOrderDetailsDialog
if (_model is not null) if (_model is not null)
{ {
_deliveryStatusValue = _model.DeliveryStatus; _deliveryStatusValue = _model.DeliveryStatus.GetHashCode();
_trackingCode = _model.TrackingCode; _trackingCode = _model.TrackingCode;
_deliveryDescription = _model.DeliveryDescription; _deliveryDescription = _model.DeliveryDescription;
} }

66
src/BackOffice/Pages/UserOrder/UserOrderMainPage.razor
View File

@@ -6,21 +6,22 @@
@using BackOffice.Common.BaseComponents @using BackOffice.Common.BaseComponents
@using DataModel = BackOffice.BFF.UserOrder.Protobuf.Protos.UserOrder.GetAllUserOrderByFilterResponseModel @using DataModel = BackOffice.BFF.UserOrder.Protobuf.Protos.UserOrder.GetAllUserOrderByFilterResponseModel
<BackOffice.Common.BaseComponents.BasePageComponent @ref="_basePage" OnClearFilterClick="OnFilterCleared" OnSubmitClick="OnFilterSubmit"> <BackOffice.Common.BaseComponents.BasePageComponent @ref="_basePage" OnClearFilterClick="OnFilterCleared"
OnSubmitClick="OnFilterSubmit">
<Filters> <Filters>
<MudNumericField HideSpinButtons="true" <MudNumericField HideSpinButtons="true"
T="long?" T="long?"
Clearable="true" Clearable="true"
Label="قیمت" Label="قیمت"
@bind-Value="@_request.Filter.Price" @bind-Value="@_request.Filter.Amount"
Variant="Variant.Outlined" Variant="Variant.Outlined"
Margin="Margin.Dense" /> Margin="Margin.Dense"/>
<MudDatePicker T="DateTime?" <MudDatePicker T="DateTime?"
Label="از تاریخ پرداخت" Label="از تاریخ پرداخت"
@bind-Date="_paymentDateFrom" @bind-Date="_paymentDateFrom"
Variant="Variant.Outlined" Variant="Variant.Outlined"
Margin="Margin.Dense" /> Margin="Margin.Dense"/>
<MudSelect T="int?" <MudSelect T="int?"
Clearable="true" Clearable="true"
@@ -55,13 +56,14 @@
</MudSelect> </MudSelect>
</Filters> </Filters>
<Content> <Content>
<MudDataGrid T="DataModel" ServerData="@(new Func<GridState<DataModel>, Task<GridData<DataModel>>>(ServerReload))" <MudDataGrid T="DataModel"
ServerData="@(new Func<GridState<DataModel>, Task<GridData<DataModel>>>(ServerReload))"
Hover="true" @ref="_gridData" Height="72vh"> Hover="true" @ref="_gridData" Height="72vh">
<ColGroup> <ColGroup>
<col /> <col/>
<col /> <col/>
<col /> <col/>
<col style="width: 58px;" /> <col style="width: 58px;"/>
</ColGroup> </ColGroup>
<ToolBarContent> <ToolBarContent>
<MudStack Row="true" Justify="Justify.SpaceBetween" AlignItems="AlignItems.Center"> <MudStack Row="true" Justify="Justify.SpaceBetween" AlignItems="AlignItems.Center">
@@ -69,22 +71,27 @@
</MudStack> </MudStack>
</ToolBarContent> </ToolBarContent>
<Columns> <Columns>
<PropertyColumn Property="x => x.Id" Title="شناسه" /> <PropertyColumn Property="x => x.Id" Title="شناسه"/>
<PropertyColumn Property="x => x.Price" Title="مبلغ" /> <PropertyColumn Property="x => x.Amount" Title="مبلغ"/>
<PropertyColumn Property="x => x.UserFullName" Title="نام کاربر" /> <PropertyColumn Property="x => x.UserFullName" Title="نام کاربر"/>
<PropertyColumn Property="x => x.UserNationalCode" Title="کدملی" /> <PropertyColumn Property="x => x.UserNationalCode" Title="کدملی"/>
<TemplateColumn Title="روش پرداخت"> <TemplateColumn Title="روش پرداخت">
<CellTemplate> <CellTemplate>
<MudChip T="string" Size="Size.Small"> <MudChip T="string" Size="Size.Small">
@GetPaymentMethodText(context.Item.PaymentMethod) @GetPaymentMethodText(context.Item.PaymentMethod.GetHashCode())
</MudChip> </MudChip>
</CellTemplate> </CellTemplate>
</TemplateColumn> </TemplateColumn>
<PropertyColumn Property="x => x.PaymentStatus" Title="وضعیت پرداخت"> <PropertyColumn Property="x => x.PaymentStatus" Title="وضعیت پرداخت">
<CellTemplate> <CellTemplate>
@if (context.Item.PaymentStatus) @if (context.Item.PaymentStatus == PaymentStatus.Success)
{ {
<MudChip T="string" Color="Color.Success">پرداخت شده</MudChip> <MudChip T="string" Color="Color.Success">پرداخت شده</MudChip>
}
else if (context.Item.PaymentStatus == PaymentStatus.Pending)
{
<MudChip T="string" Color="Color.Success" Size="Size.Small">در انتظار پرداخت</MudChip>
} }
else else
{ {
@@ -92,7 +99,8 @@
} }
</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;"/>
<TemplateColumn Title="تاریخ پرداخت" CellStyle="text-wrap: nowrap;" HeaderStyle="text-wrap: nowrap;"> <TemplateColumn Title="تاریخ پرداخت" CellStyle="text-wrap: nowrap;" HeaderStyle="text-wrap: nowrap;">
<CellTemplate> <CellTemplate>
@(context.Item.PaymentDate.ToDateTime().MiladiToJalaliWithTime()) @(context.Item.PaymentDate.ToDateTime().MiladiToJalaliWithTime())
@@ -103,10 +111,10 @@
<MudTooltip Text="@context.Item.UserAddressText"> <MudTooltip Text="@context.Item.UserAddressText">
<MudText Typo="Typo.body2"> <MudText Typo="Typo.body2">
@(string.IsNullOrWhiteSpace(context.Item.UserAddressText) @(string.IsNullOrWhiteSpace(context.Item.UserAddressText)
? "-" ? "-"
: (context.Item.UserAddressText.Length > 30 : (context.Item.UserAddressText.Length > 30
? context.Item.UserAddressText.Substring(0, 30) + "..." ? context.Item.UserAddressText.Substring(0, 30) + "..."
: context.Item.UserAddressText)) : context.Item.UserAddressText))
</MudText> </MudText>
</MudTooltip> </MudTooltip>
</CellTemplate> </CellTemplate>
@@ -115,15 +123,15 @@
<CellTemplate> <CellTemplate>
<MudChip T="string" <MudChip T="string"
Size="Size.Small" Size="Size.Small"
Color="@GetDeliveryStatusColor(context.Item.DeliveryStatus)"> Color="@GetDeliveryStatusColor(context.Item.DeliveryStatus.GetHashCode())">
@GetDeliveryStatusText(context.Item.DeliveryStatus) @GetDeliveryStatusText(context.Item.DeliveryStatus.GetHashCode())
</MudChip> </MudChip>
</CellTemplate> </CellTemplate>
</TemplateColumn> </TemplateColumn>
<TemplateColumn StickyLeft="true" Title="عملیات" CellStyle="text-wrap: nowrap;"
<TemplateColumn StickyLeft="true" Title="عملیات" CellStyle="text-wrap: nowrap;" HeaderStyle="text-wrap: nowrap;"> HeaderStyle="text-wrap: nowrap;">
<CellTemplate> <CellTemplate>
<MudStack Row="true" AlignItems="AlignItems.Center"> <MudStack Row="true" AlignItems="AlignItems.Center">
@@ -132,18 +140,22 @@
Size="Size.Small" Size="Size.Small"
ButtonType="ButtonType.Button" ButtonType="ButtonType.Button"
OnClick="@(() => OpenDetails(context.Item))" OnClick="@(() => OpenDetails(context.Item))"
Style="cursor:pointer;" /> Style="cursor:pointer;"/>
</MudTooltip> </MudTooltip>
<MudTooltip Text="آرشیو"> <MudTooltip Text="آرشیو">
<MudIconButton Icon="@Icons.Material.Filled.DeleteOutline" Size="Size.Small" ButtonType="ButtonType.Button" OnClick="@(() => OnDelete(context.Item))" Style="cursor:pointer;" /> <MudIconButton Icon="@Icons.Material.Filled.DeleteOutline" Size="Size.Small"
ButtonType="ButtonType.Button" OnClick="@(() => OnDelete(context.Item))"
Style="cursor:pointer;"/>
</MudTooltip> </MudTooltip>
</MudStack> </MudStack>
</CellTemplate> </CellTemplate>
</TemplateColumn> </TemplateColumn>
</Columns> </Columns>
<PagerContent> <PagerContent>
<MudDataGridPager T="DataModel" PageSizeOptions=@(new int[] { 30, 60, 90 }) InfoFormat="سطر {first_item} تا {last_item} از {all_items}" RowsPerPageString="تعداد سطرهای صفحه" /> <MudDataGridPager T="DataModel" PageSizeOptions=@(new int[] { 30, 60, 90 })
InfoFormat="سطر {first_item} تا {last_item} از {all_items}"
RowsPerPageString="تعداد سطرهای صفحه"/>
</PagerContent> </PagerContent>
</MudDataGrid> </MudDataGrid>

2
src/BackOffice/Pages/UserOrder/UserOrderMainPage.razor.cs
View File

@@ -53,7 +53,7 @@ public partial class UserOrderMainPage
if (_paymentStatusFilter.HasValue) if (_paymentStatusFilter.HasValue)
{ {
_request.Filter.PaymentStatus = _paymentStatusFilter.Value == 1; _request.Filter.PaymentStatus = _paymentStatusFilter;
} }
else else
{ {