mmr/moadiran
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
mmrbnjd
2024-07-03 16:52:31 +03:30
parent 337b793e0b
commit 3d389b602d
7 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Back/Controllers/InvoiceController.cs
View File

@@ -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<ActionResult<string>> GetReportByExternalAccessCode(int ExternalAccessCode)
public async Task<ActionResult<string>> GetReportByExternalAccessCode(string ExternalAccessCode)
{
if (ExternalAccessCode == null || ExternalAccessCode <= 0)
if (string.IsNullOrEmpty(ExternalAccessCode))
return NotFound();
string output = "";

2
Back/Data/Models/Invoice.cs
View File

@@ -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; }

3
Back/Services/servInvoice.cs
View File

@@ -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<Invoice> GetInvoiceByExternalAccessCode( int ExternalAccessCode)
public async Task<Invoice> GetInvoiceByExternalAccessCode( string ExternalAccessCode)
{
return await _invoiceRepo.Get(w => w.ExternalAccessCode == ExternalAccessCode && !w.IsDeleted).FirstOrDefaultAsync();

1
Shared/DTOs/InvoiceDtos.cs
View File

@@ -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<InvoiceItemDTO> items { get; set; }=new List<InvoiceItemDTO>();
public ICollection<InvoicePaymentDTO> payments { get; set; } = new List<InvoicePaymentDTO>();
// public ICollection<InvoiceStatusDto> Invoicestatuschanges { get; set; }

1
TaxPayerFull/FixedValues.cs
View File

@@ -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<ForCustomerSearch>? Cus = null;
private List<IdName<int>>? Patterns = null;

6
TaxPayerFull/Pages/InvoiceReport.razor
View File

@@ -3,16 +3,16 @@
@inject HttpClientController hc;
<Preload LoadingText="در حال بارگذاری..." />
<Toasts class="p-3" Messages="messages" Placement="ToastsPlacement.MiddleCenter" />
@page "/InvoiceReport/{ExternalAccessCode:int}"
@page "/InvoiceReport/{ExternalAccessCode}"
@using Front.Services
@code {
[Inject] protected PreloadService PreloadService { get; set; } = default!;
List<ToastMessage> messages = new List<ToastMessage>();
[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();
}

35
TaxPayerFull/Pages/UserPanel/InvoiceItem.razor
View File

@@ -496,25 +496,34 @@
{
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<List<string>>();
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<List<string>>();
ShowDangerAlert(request[0]);
}
}
PreloadService.Hide();
}
private async Task ShowReport()