diff --git a/Wonky.Client/Components/ActivityLinesComponent.razor b/Wonky.Client/Components/ActivityLinesComponent.razor index 907a1259..6da21bab 100644 --- a/Wonky.Client/Components/ActivityLinesComponent.razor +++ b/Wonky.Client/Components/ActivityLinesComponent.razor @@ -1,5 +1,13 @@ @using Wonky.Entity.Views - +@if (ReportItem.Express) +{ +
+
+
+
HASTER
+
+
+} @@ -24,33 +32,28 @@ - + } - @if (ReportItem.Express) - { - - - } - - - - - - - - - - - - - - - + + + + + + + + + + + + + + +
@($"{line.Price:N2}") @($"{line.Discount:N2}") @($"{line.LineSum:N2}") + +
-
HASTER
-
SAS@ReportItem.SasAmount
NORMAL@ReportItem.OrderAmount
TOTAL@(ReportItem.OrderAmount + ReportItem.SasAmount)
SAS@ReportItem.SasAmount
NORMAL@ReportItem.OrderAmount
TOTAL@(ReportItem.OrderAmount + ReportItem.SasAmount)
diff --git a/Wonky.Client/Components/CustomerInvoiceListComponent.razor b/Wonky.Client/Components/CustomerInvoiceListComponent.razor index 5beb3918..3645d34b 100644 --- a/Wonky.Client/Components/CustomerInvoiceListComponent.razor +++ b/Wonky.Client/Components/CustomerInvoiceListComponent.razor @@ -52,7 +52,7 @@
-
@invoice.OrderNote
+
@invoice.OrderNote
} diff --git a/Wonky.Client/OverlayB2B/B2BGetOrderQuantityOverlay.razor b/Wonky.Client/OverlayB2B/B2BGetOrderQuantityOverlay.razor index 0f29c2ba..e79b8370 100644 --- a/Wonky.Client/OverlayB2B/B2BGetOrderQuantityOverlay.razor +++ b/Wonky.Client/OverlayB2B/B2BGetOrderQuantityOverlay.razor @@ -17,7 +17,7 @@