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

end taxpayer and MarkupStringInBlog

Browse Source
This commit is contained in:
mmrbnjd
2024-07-20 12:58:17 +03:30
parent d67a9ae440
commit 5ded8c07e5
5 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Back/Back.csproj
View File

@@ -36,7 +36,7 @@
<ItemGroup>
<Reference Include="Service">
<HintPath>..\..\Dlls\Service.dll</HintPath>
<HintPath>..\..\..\LocalGit\TaxPayerTools\Service\bin\Debug\Service.dll</HintPath>
</Reference>
</ItemGroup>

18
Back/Controllers/TaxPayerController.cs
View File

@@ -87,11 +87,11 @@ namespace Back.Controllers
public async Task<ActionResult<bool>> CheckAuth()
{
//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);
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 BadRequest();
@@ -103,8 +103,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));
//if (!await _actionTaxPayer.login(user.RolUsers.First().CompanyID))
// return BadRequest(new List<string> { "خطا در احراز هویت سازمان مالیاتی" });
if (!await _actionTaxPayer.login(user.RolUsers.First().CompanyID))
return BadRequest(new List<string> { "خطا در احراز هویت سازمان مالیاتی" });
var result = await _servTaxPayer.GetInvoice(user.RolUsers.First().CompanyID, InvoiceID);
if (result == null)
@@ -497,8 +497,8 @@ namespace Back.Controllers
if (string.IsNullOrEmpty(item.uId))
return BadRequest(new List<string> { "کد پیگیری یافت نشد" });
//if (!await _actionTaxPayer.login(user.RolUsers.First().CompanyID))
// return BadRequest(new List<string> { "خطا در احراز هویت سازمان مالیاتی" });
if (!await _actionTaxPayer.login(user.RolUsers.First().CompanyID))
return BadRequest(new List<string> { "خطا در احراز هویت سازمان مالیاتی" });
DataInSendTaxDto desData = new DataInSendTaxDto();
if (item.SentStatus == SentStatus.Send

36
Back/Services/ActionTaxPayer.cs
View File

@@ -22,24 +22,24 @@ namespace Back.Services
}
public string GenerateTaxid(string FactorNo, string InvoiceDate)
{
return "testTaxid";
// return "testTaxid";
return TaxApiService.Instance.TaxIdGenerator.GenerateTaxId(_UniqueMemory,
Convert.ToInt64(FactorNo), InvoiceDate.ToMiladi());
}
public async Task<InquiryResultModel> GetResultByUid(int CompanyID, string uid)
{
return new InquiryResultModel("18084a18-1eb4-41cd-8bd3-2cad73c45398", "0a4a4ab2-8047-4c31-b765-456ddf0e9c53", "SUCCESS",
new DataInSendTaxDto()
{
error=new List<MessageInSendTaxDto>()
{
new MessageInSendTaxDto()
{
code="21001",message="یک خطای تست"
}
}
}
, "receive_invoice_confirm", "A2FFKZ");
//return new InquiryResultModel("18084a18-1eb4-41cd-8bd3-2cad73c45398", "0a4a4ab2-8047-4c31-b765-456ddf0e9c53", "SUCCESS",
// new DataInSendTaxDto()
// {
// error=new List<MessageInSendTaxDto>()
// {
// new MessageInSendTaxDto()
// {
// code="21001",message="یک خطای تست"
// }
// }
// }
// , "receive_invoice_confirm", "A2FFKZ");
if (!await login(CompanyID))
return null;
var uidAndFiscalId = new UidAndFiscalId(uid, _UniqueMemory);
@@ -50,11 +50,11 @@ namespace Back.Services
}
public async Task<TaxCollectData.Library.Dto.HttpResponse<AsyncResponseModel>> SendInvoice(int CompanyID,InvoiceHeaderDto header, List<InvoiceBodyDto> InvoiceBody, PaymentDto payment)
{
return new TaxCollectData.Library.Dto.HttpResponse<AsyncResponseModel>
( body: new AsyncResponseModel(
1702299112
,new HashSet<PacketResponse>(new List<PacketResponse> { new PacketResponse("5d0c7198-e2fd-4cc1-8802-fe498d6ccf73", "a70444a4-1810-4cea-8bcc-7acb4bc75645", null,null)})
,new List<ErrorModel>()), 200);
//return new TaxCollectData.Library.Dto.HttpResponse<AsyncResponseModel>
// ( body: new AsyncResponseModel(
// 1702299112
// ,new HashSet<PacketResponse>(new List<PacketResponse> { new PacketResponse("5d0c7198-e2fd-4cc1-8802-fe498d6ccf73", "a70444a4-1810-4cea-8bcc-7acb4bc75645", null,null)})
// ,new List<ErrorModel>()), 200);
if (!await login(CompanyID))
return null;