diff --git a/Back/Back.csproj b/Back/Back.csproj index 899d7e4..fd97cd7 100644 --- a/Back/Back.csproj +++ b/Back/Back.csproj @@ -36,7 +36,7 @@ - ..\..\..\LocalGit\TaxPayerTools\Service\bin\Debug\Service.dll + ..\..\Dlls\Service.dll diff --git a/TaxPayerFull/CUSComponent/OrderItemNew.razor b/TaxPayerFull/CUSComponent/OrderItemNew.razor new file mode 100644 index 0000000..4328df6 --- /dev/null +++ b/TaxPayerFull/CUSComponent/OrderItemNew.razor @@ -0,0 +1,63 @@ +@using Front.Services +@using Shared.DTOs +@inject Fixedvalues fv; +@inject HttpClientController hc; + + + + +
+
+ + نوع سفارش + + @foreach (var i in orderstype) + { + @i.Title + } + + +
+
+ + +
+
+
+
+ +
+
+@code { + string orderSelectName = ""; + int orderSelectID = 0; + [Inject] protected PreloadService PreloadService { get; set; } = default!; + [Parameter] public EventCallback OnMultipleOfThree { get; set; } + List> orderstype = new List>() + { new IdName() { ID=999,Title="شخصی" }, + new IdName() { ID=919,Title="qw" }}; + public List Promotions { get; set; } = new(); + public List Pricing { get; set; } = new(); +} +@functions { + protected override async Task OnParametersSetAsync() + { + Promotions = await fv.LoadPromotion(); + Pricing = await fv.LoadPricing(); + + orderstype.AddRange(Promotions.Select(s => new IdName + { + ID = s.ID, + Title = s.Name + }).ToList()); + + await base.OnParametersSetAsync(); + + } + public async Task OnChange(int ID,string Title) + { + orderSelectID = ID; + orderSelectName = Title; + } + public async Task NewOrder() { } +} diff --git a/TaxPayerFull/CUSComponent/OrderItemRead.razor b/TaxPayerFull/CUSComponent/OrderItemRead.razor index 00669a0..e752655 100644 --- a/TaxPayerFull/CUSComponent/OrderItemRead.razor +++ b/TaxPayerFull/CUSComponent/OrderItemRead.razor @@ -179,9 +179,9 @@ private async Task OnClickPay() { // result.Status = ComponentStatus.success; - // result.Action = ComponentAction.add; - // await OnMultipleOfThree.InvokeAsync(result); - + // result.Action = ComponentAction.add; + // await OnMultipleOfThree.InvokeAsync(result); + } private async Task OnClickCancel() @@ -193,15 +193,16 @@ if (confirmation) { - - PreloadService.Show(SpinnerColor.Dark); - var rsp = await hc.Get($"Orders/CancelOrder/{order.ID}"); - PreloadService.Hide(); - if (rsp.IsSuccessStatusCode) - { - if(await rsp.Content.ReadFromJsonAsync()) + + PreloadService.Show(SpinnerColor.Dark); + var rsp = await hc.Get($"Orders/CancelOrder/{order.ID}"); + PreloadService.Hide(); + if (rsp.IsSuccessStatusCode) { - result.Status = ComponentStatus.success; + if(await rsp.Content.ReadFromJsonAsync()) + { + order.Status = StatusOrder.Cancel; + result.Status = ComponentStatus.success; result.Action = ComponentAction.delete; await OnMultipleOfThree.InvokeAsync(result); } diff --git a/TaxPayerFull/FixedValues.cs b/TaxPayerFull/FixedValues.cs index f7270ae..5813e5c 100644 --- a/TaxPayerFull/FixedValues.cs +++ b/TaxPayerFull/FixedValues.cs @@ -1,4 +1,5 @@ -using Front.Services; +using BlazorBootstrap; +using Front.Services; using Shared.DTOs; using System.Net.Http.Json; using System.Security.Cryptography; @@ -16,6 +17,9 @@ namespace Front private CompanyDTO? InfoCompany = null; public InvoiceDTO? invoice { get; set; } = null; public DashBoardDTO? dashBoard { get; set; } = null; + + private List? Promotions { get; set; } = null; + private List? Pricing { get; set; } = null; public Fixedvalues(HttpClientController hc) { _hc = hc; @@ -77,7 +81,7 @@ namespace Front return InfoCompany; } - public async Task GetDashBoard(bool run=false) + public async Task GetDashBoard(bool run = false) { if (dashBoard == null || run) @@ -106,10 +110,32 @@ namespace Front } public async Task SetUlr(string Type) { - await _hc.Post("Base/Ulr",new UlrDto { Type=Type}); - - - + await _hc.Post("Base/Ulr", new UlrDto { Type = Type }); + + + + } + public async Task> LoadPricing() + { + if (Pricing == null) + { + var rsp = await _hc.Get($"Orders/GetAllPricing"); + if (rsp.IsSuccessStatusCode) + Pricing = await rsp.Content.ReadFromJsonAsync>(); + } + return Pricing ?? new List() ; + + } + public async Task> LoadPromotion() + { + if(Promotions==null) + {var rsp = await _hc.Get($"Orders/GetAllPromotion"); + if (rsp.IsSuccessStatusCode) + Promotions = await rsp.Content.ReadFromJsonAsync>(); + } + return Promotions?? new List(); + + } } diff --git a/TaxPayerFull/Pages/UserPanel/Orders.razor b/TaxPayerFull/Pages/UserPanel/Orders.razor index ab4a6b4..0bacfbb 100644 --- a/TaxPayerFull/Pages/UserPanel/Orders.razor +++ b/TaxPayerFull/Pages/UserPanel/Orders.razor @@ -8,6 +8,7 @@ @inject Fixedvalues fv; سفارشات + @* search *@
@@ -59,7 +60,7 @@
- +
@@ -120,6 +121,7 @@ public int? PageIndex { get; set; } public Shared.DTOs.PagingDto? request { get; set; } private Modal modal = default!; + private Modal Newordermodal = default!; // alert AlertColor alertColor = AlertColor.Primary; IconName alertIconName = IconName.CheckCircleFill; @@ -185,20 +187,34 @@ if (result.Status == ComponentStatus.success) ShowSuccessAlert("سفارش ابطال شد"); } - if (result.Status == ComponentStatus.success) await GetOrders(1); await modal.HideAsync(); } public async Task OrderItem(int ID) + { + await ReadOrderItem(request?.list.Where(w => w.ID == ID).First()); + } + public async Task ReadOrderItem(OrderDto order) + { + var parameters = new Dictionary(); + parameters.Add("order", order); + parameters.Add("OnMultipleOfThree", EventCallback.Factory.Create(this, CallBackFromReadItem)); + await modal.ShowAsync(title: $"سفارش {order.ID}", parameters: parameters); + } + public async Task CallBackFromNewItem(OrderDto result) + { + await Newordermodal.HideAsync(); + + } + public async Task NewOrderItem() { var parameters = new Dictionary(); - var item = request?.list.Where(w => w.ID == ID).First().Clone(); - parameters.Add("order", item); - parameters.Add("OnMultipleOfThree", EventCallback.Factory.Create(this, CallBackFromReadItem)); - await modal.ShowAsync(title:$"سفارش {ID}", parameters: parameters); + + parameters.Add("OnMultipleOfThree", EventCallback.Factory.Create(this, CallBackFromNewItem)); + await Newordermodal.ShowAsync(title: $"سفارش جدید", parameters: parameters); } diff --git a/TaxPayerFull/Program.cs b/TaxPayerFull/Program.cs index 670070e..ea0270a 100644 --- a/TaxPayerFull/Program.cs +++ b/TaxPayerFull/Program.cs @@ -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/") }); //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 -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");