From 2a2de590daaedb732ae6f0c8830b51ec0d02e3d4 Mon Sep 17 00:00:00 2001 From: mmrbnjd Date: Wed, 16 Oct 2024 16:35:38 +0330 Subject: [PATCH] ... --- Back/Controllers/TaxPayerController.cs | 2 +- Back/Services/ActionTaxPayer.cs | 29 +++---------------- .../Pages/UserPanel/InvoiceItem.razor | 4 +-- TaxPayerFull/Pages/UserPanel/TaxPayer.razor | 4 ++- .../Pages/UserPanel/TaxPayerInvoiceItem.razor | 19 ++++++------ TaxPayerFull/Program.cs | 4 +-- 6 files changed, 21 insertions(+), 41 deletions(-) diff --git a/Back/Controllers/TaxPayerController.cs b/Back/Controllers/TaxPayerController.cs index 2a489d3..0adc1f5 100644 --- a/Back/Controllers/TaxPayerController.cs +++ b/Back/Controllers/TaxPayerController.cs @@ -252,7 +252,7 @@ namespace Back.Controllers // مجموع سایر مالیات، عوارض و وجوه قانونی Todam = result.todam ?? null, //صورتحساب مجموع - Tbill = result.tbill ?? null, + Tbill =-10 /* result.tbill ?? null*/, //مجموع وزن خالض Tonw = level == 10 ? result.tonw : null, //مجموع ارزش ریالی diff --git a/Back/Services/ActionTaxPayer.cs b/Back/Services/ActionTaxPayer.cs index 9f40ea9..48d1479 100644 --- a/Back/Services/ActionTaxPayer.cs +++ b/Back/Services/ActionTaxPayer.cs @@ -22,26 +22,13 @@ namespace Back.Services } public string GenerateTaxid(string FactorNo, string InvoiceDate) { - return "testTaxid"; + //return "testTaxid"; return TaxApiService.Instance.TaxIdGenerator.GenerateTaxId(_UniqueMemory, Convert.ToInt64(FactorNo), InvoiceDate.ToMiladi()); } public async Task GetResultByUid(int CompanyID, string uid) { - //return new InquiryResultModel("18084a18-1eb4-41cd-8bd3-2cad73c45398", "0a4a4ab2-8047-4c31-b765-456ddf0e9c53", "SUCCESS", - // new DataInSendTaxDto() - // { - // error=new List() - // { - // new MessageInSendTaxDto() - // { - // code="21001",message="یک خطای تست" - // } - // } - // } - // , "receive_invoice_confirm", "A2FFKZ"); - if (!await login(CompanyID)) - return null; + var uidAndFiscalId = new UidAndFiscalId(uid, _UniqueMemory); var inquiryResultModels = TaxApiService.Instance.TaxApis.InquiryByUidAndFiscalId(new() { uidAndFiscalId }); if (inquiryResultModels.Count > 0) @@ -50,14 +37,6 @@ namespace Back.Services } public async Task> SendInvoice(int CompanyID,InvoiceHeaderDto header, List InvoiceBody, List payments) { - //return new TaxCollectData.Library.Dto.HttpResponse - // ( body: new AsyncResponseModel( - // 1702299112 - // ,new HashSet(new List { new PacketResponse("5d0c7198-e2fd-4cc1-8802-fe498d6ccf73", "a70444a4-1810-4cea-8bcc-7acb4bc75645", null,null)}) - // ,new List()), 200); - - if (!await login(CompanyID)) - return null; return await TaxApiService.Instance.TaxApis.SendInvoicesAsync(new List() { new() @@ -74,7 +53,7 @@ namespace Back.Services //-------------------internal public async Task login(int CompanyID) { - return true; + try { #region TokenTax @@ -88,7 +67,7 @@ namespace Back.Services _PrivateKey = resquth.PrivateKey; TaxApiService.Instance.Init(_UniqueMemory, new SignatoryConfig(_PrivateKey, null), - new NormalProperties(ClientType.SELF_TSP), "https://tp.tax.gov.ir/req/api/"); + new NormalProperties(ClientType.SELF_TSP), /*"https://tp.tax.gov.ir/req/api/"*/ "https://sandboxrc.tax.gov.ir/req/api/"); await TaxApiService.Instance.TaxApis.GetServerInformationAsync(); } #endregion diff --git a/TaxPayerFull/Pages/UserPanel/InvoiceItem.razor b/TaxPayerFull/Pages/UserPanel/InvoiceItem.razor index a99d4f3..b90ba17 100644 --- a/TaxPayerFull/Pages/UserPanel/InvoiceItem.razor +++ b/TaxPayerFull/Pages/UserPanel/InvoiceItem.razor @@ -331,7 +331,7 @@ -
+

@if (!invoice.IsDeleted) { @@ -392,7 +392,7 @@
-
+
diff --git a/TaxPayerFull/Pages/UserPanel/TaxPayer.razor b/TaxPayerFull/Pages/UserPanel/TaxPayer.razor index f253954..54d0037 100644 --- a/TaxPayerFull/Pages/UserPanel/TaxPayer.razor +++ b/TaxPayerFull/Pages/UserPanel/TaxPayer.razor @@ -153,6 +153,7 @@ var ingriddata= request.list.Where(w => w.ID == ID).First(); ingriddata.SentStatus = requestsendTax.SentStatus; ingriddata.msgSentStatus = requestsendTax.msgSentStatus; + SpinnerVisible = false; //----------------- var parameters = new Dictionary(); parameters.Add("inData", requestsendTax); @@ -160,9 +161,10 @@ } else{ var request = await rsp.Content.ReadFromJsonAsync>(); + SpinnerVisible = false; ShowDangerAlert(request[0]); } - SpinnerVisible = false; + } public async Task Load(int pi) { diff --git a/TaxPayerFull/Pages/UserPanel/TaxPayerInvoiceItem.razor b/TaxPayerFull/Pages/UserPanel/TaxPayerInvoiceItem.razor index fe2d10f..9d4180f 100644 --- a/TaxPayerFull/Pages/UserPanel/TaxPayerInvoiceItem.razor +++ b/TaxPayerFull/Pages/UserPanel/TaxPayerInvoiceItem.razor @@ -305,8 +305,8 @@ else
-
-
+
+ @if (FullInvoice) { @@ -316,7 +316,11 @@ else } -
+ +
+ +
+
@@ -374,12 +378,7 @@ else public async Task Send() { SpinnerVisible = true; - if (!FullInvoice && !await CheckAuth()) - { - ShowMessage(ToastType.Danger, "خطا در احراز هویت سازمان مالیاتی"); - } - else - { + string route = "PreparationInvoiceBeforeSending"; if (FullInvoice) route = "UpdateInvoice"; @@ -428,7 +427,7 @@ else var request = await rsp.Content.ReadFromJsonAsync>(); ShowMessage(ToastType.Danger, request[0]); } - } + SpinnerVisible = false; } public async Task CheckAuth() diff --git a/TaxPayerFull/Program.cs b/TaxPayerFull/Program.cs index 7ddfa86..7f9b075 100644 --- a/TaxPayerFull/Program.cs +++ b/TaxPayerFull/Program.cs @@ -33,13 +33,13 @@ builder.Services.AddScoped(sp => new UserAuthenticationDTO() }) ; // Server -builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("http://195.88.208.142:7075/api/") }); +//builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("http://195.88.208.142:7075/api/") }); //Home //builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("http://localhost:5271/api/") }); //farzan -//builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("http://localhost:5271/api/") }); +builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("http://localhost:5271/api/") }); CultureInfo.DefaultThreadCurrentCulture = new CultureInfo("fa-Ir");