diff --git a/Wonky.Client/Components/CustomerInventoryListComponent.razor.cs b/Wonky.Client/Components/CustomerInventoryListComponent.razor.cs index 3c06916f..8525860b 100644 --- a/Wonky.Client/Components/CustomerInventoryListComponent.razor.cs +++ b/Wonky.Client/Components/CustomerInventoryListComponent.razor.cs @@ -31,7 +31,12 @@ public partial class CustomerInventoryListComponent // private variables private bool Descending { get; set; } - + + protected override void OnParametersSet() + { + if(Inventory.Any()) + Inventory = Inventory.OrderBy(x => x.Description).ToList(); + } private void SortProducts(PSort column) { Descending = !Descending; @@ -62,11 +67,12 @@ public partial class CustomerInventoryListComponent Inventory = Inventory.OrderBy(x => x.Quantity).ToList(); break; case PSort.None: + Inventory = Inventory.OrderBy(x => x.Description).ToList(); break; case PSort.Abbr: break; default: - Inventory = Inventory.OrderByDescending(x => x.Quantity).ToList(); + Inventory = Inventory.OrderBy(x => x.Description).ToList(); break; } } diff --git a/Wonky.Client/Components/CustomerProductCheckListComponent.razor b/Wonky.Client/Components/CustomerProductCheckListComponent.razor index 7228d5cc..2b4f3121 100644 --- a/Wonky.Client/Components/CustomerProductCheckListComponent.razor +++ b/Wonky.Client/Components/CustomerProductCheckListComponent.razor @@ -19,7 +19,7 @@ @using System.ComponentModel.Design
diff --git a/Wonky.Client/Components/CustomerProductLineListComponent.razor.cs b/Wonky.Client/Components/CustomerProductLineListComponent.razor.cs
index 9d022fb7..731c9f4c 100644
--- a/Wonky.Client/Components/CustomerProductLineListComponent.razor.cs
+++ b/Wonky.Client/Components/CustomerProductLineListComponent.razor.cs
@@ -20,6 +20,11 @@ namespace Wonky.Client.Components;
public partial class CustomerProductLineListComponent
{
- [Parameter] public List
+
+ @if (Inventory.Any())
+ {
+
\ No newline at end of file
diff --git a/Wonky.Client/Components/OfficeInventoryListComponent.razor.cs b/Wonky.Client/Components/OfficeInventoryListComponent.razor.cs
new file mode 100644
index 00000000..6824c0bd
--- /dev/null
+++ b/Wonky.Client/Components/OfficeInventoryListComponent.razor.cs
@@ -0,0 +1,88 @@
+// Copyright (C) 2022 FCS Frede's Computer Services.
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
+//
+
+using Blazored.LocalStorage;
+using Microsoft.AspNetCore.Components;
+using Wonky.Client.Models;
+using Wonky.Entity.Views;
+
+namespace Wonky.Client.Components;
+#pragma warning disable CS8618
+
+public partial class OfficeInventoryListComponent
+{
+ // *************************************************************
+ // Injections
+ [Inject] public ILocalStorageService Storage { get; set; }
+ // *************************************************************
+ // Parameters
+ [Parameter] public List
+
+ }
+ else
+ {
+
+
+ @foreach (var product in Inventory)
+ {
+
+
+ SortProducts(PSort.Desc)"> Navn
+ SortProducts(PSort.Sku)"> Varenr
+ SortProducts(PSort.Qty)"> Antal
+
+
+
+
+ }
+
+
+
+
+
+ @product.Description
+ @if (product.Discontinued)
+ {
+ Udgået
+ Produktet er udgået
+ }
+
+
+ @product.Sku
+
+
+ @product.Quantity
+
+
+ Ingen data
+ }
+ | |
@entry.DeliveryDate | diff --git a/Wonky.Client/OverlayOrderCreate/ProductPriceHistoryOverlay.razor.cs b/Wonky.Client/OverlayOrderCreate/ProductPriceHistoryOverlay.razor.cs index 6cac4660..d5be0311 100644 --- a/Wonky.Client/OverlayOrderCreate/ProductPriceHistoryOverlay.razor.cs +++ b/Wonky.Client/OverlayOrderCreate/ProductPriceHistoryOverlay.razor.cs @@ -28,7 +28,7 @@ public partial class ProductPriceHistoryOverlay [Parameter] public string CompanyId { get; set; } = ""; [Parameter] public string Sku { get; set; } = ""; [Inject] public IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } - private List+ @* + ***************** Reset draft ***************************** + *@ | + @* + ***************** Remove item ***************************** + *@ | @@ -223,6 +237,9 @@ else@($"{DraftProvider.Draft.Total:N2}") | + @* + ***************** Price catalot overlay button ***************************** + *@ @@ -259,6 +276,9 @@ else |
+ @*
+ ***************** Price history overlay button *****************************
+ *@
@@ -272,6 +292,9 @@ else
|
@SelectedItem.Sku | + @* + ***************** Add item button ***************************** + *@ | @@ -333,28 +356,30 @@ else Kundekort+ @* + ***************** Reset draft ***************************** + *@ | @@ -145,6 +157,9 @@@($"{cartItem.Discount:N2}") | @($"{cartItem.LineTotal:N2}") | + @* + ***************** Remove draft line ***************************** + *@ | @@ -155,7 +170,10 @@Total | @($"{DraftProvider.Draft.Total:N2}") | - | @@ -202,8 +220,10 @@@SelectedItem.Sku |
+ @*
+ ***************** Add line to draft *****************************
+ *@
|
---|