diff --git a/Back/Back.csproj b/Back/Back.csproj index 69ae328..18bc412 100644 --- a/Back/Back.csproj +++ b/Back/Back.csproj @@ -34,7 +34,7 @@ - ..\..\Dlls\Service.dll + ..\..\..\LocalGit\TaxPayerTools\Service\bin\Debug\Service.dll diff --git a/Back/Services/servCustomer.cs b/Back/Services/servCustomer.cs index 3a4f454..1a7a819 100644 --- a/Back/Services/servCustomer.cs +++ b/Back/Services/servCustomer.cs @@ -44,20 +44,22 @@ namespace Back.Services //----------------------- return await invok.Select(s=>new RCustomer() { - // Address = s.Address, - CustomerType = s.CustomerType.GetEnumDisplayName(), + + Address = s.Address, + CustomerTypeTitle = s.CustomerType.GetEnumDisplayName(), EconomicCode = s.EconomicCode, - // Email =s.Email, - FullName = s.FullName, + Email = s.Email, + FullName = s.FullName, ID = s.ID, - // Info = s.Info, - Phone=s.Phone, - // BranchID = s.BranchID, - // MeliCode = s.MeliCode, - // ZipCode = s.ZipCode , - // PassportNumber=s.PassportNumber, - // CompanyID=s.CompanyID - }) + Info = s.Info, + Phone =s.Phone, + BranchID = s.BranchID, + MeliCode = s.MeliCode, + ZipCode = s.ZipCode, + PassportNumber = s.PassportNumber, + CustomerType= s.CustomerType + // CompanyID=s.CompanyID + }) .Paging(itemSerch.PageIndex, itemSerch.PageSize); } //public async Task GetCustomerByCustomerID(int CustomerID, int CompanyID) diff --git a/Shared/DTOs/RCustomer.cs b/Shared/DTOs/RCustomer.cs index 6625ac2..3c72d79 100644 --- a/Shared/DTOs/RCustomer.cs +++ b/Shared/DTOs/RCustomer.cs @@ -14,11 +14,25 @@ namespace Shared.DTOs [Display(Name = "نام کامل")] public string FullName { get; set; } [Display(Name = "نوع مشتری")] - public string CustomerType { get; set; } + public string CustomerTypeTitle { get; set; } [Display(Name = "تلفن")] public string Phone { get; set; } + [Display(Name = "پست الکترونیک")] + public string? Email { get; set; } + [Display(Name = "آدرس")] + public string? Address { get; set; } [Display(Name = "کد اقتصادی")] public string? EconomicCode { get; set; } - + [Display(Name = "کد شعبه")] + public string? BranchID { get; set; } + [Display(Name = "توضیحات")] + public string? Info { get; set; } + + //------------ + public CustomerType CustomerType { get; set; } + public string? ZipCode { get; set; } + public string? MeliCode { get; set; } + public string? PassportNumber { get; set; } + } } diff --git a/TaxPayerFull/Program.cs b/TaxPayerFull/Program.cs index 02ee651..f226d1a 100644 --- a/TaxPayerFull/Program.cs +++ b/TaxPayerFull/Program.cs @@ -33,9 +33,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");