From 3d389b602df1264959a9008aa3f8455566b9c355 Mon Sep 17 00:00:00 2001 From: mmrbnjd Date: Wed, 3 Jul 2024 16:52:31 +0330 Subject: [PATCH] ... --- Back/Controllers/InvoiceController.cs | 10 +++--- Back/Data/Models/Invoice.cs | 2 +- Back/Services/servInvoice.cs | 3 +- Shared/DTOs/InvoiceDtos.cs | 1 + TaxPayerFull/FixedValues.cs | 1 + TaxPayerFull/Pages/InvoiceReport.razor | 6 ++-- .../Pages/UserPanel/InvoiceItem.razor | 35 ++++++++++++------- 7 files changed, 35 insertions(+), 23 deletions(-) diff --git a/Back/Controllers/InvoiceController.cs b/Back/Controllers/InvoiceController.cs index fb52b59..6153852 100644 --- a/Back/Controllers/InvoiceController.cs +++ b/Back/Controllers/InvoiceController.cs @@ -474,11 +474,11 @@ namespace Back.Controllers var UserID = claim.Value; var user = await _servUser.GetUserByUserID(Convert.ToInt32(UserID)); - var code = Convert.ToInt32(DateTime.Now.ToString($"yMMdd{InvoiceID}Hmmss{user.RolUsers.First().CompanyID}")); + var code = DateTime.Now.ToString($"yMMdd{InvoiceID}Hmmss{user.RolUsers.First().CompanyID}"); Invoice? Invoice = await _servInvoice.GetInvoiceByInvoiceID(user.RolUsers.First().CompanyID, InvoiceID); if (Invoice == null) return NotFound(); - if (Invoice.ExternalAccessCode.HasValue) - return Ok(Invoice.ExternalAccessCode.Value.ToString()); + if (!string.IsNullOrEmpty(Invoice.ExternalAccessCode)) + return Ok(Invoice.ExternalAccessCode); Invoice.ExternalAccessCode = code; if (await _servInvoice.UpdateInvoice(Invoice)) @@ -490,9 +490,9 @@ namespace Back.Controllers } [HttpGet("GetReportByExternalAccessCode/{xternalAccessCode}")] [AllowAnonymous] - public async Task> GetReportByExternalAccessCode(int ExternalAccessCode) + public async Task> GetReportByExternalAccessCode(string ExternalAccessCode) { - if (ExternalAccessCode == null || ExternalAccessCode <= 0) + if (string.IsNullOrEmpty(ExternalAccessCode)) return NotFound(); string output = ""; diff --git a/Back/Data/Models/Invoice.cs b/Back/Data/Models/Invoice.cs index 0cb4419..5465b1f 100644 --- a/Back/Data/Models/Invoice.cs +++ b/Back/Data/Models/Invoice.cs @@ -97,7 +97,7 @@ namespace Back.Data.Models #endregion #region fild - public int? ExternalAccessCode { get; set; } + public string? ExternalAccessCode { get; set; } public string Title { get; set; } public string? Des { get; set; } public InvoiceType invoiceType { get; set; } diff --git a/Back/Services/servInvoice.cs b/Back/Services/servInvoice.cs index 23d0b26..408e7fb 100644 --- a/Back/Services/servInvoice.cs +++ b/Back/Services/servInvoice.cs @@ -43,6 +43,7 @@ namespace Back.Services .Include(inc => inc.pattern) .Select(s => new InvoiceDTO() { + ExternalAccessCode=s.ExternalAccessCode, IsDeleted=s.IsDeleted, PatternID = s.PatternID, PatternTitle = s.pattern.Title, @@ -161,7 +162,7 @@ namespace Back.Services return await _invoiceRepo.Get(w => w.ID == InvoiceID && w.CompanyID == CompanyID && !w.IsDeleted).AnyAsync(); } - public async Task GetInvoiceByExternalAccessCode( int ExternalAccessCode) + public async Task GetInvoiceByExternalAccessCode( string ExternalAccessCode) { return await _invoiceRepo.Get(w => w.ExternalAccessCode == ExternalAccessCode && !w.IsDeleted).FirstOrDefaultAsync(); diff --git a/Shared/DTOs/InvoiceDtos.cs b/Shared/DTOs/InvoiceDtos.cs index 5995625..fcb8eb8 100644 --- a/Shared/DTOs/InvoiceDtos.cs +++ b/Shared/DTOs/InvoiceDtos.cs @@ -78,6 +78,7 @@ namespace Shared.DTOs public decimal? tbill { get; set; } public int? BillReference { get; set; } public bool IsDeleted { get; set; } + public string? ExternalAccessCode { get; set; } public ICollection items { get; set; }=new List(); public ICollection payments { get; set; } = new List(); // public ICollection Invoicestatuschanges { get; set; } diff --git a/TaxPayerFull/FixedValues.cs b/TaxPayerFull/FixedValues.cs index 2a9ab90..f7270ae 100644 --- a/TaxPayerFull/FixedValues.cs +++ b/TaxPayerFull/FixedValues.cs @@ -7,6 +7,7 @@ namespace Front { public class Fixedvalues { + public string Domin { get; set; } = "http://195.88.208.142"; public readonly HttpClientController _hc; private List? Cus = null; private List>? Patterns = null; diff --git a/TaxPayerFull/Pages/InvoiceReport.razor b/TaxPayerFull/Pages/InvoiceReport.razor index 4414b58..dd9b2fb 100644 --- a/TaxPayerFull/Pages/InvoiceReport.razor +++ b/TaxPayerFull/Pages/InvoiceReport.razor @@ -3,16 +3,16 @@ @inject HttpClientController hc; -@page "/InvoiceReport/{ExternalAccessCode:int}" +@page "/InvoiceReport/{ExternalAccessCode}" @using Front.Services @code { [Inject] protected PreloadService PreloadService { get; set; } = default!; List messages = new List(); - [Parameter] public int ExternalAccessCode { get; set; } + [Parameter] public string ExternalAccessCode { get; set; } protected async override Task OnParametersSetAsync() { - if (ExternalAccessCode == null || ExternalAccessCode <= 0) + if (!string.IsNullOrEmpty(ExternalAccessCode)) ShowReport(); await base.OnParametersSetAsync(); } diff --git a/TaxPayerFull/Pages/UserPanel/InvoiceItem.razor b/TaxPayerFull/Pages/UserPanel/InvoiceItem.razor index d54490b..ba175ce 100644 --- a/TaxPayerFull/Pages/UserPanel/InvoiceItem.razor +++ b/TaxPayerFull/Pages/UserPanel/InvoiceItem.razor @@ -496,24 +496,33 @@ { PreloadService.Show(SpinnerColor.Dark); - var rsp = await hc.Put($"Invoice/SetExternalAccessCode/{InvoiceID}"); - if (rsp.IsSuccessStatusCode) + if (!string.IsNullOrEmpty(invoice.ExternalAccessCode)) { - var str = await rsp.Content.ReadAsStringAsync(); - if (string.IsNullOrEmpty(str)) - ShowDangerAlert("مشکلی در ساخت فایل رخ داده لطفا مجدد تلاش کنید"); - else - { - ExUrl = "http://195.88.208.142/InvoiceReport/"+ str; - await Codemodal.ShowAsync(); - } - + ExUrl = $"{fv.Domin}/InvoiceReport/" + invoice.ExternalAccessCode; + await Codemodal.ShowAsync(); } else { - var request = await rsp.Content.ReadFromJsonAsync>(); - ShowDangerAlert(request[0]); + var rsp = await hc.Put($"Invoice/SetExternalAccessCode/{InvoiceID}"); + if (rsp.IsSuccessStatusCode) + { + var str = await rsp.Content.ReadAsStringAsync(); + if (string.IsNullOrEmpty(str)) + ShowDangerAlert("مشکلی در ساخت فایل رخ داده لطفا مجدد تلاش کنید"); + else + { + ExUrl = $"{fv.Domin}/InvoiceReport/" + str; + await Codemodal.ShowAsync(); + } + + } + else + { + var request = await rsp.Content.ReadFromJsonAsync>(); + ShowDangerAlert(request[0]); + } } + PreloadService.Hide(); }