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> <ItemGroup>
<Reference Include="Service"> <Reference Include="Service">
<HintPath>..\..\Dlls\Service.dll</HintPath> <HintPath>..\..\..\LocalGit\TaxPayerTools\Service\bin\Debug\Service.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>

18
Back/Controllers/TaxPayerController.cs
View File

@@ -87,11 +87,11 @@ namespace Back.Controllers
public async Task<ActionResult<bool>> CheckAuth() public async Task<ActionResult<bool>> CheckAuth()
{ {
//var claim = HttpContext.User.Claims.First(c => c.Type == "UserID"); var claim = HttpContext.User.Claims.First(c => c.Type == "UserID");
//var UserID = claim.Value; var UserID = claim.Value;
//var user = await _servUser.GetUserByUserID(Convert.ToInt32(UserID)); var user = await _servUser.GetUserByUserID(Convert.ToInt32(UserID));
// return Ok(await _actionTaxPayer.login(user.RolUsers.First().CompanyID)); return Ok(await _actionTaxPayer.login(user.RolUsers.First().CompanyID));
return Ok(true); // return Ok(true);
return BadRequest(); return BadRequest();
@@ -103,8 +103,8 @@ namespace Back.Controllers
var claim = HttpContext.User.Claims.First(c => c.Type == "UserID"); var claim = HttpContext.User.Claims.First(c => c.Type == "UserID");
var UserID = claim.Value; var UserID = claim.Value;
var user = await _servUser.GetUserByUserID(Convert.ToInt32(UserID)); var user = await _servUser.GetUserByUserID(Convert.ToInt32(UserID));
//if (!await _actionTaxPayer.login(user.RolUsers.First().CompanyID)) if (!await _actionTaxPayer.login(user.RolUsers.First().CompanyID))
// return BadRequest(new List<string> { "خطا در احراز هویت سازمان مالیاتی" }); return BadRequest(new List<string> { "خطا در احراز هویت سازمان مالیاتی" });
var result = await _servTaxPayer.GetInvoice(user.RolUsers.First().CompanyID, InvoiceID); var result = await _servTaxPayer.GetInvoice(user.RolUsers.First().CompanyID, InvoiceID);
if (result == null) if (result == null)
@@ -497,8 +497,8 @@ namespace Back.Controllers
if (string.IsNullOrEmpty(item.uId)) if (string.IsNullOrEmpty(item.uId))
return BadRequest(new List<string> { "کد پیگیری یافت نشد" }); return BadRequest(new List<string> { "کد پیگیری یافت نشد" });
//if (!await _actionTaxPayer.login(user.RolUsers.First().CompanyID)) if (!await _actionTaxPayer.login(user.RolUsers.First().CompanyID))
// return BadRequest(new List<string> { "خطا در احراز هویت سازمان مالیاتی" }); return BadRequest(new List<string> { "خطا در احراز هویت سازمان مالیاتی" });
DataInSendTaxDto desData = new DataInSendTaxDto(); DataInSendTaxDto desData = new DataInSendTaxDto();
if (item.SentStatus == SentStatus.Send 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) public string GenerateTaxid(string FactorNo, string InvoiceDate)
{ {
return "testTaxid"; // return "testTaxid";
return TaxApiService.Instance.TaxIdGenerator.GenerateTaxId(_UniqueMemory, return TaxApiService.Instance.TaxIdGenerator.GenerateTaxId(_UniqueMemory,
Convert.ToInt64(FactorNo), InvoiceDate.ToMiladi()); Convert.ToInt64(FactorNo), InvoiceDate.ToMiladi());
} }
public async Task<InquiryResultModel> GetResultByUid(int CompanyID, string uid) public async Task<InquiryResultModel> GetResultByUid(int CompanyID, string uid)
{ {
return new InquiryResultModel("18084a18-1eb4-41cd-8bd3-2cad73c45398", "0a4a4ab2-8047-4c31-b765-456ddf0e9c53", "SUCCESS", //return new InquiryResultModel("18084a18-1eb4-41cd-8bd3-2cad73c45398", "0a4a4ab2-8047-4c31-b765-456ddf0e9c53", "SUCCESS",
new DataInSendTaxDto() // new DataInSendTaxDto()
{ // {
error=new List<MessageInSendTaxDto>() // error=new List<MessageInSendTaxDto>()
{ // {
new MessageInSendTaxDto() // new MessageInSendTaxDto()
{ // {
code="21001",message="یک خطای تست" // code="21001",message="یک خطای تست"
} // }
} // }
} // }
, "receive_invoice_confirm", "A2FFKZ"); // , "receive_invoice_confirm", "A2FFKZ");
if (!await login(CompanyID)) if (!await login(CompanyID))
return null; return null;
var uidAndFiscalId = new UidAndFiscalId(uid, _UniqueMemory); 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) 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> //return new TaxCollectData.Library.Dto.HttpResponse<AsyncResponseModel>
( body: new AsyncResponseModel( // ( body: new AsyncResponseModel(
1702299112 // 1702299112
,new HashSet<PacketResponse>(new List<PacketResponse> { new PacketResponse("5d0c7198-e2fd-4cc1-8802-fe498d6ccf73", "a70444a4-1810-4cea-8bcc-7acb4bc75645", null,null)}) // ,new HashSet<PacketResponse>(new List<PacketResponse> { new PacketResponse("5d0c7198-e2fd-4cc1-8802-fe498d6ccf73", "a70444a4-1810-4cea-8bcc-7acb4bc75645", null,null)})
,new List<ErrorModel>()), 200); // ,new List<ErrorModel>()), 200);
if (!await login(CompanyID)) if (!await login(CompanyID))
return null; return null;

9
TaxPayerFull/Pages/BlogDetails.razor
View File

@@ -64,10 +64,9 @@
<article> <article>
<div class="postbox__details-title-box pb-30"> <div class="postbox__details-title-box pb-30">
<p> @((MarkupString)Item?.Text)
@Item?.Text
</p>
</div> </div>
@@ -133,11 +132,13 @@
public List<BlogDto> collectionitem { get; set; } = new List<BlogDto>(); public List<BlogDto> collectionitem { get; set; } = new List<BlogDto>();
public BlogDtoFull? Item { get; set; } public BlogDtoFull? Item { get; set; }
protected override async Task OnParametersSetAsync() protected override async Task OnParametersSetAsync()
{ {
if (ItemID != null) if (ItemID != null)
{ {
Item = await GetItems(); Item = await GetItems();
// Item.Text = "<p><strong>RTHH</strong></p>";
if (Item==null) if (Item==null)
Navigation.NavigateTo("/"); Navigation.NavigateTo("/");

4
TaxPayerFull/Program.cs
View File

@@ -37,10 +37,10 @@ builder.Services.AddScoped(sp => new UserAuthenticationDTO()
//builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("http://195.88.208.142:7075/api/") }); //builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("http://195.88.208.142:7075/api/") });
//Home //Home
builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("https://localhost:7075/api/") }); //builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("https://localhost:7075/api/") });
//farzan //farzan
//builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("http://localhost:5271/api/") }); builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("http://localhost:5271/api/") });
CultureInfo.DefaultThreadCurrentCulture = new CultureInfo("fa-Ir"); CultureInfo.DefaultThreadCurrentCulture = new CultureInfo("fa-Ir");