diff --git a/Back/Back.csproj b/Back/Back.csproj
index a6bcdd4..52705f9 100644
--- a/Back/Back.csproj
+++ b/Back/Back.csproj
@@ -35,7 +35,7 @@
- ..\..\..\LocalGit\TaxPayerTools\Service\bin\Debug\Service.dll
+ ..\..\Dlls\Service.dll
diff --git a/Back/Services/servTaxPayer.cs b/Back/Services/servTaxPayer.cs
index c77f106..e6f6226 100644
--- a/Back/Services/servTaxPayer.cs
+++ b/Back/Services/servTaxPayer.cs
@@ -60,6 +60,7 @@ namespace Back.Services
.Include(inc => inc.company)
.Include(inc => inc.company)
.Include(inc => inc.pattern)
+ .ThenInclude(inc => inc.BillType)
.Include(inc => inc.payments)
.Include(inc => inc.invoice)
.Include(inc => inc.invoiceDetails)
@@ -112,7 +113,7 @@ namespace Back.Services
{
foreach (_TaxPayer.Fild item in body)
{
- var resval = InvoiceItem.GetType().GetProperties().Where(w => w.Name == item.eName).Select(s => s.GetValue(InvoiceItem)).FirstOrDefault();
+ var resval = invoicedetail.GetType().GetProperties().Where(w => w.Name == item.eName).Select(s => s.GetValue(invoicedetail)).FirstOrDefault();
item.Value = resval == null ? "" : resval.ToString();
item.DefVals = item.InputBox == "fromdb" ? _codingRepo.Get(w => w.FildID == item.FildID).Select(ss => new _TaxPayer.Coding() { ID = ss.Code, Name = ss.Title }).ToList() : new List<_TaxPayer.Coding>();
item.Des = item.ModeID == 3 ? _specialConditionRepo.Get(w => w.FildID == item.FildID).Select(ss => ss.condition).ToArray() : null;
@@ -135,7 +136,7 @@ namespace Back.Services
{
foreach (_TaxPayer.Fild item in pay)
{
- var resval = InvoiceItem.GetType().GetProperties().Where(w => w.Name == item.eName).Select(s => s.GetValue(InvoiceItem)).FirstOrDefault();
+ var resval = InvoiceItem.payments.GetType().GetProperties().Where(w => w.Name == item.eName).Select(s => s.GetValue(InvoiceItem.payments)).FirstOrDefault();
item.Value = resval == null ? "" : resval.ToString();
item.DefVals = item.InputBox == "fromdb" ? _codingRepo.Get(w => w.FildID == item.FildID).Select(ss => new _TaxPayer.Coding() { ID = ss.Code, Name = ss.Title }).ToList() : new List<_TaxPayer.Coding>();
item.Des = item.ModeID == 3 ? _specialConditionRepo.Get(w => w.FildID == item.FildID).Select(ss => ss.condition).ToArray() : null;
diff --git a/Shared/DTOs/_TaxPayer.cs b/Shared/DTOs/_TaxPayer.cs
index 11ddef6..db37e1c 100644
--- a/Shared/DTOs/_TaxPayer.cs
+++ b/Shared/DTOs/_TaxPayer.cs
@@ -11,8 +11,8 @@ namespace Shared.DTOs
public class Atemplatefield
{
public Filds header { get; set; }
- public List Bodys { get; set; }
- public List Payments { get; set; }
+ public List Bodys { get; set; } = new List();
+ public List Payments { get; set; }=new List();
}
public class Filds
diff --git a/TaxPayerFull/Program.cs b/TaxPayerFull/Program.cs
index f8805c2..628e6c3 100644
--- a/TaxPayerFull/Program.cs
+++ b/TaxPayerFull/Program.cs
@@ -34,9 +34,9 @@ builder.Services.AddScoped(sp => new UserAuthenticationDTO()
}) ;
-//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/") });
-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");