...
This commit is contained in:
@@ -46,7 +46,7 @@ namespace Back.Controllers
|
||||
|
||||
else
|
||||
{
|
||||
if (!result.PatternID.HasValue || result.PatternID==0)
|
||||
if (!result.PatternID.HasValue || result.PatternID == 0)
|
||||
return BadRequest(new List<string> { "ابتدا برای این صورتحساب الگو در نظر بگیرید" });
|
||||
|
||||
if (result.invoiceType == InvoiceType.Bidding)
|
||||
@@ -90,8 +90,8 @@ namespace Back.Controllers
|
||||
//var claim = HttpContext.User.Claims.First(c => c.Type == "UserID");
|
||||
//var UserID = claim.Value;
|
||||
//var user = await _servUser.GetUserByUserID(Convert.ToInt32(UserID));
|
||||
// return Ok(await _actionTaxPayer.login(user.RolUsers.First().CompanyID));
|
||||
return Ok(true);
|
||||
// return Ok(await _actionTaxPayer.login(user.RolUsers.First().CompanyID));
|
||||
return Ok(true);
|
||||
|
||||
return BadRequest();
|
||||
|
||||
@@ -425,7 +425,7 @@ namespace Back.Controllers
|
||||
InvoiceBody.Add(item);
|
||||
}
|
||||
|
||||
|
||||
|
||||
var responseModel = await _actionTaxPayer.SendInvoice(user.RolUsers.First().CompanyID, header, InvoiceBody, new PaymentDto { });
|
||||
if (responseModel == null)
|
||||
{
|
||||
@@ -435,6 +435,8 @@ namespace Back.Controllers
|
||||
{
|
||||
foreach (var item in responseModel.Body.Result)
|
||||
{
|
||||
//ta imja
|
||||
|
||||
var ressenttax = new SentTax
|
||||
{
|
||||
InvoiceID = result.ID,
|
||||
@@ -444,7 +446,8 @@ namespace Back.Controllers
|
||||
ReferenceNumber = item.ReferenceNumber,
|
||||
uId = item.Uid,
|
||||
SentStatus = SentStatus.Send,
|
||||
InvoiceModel = JsonConvert.SerializeObject(result),
|
||||
InvoiceModel = JsonConvert.SerializeObject(result, Formatting.Indented,new JsonSerializerSettings
|
||||
{ PreserveReferencesHandling = PreserveReferencesHandling.Objects }),
|
||||
ResponseModel = JsonConvert.SerializeObject(responseModel)
|
||||
};
|
||||
await _servTaxPayer.AddSentTax(ressenttax);
|
||||
@@ -495,11 +498,11 @@ namespace Back.Controllers
|
||||
return BadRequest(new List<string> { "خطا در احراز هویت سازمان مالیاتی" });
|
||||
|
||||
DataInSendTaxDto desData = new DataInSendTaxDto();
|
||||
if (item.SentStatus==SentStatus.Send
|
||||
if (item.SentStatus == SentStatus.Send
|
||||
|| item.SentStatus == SentStatus.pending
|
||||
|| item.SentStatus == SentStatus.IN_PROGRESS)
|
||||
{
|
||||
|
||||
|
||||
|
||||
var result = await _actionTaxPayer.GetResultByUid(user.RolUsers.First().CompanyID, item.uId);
|
||||
if (result == null)
|
||||
|
Reference in New Issue
Block a user