This commit is contained in:
mmrbnjd
2024-09-09 17:11:28 +03:30
parent 7d7b352b51
commit 5ba30cf970
3 changed files with 70 additions and 47 deletions

View File

@@ -83,14 +83,14 @@ namespace Back.Controllers
{
ID = item.ID,
acn = item.acn,
iinn = item.acn,
pcn = item.acn,
iinn = item.iinn,
pcn = item.pcn,
PaymentDateTime = item.PaymentDateTime.ShamciToFormatShamci(),
pid = item.pid,
pmt = item.pmt,
pv = item.pv,
trmn = item.trmn,
trn = item.acn,
trn = item.trn,
paymentMethod = item.pmt.HasValue ? codings.Where(w => w.Code == item.pmt.Value.ToString()).Select(s => s.Title).FirstOrDefault() : null,
} :null);
}
@@ -159,14 +159,14 @@ namespace Back.Controllers
{
ID = modelout.ID,
acn = modelout.acn,
iinn = modelout.acn,
pcn = modelout.acn,
iinn = modelout.iinn,
pcn = modelout.pcn,
PaymentDateTime = modelout.PaymentDateTime.ShamciToFormatShamci(),
pid = modelout.pid,
pmt = modelout.pmt,
pv = modelout.pv,
trmn = modelout.trmn,
trn = modelout.acn,
trn = modelout.trn,
paymentMethod = modelout.pmt.HasValue ? codings.Where(w => w.Code == modelout.pmt.Value.ToString()).Select(s => s.Title).FirstOrDefault() : null,
} : null);
}
@@ -191,10 +191,10 @@ namespace Back.Controllers
if (payitem == null)
return NotFound(new List<string> { "invoice pay notFound..." });
////-----Validaton
var resultValidationmodel = await _validation.ValidateAsync(Tuple.Create(user.RolUsers.First().CompanyID, payitem.InvoiceID, new InvoicePaymentDTO(), eActionValidation.delete));
if (!resultValidationmodel.IsValid)
return BadRequest(resultValidationmodel.Errors.Select(s => s.ErrorMessage).ToList());
//////-----Validaton
//var resultValidationmodel = await _validation.ValidateAsync(Tuple.Create(user.RolUsers.First().CompanyID, payitem.InvoiceID, new InvoicePaymentDTO(), eActionValidation.delete));
//if (!resultValidationmodel.IsValid)
// return BadRequest(resultValidationmodel.Errors.Select(s => s.ErrorMessage).ToList());