diff --git a/Back/Controllers/VerificationController.cs b/Back/Controllers/VerificationController.cs index 55cb71f..9d438cc 100644 --- a/Back/Controllers/VerificationController.cs +++ b/Back/Controllers/VerificationController.cs @@ -98,6 +98,8 @@ namespace Back.Controllers { case "NewTicketNoAuthentication": Sucstatus = await _servValidatinMsg.SubmittedTicket(VerificationCode); + if (Sucstatus) _servSendMsg.SuccessfulSubmitTicket(VerificationCode.val, VerificationCode.prm); + break; case "CompanyRegistration": diff --git a/Back/Services/servSendMsg.cs b/Back/Services/servSendMsg.cs index 9b8bc6c..5dc7b99 100644 --- a/Back/Services/servSendMsg.cs +++ b/Back/Services/servSendMsg.cs @@ -28,6 +28,10 @@ // "اطلاعات کاربری:" + '\n' + // $"نام کاربری : {Username}" + // $"کلمه عبور : {Password}", to); + } + public void SuccessfulSubmitTicket(string To, string Code) + { + SendByPattern(new string[] { Code }, 258239, To); } //public void Authentication(string to,string code) => SendMsgByPatern(code, to, 0); // diff --git a/TaxPayerFull/CUSComponent/CodItem.razor b/TaxPayerFull/CUSComponent/CodItem.razor index 7edbc35..2ccfa6f 100644 --- a/TaxPayerFull/CUSComponent/CodItem.razor +++ b/TaxPayerFull/CUSComponent/CodItem.razor @@ -94,16 +94,16 @@ } else { - - @if (_UsedInTheInvoice) { - } @@ -139,6 +139,7 @@ else Hidealert = true; alertMessage = ""; await UsedInTheInvoice(); + SpinnerVisible = false; await base.OnParametersSetAsync(); } } diff --git a/TaxPayerFull/CUSComponent/CustomerItem.razor b/TaxPayerFull/CUSComponent/CustomerItem.razor index 73b1496..993b949 100644 --- a/TaxPayerFull/CUSComponent/CustomerItem.razor +++ b/TaxPayerFull/CUSComponent/CustomerItem.razor @@ -30,11 +30,11 @@ @if (Cus.ID == 0 || !_UsedInTheInvoice) { - + } else { - + }
@@ -52,81 +52,85 @@
- +
- +
- +
- +
- +
- - + +
- +
- +
- +
- - +
+
@if (Cus.ID == 0) { - } else { - - @if (_UsedInTheInvoice) { - } } - - +
+
+ +
+
@code { + public bool SpinnerVisible { get; set; } = false; // alert AlertColor alertColor = AlertColor.Primary; IconName alertIconName = IconName.CheckCircleFill; @@ -150,6 +154,7 @@ else Hidealert = true; alertMessage = ""; await UsedInTheInvoice(); + SpinnerVisible = false; await base.OnParametersSetAsync(); } } @@ -174,7 +179,7 @@ else } public async Task OnClickDelete() { - + SpinnerVisible = !SpinnerVisible; var rsp = await hc.Delete($"Customer/Delete/{Cus.ID}"); if (rsp.IsSuccessStatusCode) { @@ -193,13 +198,14 @@ else ShowDangerAlert("مشتری با این شناسه یافت نشد"); } else ShowDangerAlert("خطایی در اجرای عملیات رخ داده"); - + SpinnerVisible = !SpinnerVisible; } public async Task OnClickUpdate() { + SpinnerVisible = !SpinnerVisible; if (ItemSearchCustomertype > 0 && !string.IsNullOrEmpty(Cus.FullName)) { if (ItemSearchCustomertype > 0) @@ -224,9 +230,11 @@ else } } else ShowDangerAlert("فیلدهای قرمز باید مقدار دهی شوند"); + SpinnerVisible = !SpinnerVisible; } public async Task OnClickAdd() { + SpinnerVisible = !SpinnerVisible; if (ItemSearchCustomertype > 0 && !string.IsNullOrEmpty(Cus.FullName)) { if (ItemSearchCustomertype > 0) @@ -255,9 +263,11 @@ else } } else ShowDangerAlert("فیلدهای قرمز باید مقدار دهی شوند"); + SpinnerVisible = !SpinnerVisible; } public async Task UsedInTheInvoice() { + SpinnerVisible = !SpinnerVisible; if (Cus.ID!=0) { var rsp = await hc.Get($"Customer/UsedInTheInvoice/{Cus.ID}"); @@ -266,6 +276,7 @@ else else _UsedInTheInvoice = false; } + SpinnerVisible = !SpinnerVisible; } private async Task ShowConfirmationDeleteAsync() diff --git a/TaxPayerFull/Layout/Contact.razor b/TaxPayerFull/Layout/Contact.razor index c07751e..7d976da 100644 --- a/TaxPayerFull/Layout/Contact.razor +++ b/TaxPayerFull/Layout/Contact.razor @@ -42,33 +42,36 @@
- + نام شما
- + موبایل
- + عنوان
- + پیام شما ...
-
+
- +
+
+ +
@@ -83,7 +86,7 @@ @code { - + public bool SpinnerVisible { get; set; } = false; string type = "NewTicketNoAuthentication"; private EditContext? editContext; [SupplyParameterFromForm] @@ -97,7 +100,7 @@ // editContext = new(modelTaxTools); // editContext.OnValidationRequested += HandleValidationRequested; // messageStore = new(editContext); - + SpinnerVisible = false; editContext = new EditContext(model); messageStore = new(editContext); } @@ -105,7 +108,7 @@ @functions{ private async Task OnClearmessageStore() => messageStore?.Clear(); private async Task newTicket(){ - + SpinnerVisible = true; var request = await _hc.PostAsJsonAsync("Ticket/NewTicketNoAuthentication", model); if (request.IsSuccessStatusCode) { @@ -119,6 +122,7 @@ messageStore?.Add(() => model.Mobile, error); } + SpinnerVisible = false; } diff --git a/TaxPayerFull/Pages/Register.razor b/TaxPayerFull/Pages/Register.razor index aeaa0eb..b9a5b86 100644 --- a/TaxPayerFull/Pages/Register.razor +++ b/TaxPayerFull/Pages/Register.razor @@ -54,25 +54,28 @@
- + نام کامل
- + موبایل
+
+ +
@@ -82,6 +85,8 @@ @code { + public string hidden { get; set; } + public bool SpinnerVisible { get; set; } = false; string type = "CompanyRegistration"; private EditContext? editContext; [SupplyParameterFromForm] @@ -104,6 +109,8 @@ private async Task OnClearmessageStore() => messageStore?.Clear(); private async Task OnRegisterClick() { + SpinnerVisible = !SpinnerVisible; + hidden = "hidden"; var request = await _hc.PostAsJsonAsync("Base/CompanyRegistration", model); if (request.IsSuccessStatusCode) { @@ -117,5 +124,7 @@ messageStore?.Add(() => model.Mobile, error); } + hidden = null; + SpinnerVisible = !SpinnerVisible; } } \ No newline at end of file diff --git a/TaxPayerFull/Pages/Sign-in.razor b/TaxPayerFull/Pages/Sign-in.razor index 5c1ce66..72dd784 100644 --- a/TaxPayerFull/Pages/Sign-in.razor +++ b/TaxPayerFull/Pages/Sign-in.razor @@ -57,14 +57,14 @@
- + نام کاربری(موبایل)
- + گذرواژه @@ -105,7 +105,7 @@
- +
@@ -114,7 +114,7 @@
@@ -137,7 +137,7 @@
@@ -148,6 +148,7 @@ @code { + public string hidden { get; set; } public bool SpinnerVisible { get; set; } = false; [Parameter] public string from { get; set; } = ""; @@ -176,8 +177,9 @@ else if (from == "changePass") { ShowSuccessAlert("کلمه عبور با موفقیت تغییر کرد"); - + } + SpinnerVisible = false; await base.OnParametersSetAsync(); } protected override async Task OnInitializedAsync() @@ -210,6 +212,8 @@ private async Task EndForm() => nav.NavigateTo("/"); private async Task ForgetPass() { + hidden = "hidden"; + SpinnerVisible = !SpinnerVisible; if (string.IsNullOrEmpty(Model.Username)) { ShowDangerAlert("لطفا نام کابری(موبایل) خود را وارد نمایید"); @@ -237,10 +241,13 @@ } } + hidden = null; + SpinnerVisible = !SpinnerVisible; } private async Task OnLoginClick() { + hidden = "hidden"; SpinnerVisible = true; _hc.DefaultRequestHeaders.Clear(); var request = await _hc.PostAsJsonAsync("User/authenticate", Model); @@ -253,8 +260,8 @@ _hc.DefaultRequestHeaders.Add("Authorization", $"Bearer {userinfomodel?.Token}"); - if (Model.Remember) - Storage.SetItem("token", userinfomodel?.Token); + if (Model.Remember) + Storage.SetItem("token", userinfomodel?.Token); userinfo.Token = userinfomodel?.Token; userinfo.Company = userinfomodel?.Company; @@ -271,6 +278,7 @@ else ShowDangerAlert("خطای سیستمی"); SpinnerVisible = false ; + hidden = null; } } \ No newline at end of file diff --git a/TaxPayerFull/Pages/UserPanel/COD.razor b/TaxPayerFull/Pages/UserPanel/COD.razor index d15ec1f..f672e45 100644 --- a/TaxPayerFull/Pages/UserPanel/COD.razor +++ b/TaxPayerFull/Pages/UserPanel/COD.razor @@ -27,7 +27,7 @@
- @if (Unitrequest!=null) { diff --git a/TaxPayerFull/Pages/UserPanel/Customer.razor b/TaxPayerFull/Pages/UserPanel/Customer.razor index aaa81d9..4368c8e 100644 --- a/TaxPayerFull/Pages/UserPanel/Customer.razor +++ b/TaxPayerFull/Pages/UserPanel/Customer.razor @@ -5,7 +5,7 @@ @using Shared.DTOs.Serch @inject HttpClientController hc; مشتری - + @* search *@ @@ -21,10 +21,10 @@
  • - +
    - @@ -33,13 +33,13 @@
    - +
    - +
    - +
    diff --git a/TaxPayerFull/Pages/Verification.razor b/TaxPayerFull/Pages/Verification.razor index 6b5007f..30205ee 100644 --- a/TaxPayerFull/Pages/Verification.razor +++ b/TaxPayerFull/Pages/Verification.razor @@ -4,6 +4,7 @@ @inject NavigationManager nav @inject UserAuthenticationDTO userinfo احراز هویت +
    @@ -48,14 +49,17 @@
    -
    +
    - + کد تائید
    +
    + +
    @@ -70,8 +74,7 @@
    @@ -82,14 +85,19 @@ @code { + List messages = new List(); + public string hidden { get; set; } + public bool SpinnerVisible { get; set; } = false; + public string valueCode { get; set; } bool successfull = false; // alert AlertColor alertColor = AlertColor.Primary; IconName alertIconName = IconName.CheckCircleFill; bool Hidealert = true; string alertMessage = ""; + private void ShowMessage(ToastType toastType, string Message) => messages.Add(CreateToastMessage(toastType, Message)); + - [Parameter] public int ID { get; set; } @@ -108,7 +116,8 @@ { nav.NavigateTo($"/"); } - + hidden = null; + SpinnerVisible = false; await base.OnParametersSetAsync(); } } @@ -116,6 +125,8 @@ private async Task ReSend() { + hidden = "hidden"; + SpinnerVisible = !SpinnerVisible; var request = await _hc.GetAsync($"Verification/ReSend/{VerificationCodeModel?.ID}"); if (request.IsSuccessStatusCode) @@ -128,10 +139,17 @@ ShowDangerAlert(listerror[0]); } - + SpinnerVisible = !SpinnerVisible; + hidden = null; } private async Task SubmitVerificationCode() { + hidden = "hidden"; + SpinnerVisible = !SpinnerVisible; + if (!int.TryParse(valueCode, out int code)) + return; + + VerificationCodeModel.Code = code; if (VerificationCodeModel.Code < 1000 || VerificationCodeModel.Code > 9000) { ShowDangerAlert("کد احراز صحیح نمی باشد"); @@ -154,7 +172,7 @@ nav.NavigateTo("/Profile/Verification"); } - + else nav.NavigateTo("/"); @@ -171,7 +189,8 @@ ShowDangerAlert(listerror[0]); } } - + SpinnerVisible = !SpinnerVisible; + hidden = null; } private void ShowSuccessAlert(string msg) { @@ -195,4 +214,10 @@ nav.NavigateTo("/Profile"); nav.NavigateTo("/"); } + private ToastMessage CreateToastMessage(ToastType toastType, string Message) + => new ToastMessage + { + Type = toastType, + Message = Message, + }; }