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-09-08 17:23:33 +03:30
parent 745412ee56
commit b81c950c39
9 changed files with 468 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
Back/Controllers/InvoicePaymentController.cs
View File

@@ -1,4 +1,5 @@
using Back.Common;
using Back.Data.Contracts;
using Back.Data.Models;
using Back.Services;
using Back.Validations;
@@ -10,6 +11,7 @@ using Shared.DTOs;
using System.Net;
using System.Runtime.ConstrainedExecution;
using System.Security.Cryptography;
using static Shared.DTOs._TaxPayer;
namespace Back.Controllers
{
@@ -31,8 +33,13 @@ namespace Back.Controllers
_servInvoice = servInvoice;
}
[HttpGet("PaymentMethods")]
public async Task<ActionResult<List<IdName<string>>>> PaymentMethods()
{
return Ok(await _servpay.GetPaymentMethods());
}
[HttpPost("AddPay")]
public async Task<ActionResult<bool>> AddItem([FromBody] InvoiceItemAction<InvoicePaymentDTO> model)
public async Task<ActionResult<InvoicePaymentDTO>> AddItem([FromBody] InvoiceItemAction<InvoicePaymentDTO> model)
{
//-----GetUserAndCompany
var claim = HttpContext.User.Claims.First(c => c.Type == "UserID");
@@ -49,12 +56,15 @@ namespace Back.Controllers
if (invoice == null)
return BadRequest(new List<string> { "invoice notFound..." });
//-------------pmt
List<Back.Data.Models.Coding> codings = await _servInvoice.GetCodingPMT();
//-----------------------
invoice.LastChangeUserID = Convert.ToInt32(UserID);
if (await _servInvoice.UpdateInvoice(invoice))
{
return Ok(await _servpay.Add(new Data.Models.InvoicePayment
var item = await _servpay.Add(new Data.Models.InvoicePayment
{
InvoiceID = model.invoiceID,
acn = model.item.acn,
@@ -68,7 +78,21 @@ namespace Back.Controllers
trn = model.item.trn,
}));
});
return Ok(item!=null ?new InvoicePaymentDTO
{
ID = item.ID,
acn = item.acn,
iinn = item.acn,
pcn = item.acn,
PaymentDateTime = item.PaymentDateTime.ShamciToFormatShamci(),
pid = item.pid,
pmt = item.pmt,
pv = item.pv,
trmn = item.trmn,
trn = item.acn,
paymentMethod = item.pmt.HasValue ? codings.Where(w => w.Code == item.pmt.Value.ToString()).Select(s => s.Title).FirstOrDefault() : null,
} :null);
}
else return BadRequest(new List<string> { "خطایی رخ داده" });
@@ -124,7 +148,29 @@ namespace Back.Controllers
item.trn = model.item.trn;
if (await _servInvoice.UpdateInvoice(invoice))
return Ok(await _servpay.Update(item));
{
var modelout = await _servpay.Update(item);
//-------------pmt
List<Back.Data.Models.Coding> codings = await _servInvoice.GetCodingPMT();
//-----------------------
return Ok(modelout!=null ? new InvoicePaymentDTO
{
ID = modelout.ID,
acn = modelout.acn,
iinn = modelout.acn,
pcn = modelout.acn,
PaymentDateTime = modelout.PaymentDateTime.ShamciToFormatShamci(),
pid = modelout.pid,
pmt = modelout.pmt,
pv = modelout.pv,
trmn = modelout.trmn,
trn = modelout.acn,
paymentMethod = modelout.pmt.HasValue ? codings.Where(w => w.Code == modelout.pmt.Value.ToString()).Select(s => s.Title).FirstOrDefault() : null,
} : null);
}
else
return BadRequest(new List<string> { "خطایی رخ داده" });

1
Back/Program.cs
View File

@@ -82,6 +82,7 @@ builder.Services.AddScoped<ServPromotion>();
builder.Services.AddScoped<ServOrders>();
builder.Services.AddScoped<ServPricing>();
builder.Services.AddScoped<ServWalt>();
builder.Services.AddScoped<AUInvoicePayValidation>();
builder.Services.AddScoped(c => new mpNuget.RestClient("09119660045", "C54S2"));
string origins = "OriginTaxPayer";

94
Back/Services/servInvoice.cs
View File

