feat: ActivateClubDialog — dropdown پکیج + حذف مدت زمان + ForceActivation
Build and Deploy to Kubernetes / build-and-deploy (push) Has been cancelled
Build and Deploy to Kubernetes / build-and-deploy (push) Has been cancelled
- جایگزینی MudNumericField پکیج با MudSelect dropdown (لود از سرور) - حذف فیلد مدت زمان (DurationMonths) — عضویت باشگاه زمانی نیست - ارسال ForceActivation=true در request (bypass order validation) - اضافه کردن PackageContract client injection - Proto NuGet بروزرسانی به 0.0.184
This commit is contained in:
@@ -138,7 +138,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.183" />
|
<PackageReference Include="Foursat.CMSMicroservice.Protobuf" Version="0.0.184" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<!-- ============================================================ -->
|
<!-- ============================================================ -->
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
@using CMSMicroservice.Protobuf.Protos.ClubMembership
|
@using CMSMicroservice.Protobuf.Protos.ClubMembership
|
||||||
|
@using CMSMicroservice.Protobuf.Protos.Package
|
||||||
@using BackOffice.Pages.AutoComplete
|
@using BackOffice.Pages.AutoComplete
|
||||||
|
|
||||||
<MudDialog>
|
<MudDialog>
|
||||||
@@ -7,23 +8,32 @@
|
|||||||
<MudStack Spacing="3">
|
<MudStack Spacing="3">
|
||||||
<UserAutoComplete Label="انتخاب کاربر" @bind-SelectedUserId="_model.UserId" />
|
<UserAutoComplete Label="انتخاب کاربر" @bind-SelectedUserId="_model.UserId" />
|
||||||
|
|
||||||
<MudNumericField @bind-Value="_model.PackageId"
|
@if (_isLoadingPackages)
|
||||||
Label="شناسه پکیج"
|
{
|
||||||
Required="true"
|
<MudSkeleton SkeletonType="SkeletonType.Rectangle" Height="56px" />
|
||||||
RequiredError="شناسه پکیج الزامی است"
|
}
|
||||||
Variant="Variant.Outlined" />
|
else
|
||||||
|
{
|
||||||
<MudNumericField @bind-Value="_model.DurationMonths"
|
<MudSelect T="long" @bind-Value="_model.PackageId"
|
||||||
Label="مدت زمان (ماه)"
|
Label="انتخاب پکیج"
|
||||||
Required="true"
|
Required="true"
|
||||||
RequiredError="مدت زمان الزامی است"
|
RequiredError="انتخاب پکیج الزامی است"
|
||||||
Min="1"
|
Variant="Variant.Outlined"
|
||||||
Max="12"
|
AnchorOrigin="Origin.BottomCenter">
|
||||||
Variant="Variant.Outlined" />
|
@foreach (var pkg in _packages)
|
||||||
|
{
|
||||||
|
<MudSelectItem T="long" Value="pkg.Id">
|
||||||
|
@pkg.Title — @($"{pkg.Price:N0}") ریال
|
||||||
|
</MudSelectItem>
|
||||||
|
}
|
||||||
|
</MudSelect>
|
||||||
|
}
|
||||||
|
|
||||||
<MudAlert Severity="Severity.Info" Dense="true">
|
<MudAlert Severity="Severity.Info" Dense="true">
|
||||||
<MudText Typo="Typo.body2">
|
<MudText Typo="Typo.body2">
|
||||||
با تایید، عضویت باشگاه برای کاربر فعال میشود.
|
با تایید، عضویت باشگاه برای کاربر فعال میشود.
|
||||||
|
<br/>
|
||||||
|
<small>عضویت باشگاه بدون محدودیت زمانی است.</small>
|
||||||
</MudText>
|
</MudText>
|
||||||
</MudAlert>
|
</MudAlert>
|
||||||
</MudStack>
|
</MudStack>
|
||||||
@@ -34,7 +44,7 @@
|
|||||||
<MudButton Color="Color.Success"
|
<MudButton Color="Color.Success"
|
||||||
Variant="Variant.Filled"
|
Variant="Variant.Filled"
|
||||||
OnClick="Submit"
|
OnClick="Submit"
|
||||||
Disabled="@(!_formValid || _isSubmitting)">
|
Disabled="@(!_formValid || _isSubmitting || _isLoadingPackages)">
|
||||||
@if (_isSubmitting)
|
@if (_isSubmitting)
|
||||||
{
|
{
|
||||||
<MudProgressCircular Size="Size.Small" Indeterminate="true" />
|
<MudProgressCircular Size="Size.Small" Indeterminate="true" />
|
||||||
@@ -51,12 +61,49 @@
|
|||||||
@code {
|
@code {
|
||||||
[CascadingParameter] IMudDialogInstance MudDialog { get; set; }
|
[CascadingParameter] IMudDialogInstance MudDialog { get; set; }
|
||||||
[Inject] public ClubMembershipContract.ClubMembershipContractClient ClubContract { get; set; }
|
[Inject] public ClubMembershipContract.ClubMembershipContractClient ClubContract { get; set; }
|
||||||
|
[Inject] public PackageContract.PackageContractClient PackageClient { get; set; }
|
||||||
|
|
||||||
private MudForm _form;
|
private MudForm _form;
|
||||||
private bool _formValid;
|
private bool _formValid;
|
||||||
private bool _isSubmitting;
|
private bool _isSubmitting;
|
||||||
|
private bool _isLoadingPackages = true;
|
||||||
|
private List<GetAllPackageByFilterResponseModel> _packages = new();
|
||||||
private ActivateModel _model = new();
|
private ActivateModel _model = new();
|
||||||
|
|
||||||
|
protected override async Task OnInitializedAsync()
|
||||||
|
{
|
||||||
|
await LoadPackages();
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task LoadPackages()
|
||||||
|
{
|
||||||
|
_isLoadingPackages = true;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var request = new GetAllPackageByFilterRequest
|
||||||
|
{
|
||||||
|
PaginationState = new CMSMicroservice.Protobuf.Protos.PaginationState
|
||||||
|
{
|
||||||
|
PageNumber = 1,
|
||||||
|
PageSize = 50
|
||||||
|
}
|
||||||
|
};
|
||||||
|
var result = await PackageClient.GetAllPackageByFilterAsync(request);
|
||||||
|
if (result?.Models != null)
|
||||||
|
{
|
||||||
|
_packages = result.Models.ToList();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Snackbar.Add($"خطا در بارگذاری پکیجها: {ex.Message}", Severity.Error);
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
_isLoadingPackages = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void Cancel() => MudDialog.Cancel();
|
private void Cancel() => MudDialog.Cancel();
|
||||||
|
|
||||||
private async Task Submit()
|
private async Task Submit()
|
||||||
@@ -70,6 +117,12 @@
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (_model.PackageId <= 0)
|
||||||
|
{
|
||||||
|
Snackbar.Add("لطفاً پکیج را انتخاب کنید.", Severity.Warning);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
_isSubmitting = true;
|
_isSubmitting = true;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -77,12 +130,12 @@
|
|||||||
{
|
{
|
||||||
UserId = _model.UserId.Value,
|
UserId = _model.UserId.Value,
|
||||||
PackageId = _model.PackageId,
|
PackageId = _model.PackageId,
|
||||||
DurationMonths = _model.DurationMonths
|
ForceActivation = true
|
||||||
};
|
};
|
||||||
|
|
||||||
var response = await ClubContract.ActivateClubMembershipAsync(request);
|
var response = await ClubContract.ActivateClubMembershipAsync(request);
|
||||||
|
|
||||||
Snackbar.Add($"عضویت با موفقیت فعال شد.", Severity.Success);
|
Snackbar.Add("عضویت با موفقیت فعال شد.", Severity.Success);
|
||||||
MudDialog.Close(DialogResult.Ok(true));
|
MudDialog.Close(DialogResult.Ok(true));
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
@@ -99,6 +152,5 @@
|
|||||||
{
|
{
|
||||||
public long? UserId { get; set; }
|
public long? UserId { get; set; }
|
||||||
public long PackageId { get; set; }
|
public long PackageId { get; set; }
|
||||||
public int DurationMonths { get; set; } = 1;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user