From b150b3679d566b3ce5d350a3ffba5aa02bb12e60 Mon Sep 17 00:00:00 2001
From: Frede Hundewadt <noreply@wonky.codeberg.org>
Date: Fri, 1 Dec 2023 16:18:27 +0100
Subject: [PATCH] layout update

---
 Wonky.Client/Helpers/Mapper.cs                | 27 ++++++-----
 .../CustomerInvoiceViewOverlay.razor          | 46 +++++++++++--------
 .../OfficeCustomerInvoiceViewOverlay.razor    |  4 +-
 Wonky.Client/wwwroot/appsettings.json         |  4 +-
 4 files changed, 46 insertions(+), 35 deletions(-)

diff --git a/Wonky.Client/Helpers/Mapper.cs b/Wonky.Client/Helpers/Mapper.cs
index 589645f7..9f782cd3 100644
--- a/Wonky.Client/Helpers/Mapper.cs
+++ b/Wonky.Client/Helpers/Mapper.cs
@@ -32,19 +32,24 @@ public class Mapper
         return validVat == 0 ? "no-vat" : "the-good";
     }
 
-
+    
     public static string MapVisitState(string dtNextVisit)
     {
-        if (dtNextVisit is "0001-01-01" or "1970-01-01" or "2010-01-01" or "2020-01-01")
-            return "the-draw";
-        if (!DateTime.TryParse(dtNextVisit, out _))
-            return "the-draw";
-
-        var dtNow = DateTime.Now;
-        var dtNext = DateTime.Parse(dtNextVisit);
-        if (dtNow > dtNext)
-            return "the-ugly";
-
+        var specialDates = new HashSet<string> 
+        { 
+            "0001-01-01", 
+            "1970-01-01", 
+            "2010-01-01", 
+            "2020-01-01"
+        };
+    
+        if (specialDates.Contains(dtNextVisit)) return "the-draw";
+    
+        if (!DateTime.TryParse(dtNextVisit, out var dtNext)) return "the-draw";
+    
+        var dtNow = DateTime.Now;    
+        if (dtNow > dtNext) return "the-ugly";
+    
         return dtNow > dtNext.AddDays(-14) ? "the-bad" : "the-good";
     }
 
diff --git a/Wonky.Client/OverlayCustomer/CustomerInvoiceViewOverlay.razor b/Wonky.Client/OverlayCustomer/CustomerInvoiceViewOverlay.razor
index 430986da..4cd7bf78 100644
--- a/Wonky.Client/OverlayCustomer/CustomerInvoiceViewOverlay.razor
+++ b/Wonky.Client/OverlayCustomer/CustomerInvoiceViewOverlay.razor
@@ -32,38 +32,45 @@
                         <tr>
                             <th scope="row">Dato</th>
                             <td>@Invoice.DocumentDate</td>
-                            <th scope="row">Faktura nr.</th>
-                            <td>@Invoice.DocumentNumber</td>
-                            <td colspan="2"></td>
+                            <th scope="row">Eordre</th>
+                            <td>@Invoice.ESalesNumber</td>
+                        </tr>
+                        <tr>
+                            <th scope="row">Navn</th>
+                            <td >@Invoice.Company.Name</td>
+                            <th scope="row">Ordre No.</th>
+                            <td>@Invoice.OrderNo</td>
                         </tr>
                         <tr>
                             <th scope="row">Konto</th>
                             <td>@Invoice.Account</td>
-                            <th scope="row">Moms Nr.</th>
+                            <th scope="row">Faktura nr.</th>
+                            <td>@Invoice.DocumentNumber</td>
+                        </tr>
+                        <tr>
+                            <th scope="row">Moms No.</th>
                             <td>@Invoice.VatNumber</td>
-                            <td colspan="2"></td>
-                        </tr>
-                        <tr>
-                            <th scope="row">Eordre</th>
-                            <td>@Invoice.ESalesNumber</td>
-                            <th scope="row">Vores Ref.</th>
-                            <td>@Invoice.OurRef</td>
-                            <td colspan="2"></td>
-                        </tr>
-                        <tr>
-                            <th scope="row">Rekv.</th>
-                            <td>@Invoice.ReferenceNumber</td>
-                            <th scope="row">Deres Ref.</th>
-                            <td>@Invoice.YourRef</td>
                             <th scope="row">Pakke nr.</th>
                             <td>@Invoice.TrackingNumber</td>
                         </tr>
+                        <tr>
+                            <th scope="row">Rekv.</th>
+                            <td>@Invoice.ReferenceNumber</td>
+                            <th scope="row">Vores Ref.</th>
+                            <td>@Invoice.OurRef</td>
+                        </tr>
+                        <tr>
+                            <th scope="row">Deres Ref.</th>
+                            <td>@Invoice.YourRef</td>
+                            <td colspan="2"></td>
+                        </tr>
                         <tr>
                             <th scope="row">Notat</th>
-                            <td class="fw-bold" colspan="5">@Invoice.OrderNote</td>
+                            <td colspan="3">@Invoice.OrderNote</td>
                         </tr>
                         </tbody>
                     </table>
+                    @* Sales linies  *@
                     <table class="table table-striped">
                         <thead>
                         <tr>
@@ -72,7 +79,6 @@
                             <th class="text-end" scope="col">Antal</th>
                             <th class="text-end" scope="col">Pris</th>
                             <th class="text-end" scope="col">Rabat</th>
-                            <th class="text-center" scope="col">SAS</th>
                         </tr>
                         </thead>
                         <tbody>
diff --git a/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceViewOverlay.razor b/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceViewOverlay.razor
index 2301d3ab..676940da 100644
--- a/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceViewOverlay.razor
+++ b/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceViewOverlay.razor
@@ -19,7 +19,7 @@
     <div class="modal-dialog modal-dialog-scrollable modal-fullscreen">
         <div class="modal-content">
             <div class="modal-header">
-                <h2 class="modal-title">Info fra @(Invoice.DocumentNumber.Split("-")[1])</h2>
+                <h2 class="modal-title">Salgsfaktura @(Invoice.DocumentNumber.Split("-")[1])</h2>
                 <button type="button" class="btn btn-danger" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"><i class="bi-x-lg"></i></button>
             </div>
             <div class="modal-body">
@@ -96,7 +96,7 @@
                         </tbody>
                         <tfoot>
                         <tr>
-                            <td colspan="5" class="text-end">Beløb</td>
+                            <td colspan="5" class="text-end">Faktura Beløb</td>
                             <td class="text-end">@Invoice.InvoiceAmount</td>
                             <td colspan="1"></td>
                         </tr>
diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json
index 96138ca3..615bc445 100644
--- a/Wonky.Client/wwwroot/appsettings.json
+++ b/Wonky.Client/wwwroot/appsettings.json
@@ -1,8 +1,8 @@
 {
   "appInfo": {
     "name": "Wonky Online",
-    "version": "313.0",
-    "rc": false,
+    "version": "314.0",
+    "rc": true,
     "sandBox": true,
     "image": "grumpy-coder.png",
     "sdk": "dotnet 8.0"