diff --git a/Back/Controllers/OrderssController.cs b/Back/Controllers/OrderssController.cs index d3158e8..0a4f044 100644 --- a/Back/Controllers/OrderssController.cs +++ b/Back/Controllers/OrderssController.cs @@ -34,7 +34,7 @@ namespace Back.Controllers [AllowAnonymous] public async Task>> GetAllPricing() => Ok(await _servPricing.GetPricing()); [HttpPost("GetAllOrder")] - public async Task>> GetAllOrder(ItemSerachOrder itemSerach) + public async Task>> GetAllOrder(ItemSerachOrder itemSerach) { var claim = HttpContext.User.Claims.First(c => c.Type == "UserID"); var UserID = claim.Value; diff --git a/Back/Services/ServOrders.cs b/Back/Services/ServOrders.cs index a771907..1ddd465 100644 --- a/Back/Services/ServOrders.cs +++ b/Back/Services/ServOrders.cs @@ -1,4 +1,5 @@ -using Back.Data.Contracts; +using Back.Common; +using Back.Data.Contracts; using Back.Data.Models; using Microsoft.EntityFrameworkCore; using Shared.DTOs; @@ -18,7 +19,7 @@ namespace Back.Services _repoOrderItem = repoOrderItem; } - public async Task> GetOrdersByCompanyID(int CompanyID, ItemSerachOrder itemSerach) + public async Task> GetOrdersByCompanyID(int CompanyID, ItemSerachOrder itemSerach) { var request = _repoOrder.Get(w => w.CompanyID == CompanyID); @@ -41,7 +42,7 @@ namespace Back.Services TPrice = w.TPrice, TTax = w.TPrice, lstDiscount = w.lstDiscount, - }).ToListAsync(); + }).Paging(itemSerach.PageIndex,itemSerach.PageSize); } public async Task> GetOrderItems(int OrderID,int CompanyID) { diff --git a/Shared/DTOs/OrderDto.cs b/Shared/DTOs/OrderDto.cs index 18f67e5..ea60139 100644 --- a/Shared/DTOs/OrderDto.cs +++ b/Shared/DTOs/OrderDto.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -8,15 +9,25 @@ namespace Shared.DTOs { public class OrderDto { + [Display(Name = "شناسه")] public int ID { get; set; } + public StatusOrder Status { get; set; } + [Display(Name = "وضعیت")] public string StatusTitle { get { return Status.GetEnumDisplayName(); } } + [Display(Name = "زمان ایجاد")] public string DateCreate { get; set; } + [Display(Name = "زمان پرداخت")] public string ApprovalDate { get; set; } + [Display(Name = "مبلغ سفارش")] public decimal PreDiscount { get; set; } + [Display(Name = "تخفیف سفارش")] public decimal TDiscount { get; set; } + [Display(Name = "مبلغ بغد از تخفیف")] public decimal lstDiscount { get; set; } + [Display(Name = "مبلغ مالیات")] public decimal TTax { get; set; } + [Display(Name = "مبلغ نهایی")] public decimal TPrice { get; set; } } } diff --git a/Shared/DTOs/Serch/ItemSerachOrder.cs b/Shared/DTOs/Serch/ItemSerachOrder.cs index 71a254a..a4aee92 100644 --- a/Shared/DTOs/Serch/ItemSerachOrder.cs +++ b/Shared/DTOs/Serch/ItemSerachOrder.cs @@ -6,9 +6,11 @@ using System.Threading.Tasks; namespace Shared.DTOs.Serch { - public class ItemSerachOrder + public class ItemSerachOrder : IFildGlobalItemSerch { public int? ID { get; set; } public StatusOrder? Status { get; set; } + public int PageIndex { get; set; } = 1; + public int PageSize { get; set; } = 5; } } diff --git a/TaxPayerFull/Layout/PanelNavMenu.razor b/TaxPayerFull/Layout/PanelNavMenu.razor index f38d80d..fdd2e3b 100644 --- a/TaxPayerFull/Layout/PanelNavMenu.razor +++ b/TaxPayerFull/Layout/PanelNavMenu.razor @@ -51,23 +51,23 @@
پشتیبانی
- @*
  • - - -
    سفارشات
    -     -
    • *@ +
  • تنظیمات
    • - +
  • + + +
    سفارشات
    +     +
    • @code{ - string[] cssActionItem = { "active", "", "", "", "", "", "", "" }; + string[] cssActionItem = { "active", "", "", "", "", "", "", "", "" }; } @functions{ diff --git a/TaxPayerFull/Pages/UserPanel/Orders.razor b/TaxPayerFull/Pages/UserPanel/Orders.razor new file mode 100644 index 0000000..4b59ece --- /dev/null +++ b/TaxPayerFull/Pages/UserPanel/Orders.razor @@ -0,0 +1,211 @@ +@page "/Orders" +@using Front.Services +@using Shared +@using Shared.DTOs +@using Front.CUSComponent +@using Shared.DTOs.Serch +@inject HttpClientController hc; +@inject Fixedvalues fv; +سفارشات + + +@* search *@ +
    +

    + متفرقه / سفارشات +

    +
    +
    +
    +
    +
      +
    • +
      +
      + +
      +
      + +
      + +
      + +
      +
      +
      • +
    +
    +
    +
    +
    +
    + +@* action *@ +
    +
    +
      +
    • +
      +
      + + + + +
      + +
      + +
      • +
    + +
    +
    + +@* alert *@ +
    + + +
    + +@* data *@ +@if (request != null) +{ + + @* pagination *@ +

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

    + +} + +@layout PanelLayout +@code { + //private Modal stuffmodal = default!; + [Inject] protected PreloadService PreloadService { get; set; } = default!; + ItemSerachOrder itemsearch = new ItemSerachOrder(); + public int? ItemSearchOrdertype { get; set; } + [Parameter, SupplyParameterFromQuery] + public int? PageIndex { 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() + { + await base.OnInitializedAsync(); + } + protected override async Task OnParametersSetAsync() + { + if (PageIndex == null) PageIndex = 1; + await GetOrders(PageIndex.Value); + await base.OnParametersSetAsync(); + } +} +@functions { + public async Task GetOrders(int pi=1) + { + if (ItemSearchOrdertype == 0 || ItemSearchOrdertype == null) + itemsearch.Status = null; + else + itemsearch.Status = (StatusOrder)ItemSearchOrdertype; + + itemsearch.PageSize = 10; + itemsearch.PageIndex = pi; + PreloadService.Show(SpinnerColor.Dark); + var rsp = await hc.Post("Orderss/GetAllOrder",itemsearch); + if (rsp.IsSuccessStatusCode) + request = await rsp.Content.ReadFromJsonAsync?>(); + else + ShowDangerAlert("خطایی در بارگیری سفارشات رخ داده"); + PreloadService.Hide(); + + } + 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 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 GetOrders(1); + + await modal.HideAsync(); + } + public async Task OrderItem(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