Merge branch 'kub-stage' into production
Build and Deploy to Production / build-and-deploy (push) Successful in 19m22s
Build and Deploy to Production / build-and-deploy (push) Successful in 19m22s
This commit is contained in:
@@ -27,8 +27,6 @@ spec:
|
|||||||
env:
|
env:
|
||||||
- name: BLAZOR_ENVIRONMENT
|
- name: BLAZOR_ENVIRONMENT
|
||||||
value: "Staging"
|
value: "Staging"
|
||||||
- name: GW_URL
|
|
||||||
value: "https://cms.kbs2.ir"
|
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
memory: "128Mi"
|
memory: "128Mi"
|
||||||
|
|||||||
@@ -9,6 +9,8 @@
|
|||||||
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
|
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
|
||||||
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
|
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
|
||||||
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
|
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
|
||||||
|
<!-- Suppress pre-existing warnings that do not affect runtime correctness -->
|
||||||
|
<NoWarn>MUD0002;CA2022;BL0005</NoWarn>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
@@ -138,7 +140,7 @@
|
|||||||
|
|
||||||
<!-- CMS Protobuf NuGet package (used for both local dev and Docker builds) -->
|
<!-- CMS Protobuf NuGet package (used for both local dev and Docker builds) -->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Foursat.CMSMicroservice.Protobuf" Version="0.0.195" />
|
<PackageReference Include="Foursat.CMSMicroservice.Protobuf" Version="0.0.199" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<!-- ============================================================ -->
|
<!-- ============================================================ -->
|
||||||
|
|||||||
@@ -49,6 +49,21 @@
|
|||||||
StartIcon="@Icons.Material.Filled.Search">
|
StartIcon="@Icons.Material.Filled.Search">
|
||||||
جستجو
|
جستجو
|
||||||
</MudButton>
|
</MudButton>
|
||||||
|
<MudButton Variant="Variant.Filled"
|
||||||
|
Color="Color.Success"
|
||||||
|
StartIcon="@Icons.Material.Filled.AccountBalanceWallet"
|
||||||
|
Disabled="@(!_filterWeekDefinitionId.HasValue || _isCreditingWallets)"
|
||||||
|
OnClick="BulkCreditWallets">
|
||||||
|
@if (_isCreditingWallets)
|
||||||
|
{
|
||||||
|
<MudProgressCircular Size="Size.Small" Indeterminate="true" Class="ms-n1 me-2" />
|
||||||
|
<span>در حال واریز...</span>
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
<span>واریز به کیف پول</span>
|
||||||
|
}
|
||||||
|
</MudButton>
|
||||||
</MudStack>
|
</MudStack>
|
||||||
</ToolBarContent>
|
</ToolBarContent>
|
||||||
<Columns>
|
<Columns>
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ public partial class UserPayouts
|
|||||||
private long? _filterWeekDefinitionId;
|
private long? _filterWeekDefinitionId;
|
||||||
private int? _filterStatus;
|
private int? _filterStatus;
|
||||||
private long? _filterPackageId;
|
private long? _filterPackageId;
|
||||||
|
private bool _isCreditingWallets;
|
||||||
|
|
||||||
private async Task<GridData<UserCommissionPayoutModel>> ServerReload(GridState<UserCommissionPayoutModel> state)
|
private async Task<GridData<UserCommissionPayoutModel>> ServerReload(GridState<UserCommissionPayoutModel> state)
|
||||||
{
|
{
|
||||||
@@ -147,6 +148,50 @@ public partial class UserPayouts
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async Task BulkCreditWallets()
|
||||||
|
{
|
||||||
|
if (!_filterWeekDefinitionId.HasValue)
|
||||||
|
{
|
||||||
|
Snackbar.Add("لطفاً ابتدا یک هفته انتخاب کنید", Severity.Warning);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var confirmed = await DialogService.ShowMessageBox(
|
||||||
|
"واریز دستهجمعی به کیف پول",
|
||||||
|
$"آیا از واریز کمیسیون همه پرداختهای «در انتظار» هفته انتخابشده به کیف پول کاربران مطمئن هستید؟ این عملیات برگشتپذیر نیست.",
|
||||||
|
yesText: "بله، واریز کن", cancelText: "لغو");
|
||||||
|
|
||||||
|
if (confirmed != true)
|
||||||
|
return;
|
||||||
|
|
||||||
|
_isCreditingWallets = true;
|
||||||
|
StateHasChanged();
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var result = await CommissionContract.BulkCreditPayoutsAsync(new BulkCreditPayoutsRequest
|
||||||
|
{
|
||||||
|
WeekDefinitionId = _filterWeekDefinitionId.Value
|
||||||
|
});
|
||||||
|
|
||||||
|
if (result.CreditedCount == 0)
|
||||||
|
Snackbar.Add("هیچ پرداخت در انتظاری برای این هفته یافت نشد", Severity.Info);
|
||||||
|
else
|
||||||
|
Snackbar.Add(result.Message, Severity.Success);
|
||||||
|
|
||||||
|
await ApplyFilter();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Snackbar.Add($"خطا در واریز: {ex.Message}", Severity.Error);
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
_isCreditingWallets = false;
|
||||||
|
StateHasChanged();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private async Task RejectWithdrawal(UserCommissionPayoutModel payout)
|
private async Task RejectWithdrawal(UserCommissionPayoutModel payout)
|
||||||
{
|
{
|
||||||
var reason = await DialogService.ShowMessageBox(
|
var reason = await DialogService.ShowMessageBox(
|
||||||
|
|||||||
@@ -48,6 +48,11 @@
|
|||||||
<MudText Color="Color.Success">@context.Item.NetworkBalance.ToString("N0") تومان</MudText>
|
<MudText Color="Color.Success">@context.Item.NetworkBalance.ToString("N0") تومان</MudText>
|
||||||
</CellTemplate>
|
</CellTemplate>
|
||||||
</TemplateColumn>
|
</TemplateColumn>
|
||||||
|
<TemplateColumn Title="موجودی اعتباری">
|
||||||
|
<CellTemplate>
|
||||||
|
<MudText Color="Color.Tertiary">@context.Item.DiscountBalance.ToString("N0") تومان</MudText>
|
||||||
|
</CellTemplate>
|
||||||
|
</TemplateColumn>
|
||||||
<TemplateColumn Title="عملیات" Sortable="false">
|
<TemplateColumn Title="عملیات" Sortable="false">
|
||||||
<CellTemplate>
|
<CellTemplate>
|
||||||
<MudTooltip Text="تاریخچه تغییرات">
|
<MudTooltip Text="تاریخچه تغییرات">
|
||||||
|
|||||||
Reference in New Issue
Block a user