@@ -10,15 +10,20 @@ namespace Back.Services
public class servInvoice
{
private readonly IAsyncRepository<Invoice> _invoiceRepo;
private readonly IAsyncRepository<Coding> _CodingRepo;
private readonly IAsyncRepository<InvoiceStatusChang> _invoiceStatusChangPaymentRepo;
private readonly CheckPermission _checkPermission;
public servInvoice(IAsyncRepository<Invoice> invoiceRepo, CheckPermission checkPermission
, IAsyncRepository<InvoiceStatusChang> invoiceStatusChangPaymentRepo)
, IAsyncRepository<InvoiceStatusChang> invoiceStatusChangPaymentRepo, IAsyncRepository<Coding> codingRepo)
{
_invoiceStatusChangPaymentRepo = invoiceStatusChangPaymentRepo;
_invoiceRepo = invoiceRepo;
_checkPermission = checkPermission;
_CodingRepo = codingRepo;
}
public async Task<List<Coding>> GetCodingPMT()
{
return await _CodingRepo.Get(w => w.FildID == 71).ToListAsync();
}
public async Task<InvoiceDTO?> GetInvoice(int CompanyID, int ID, bool notloaddelete = true)
{
@@ -33,18 +38,16 @@ namespace Back.Services
}
#endregion
//-----------------------
var item= await invok
.Include(inc => inc.invoiceDetails)
.ThenInclude(inc => inc.cODItem)
.ThenInclude(inc => inc.CODUnit)
.Include(inc => inc.Customer)
.Include(inc => inc.sentTax)
.Include(inc => inc.payments)
.Include(inc => inc.pattern)
.ThenInclude(inc => inc.BillType)
.FirstOrDefaultAsync();
return new InvoiceDTO()
var item = await invok.Include(inc => inc.invoiceDetails) .ThenInclude(inc => inc.cODItem).ThenInclude(inc => inc.CODUnit).Include(inc => inc.Customer)
.Include(inc => inc.sentTax).Include(inc => inc.payments).Include(inc => inc.pattern).ThenInclude(inc => inc.BillType).FirstOrDefaultAsync();
//-------------pmt
List<Coding> codings = new List<Coding>();
if (item != null)
codings =await GetCodingPMT();
//-----------------------
return new InvoiceDTO()
{
IsDeleted = item.IsDeleted,
@@ -66,33 +69,33 @@ namespace Back.Services
tvam = item.tvam,
Udate = item.Udate.ShamciToFormatShamci(),
inno = item.inno,
InvoiceSendTaxs = item.sentTax.OrderBy(o => o.ID).Select(s => new SentTaxDto()
{
Date = s.Date.ShamciToFormatShamci(),
Time = s.Time,
ID = s.ID,
InvoiceID = s.InvoiceID,
SentStatus = s.SentStatus,
InvoiceType = s.InvoiceType,
msgInvoiceType = s.InvoiceType.GetEnumDisplayName(),
msgSentStatus = s.SentStatus.GetEnumDisplayName()
}).ToList(),
items = item.invoiceDetails.OrderBy(o => o.ID).Select(x => new InvoiceItemDTO()
{
ID = x.ID,
CODID = x.CODID,
adis = x.adis,
am = x.am.Value,
dis = x.dis,
fee = x.fee.Value,
mu = x.unitTitle,
sstt = x.sstt,
tsstam = x.tsstam,
vam = x.vam,
vra = x.vra,
prdis = x.prdis
}).ToList(),
payments =
InvoiceSendTaxs = item.sentTax.OrderBy(o => o.ID).Select(s => new SentTaxDto()
{
Date = s.Date.ShamciToFormatShamci(),
Time = s.Time,
ID = s.ID,
InvoiceID = s.InvoiceID,
SentStatus = s.SentStatus,
InvoiceType = s.InvoiceType,
msgInvoiceType = s.InvoiceType.GetEnumDisplayName(),
msgSentStatus = s.SentStatus.GetEnumDisplayName()
}).ToList(),
items = item.invoiceDetails.OrderBy(o => o.ID).Select(x => new InvoiceItemDTO()
{
ID = x.ID,
CODID = x.CODID,
adis = x.adis,
am = x.am.Value,
dis = x.dis,
fee = x.fee.Value,
mu = x.unitTitle,
sstt = x.sstt,
tsstam = x.tsstam,
vam = x.vam,
vra = x.vra,
prdis = x.prdis
}).ToList(),
payments =
item.payments.OrderBy(o => o.ID).Select(x => new InvoicePaymentDTO()
{
ID = x.ID,
@@ -104,9 +107,10 @@ namespace Back.Services
pmt = x.pmt,
pv = x.pv,
trmn = x.trmn,
trn = x.acn
trn = x.acn,
paymentMethod = x.pmt.HasValue ? codings.Where(w=>w.Code== x.pmt.Value.ToString()).Select(s=>s.Title).FirstOrDefault() : null,
}).ToList()
};
};
}
@@ -144,7 +148,7 @@ namespace Back.Services
.ThenInclude(inc => inc.CODUnit)
//.Include(inc => inc.payments)
.Include(inc => inc.pattern)
.OrderByDescending(o=>o.ID)
.OrderByDescending(o => o.ID)
.Select(s => new InvoiceGridDTO()
{
@@ -232,7 +236,7 @@ namespace Back.Services
.Include(inc => inc.sentTax)
.Include(inc => inc.pattern)
.Include(inc => inc.invoice)
.Include(inc=>inc.payments)
.Include(inc => inc.payments)
.FirstOrDefaultAsync();
}
public async Task<bool> DeleteInvoice(Invoice item)

23
Back/Services/servInvoicePayment.cs
View File

@@ -9,17 +9,19 @@ namespace Back.Services
public class servInvoicePayment
{
private readonly IAsyncRepository<InvoicePayment> _Repo;
public servInvoicePayment(IAsyncRepository<InvoicePayment> Repo)
private readonly IAsyncRepository<Coding> _CodingRepo;
public servInvoicePayment(IAsyncRepository<InvoicePayment> Repo, IAsyncRepository<Coding> CodingRepo)
{
_Repo = Repo;
_CodingRepo = CodingRepo;
}
public async Task<bool> Add(InvoicePayment item)
public async Task<InvoicePayment> Add(InvoicePayment item)
{
return await _Repo.AddBoolResultAsync(item);
return await _Repo.AddAsync(item);
}
public async Task<bool> Update(InvoicePayment item)
public async Task<InvoicePayment> Update(InvoicePayment item)
{
return await _Repo.UpdateAsync(item);
return await _Repo.UpdateByObjAsync(item);
}
public async Task<bool> Delete(InvoicePayment item)
{
@@ -40,6 +42,15 @@ namespace Back.Services
{
return await _Repo.Get(w => w.InvoiceID == invoiceID && w.ID == ID && w.invoice.CompanyID == companyID).FirstOrDefaultAsync();
}
public async Task<List<IdName<string>>> GetPaymentMethods()
{
return await _CodingRepo.Get(w => w.FildID == 71)
.Select(s=>new IdName<string>
{
ID=s.Code,Title=s.Title
}).ToListAsync();
}
}
}

50
Back/Validations/AUInvoicePayValidation.cs
View File

@@ -23,29 +23,7 @@ namespace Back.Validations
});
});
When(m => m.Item4 == eActionValidation.update || m.Item4 == eActionValidation.add, () =>
{
RuleFor(r => r.Item3).Custom((model, context) =>
{
if (model.pmt.HasValue && model.pmt.Value > 0 && model.pmt.Value < 9)
{
}
else context.AddFailure("روش پرداخت مشخص نشده");
});
//RuleFor(r => r).Custom(async (model, context) =>
//{
// if (model.Item3.dis != null && model.Item3.dis > 0)
// if (model.Item3.dis > model.Item3.am * model.Item3.fee)
// context.AddFailure("مبلغ تخفیف نمی تواند از (تعداد * مبلغ واحد) بیشتر باشد");
//});
});
RuleFor(r => r)
.Custom((model, context) =>
{
@@ -61,7 +39,33 @@ namespace Back.Validations
if (model.Item4 == eActionValidation.update || model.Item4 == eActionValidation.add)
{
var totalpay = invoice.payments.Sum(s => s.pv).GetValueOrDefault() + model.Item3.pv;
if (totalpay > invoice.tbill) context.AddFailure("مجموع مبلغ پرداختی میبایست از مجموع صورتحساب کوچکتر باشد.");
if (totalpay > invoice.tbill) context.AddFailure("مجموع مبلغ پرداختی نمی تواند از مجموع صورتحساب بیشتر باشد.");
else
{
if (model.Item3.pmt.HasValue && model.Item3.pmt.Value > 0 && model.Item3.pmt.Value < 9)
{
if (string.IsNullOrEmpty(model.Item3.PaymentDateTime))
{
context.AddFailure("تاریخ نمیتواند خالی باشد");
}
else
{
string paydate = model.Item3.PaymentDateTime.Replace("/", "");
if (paydate.Length == 8 && int.TryParse(paydate, out int _paydate))
{
if (Convert.ToInt32(invoice.InvoiceDate) > _paydate)
{
context.AddFailure("تاریخ پرداخت نمیتواند از تاریخ صورتحساب عقبتر باشد");
}
}
else context.AddFailure("تاریخ صحیح نمی باشد");
}
}
else context.AddFailure("روش پرداخت مشخص نشده");
}
}