From 17f27cad5c06dad72ff0d7fa8a8dcedda8be130b Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Fri, 20 Jan 2023 17:21:41 +0100 Subject: [PATCH] done - customer inventory overlay --- .../CustomerInvoiceListComponent.razor | 2 +- .../Pages/AdvisorActivityCreatePage.razor | 27 +++++--- .../Pages/AdvisorActivityCreatePage.razor.cs | 26 ++++++- .../Shared/ConfirmProductCheckModal.razor | 2 +- .../Shared/CustomerInventoryOverlay.razor | 23 +++++-- .../Shared/CustomerInventoryOverlay.razor.cs | 69 ++++++++++++++++++- .../Shared/CustomerInvoiceOverlay.razor | 2 +- .../Shared/InventoryReorderModal.razor | 3 +- Wonky.Client/Shared/InvoiceViewModal.razor | 2 +- Wonky.Client/Shared/PriceCatalogModal.razor | 2 +- Wonky.Client/Shared/ProductHistoryModal.razor | 2 +- .../Shared/ProductPriceHistoryModal.razor | 2 +- Wonky.Client/wwwroot/appsettings.json | 4 +- 13 files changed, 136 insertions(+), 30 deletions(-) diff --git a/Wonky.Client/Components/CustomerInvoiceListComponent.razor b/Wonky.Client/Components/CustomerInvoiceListComponent.razor index c9f77d12..365e56e3 100644 --- a/Wonky.Client/Components/CustomerInvoiceListComponent.razor +++ b/Wonky.Client/Components/CustomerInvoiceListComponent.razor @@ -47,5 +47,5 @@ } else { -
Venter ...
+
Ingen data
} \ No newline at end of file diff --git a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor index b10f4550..8f048c84 100644 --- a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor +++ b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor @@ -156,19 +156,18 @@ else -
-
+
+
-
+
-
- +
+
-
@* Draft lines in draft -----------------------------------------------------*@
@@ -336,9 +335,15 @@ else
} - - + + - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs index f4c9de14..a587620b 100644 --- a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs +++ b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs @@ -32,9 +32,6 @@ namespace Wonky.Client.Pages; public partial class AdvisorActivityCreatePage : IDisposable { - // Parameters - [CascadingParameter] DraftStateProvider DraftProvider { get; set; } - [Parameter] public string CompanyId { get; set; } // Services [Inject] private ILogger Logger { get; set; } [Inject] private HttpInterceptorService Interceptor { get; set; } @@ -47,6 +44,10 @@ public partial class AdvisorActivityCreatePage : IDisposable [Inject] private IAdvisorActivityRepository Actitivites { get; set; } [Inject] private IAdvisorReportRepository Reports { get; set; } [Inject] private IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } + + [CascadingParameter] private DraftStateProvider DraftProvider { get; set; } = new(); + [Parameter] public string CompanyId { get; set; } + // variables private readonly JsonSerializerOptions _options = new() {PropertyNameCaseInsensitive = true}; private SalesItemView SelectedItem { get; set; } = new(); @@ -79,6 +80,8 @@ public partial class AdvisorActivityCreatePage : IDisposable private bool OrgWarning { get; set; } private CustomerInvoiceOverlay InvoiceOverlay { get; set; } private InvoiceListView CompanyInvoices { get; set; } = new(); + private CustomerInventoryOverlay InventoryOverlay { get; set; } = new(); + private List Inventory { get; set; } = new(); /// @@ -156,6 +159,23 @@ public partial class AdvisorActivityCreatePage : IDisposable Working = false; } + private async Task ShowInventoryOverlay() + { + Logger.LogDebug("ShowInventoryOverlay - wait for inventory"); + + InventoryOverlay.Show(); + Inventory = await HistoryRepo.FetchInventory(CompanyId); + await Task.Delay(500); + } + + private async Task OnInventoryCallback(DraftItem item) + { + Activity.ActivityStatusEnum = "order"; + DraftProvider.Draft.DraftType = "order"; + DraftProvider.Draft.Items.Add(item); + StateHasChanged(); + } + private async Task ShowInvoiceOverlay() { Logger.LogDebug("ShowInvoiceOverlay - wait for invoices"); diff --git a/Wonky.Client/Shared/ConfirmProductCheckModal.razor b/Wonky.Client/Shared/ConfirmProductCheckModal.razor index e1e852b3..34432c14 100644 --- a/Wonky.Client/Shared/ConfirmProductCheckModal.razor +++ b/Wonky.Client/Shared/ConfirmProductCheckModal.razor @@ -16,7 +16,7 @@ *@ @using Wonky.Client.Components