diff --git a/Back/Back.csproj b/Back/Back.csproj index 7cd4417..69ae328 100644 --- a/Back/Back.csproj +++ b/Back/Back.csproj @@ -6,13 +6,6 @@ enable - - - - - - - @@ -31,13 +24,17 @@ + + + + - ..\..\..\LocalGit\TaxPayerTools\Service\bin\Debug\Service.dll + ..\..\Dlls\Service.dll diff --git a/Back/Controllers/CODController.cs b/Back/Controllers/CODController.cs index 5423a7a..2ae4e25 100644 --- a/Back/Controllers/CODController.cs +++ b/Back/Controllers/CODController.cs @@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Mvc; using Shared.DTOs.Serch; using Shared.DTOs; using System.Xml.Linq; +using Back.Common; namespace Back.Controllers { @@ -28,9 +29,92 @@ namespace Back.Controllers return Ok(await _servCOD.GetCODs(user.RolUsers.First().CompanyID, itemSerch)); } [HttpGet("GetUnits")] - public async Task>> GetUnits() + public async Task>>> GetUnits() { return Ok(await _servCOD.GetUnits()); } + [HttpPost("Add")] + public async Task> Add(RCOD item) + { + return Ok(); + //var claim = HttpContext.User.Claims.First(c => c.Type == "UserID"); + //var UserID = claim.Value; + //var user = await _servUser.GetUserByUserID(Convert.ToInt32(UserID)); + + //var resultValidationmodel = await _addorupdateCustomerValidation.ValidateAsync(Tuple.Create(user.RolUsers.First().CompanyID, item, eActionValidation.add)); + //if (!resultValidationmodel.IsValid) + // return BadRequest(resultValidationmodel.Errors.Select(s => s.ErrorMessage).ToList()); + + //return Ok(await _servCus.AddOrUpdateCustomer(new Data.Models.Customer + //{ + // Address = item.Address, + // BranchID = item.BranchID, + // CompanyID = user.RolUsers.First().CompanyID, + // CustomerType = item.CustomerType, + // EconomicCode = item.EconomicCode, + // Email = item.Email, + // FullName = item.FullName, + // Info = item.Info, + // MeliCode = item.MeliCode, + // PassportNumber = item.PassportNumber, + // Phone = item.Phone, + // ZipCode = item.ZipCode, + // IsDeleted = false + //})); + } + [HttpPut("Update")] + public async Task> Update(RCOD item) + { + return Ok(); + ////-----GetUserAndCompany + //var claim = HttpContext.User.Claims.First(c => c.Type == "UserID"); + //var UserID = claim.Value; + //var user = await _servUser.GetUserByUserID(Convert.ToInt32(UserID)); + + ////-----Validaton + //var resultValidationmodel = await _addorupdateCustomerValidation.ValidateAsync(Tuple.Create(user.RolUsers.First().CompanyID, item, eActionValidation.update)); + //if (!resultValidationmodel.IsValid) + // return BadRequest(resultValidationmodel.Errors.Select(s => s.ErrorMessage).ToList()); + + ////-----Get Cus + //var cus = await _servCus.GetCustomerByCustomerID(item.ID.Value, user.RolUsers.First().CompanyID); + //if (cus == null) + // return BadRequest(new List { "Cus notFound..." }); + + ////-----change Cus + //cus.Address = item.Address; + //cus.BranchID = item.BranchID; + //cus.CompanyID = user.RolUsers.First().CompanyID; + //cus.CustomerType = item.CustomerType; + //cus.EconomicCode = item.EconomicCode; + //cus.Email = item.Email; + //cus.FullName = item.FullName; + //cus.Info = item.Info; + //cus.MeliCode = item.MeliCode; + //cus.PassportNumber = item.PassportNumber; + //cus.Phone = item.Phone; + //cus.ZipCode = item.ZipCode; + //cus.IsDeleted = false; + + ////----Update and sendResult + //return Ok(await _servCus.AddOrUpdateCustomer(cus)); + } + [HttpDelete("Delete/{ID}")] + public async Task> Delete(int ID) + { + return Ok(); + ////-----GetUserAndCompany + //var claim = HttpContext.User.Claims.First(c => c.Type == "UserID"); + //var UserID = claim.Value; + //var user = await _servUser.GetUserByUserID(Convert.ToInt32(UserID)); + + ////-----Get Cus + //var cus = await _servCus.GetCustomerByCustomerID(ID, user.RolUsers.First().CompanyID); + //if (cus == null) + // return NotFound(); + + ////----Update and sendResult + //return Ok(await _servCus.DeleteCustomer(cus)); + } } } diff --git a/Back/Program.cs b/Back/Program.cs index 1beb178..040f5e2 100644 --- a/Back/Program.cs +++ b/Back/Program.cs @@ -40,6 +40,7 @@ builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); +builder.Services.AddScoped(); builder.Services.AddScoped(c => new mpNuget.RestClient("09119660045", "C54S2")); string origins = "OriginTaxPayer"; diff --git a/Shared/DTOs/RCOD.cs b/Shared/DTOs/RCOD.cs index 184abe0..8bc0ced 100644 --- a/Shared/DTOs/RCOD.cs +++ b/Shared/DTOs/RCOD.cs @@ -13,7 +13,7 @@ namespace Shared.DTOs public int? ID { get; set; } [Display(Name = "شناسه مالیاتی")] public string? TaxID { get; set; } - [Display(Name = "عنوان")] + [Display(Name = "نام کالا")] public string Title { get; set; } public int UnitID { get; set; } [Display(Name = "واحد")] diff --git a/TaxPayerFull/CUSComponent/CodItem.razor b/TaxPayerFull/CUSComponent/CodItem.razor new file mode 100644 index 0000000..44fdc9e --- /dev/null +++ b/TaxPayerFull/CUSComponent/CodItem.razor @@ -0,0 +1,182 @@ +@using Front.Services +@using Shared.DTOs +@inject HttpClientController hc; +
+ @* alert *@ +
+ + +
+
+
+ + +
+
+ + +
+
+ +
+
+ + +
+
+ + +
+
+ + +
+ + +@if (Cod.ID == 0) +{ + +} +else +{ + + +} + + +@code { + // alert + AlertColor alertColor = AlertColor.Primary; + IconName alertIconName = IconName.CheckCircleFill; + bool Hidealert = true; + string alertMessage = ""; + [Parameter] public RCOD Cod { get; set; } + [Parameter] public EventCallback OnMultipleOfThree { get; set; } + [Parameter] public List>? Unitrequest { get; set; } + public ActionInResultComponent result { get; set; } + + + protected override Task OnParametersSetAsync() + { + + result = new ActionInResultComponent() + { + Status = ComponentStatus.fild + }; + Hidealert = true; + alertMessage = ""; + return base.OnParametersSetAsync(); + } +} +@functions { + private void ShowSuccessAlert(string msg) + { + Hidealert = false; + alertColor = AlertColor.Success; + alertIconName = IconName.CheckCircleFill; + alertMessage = msg; + } + private void ShowDangerAlert(string msg) + { + Hidealert = false; + alertColor = AlertColor.Danger; + alertIconName = IconName.ExclamationTriangleFill; + alertMessage = msg; + } + public async Task OnClickDelete() + { + + var rsp = await hc.Delete($"Cod/Delete/{Cod.ID}"); + if (rsp.IsSuccessStatusCode) + { + var request = await rsp.Content.ReadFromJsonAsync(); + if (request) + { + result.Status = ComponentStatus.success; + result.Action = ComponentAction.delete; + await OnMultipleOfThree.InvokeAsync(result); + } + else ShowDangerAlert("خطایی در اجرای عملیات رخ داده"); + } + + else if (rsp.StatusCode == System.Net.HttpStatusCode.NotFound) + { + ShowDangerAlert("کالا با این شناسه یافت نشد"); + } + else ShowDangerAlert("خطایی در اجرای عملیات رخ داده"); + + + + + } + public async Task OnClickUpdate() + { + if (Cod.UnitID > 0 && Cod.TaxRate > 0 && !string.IsNullOrEmpty(Cod.Title)) + { + + var rsp = await hc.Put("Cod/Update", Cod); + if (rsp.IsSuccessStatusCode) + { + var request = await rsp.Content.ReadFromJsonAsync(); + if (request) + { + result.Status = ComponentStatus.success; + result.Action = ComponentAction.update; + await OnMultipleOfThree.InvokeAsync(result); + } + else ShowDangerAlert("خطایی در اجرای عملیات رخ داده"); + } + else + { + var request = await rsp.Content.ReadFromJsonAsync>(); + ShowDangerAlert(request[0]); + } + } + else ShowDangerAlert("فیلدهای قرمز باید مقدار دهی شوند"); + } + public async Task OnClickAdd() + { + if (Cod.UnitID > 0 && Cod.TaxRate > 0 && !string.IsNullOrEmpty(Cod.Title)) + { + + var rsp = await hc.Post("Cod/Add", Cod); + if (rsp.IsSuccessStatusCode) + { + var request = await rsp.Content.ReadFromJsonAsync(); + + if (request) + { + result.Status = ComponentStatus.success; + result.Action = ComponentAction.add; + await OnMultipleOfThree.InvokeAsync(result); + } + else ShowDangerAlert("خطایی در اجرای عملیات رخ داده"); + } + else + { + + var request = await rsp.Content.ReadFromJsonAsync>(); + ShowDangerAlert(request[0]); + } + } + else ShowDangerAlert("فیلدهای قرمز باید مقدار دهی شوند"); + } +} \ No newline at end of file diff --git a/TaxPayerFull/Layout/PanelNavMenu.razor b/TaxPayerFull/Layout/PanelNavMenu.razor index 2364115..618ed9e 100644 --- a/TaxPayerFull/Layout/PanelNavMenu.razor +++ b/TaxPayerFull/Layout/PanelNavMenu.razor @@ -20,7 +20,7 @@
  • - +
    کالا
     diff --git a/TaxPayerFull/Pages/UserPanel/COD.razor b/TaxPayerFull/Pages/UserPanel/COD.razor new file mode 100644 index 0000000..2222ebe --- /dev/null +++ b/TaxPayerFull/Pages/UserPanel/COD.razor @@ -0,0 +1,213 @@ +@page "/Cod" +@using Front.Services +@using Shared.DTOs +@using Front.CUSComponent +@using Shared.DTOs.Serch +@inject HttpClientController hc; +کالا + + + +@* search *@ +
    +
    +
    +
    +
    +
      +
    • +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      + +
      + +
      +
      +
      • +
    +
    +
    +
    +
    +
    + +@* action *@ +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    + +@* alert *@ +
    + + +
    + +@* data *@ +@if (request != null) +{ + + @* pagination *@ +

    @request?.RowCount آیتم یافت شد

    + +} + +@layout PanelLayout +@code { + + [Inject] protected PreloadService PreloadService { get; set; } = default!; + ItemSerchGetCOD itemsearch = new ItemSerchGetCOD(); + [Parameter, SupplyParameterFromQuery] + public int? PageIndex { get; set; } + public List>? Unitrequest { get; set; } + public Shared.DTOs.PagingDto? request { get; set; } + private Modal modal = default!; + // alert + AlertColor alertColor = AlertColor.Primary; + IconName alertIconName = IconName.CheckCircleFill; + bool Hidealert = true; + string alertMessage = ""; + + protected override async Task OnInitializedAsync() + { + var rsp = await hc.Get("COD/GetUnits"); + if (rsp.IsSuccessStatusCode) + { + Unitrequest = await rsp.Content.ReadFromJsonAsync>>(); + } + await base.OnInitializedAsync(); + } + protected override async Task OnParametersSetAsync() + { + if (PageIndex == null) PageIndex = 1; + await LoadCod(PageIndex.Value); + await base.OnParametersSetAsync(); + } +} +@functions { + private void ShowSuccessAlert(string msg) + { + Hidealert = false; + alertColor = AlertColor.Success; + alertIconName = IconName.CheckCircleFill; + alertMessage = msg; + } + private void ShowDangerAlert(string msg) + { + Hidealert = false; + alertColor = AlertColor.Danger; + alertIconName = IconName.ExclamationTriangleFill; + alertMessage = msg; + } + public async Task LoadCod(int pi) + { + + itemsearch.PageSize = 10; + itemsearch.PageIndex = pi; + PreloadService.Show(SpinnerColor.Dark); + var rsp = await hc.Post("COD/GetAll", itemsearch); + if (rsp.IsSuccessStatusCode) + { + request = await rsp.Content.ReadFromJsonAsync>(); + } + else if(rsp.StatusCode==System.Net.HttpStatusCode.Forbidden) + { + ShowDangerAlert("شما دسترسی به خواندن اطلاعات کالا را نداربد"); + } + else + { + ShowDangerAlert("خطایی در اجرای عملیات رخ داده"); + } + PreloadService.Hide(); + } + public async Task CallBackCodItem(ActionInResultComponent result) + { + + if (result.Action == ComponentAction.add) + { + if (result.Status==ComponentStatus.success) + ShowSuccessAlert("کالا جدید با موفقیت اضافه شد"); + + } + else if (result.Action == ComponentAction.update) + { + if (result.Status == ComponentStatus.success) + ShowSuccessAlert("اطلاعات کالا با موفقیت ویرایش شد"); + } + else if (result.Action == ComponentAction.delete) + { + if (result.Status == ComponentStatus.success) + ShowSuccessAlert("کالا با موفقیت حذف شد"); + } + + if (result.Status == ComponentStatus.success) + await LoadCod(1); + + await modal.HideAsync(); + } + public async Task CodItem(int ID) + { + + var parameters = new Dictionary(); + + if(ID == 0) parameters.Add("Cod", new RCOD(){ID=0}); + else parameters.Add("Cod", request.list.Where(w=>w.ID==ID).First().Clone()); + parameters.Add("Unitrequest", Unitrequest); + parameters.Add("OnMultipleOfThree", EventCallback.Factory.Create(this, CallBackCodItem)); + await modal.ShowAsync(title: ID == 0 ? "کالا جدید" : "ویرایش اطلاعات", parameters: parameters); + + + } +} \ No newline at end of file diff --git a/TaxPayerFull/Pages/UserPanel/Customer.razor b/TaxPayerFull/Pages/UserPanel/Customer.razor index 2837604..83a4927 100644 --- a/TaxPayerFull/Pages/UserPanel/Customer.razor +++ b/TaxPayerFull/Pages/UserPanel/Customer.razor @@ -200,7 +200,7 @@ else parameters.Add("Cus", request.list.Where(w=>w.ID==ID).First().Clone()); parameters.Add("OnMultipleOfThree", EventCallback.Factory.Create(this, CallBackCustomerItem)); - await modal.ShowAsync(title: ID == null ? "مشتری جدید" : "ویرایش اطلاعات", parameters: parameters); + await modal.ShowAsync(title: ID == 0 ? "مشتری جدید" : "ویرایش اطلاعات", parameters: parameters); } diff --git a/TaxPayerFull/Program.cs b/TaxPayerFull/Program.cs index f226d1a..02ee651 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");