diff --git a/src/BackOffice/BackOffice.csproj b/src/BackOffice/BackOffice.csproj index 25b70fd..32ce305 100644 --- a/src/BackOffice/BackOffice.csproj +++ b/src/BackOffice/BackOffice.csproj @@ -138,7 +138,7 @@ - + diff --git a/src/BackOffice/Common/Configure/ConfigureService.cs b/src/BackOffice/Common/Configure/ConfigureService.cs index 70ee6b6..cdcf926 100644 --- a/src/BackOffice/Common/Configure/ConfigureService.cs +++ b/src/BackOffice/Common/Configure/ConfigureService.cs @@ -30,7 +30,7 @@ using CMSMicroservice.Protobuf.Protos.SitePage; using CMSMicroservice.Protobuf.Protos.SitePageSettings; using CMSMicroservice.Protobuf.Protos.UserContract; using CMSMicroservice.Protobuf.Protos.UserWallet; -using CMSMicroservice.Protobuf.Protos.UserWalletChangeLog; +using CMSMicroservice.Protobuf.Protos.UserWalletHistory; using BackOffice.Common.Utilities; using BackOffice.Services.DiscountProduct; using BackOffice.Services.DiscountCategory; @@ -167,7 +167,7 @@ public static class ConfigureServices // User Wallet Services services.AddTransient(sp => new UserWalletContract.UserWalletContractClient(sp.GetRequiredService())); - services.AddTransient(sp => new UserWalletChangeLogContract.UserWalletChangeLogContractClient(sp.GetRequiredService())); + services.AddTransient(sp => new UserWalletHistoryContract.UserWalletHistoryContractClient(sp.GetRequiredService())); return services; } diff --git a/src/BackOffice/Pages/Commission/Models/WithdrawalRequestModel.cs b/src/BackOffice/Pages/Commission/Models/WithdrawalRequestModel.cs index 770ea6d..1447b79 100644 --- a/src/BackOffice/Pages/Commission/Models/WithdrawalRequestModel.cs +++ b/src/BackOffice/Pages/Commission/Models/WithdrawalRequestModel.cs @@ -19,4 +19,5 @@ public class WithdrawalRequestModel public string? BankTrackingCode { get; set; } public string? PaymentFailureReason { get; set; } public string? IbanNumber { get; set; } + public string? PackageName { get; set; } } diff --git a/src/BackOffice/Pages/Commission/WithdrawalRequests.razor.cs b/src/BackOffice/Pages/Commission/WithdrawalRequests.razor.cs index c291684..6a96252 100644 --- a/src/BackOffice/Pages/Commission/WithdrawalRequests.razor.cs +++ b/src/BackOffice/Pages/Commission/WithdrawalRequests.razor.cs @@ -87,7 +87,8 @@ public partial class WithdrawalRequests BankReferenceId = grpcModel.BankReferenceId, BankTrackingCode = grpcModel.BankTrackingCode, PaymentFailureReason = grpcModel.PaymentFailureReason, - IbanNumber = grpcModel.IbanNumber + IbanNumber = grpcModel.IbanNumber, + PackageName = grpcModel.PackageName }; } @@ -269,7 +270,7 @@ public partial class WithdrawalRequests } var sb = new StringBuilder(); - sb.AppendLine("شناسه,کاربر,نام کاربر,مبلغ,وضعیت,روش,شماره شبا,تاریخ درخواست,تاریخ پردازش,شماره مرجع بانکی"); + sb.AppendLine("شناسه,کاربر,نام کاربر,پکیج,مبلغ,وضعیت,روش,شماره شبا,تاریخ درخواست,تاریخ پردازش,شماره مرجع بانکی"); foreach (var r in result.Models) { @@ -278,6 +279,7 @@ public partial class WithdrawalRequests mapped.Id, mapped.UserId, EscapeCsv(mapped.UserName), + EscapeCsv(mapped.PackageName ?? "-"), mapped.Amount, EscapeCsv(GetStatusText(mapped.Status)), EscapeCsv(GetMethodText(mapped.Method)), diff --git a/src/BackOffice/Pages/Payment/ManualPayments.razor.cs b/src/BackOffice/Pages/Payment/ManualPayments.razor.cs index 2d1dd53..ee20e62 100644 --- a/src/BackOffice/Pages/Payment/ManualPayments.razor.cs +++ b/src/BackOffice/Pages/Payment/ManualPayments.razor.cs @@ -37,7 +37,7 @@ public partial class ManualPayments } var sb = new StringBuilder(); - sb.AppendLine("شناسه,شناسه کاربر,نام کاربر,مبلغ,نوع,وضعیت,تاریخ ایجاد"); + sb.AppendLine("شناسه,شناسه کاربر,نام کاربر,پکیج,مبلغ,نوع,وضعیت,تاریخ ایجاد"); foreach (var m in response.Models) { @@ -45,6 +45,7 @@ public partial class ManualPayments m.Id, m.UserId, EscapeCsv(m.UserFullName), + EscapeCsv(m.PackageName ?? "-"), m.Amount.ToString("N0"), EscapeCsv(GetTypeText((int)m.Type)), EscapeCsv(GetStatusText((int)m.Status)), diff --git a/src/BackOffice/Pages/Wallet/WalletManagementPage.razor b/src/BackOffice/Pages/Wallet/WalletManagementPage.razor index f8ea8db..ad135d7 100644 --- a/src/BackOffice/Pages/Wallet/WalletManagementPage.razor +++ b/src/BackOffice/Pages/Wallet/WalletManagementPage.razor @@ -2,11 +2,11 @@ @attribute [Authorize(Roles = "Administrator")] @using CMSMicroservice.Protobuf.Protos.UserWallet -@using CMSMicroservice.Protobuf.Protos.UserWalletChangeLog +@using CMSMicroservice.Protobuf.Protos.UserWalletHistory @using BackOffice.Pages.AutoComplete @inject UserWalletContract.UserWalletContractClient WalletClient -@inject UserWalletChangeLogContract.UserWalletChangeLogContractClient ChangeLogClient +@inject UserWalletHistoryContract.UserWalletHistoryContractClient ChangeLogClient
مدیریت کیف‌پول کاربران @@ -85,7 +85,7 @@ OnClick="ApplyLogFilter">جستجو - @@ -135,7 +135,7 @@ موردی یافت نشد. - @@ -147,7 +147,7 @@ @code { private int _activeTab; private MudDataGrid? _walletGrid; - private MudDataGrid? _logGrid; + private MudDataGrid? _logGrid; // Wallet filters private long? _filterUserId; @@ -183,14 +183,14 @@ } } - private async Task> LoadChangeLogs(GridState state) + private async Task> LoadChangeLogs(GridState state) { try { - var request = new GetAllUserWalletChangeLogByFilterRequest + var request = new GetAllUserWalletHistoryByFilterRequest { PaginationState = new() { PageNumber = state.Page + 1, PageSize = state.PageSize }, - Filter = new GetAllUserWalletChangeLogByFilterFilter() + Filter = new GetAllUserWalletHistoryByFilterFilter() }; if (_logFilterUserId.HasValue && _logFilterUserId.Value > 0) @@ -199,8 +199,8 @@ if (_logFilterIsIncrease.HasValue) request.Filter.IsIncrease = _logFilterIsIncrease.Value; - var result = await ChangeLogClient.GetAllUserWalletChangeLogByFilterAsync(request); - return new GridData + var result = await ChangeLogClient.GetAllUserWalletHistoryByFilterAsync(request); + return new GridData { Items = result?.Models?.ToList() ?? new(), TotalItems = (int)(result?.MetaData?.TotalCount ?? 0) @@ -209,7 +209,7 @@ catch (Exception ex) { Snackbar.Add($"خطا: {ex.Message}", Severity.Error); - return new GridData(); + return new GridData(); } }