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-05-26 17:25:34 +03:30
parent 58940b9e50
commit b2b2e2cf2d
7 changed files with 299 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Back/Controllers/InvoiceController.cs
View File

@@ -55,8 +55,8 @@ namespace Back.Controllers
item.InvoicIssueDate = DateTime.Now.ConvertMiladiToShamsi();
if (!ModelState.IsValid)
return BadRequest(item);
//if (!ModelState.IsValid)
// return BadRequest(item);
//-----GetUserAndCompany
var claim = HttpContext.User.Claims.First(c => c.Type == "UserID");

12
Back/Controllers/InvoiceItemController.cs
View File

@@ -27,7 +27,7 @@ namespace Back.Controllers
}
[HttpPost("AddItem/{invoiceID}")]
public async Task<ActionResult> AddItem([FromRoute] int invoiceID, [FromBody] InvoiceItemDTO model)
public async Task<ActionResult<bool>> AddItem([FromRoute] int invoiceID, [FromBody] InvoiceItemDTO model)
{
//-----GetUserAndCompany
var claim = HttpContext.User.Claims.First(c => c.Type == "UserID");
@@ -64,7 +64,7 @@ namespace Back.Controllers
}
[HttpPut("UpdateItem/{invoiceID}")]
public async Task<ActionResult> UpdateItem([FromRoute] int invoiceID, [FromBody] InvoiceItemDTO model)
public async Task<ActionResult<bool>> UpdateItem([FromRoute] int invoiceID, [FromBody] InvoiceItemDTO model)
{
//-----GetUserAndCompany
var claim = HttpContext.User.Claims.First(c => c.Type == "UserID");
@@ -109,7 +109,7 @@ namespace Back.Controllers
}
[HttpDelete("DeleteItem/{invoiceID}/{invoiceItemID}")]
public async Task<ActionResult> DeleteItem([FromRoute] int invoiceID, [FromRoute] int invoiceItemID)
public async Task<ActionResult<bool>> DeleteItem([FromRoute] int invoiceID, [FromRoute] int invoiceItemID)
{
//-----GetUserAndCompany
var claim = HttpContext.User.Claims.First(c => c.Type == "UserID");
@@ -124,12 +124,12 @@ namespace Back.Controllers
//-----Get invoice
Invoice invoice = await _servInvoice.GetInvoiceByInvoiceID(user.RolUsers.First().CompanyID, invoiceID);
if (invoice == null)
return BadRequest(new List<string> { "invoice notFound..." });
return NotFound(new List<string> { "invoice notFound..." });
var invoiceitem = await _servInvoiceItem.Getinvoiceitem(user.RolUsers.First().CompanyID, invoiceID, model.ID.Value);
var invoiceitem = await _servInvoiceItem.Getinvoiceitem(user.RolUsers.First().CompanyID, invoiceID, invoiceItemID);
if (invoiceitem == null)
return BadRequest(new List<string> { "invoice Item notFound..." });
return NotFound(new List<string> { "invoice Item notFound..." });
invoice.LastChangeUserID = Convert.ToInt32(UserID);

13
Back/Services/servInvoice.cs
View File

@@ -129,7 +129,7 @@ namespace Back.Services
return await _invoiceRepo.Get(w => w.ID == InvoiceID && w.CompanyID == CompanyID && !w.IsDeleted).AnyAsync();
}
public async Task<bool> AddInvoice(Invoice invoice, bool calculate = true)
public async Task<int> AddInvoice(Invoice invoice, bool calculate = true)
{
invoice.Cdate = DateTime.Now.ConvertMiladiToShamsi();
invoice.Udate = DateTime.Now.ConvertMiladiToShamsi();
@@ -137,12 +137,17 @@ namespace Back.Services
if (calculate)
{
if (await _checkPermission.ExtensionofAccess(invoice.CompanyID.Value, 3, "-1"))
return await _invoiceRepo.AddBoolResultAsync(invoice);
return false;
{
var item= await _invoiceRepo.AddAsync(invoice);
return item.ID;
}
return -1;
}
else
{
return await _invoiceRepo.AddBoolResultAsync(invoice);
var item = await _invoiceRepo.AddAsync(invoice);
return item.ID;
}
}