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

...

Browse Source
This commit is contained in:
mmrbnjd
2025-01-25 12:57:07 +03:30
parent 48072d6e00
commit b57839a212
14 changed files with 2229 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Back/Controllers/CODController.cs
View File

@@ -52,6 +52,17 @@ namespace Back.Controllers
});
}
[HttpGet("GetVra/{ID}")]
public async Task<ActionResult<decimal>> GetVra(int ID)
{
var claim = HttpContext.User.Claims.First(c => c.Type == "UserID");
var UserID = claim.Value;
var user = await _servUser.GetUserByUserID(Convert.ToInt32(UserID));
var cod = await _servCOD.GetCodByCodID(ID, user.RolUsers.First().CompanyID);
if(cod!=null)
return Ok(cod.TaxRate);
return NotFound();
}
[HttpGet("GetAllForidName")]
public async Task<ActionResult<List<CODIdName<int>>>> GetAllForidName()
{

55
Back/Controllers/InvoiceController.cs
View File

@@ -234,40 +234,31 @@ namespace Back.Controllers
//{
// return BadRequest(new List<string> { $"صورتحساب در حالت {invoice.invoiceType.GetEnumDisplayName()} نمی تواند ویرایش شود" });
//}
if (invoice.invoiceType!=InvoiceType.Cancellation)
{
bool InvoiceHasaRemittanceBillReference = invoice.BillReference.HasValue && await _remittanceService.HasaRemittance(invoice.BillReference.Value);
foreach (var item in invoice.invoiceDetails)
{
if (await _remittanceService.HasaRemittance(invoice.ID, item.CODID))
{
await _receiptService.ADD(new Shared.DTOs.Warehouse.ReceiptDto()
{
CODID = item.CODID,
Count = item.am.GetValueOrDefault(),
Date = DateTime.Now.ConvertMiladiToShamsi(),
ForSale = true,
InvoiceID = item.InvoiceID,
Type = TypeReceipt.Shopping,
info = $"حذف صورتحساب {item.InvoiceID}",
//if (invoice.invoiceType!=InvoiceType.Cancellation)
//{
//bool InvoiceHasaRemittanceBillReference = invoice.BillReference.HasValue && await _remittanceService.HasaRemittance(invoice.BillReference.Value);
await _receiptService.DeleteByInvoiceID(invoice.ID, user.RolUsers.First().CompanyID);
await _remittanceService.DeleteByInvoiceID(invoice.ID,user.RolUsers.First().CompanyID);
//foreach (var item in invoice.invoiceDetails)
//{
// if (await _remittanceService.HasaRemittance(invoice.ID, item.CODID))
// {
// await _receiptService.ADD(new Shared.DTOs.Warehouse.ReceiptDto()
// {
// CODID = item.CODID,
// Count = item.am.GetValueOrDefault(),
// Date = DateTime.Now.ConvertMiladiToShamsi(),
// ForSale = true,
// InvoiceID = item.InvoiceID,
// Type = TypeReceipt.Shopping,
// info = $"حذف صورتحساب {item.InvoiceID}",
}, user.RolUsers.First().CompanyID, true);
// }, user.RolUsers.First().CompanyID, true);
//if (invoice.BillReference.HasValue && InvoiceHasaRemittanceBillReference)
//{
// await _remittanceService.ADD(new Shared.DTOs.Warehouse.RemittanceDto()
// {
// CODID = item.CODID,
// Count = item.am.GetValueOrDefault(),
// Date = DateTime.Now.ConvertMiladiToShamsi(),
// InvoiceID = invoice.BillReference.Value,
// Type = TypeRemittance.Sale,
// info = $"حواله خودکار از صورتحساب {invoice.BillReference.Value}",
// });
//}
}
}
}
// }
//}
// }
invoice.LastChangeUserID = Convert.ToInt32(UserID);
//----Update and sendResult

2
Back/Controllers/InvoiceItemController.cs
View File

@@ -100,6 +100,7 @@ namespace Back.Controllers
return Ok(await _servInvoiceItem.Add(new InvoiceItem
{
vra=model.item.vra,
am = model.item.am,
fee = model.item.fee,
dis = model.item.dis,
@@ -196,6 +197,7 @@ namespace Back.Controllers
invoiceitem.fee = model.item.fee;
invoiceitem.dis = model.item.dis;
invoiceitem.CODID = model.item.CODID;
invoiceitem.vra = model.item.vra;
}
if (await _servInvoice.UpdateInvoice(invoice))