From ac11c8dcd66862cb56e4684e7e3ee29888047c61 Mon Sep 17 00:00:00 2001 From: mmrbnjd Date: Wed, 16 Oct 2024 23:36:52 +0330 Subject: [PATCH] ... --- Back/Controllers/TaxPayerController.cs | 24 +++++++++++++ Back/Services/ActionTaxPayer.cs | 9 ++++- Shared/DTOs/EconomicCodeModelDto.cs | 24 +++++++++++++ Shared/DTOs/FiscalInformationModelDto.cs | 19 +++++++++++ TaxPayerFull/CUSComponent/CustomerItem.razor | 34 +++++++++++++++++-- .../Pages/UserPanel/InvoiceItem.razor | 2 +- TaxPayerFull/Pages/UserPanel/TaxPayer.razor | 4 ++- .../Pages/UserPanel/TaxPayerInvoiceItem.razor | 18 ++++++---- TaxPayerFull/Program.cs | 4 +-- 9 files changed, 124 insertions(+), 14 deletions(-) create mode 100644 Shared/DTOs/EconomicCodeModelDto.cs create mode 100644 Shared/DTOs/FiscalInformationModelDto.cs diff --git a/Back/Controllers/TaxPayerController.cs b/Back/Controllers/TaxPayerController.cs index 0adc1f5..44e6a21 100644 --- a/Back/Controllers/TaxPayerController.cs +++ b/Back/Controllers/TaxPayerController.cs @@ -544,5 +544,29 @@ namespace Back.Controllers { return Ok(await _servTaxPayer.GetUnits()); } + [HttpGet("EconomicCodeInformation")] + public async Task> GetEconomicCodeInformation(string item) + { + var claim = HttpContext.User.Claims.First(c => c.Type == "UserID"); + var UserID = claim.Value; + var user = await _servUser.GetUserByUserID(Convert.ToInt32(UserID)); + if (!await _actionTaxPayer.login(user.RolUsers.First().CompanyID)) + return BadRequest(new List { "خطا در احراز هویت سازمان مالیاتی" }); + var result=await _actionTaxPayer.GetEconomicCodeInformation(item); + if (result == null) return NotFound(); + return Ok(result); + } + [HttpGet("FiscalInformation")] + public async Task> GetFiscalInformation(string item) + { + var claim = HttpContext.User.Claims.First(c => c.Type == "UserID"); + var UserID = claim.Value; + var user = await _servUser.GetUserByUserID(Convert.ToInt32(UserID)); + if (!await _actionTaxPayer.login(user.RolUsers.First().CompanyID)) + return BadRequest(new List { "خطا در احراز هویت سازمان مالیاتی" }); + var result=await _actionTaxPayer.GetFiscalInformation(item); + if (result == null) return NotFound(); + return Ok(result); + } } } diff --git a/Back/Services/ActionTaxPayer.cs b/Back/Services/ActionTaxPayer.cs index 48d1479..6463808 100644 --- a/Back/Services/ActionTaxPayer.cs +++ b/Back/Services/ActionTaxPayer.cs @@ -48,7 +48,14 @@ namespace Back.Services } public async Task GetEconomicCodeInformation(string Item) { - return await TaxApiService.Instance.TaxApis.GetEconomicCodeInformationAsync(Item); + + return await TaxApiService.Instance.TaxApis.GetEconomicCodeInformationAsync(Item); + + + } + public async Task GetFiscalInformation(string Item) + { + return await TaxApiService.Instance.TaxApis.GetFiscalInformationAsync(Item); } //-------------------internal public async Task login(int CompanyID) diff --git a/Shared/DTOs/EconomicCodeModelDto.cs b/Shared/DTOs/EconomicCodeModelDto.cs new file mode 100644 index 0000000..ae86276 --- /dev/null +++ b/Shared/DTOs/EconomicCodeModelDto.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Shared.DTOs +{ + public class EconomicCodeModelDto + { + public string NameTrade { get; set; } + + public string TaxpayerStatus { get; set; } + + public string TaxpayerType { get; set; } + + public string PostalcodeTaxpayer { get; set; } + + public string AddressTaxpayer { get; set; } + + public string NationalId { get; set; } + + } +} diff --git a/Shared/DTOs/FiscalInformationModelDto.cs b/Shared/DTOs/FiscalInformationModelDto.cs new file mode 100644 index 0000000..28816d8 --- /dev/null +++ b/Shared/DTOs/FiscalInformationModelDto.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Shared.DTOs +{ + public class FiscalInformationModelDto + { + public string NameTrade { get; set; } + + public int FiscalStatus { get; set; } + + public string EconomicCode { get; set; } + + public string NationalId { get; set; } + } +} diff --git a/TaxPayerFull/CUSComponent/CustomerItem.razor b/TaxPayerFull/CUSComponent/CustomerItem.razor index 993b949..848ce0e 100644 --- a/TaxPayerFull/CUSComponent/CustomerItem.razor +++ b/TaxPayerFull/CUSComponent/CustomerItem.razor @@ -105,13 +105,13 @@
@if (Cus.ID == 0) { - } else { - } } +
@@ -231,6 +234,33 @@ else } else ShowDangerAlert("فیلدهای قرمز باید مقدار دهی شوند"); SpinnerVisible = !SpinnerVisible; + } + public async Task OnClickCheckEconomicCode() + { + SpinnerVisible = !SpinnerVisible; + if (!string.IsNullOrEmpty(Cus.EconomicCode)) + { + + var rsp = await hc.Get($"TaxPayer/EconomicCodeInformation?item={Cus.EconomicCode}"); + if (rsp.IsSuccessStatusCode) + { + var request = await rsp.Content.ReadFromJsonAsync(); + // dialog.ShowAsync( + // title: $"کد اقتصادی به نام {request.NameTrade}", + // message1: $"وضعیت {request.TaxpayerStatus}"); + + } + else if(rsp.StatusCode==System.Net.HttpStatusCode.NotFound) + { + ShowDangerAlert("یافت نشد"); + } + else + { + ShowDangerAlert("خطایی در اجرای عملیات رخ داده"); + } + } + else ShowDangerAlert("کد اقعصادی را مشخص کنید"); + SpinnerVisible = !SpinnerVisible; } public async Task OnClickAdd() { diff --git a/TaxPayerFull/Pages/UserPanel/InvoiceItem.razor b/TaxPayerFull/Pages/UserPanel/InvoiceItem.razor index b90ba17..beed317 100644 --- a/TaxPayerFull/Pages/UserPanel/InvoiceItem.razor +++ b/TaxPayerFull/Pages/UserPanel/InvoiceItem.razor @@ -111,7 +111,7 @@ && a.SentStatus == SentStatus.Successful)) { SendInvoice = false; -
+
این صورتحساب با این وضعیت به سامانه مودیان ارسال و تائید شده
} diff --git a/TaxPayerFull/Pages/UserPanel/TaxPayer.razor b/TaxPayerFull/Pages/UserPanel/TaxPayer.razor index 54d0037..d130030 100644 --- a/TaxPayerFull/Pages/UserPanel/TaxPayer.razor +++ b/TaxPayerFull/Pages/UserPanel/TaxPayer.razor @@ -144,6 +144,7 @@ @functions{ public async Task SentTaxItem(int ID) { + PreloadService.Show(SpinnerColor.Dark); SpinnerVisible = true; var rsp = await hc.Get($"TaxPayer/GetResult/{ID}"); if (rsp.IsSuccessStatusCode) @@ -154,6 +155,7 @@ ingriddata.SentStatus = requestsendTax.SentStatus; ingriddata.msgSentStatus = requestsendTax.msgSentStatus; SpinnerVisible = false; + PreloadService.Hide(); //----------------- var parameters = new Dictionary(); parameters.Add("inData", requestsendTax); @@ -161,7 +163,7 @@ } else{ var request = await rsp.Content.ReadFromJsonAsync>(); - SpinnerVisible = false; + SpinnerVisible = false; PreloadService.Hide(); ShowDangerAlert(request[0]); } diff --git a/TaxPayerFull/Pages/UserPanel/TaxPayerInvoiceItem.razor b/TaxPayerFull/Pages/UserPanel/TaxPayerInvoiceItem.razor index 9d4180f..e53a3d0 100644 --- a/TaxPayerFull/Pages/UserPanel/TaxPayerInvoiceItem.razor +++ b/TaxPayerFull/Pages/UserPanel/TaxPayerInvoiceItem.razor @@ -22,16 +22,16 @@ else @* alert *@
-
+ -
-
- -
+ +
+
+
@if (FullInvoice) {

@@ -43,8 +43,12 @@ else

سرویس ها / صورتحساب / آماده سازی قبل از ارسال به سامانه مودیان

-} - + } +
+
+ +
+
@if (!FullInvoice) {
diff --git a/TaxPayerFull/Program.cs b/TaxPayerFull/Program.cs index 7f9b075..f0789ae 100644 --- a/TaxPayerFull/Program.cs +++ b/TaxPayerFull/Program.cs @@ -36,10 +36,10 @@ builder.Services.AddScoped(sp => new UserAuthenticationDTO() //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/") }); +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");