diff --git a/TaxPayerFull/CUSComponent/InvoiceItem.razor b/TaxPayerFull/CUSComponent/InvoiceItem.razor index 4413770..b3b8ffb 100644 --- a/TaxPayerFull/CUSComponent/InvoiceItem.razor +++ b/TaxPayerFull/CUSComponent/InvoiceItem.razor @@ -98,25 +98,31 @@ - +
+
@if (itemDTO.ID == null) { - } else { - - } - +
+
+ +
+
@code { + public bool SpinnerVisible { get; set; } = false; List messages = new List(); private ConfirmDialog dialog = default!; // alert @@ -132,11 +138,14 @@ else public ActionInResultComponent result { get; set; } protected override async Task OnInitializedAsync() { + SpinnerVisible = true; cods = await fv.GetCODs(); + SpinnerVisible = false; await base.OnInitializedAsync(); } protected override async Task OnParametersSetAsync() { + SpinnerVisible = false; result = new ActionInResultComponent() { @@ -203,7 +212,7 @@ else //----------------------- public async Task OnClickDelete() { - + SpinnerVisible = true; var rsp = await hc.Delete($"InvoiceItem/DeleteItem/{itemDTO.ID}"); if (rsp.IsSuccessStatusCode) { @@ -222,34 +231,37 @@ else var request = await rsp.Content.ReadFromJsonAsync>(); ShowDangerAlert(request[0]); } - + SpinnerVisible = false; } public async Task OnClickUpdate() { + SpinnerVisible = true; if (itemDTO.CODID == null || itemDTO.CODID <= 0) { ShowDangerAlert("کالا انتخاب نشده"); + SpinnerVisible = false; return; } if (itemDTO.am == null || itemDTO.am <= 0) { ShowDangerAlert("تعداد وارد نشده"); + SpinnerVisible = false; return; } if (itemDTO.fee == null || itemDTO.fee < 0) { - ShowDangerAlert("مبلغ واحد وارد نشده"); + ShowDangerAlert("مبلغ واحد وارد نشده"); SpinnerVisible = false; return; } if (itemDTO.dis == null || itemDTO.dis < 0) { - ShowDangerAlert("مبلغ تخفیف درست نیست"); + ShowDangerAlert("مبلغ تخفیف درست نیست"); SpinnerVisible = false; return; } var rsp = await hc.Put>($"InvoiceItem/UpdateItem" @@ -274,30 +286,32 @@ else var request = await rsp.Content.ReadFromJsonAsync>(); ShowDangerAlert(request[0]); } + SpinnerVisible = false; } public async Task OnClickAdd() { + SpinnerVisible = true; if (itemDTO.CODID == null || itemDTO.CODID <= 0) { - ShowDangerAlert("کالا انتخاب نشده"); + ShowDangerAlert("کالا انتخاب نشده"); SpinnerVisible = false; return; } if (itemDTO.am == null || itemDTO.am <= 0) { - ShowDangerAlert("تعداد وارد نشده"); + ShowDangerAlert("تعداد وارد نشده"); SpinnerVisible = false; return; } if (itemDTO.fee == null || itemDTO.fee < 0) { - ShowDangerAlert("مبلغ واحد وارد نشده"); + ShowDangerAlert("مبلغ واحد وارد نشده"); SpinnerVisible = false; return; } if (itemDTO.dis == null || itemDTO.dis < 0) { - ShowDangerAlert("مبلغ تخفیف درست نیست"); + ShowDangerAlert("مبلغ تخفیف درست نیست"); SpinnerVisible = false; return; } @@ -323,7 +337,7 @@ else var request = await rsp.Content.ReadFromJsonAsync>(); ShowDangerAlert(request[0]); } - + SpinnerVisible = false; } private async Task ShowConfirmationDeleteAsync() { diff --git a/TaxPayerFull/CUSComponent/InvoicePays.razor b/TaxPayerFull/CUSComponent/InvoicePays.razor index 3710fdf..288a66d 100644 --- a/TaxPayerFull/CUSComponent/InvoicePays.razor +++ b/TaxPayerFull/CUSComponent/InvoicePays.razor @@ -141,12 +141,13 @@ - +
+
@if (add) {
-
@@ -155,24 +156,28 @@ else {
- - - - -
} - +
+ +
+
@code { + public bool SpinnerVisible { get; set; } = false; private ConfirmDialog dialog = default!; bool add = true; [Parameter] public InvoiceDTO invoice { get; set; } @@ -188,8 +193,9 @@ protected override async Task OnParametersSetAsync() { item = new InvoicePaymentDTO(); - + SpinnerVisible = true; pmts = await fv.GetPaymentMethods(); + SpinnerVisible = false; await base.OnParametersSetAsync(); } } @@ -208,6 +214,7 @@ } async Task AddPay() { + SpinnerVisible = true; Hidealert = true; if (await Validation()) { @@ -239,12 +246,13 @@ } } - + SpinnerVisible = false; } async Task UpdatePay() { Hidealert = true; + SpinnerVisible = true; if (await Validation()) { var rsp = await hc.Put>("InvoicePayment/UpdatePay", new InvoiceItemAction() @@ -275,6 +283,7 @@ ShowDangerAlert(request[0]); } } + SpinnerVisible = false; } async Task DeletePay() { @@ -285,6 +294,7 @@ if (confirmation) { + SpinnerVisible = true; Hidealert = true; if (item.ID.HasValue) { @@ -311,6 +321,7 @@ ShowDangerAlert(request[0]); } } + SpinnerVisible = false; } } diff --git a/TaxPayerFull/CUSComponent/OrderItemNew.razor b/TaxPayerFull/CUSComponent/OrderItemNew.razor index 30e0a23..8a4097d 100644 --- a/TaxPayerFull/CUSComponent/OrderItemNew.razor +++ b/TaxPayerFull/CUSComponent/OrderItemNew.razor @@ -126,15 +126,18 @@
-
+
قیمت نهایی : @TotalPrice.ToString("N0") ريال
- + +
+
+
@code { - + public bool SpinnerVisible { get; set; } = false; #region Alert // alert AlertColor alertColor = AlertColor.Primary; @@ -224,7 +227,7 @@ } public async Task NewOrder() { - + SpinnerVisible = true; if (Selected != null) { if (Selected.ID < 0 && (values[0] < 0 || values[1] < 0 || values[2] < 0 || values[3] < 0)) return; @@ -264,7 +267,7 @@ } } - + SpinnerVisible = false; } } diff --git a/TaxPayerFull/CUSComponent/OrderItemRead.razor b/TaxPayerFull/CUSComponent/OrderItemRead.razor index 2330644..df6f11e 100644 --- a/TaxPayerFull/CUSComponent/OrderItemRead.razor +++ b/TaxPayerFull/CUSComponent/OrderItemRead.razor @@ -97,19 +97,21 @@
@if (order.Status == StatusOrder.Create) { - - }
- +
+ +
@code { - + public bool SpinnerVisible { get; set; } = false; #region Alert // alert AlertColor alertColor = AlertColor.Primary; @@ -162,12 +164,17 @@ } private async Task> LoadOrderItem() { - + SpinnerVisible = true; var rsp = await hc.Get($"Orders/GetOrderDetails/{order.ID}"); if (rsp.IsSuccessStatusCode) + { + SpinnerVisible = false; return await rsp.Content.ReadFromJsonAsync?>(); + } else { + + SpinnerVisible = false; ShowDangerAlert("خطایی در بارگیری"); return new List(); } @@ -175,6 +182,7 @@ } private async Task OnClickPay() { + SpinnerVisible = true; var rsp = await hc.Get($"Orders/SubmitOrderBywallet/{order.ID}"); if (rsp.IsSuccessStatusCode) @@ -183,6 +191,7 @@ result = new ActionInResultComponent(); result.Status = ComponentStatus.success; result.Action = ComponentAction.add; + await OnMultipleOfThree.InvokeAsync(result); } else @@ -190,8 +199,8 @@ var request = await rsp.Content.ReadFromJsonAsync>(); ShowDangerAlert(request[0]); } - + SpinnerVisible = false; } private async Task OnClickCancel() @@ -203,32 +212,35 @@ if (confirmation) { - + SpinnerVisible = true; PreloadService.Show(SpinnerColor.Dark); var rsp = await hc.Delete($"Orders/CancelOrder/{order.ID}"); PreloadService.Hide(); if (rsp.IsSuccessStatusCode) { - if(await rsp.Content.ReadFromJsonAsync()) + if (await rsp.Content.ReadFromJsonAsync()) { order.Status = StatusOrder.Cancel; result = new ActionInResultComponent(); result.Status = ComponentStatus.success; - result.Action = ComponentAction.delete; - await OnMultipleOfThree.InvokeAsync(result); + result.Action = ComponentAction.delete; + await OnMultipleOfThree.InvokeAsync(result); + } + else + ShowDangerAlert("خطای سیستمی"); + + } + else if (rsp.StatusCode == System.Net.HttpStatusCode.NotFound) + ShowDangerAlert("سفارش یافت نشد"); + else - ShowDangerAlert("خطای سیستمی"); + { + var request = await rsp.Content.ReadFromJsonAsync>(); + ShowDangerAlert(request[0]); + } + SpinnerVisible = false; } - else if (rsp.StatusCode==System.Net.HttpStatusCode.NotFound) - ShowDangerAlert("سفارش یافت نشد"); - - else - { - var request = await rsp.Content.ReadFromJsonAsync>(); - ShowDangerAlert(request[0]); - } - } - + } } \ No newline at end of file diff --git a/TaxPayerFull/Layout/TaxTools.razor b/TaxPayerFull/Layout/TaxTools.razor index 53d8869..efe1a9b 100644 --- a/TaxPayerFull/Layout/TaxTools.razor +++ b/TaxPayerFull/Layout/TaxTools.razor @@ -34,32 +34,32 @@
- + نام شرکت به حالت فینگلیش
- + شناسه ملی شرکت
- + نام شرکت به فارسی
- + موبایل
- +
@@ -70,7 +70,9 @@
*@
-

+
+ +
@@ -84,7 +86,11 @@
@@ -99,9 +105,10 @@
@code { - + public string hidden { get; set; } + public bool SpinnerVisible { get; set; } = false; private long maxFileSize = 1024 * 15; - public string ErrorReadpublickey { get; set; } + public string ErrorReadpublickey { get; set; } private EditContext? editContext; [SupplyParameterFromForm] @@ -111,6 +118,8 @@ protected override void OnInitialized() { + SpinnerVisible = false; + hidden = null; // modelTaxTools ??= new(); // editContext = new(modelTaxTools); // editContext.OnValidationRequested += HandleValidationRequested; @@ -135,7 +144,8 @@ @functions { private async Task CreateCsrAndPrivateKey() { - + hidden = "hidden"; + SpinnerVisible = true; var request = await _hc.PostAsJsonAsync("Base/CreateCsrAndPrivateKey", modelTaxTools); if (request.IsSuccessStatusCode) { @@ -150,9 +160,13 @@ messageStore?.Add(() => modelTaxTools.Mobile, error); } + SpinnerVisible = false; + hidden = null; } private async Task ReadPublicKeyFromCER(InputFileChangeEventArgs e) { + hidden = "hidden"; + SpinnerVisible = true; ErrorReadpublickey = ""; if (e.GetMultipleFiles()[0].Size <= maxFileSize) { @@ -184,25 +198,31 @@ { ErrorReadpublickey = "حجم فایل بیشتر از حد مجاز می باشد"; } - - + hidden = null; + SpinnerVisible = false; } private Stream GetFileStream(byte[] bytes) { + hidden = "hidden"; + SpinnerVisible = true; var fileStream = new MemoryStream(bytes); - + SpinnerVisible=false; + hidden = null; return fileStream; } private async Task DownloadFileFromStream(string Base64, string FileName) { + hidden = "hidden"; + SpinnerVisible = true; byte[] bytes = System.Convert.FromBase64String(Base64); var fileStream = GetFileStream(bytes); // var fileName = "log.bin"; using var streamRef = new DotNetStreamReference(stream: fileStream); - + SpinnerVisible = false ; + hidden = null; await JS.InvokeVoidAsync("downloadFileFromStream", FileName, streamRef); } } diff --git a/TaxPayerFull/Pages/Speech.razor b/TaxPayerFull/Pages/Speech.razor index cab26b0..3f654f4 100644 --- a/TaxPayerFull/Pages/Speech.razor +++ b/TaxPayerFull/Pages/Speech.razor @@ -4,12 +4,12 @@
-

درباره سامانه مودیران

+

درباره سامانه مُؤدیٰران

-
+

سامانه مودیران برای راحتی کاربری با سامانه مودیان طراحی شده است و هدف اصلی ما هم افزایش دانش مالیاتی می باشد، برای همین دوستانی نزدیک حمع شدیم که بتوانیم قدمی مثبت در این راه برداریم تا بتوانیم انکی در ایرانی آباد سهیم باشیم diff --git a/TaxPayerFull/Pages/UserPanel/InvoiceItem.razor b/TaxPayerFull/Pages/UserPanel/InvoiceItem.razor index 24b9323..a99d4f3 100644 --- a/TaxPayerFull/Pages/UserPanel/InvoiceItem.razor +++ b/TaxPayerFull/Pages/UserPanel/InvoiceItem.razor @@ -55,26 +55,26 @@ @switch (invoice.invoiceType) { case (InvoiceType.Bidding): - + break; case (InvoiceType.Sale): - - - + + + @* *@ break; case (InvoiceType.BackFrmSale): - + @* *@ break; case (InvoiceType.Repair): - + @* *@ - + break; @* case (InvoiceType.Cancellation): @@ -267,8 +267,8 @@

@if (!invoice.IsDeleted) { - - @@ -312,7 +312,8 @@
-
+
+
@@ -330,7 +331,7 @@
-
+

@if (!invoice.IsDeleted) { @@ -338,7 +339,7 @@ {
- @@ -349,25 +350,25 @@
- - - - @@ -375,7 +376,7 @@ @if (!invoice.IsDeleted && invoice.invoiceType != InvoiceType.Bidding && SendInvoice) { - @@ -391,6 +392,9 @@
+
+ +

@@ -422,6 +426,8 @@ @code { + public bool SpinnerVisible { get; set; } = false; + public bool SendInvoice { get; set; } = false; List messages = new List(); private ConfirmDialog dialog = default!; @@ -439,6 +445,7 @@ public string ExUrl { get; set; } = ""; protected override async Task OnInitializedAsync() { + SpinnerVisible = false; fv.invoice = null; invoice = new InvoiceDTO(); await base.OnInitializedAsync(); @@ -446,7 +453,7 @@ protected override async Task OnParametersSetAsync() { - + SpinnerVisible = true; Cus = await fv.GetCustomers(); Patterns = await fv.GetPatterns(); if (InvoiceID != null && InvoiceID > 0) @@ -469,7 +476,7 @@ Hidealert = true; alertMessage = ""; - + SpinnerVisible = false; await base.OnParametersSetAsync(); } } @@ -489,6 +496,7 @@ { if (InvoiceID.HasValue) { + modal.Size = ModalSize.Large; var parameters = new Dictionary(); @@ -515,6 +523,7 @@ } private async Task CopyInvoice() { + SpinnerVisible = true; var rsp = await hc.Post($"Invoice/CopyInvoice/{InvoiceID}"); if (rsp.IsSuccessStatusCode) @@ -538,11 +547,12 @@ var request = await rsp.Content.ReadFromJsonAsync>(); ShowDangerAlert(request[0]); } + SpinnerVisible = false; } private async Task ChangeStatus(int type) { - + SpinnerVisible = true; var rsp = await hc.Post($"Invoice/ChangeInvoiceType/{InvoiceID}?invoiceType={type}"); if (rsp.IsSuccessStatusCode) { @@ -565,7 +575,7 @@ var request = await rsp.Content.ReadFromJsonAsync>(); ShowDangerAlert(request[0]); } - + SpinnerVisible = false; } private async Task showTaxPayer() @@ -586,6 +596,7 @@ private async Task LoadData() { + SpinnerVisible = true; PreloadService.Show(SpinnerColor.Dark); var rsp = await hc.Get($"Invoice/Get/{InvoiceID}/{true}"); if (rsp.IsSuccessStatusCode) @@ -604,6 +615,7 @@ ShowDangerAlert("خطایی در بارگذاری"); } PreloadService.Hide(); + SpinnerVisible = false; } public async Task CallBack(ActionInResultComponent result) { @@ -655,6 +667,7 @@ } public async Task OnClickDelete() { + SpinnerVisible = true; if (InvoiceID.HasValue) { var rsp = await hc.Delete($"Invoice/Delete/{InvoiceID.Value}"); @@ -680,11 +693,12 @@ ShowDangerAlert(request[0]); } } - + SpinnerVisible = false; } public async Task OnClickUpdate() { + SpinnerVisible = true; if (InvoiceID.HasValue) { if (await Validate()) @@ -740,9 +754,12 @@ // } // } // else ShowDangerAlert("فیلدهای قرمز باید مقدار دهی شوند"); + + SpinnerVisible = false; } public async Task OnClickAdd() { + SpinnerVisible = true; if (await Validate()) { var rsp = await hc.Post("Invoice/Add", new NUInvoiceDTO @@ -772,7 +789,7 @@ ShowDangerAlert(request[0]); } } - + SpinnerVisible = false; } public async Task Validate() { diff --git a/TaxPayerFull/Pages/UserPanel/Orders.razor b/TaxPayerFull/Pages/UserPanel/Orders.razor index c388ac9..873ec27 100644 --- a/TaxPayerFull/Pages/UserPanel/Orders.razor +++ b/TaxPayerFull/Pages/UserPanel/Orders.razor @@ -41,7 +41,12 @@
- + +
+ + +
+
@@ -60,7 +65,7 @@
- +
@@ -113,6 +118,7 @@ @layout PanelLayout @code { + public bool SpinnerVisible { get; set; } = false; //private Modal stuffmodal = default!; [Inject] protected PreloadService PreloadService { get; set; } = default!; ItemSerachOrder itemsearch = new ItemSerachOrder(); @@ -130,10 +136,12 @@ protected override async Task OnInitializedAsync() { + SpinnerVisible = false; await base.OnInitializedAsync(); } protected override async Task OnParametersSetAsync() { + SpinnerVisible = false; if (PageIndex == null) PageIndex = 1; await GetOrders(PageIndex.Value); await base.OnParametersSetAsync(); @@ -142,6 +150,7 @@ @functions { public async Task GetOrders(int pi=1) { + SpinnerVisible = true; if (ItemSearchOrdertype == 0 || ItemSearchOrdertype == null) itemsearch.Status = null; else @@ -156,7 +165,7 @@ else ShowDangerAlert("خطایی در بارگیری سفارشات رخ داده"); PreloadService.Hide(); - + SpinnerVisible = false; } private void ShowSuccessAlert(string msg) { diff --git a/TaxPayerFull/Pages/UserPanel/Profile.razor b/TaxPayerFull/Pages/UserPanel/Profile.razor index 7ae5e63..76cda60 100644 --- a/TaxPayerFull/Pages/UserPanel/Profile.razor +++ b/TaxPayerFull/Pages/UserPanel/Profile.razor @@ -12,12 +12,16 @@ متفرقه / پروفایل
+
+
- +
+ +
@@ -36,7 +40,7 @@

JPG، GIF یا PNG مجاز است. حداکثر اندازه @maxFileSize هزار

@@ -70,7 +74,7 @@
- +
@@ -88,7 +92,7 @@
- +
@@ -108,7 +112,7 @@
- + @@ -120,6 +124,7 @@ @code { + public bool SpinnerVisible { get; set; } = false; [Parameter] public string from { get; set; } = ""; @@ -168,6 +173,7 @@ alertMessage = msg; } private async Task changepassSubmit(){ + SpinnerVisible = true; var request = await _hc.Post("User/ChangePassword", changepassModel); if (request.IsSuccessStatusCode) { @@ -184,9 +190,11 @@ var errors = await request.Content.ReadFromJsonAsync>(); ShowDangerAlert(errors[0]); } + SpinnerVisible = false; } private async Task changeUserNameSubmit() { + SpinnerVisible = true; if (newUsername != userinfo.UserName) { var request = await _hc.Get($"User/ChangeUserName/{newUsername}"); @@ -203,10 +211,11 @@ ShowDangerAlert(errors[0]); } } - + SpinnerVisible = false; } private async Task changeNameSubmit() { + SpinnerVisible = true; if (newname != userinfo.Company.Name) { var request = await _hc.Get($"Company/ChangeName/{newname}"); @@ -231,9 +240,10 @@ ShowDangerAlert(errors[0]); } } - + SpinnerVisible = false; } private async Task changePic(InputFileChangeEventArgs e){ + SpinnerVisible = true; if (e.GetMultipleFiles()[0].Size <= maxFileSize) { string Base64Str = ""; @@ -266,6 +276,7 @@ { ShowDangerAlert ( "حجم فایل بیشتر از حد مجاز می باشد"); } + SpinnerVisible = false; } } \ No newline at end of file diff --git a/TaxPayerFull/Pages/UserPanel/Setting.razor b/TaxPayerFull/Pages/UserPanel/Setting.razor index fc83da4..5866f37 100644 --- a/TaxPayerFull/Pages/UserPanel/Setting.razor +++ b/TaxPayerFull/Pages/UserPanel/Setting.razor @@ -12,12 +12,16 @@ متفرقه / تنظیمات
+
- +
+
+ +
@@ -45,7 +49,7 @@
- +
@@ -61,7 +65,7 @@ @code { - + public bool SpinnerVisible { get; set; } = false; [SupplyParameterFromForm] public TaxPayerInfoDto? InfoModel { get; set; } @@ -102,11 +106,11 @@ alertIconName = IconName.CheckCircleFill; alertMessage = msg; } - - + + private async Task Submit() { - + SpinnerVisible = true; var request = await _hc.Put($"Company/ChangeTaxPayerInfo", InfoModel); if (request.IsSuccessStatusCode) { @@ -128,7 +132,7 @@ ShowDangerAlert(errors[0]); } - + SpinnerVisible = false; } diff --git a/TaxPayerFull/Pages/UserPanel/TaxPayer.razor b/TaxPayerFull/Pages/UserPanel/TaxPayer.razor index 4f5f15b..f253954 100644 --- a/TaxPayerFull/Pages/UserPanel/TaxPayer.razor +++ b/TaxPayerFull/Pages/UserPanel/TaxPayer.razor @@ -54,7 +54,7 @@
- +
@@ -66,11 +66,15 @@ @* alert *@
+
- +
+
+ +
@* data *@ @if (request != null) @@ -102,6 +106,7 @@ } @code { + public bool SpinnerVisible { get; set; } = false; private Modal modal = default!; [Inject] protected PreloadService PreloadService { get; set; } = default!; ItemSerchGetSentTax itemsearch = new ItemSerchGetSentTax(); @@ -116,8 +121,14 @@ public int? PageIndex { get; set; } public Shared.DTOs.PagingDto? request { get; set; } + protected override Task OnInitializedAsync() + { + SpinnerVisible = false; + return base.OnInitializedAsync(); + } protected override async Task OnParametersSetAsync() { + SpinnerVisible = false; if (routed.HasValue && routed > 0) { ShowSuccessAlert($"صورتحساب شماره {routed} با موفقیت ارسال شد " +'\n'+ @@ -133,6 +144,7 @@ @functions{ public async Task SentTaxItem(int ID) { + SpinnerVisible = true; var rsp = await hc.Get($"TaxPayer/GetResult/{ID}"); if (rsp.IsSuccessStatusCode) { @@ -150,9 +162,11 @@ var request = await rsp.Content.ReadFromJsonAsync>(); ShowDangerAlert(request[0]); } + SpinnerVisible = false; } public async Task Load(int pi) { + SpinnerVisible = true; itemsearch.PageSize = 10; itemsearch.PageIndex = pi; PreloadService.Show(SpinnerColor.Dark); @@ -170,6 +184,7 @@ ShowDangerAlert("خطایی در اجرای عملیات رخ داده"); } PreloadService.Hide(); + SpinnerVisible = false; } private void ShowSuccessAlert(string msg) { diff --git a/TaxPayerFull/Pages/UserPanel/TaxPayerInvoiceItem.razor b/TaxPayerFull/Pages/UserPanel/TaxPayerInvoiceItem.razor index a548e04..fe2d10f 100644 --- a/TaxPayerFull/Pages/UserPanel/TaxPayerInvoiceItem.razor +++ b/TaxPayerFull/Pages/UserPanel/TaxPayerInvoiceItem.razor @@ -22,11 +22,15 @@ else @* alert *@
+
- +
+
+ +
@if (FullInvoice) { @@ -305,11 +309,11 @@ else
@if (FullInvoice) { - + } else { - + }
@@ -322,6 +326,7 @@ else @code { + public bool SpinnerVisible { get; set; } = false; string patt = ""; private List>? Patterns = new List>(); private List>? BillTypes = new List>(); @@ -341,10 +346,12 @@ else protected override async Task OnParametersSetAsync() { + SpinnerVisible = true; PreloadService.Show(SpinnerColor.Dark); Patterns = await fv.GetPatternsbyinp(); BillTypes = await fv.GetBillTypes(); units = await fv.GetUnitsbyUnitTaxID(); + SpinnerVisible = false; await LoadData(); PreloadService.Hide(); @@ -366,6 +373,7 @@ else }; public async Task Send() { + SpinnerVisible = true; if (!FullInvoice && !await CheckAuth()) { ShowMessage(ToastType.Danger, "خطا در احراز هویت سازمان مالیاتی"); @@ -421,19 +429,22 @@ else ShowMessage(ToastType.Danger, request[0]); } } - + SpinnerVisible = false; } public async Task CheckAuth() { + SpinnerVisible = true; var rsp = await hc.Get($"TaxPayer/CheckAuth"); if (rsp.IsSuccessStatusCode) { var response = await rsp.Content.ReadFromJsonAsync(); if (response) { + SpinnerVisible = false; return true; } } + SpinnerVisible = false; return false; } private void ShowSuccessAlert(string msg) @@ -452,7 +463,7 @@ else } private async Task LoadData() { - + SpinnerVisible = true; var rsp = await hc.Get($"TaxPayer/GetInvoice/{InvoiceID}"); if (rsp.IsSuccessStatusCode) { @@ -463,7 +474,7 @@ else var request = await rsp.Content.ReadFromJsonAsync>(); ShowDangerAlert(request[0]); } - + SpinnerVisible = false; } private async Task ShowConditions(string[]? Conditions, string fild) { diff --git a/TaxPayerFull/Pages/UserPanel/Ticket.razor b/TaxPayerFull/Pages/UserPanel/Ticket.razor index c261073..7db1ba6 100644 --- a/TaxPayerFull/Pages/UserPanel/Ticket.razor +++ b/TaxPayerFull/Pages/UserPanel/Ticket.razor @@ -21,8 +21,8 @@ - - + + @@ -31,11 +31,15 @@ متفرقه / پشتیبانی
+
- +
+
+ +
@@ -56,12 +60,12 @@
- +
- +
@@ -112,7 +116,7 @@ @code { LTicket child; - + public bool SpinnerVisible { get; set; } = false; private Modal modal = default!; // alert AlertColor alertColor = AlertColor.Primary; @@ -134,6 +138,7 @@ protected override async Task OnParametersSetAsync() { + SpinnerVisible = false; if (PageIndex == null) PageIndex = 1; await Search(PageIndex.Value); await base.OnParametersSetAsync(); @@ -161,7 +166,8 @@ } public async Task Search(int pi) { - + SpinnerVisible = true; + var rsp = await hc.Post("Ticket/GetAll", new ItemSerchGetTicket { PageIndex = pi, @@ -178,6 +184,7 @@ { ShowDangerAlert("خطایی در اجرای عملیات رخ داده"); } + SpinnerVisible = false; } private async Task OnShowModalClick() { @@ -189,6 +196,7 @@ } private async Task OnClickNewTicket() { + SpinnerVisible = true; var rsp = await hc.Post("Ticket/NewTicket", new CTicketDto { CompanyID = userinfo.Company.ID.ToString(), @@ -206,6 +214,6 @@ ShowDangerAlert("خطایی در اجرای عملیات رخ داده"); } await modal.HideAsync(); - + SpinnerVisible = false; } } \ No newline at end of file