...
This commit is contained in:
@@ -474,11 +474,11 @@ namespace Back.Controllers
|
|||||||
var UserID = claim.Value;
|
var UserID = claim.Value;
|
||||||
var user = await _servUser.GetUserByUserID(Convert.ToInt32(UserID));
|
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);
|
Invoice? Invoice = await _servInvoice.GetInvoiceByInvoiceID(user.RolUsers.First().CompanyID, InvoiceID);
|
||||||
if (Invoice == null) return NotFound();
|
if (Invoice == null) return NotFound();
|
||||||
if (Invoice.ExternalAccessCode.HasValue)
|
if (!string.IsNullOrEmpty(Invoice.ExternalAccessCode))
|
||||||
return Ok(Invoice.ExternalAccessCode.Value.ToString());
|
return Ok(Invoice.ExternalAccessCode);
|
||||||
|
|
||||||
Invoice.ExternalAccessCode = code;
|
Invoice.ExternalAccessCode = code;
|
||||||
if (await _servInvoice.UpdateInvoice(Invoice))
|
if (await _servInvoice.UpdateInvoice(Invoice))
|
||||||
@@ -490,9 +490,9 @@ namespace Back.Controllers
|
|||||||
}
|
}
|
||||||
[HttpGet("GetReportByExternalAccessCode/{xternalAccessCode}")]
|
[HttpGet("GetReportByExternalAccessCode/{xternalAccessCode}")]
|
||||||
[AllowAnonymous]
|
[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();
|
return NotFound();
|
||||||
|
|
||||||
string output = "";
|
string output = "";
|
||||||
|
@@ -97,7 +97,7 @@ namespace Back.Data.Models
|
|||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region fild
|
#region fild
|
||||||
public int? ExternalAccessCode { get; set; }
|
public string? ExternalAccessCode { get; set; }
|
||||||
public string Title { get; set; }
|
public string Title { get; set; }
|
||||||
public string? Des { get; set; }
|
public string? Des { get; set; }
|
||||||
public InvoiceType invoiceType { get; set; }
|
public InvoiceType invoiceType { get; set; }
|
||||||
|
@@ -43,6 +43,7 @@ namespace Back.Services
|
|||||||
.Include(inc => inc.pattern)
|
.Include(inc => inc.pattern)
|
||||||
.Select(s => new InvoiceDTO()
|
.Select(s => new InvoiceDTO()
|
||||||
{
|
{
|
||||||
|
ExternalAccessCode=s.ExternalAccessCode,
|
||||||
IsDeleted=s.IsDeleted,
|
IsDeleted=s.IsDeleted,
|
||||||
PatternID = s.PatternID,
|
PatternID = s.PatternID,
|
||||||
PatternTitle = s.pattern.Title,
|
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();
|
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();
|
return await _invoiceRepo.Get(w => w.ExternalAccessCode == ExternalAccessCode && !w.IsDeleted).FirstOrDefaultAsync();
|
||||||
|
|
||||||
|
@@ -78,6 +78,7 @@ namespace Shared.DTOs
|
|||||||
public decimal? tbill { get; set; }
|
public decimal? tbill { get; set; }
|
||||||
public int? BillReference { get; set; }
|
public int? BillReference { get; set; }
|
||||||
public bool IsDeleted { get; set; }
|
public bool IsDeleted { get; set; }
|
||||||
|
public string? ExternalAccessCode { get; set; }
|
||||||
public ICollection<InvoiceItemDTO> items { get; set; }=new List<InvoiceItemDTO>();
|
public ICollection<InvoiceItemDTO> items { get; set; }=new List<InvoiceItemDTO>();
|
||||||
public ICollection<InvoicePaymentDTO> payments { get; set; } = new List<InvoicePaymentDTO>();
|
public ICollection<InvoicePaymentDTO> payments { get; set; } = new List<InvoicePaymentDTO>();
|
||||||
// public ICollection<InvoiceStatusDto> Invoicestatuschanges { get; set; }
|
// public ICollection<InvoiceStatusDto> Invoicestatuschanges { get; set; }
|
||||||
|
@@ -7,6 +7,7 @@ namespace Front
|
|||||||
{
|
{
|
||||||
public class Fixedvalues
|
public class Fixedvalues
|
||||||
{
|
{
|
||||||
|
public string Domin { get; set; } = "http://195.88.208.142";
|
||||||
public readonly HttpClientController _hc;
|
public readonly HttpClientController _hc;
|
||||||
private List<ForCustomerSearch>? Cus = null;
|
private List<ForCustomerSearch>? Cus = null;
|
||||||
private List<IdName<int>>? Patterns = null;
|
private List<IdName<int>>? Patterns = null;
|
||||||
|
@@ -3,16 +3,16 @@
|
|||||||
@inject HttpClientController hc;
|
@inject HttpClientController hc;
|
||||||
<Preload LoadingText="در حال بارگذاری..." />
|
<Preload LoadingText="در حال بارگذاری..." />
|
||||||
<Toasts class="p-3" Messages="messages" Placement="ToastsPlacement.MiddleCenter" />
|
<Toasts class="p-3" Messages="messages" Placement="ToastsPlacement.MiddleCenter" />
|
||||||
@page "/InvoiceReport/{ExternalAccessCode:int}"
|
@page "/InvoiceReport/{ExternalAccessCode}"
|
||||||
@using Front.Services
|
@using Front.Services
|
||||||
|
|
||||||
@code {
|
@code {
|
||||||
[Inject] protected PreloadService PreloadService { get; set; } = default!;
|
[Inject] protected PreloadService PreloadService { get; set; } = default!;
|
||||||
List<ToastMessage> messages = new List<ToastMessage>();
|
List<ToastMessage> messages = new List<ToastMessage>();
|
||||||
[Parameter] public int ExternalAccessCode { get; set; }
|
[Parameter] public string ExternalAccessCode { get; set; }
|
||||||
protected async override Task OnParametersSetAsync()
|
protected async override Task OnParametersSetAsync()
|
||||||
{
|
{
|
||||||
if (ExternalAccessCode == null || ExternalAccessCode <= 0)
|
if (!string.IsNullOrEmpty(ExternalAccessCode))
|
||||||
ShowReport();
|
ShowReport();
|
||||||
await base.OnParametersSetAsync();
|
await base.OnParametersSetAsync();
|
||||||
}
|
}
|
||||||
|
@@ -496,24 +496,33 @@
|
|||||||
{
|
{
|
||||||
|
|
||||||
PreloadService.Show(SpinnerColor.Dark);
|
PreloadService.Show(SpinnerColor.Dark);
|
||||||
var rsp = await hc.Put($"Invoice/SetExternalAccessCode/{InvoiceID}");
|
if (!string.IsNullOrEmpty(invoice.ExternalAccessCode))
|
||||||
if (rsp.IsSuccessStatusCode)
|
|
||||||
{
|
{
|
||||||
var str = await rsp.Content.ReadAsStringAsync();
|
ExUrl = $"{fv.Domin}/InvoiceReport/" + invoice.ExternalAccessCode;
|
||||||
if (string.IsNullOrEmpty(str))
|
await Codemodal.ShowAsync();
|
||||||
ShowDangerAlert("مشکلی در ساخت فایل رخ داده لطفا مجدد تلاش کنید");
|
|
||||||
else
|
|
||||||
{
|
|
||||||
ExUrl = "http://195.88.208.142/InvoiceReport/"+ str;
|
|
||||||
await Codemodal.ShowAsync();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
var request = await rsp.Content.ReadFromJsonAsync<List<string>>();
|
var rsp = await hc.Put($"Invoice/SetExternalAccessCode/{InvoiceID}");
|
||||||
ShowDangerAlert(request[0]);
|
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();
|
PreloadService.Hide();
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user