From 86ba3a3f5a1ac3db35a089a4aaa49ef720e0e848 Mon Sep 17 00:00:00 2001
From: Frede Hundewadt <22748698+fhdk@users.noreply.github.com>
Date: Tue, 28 Jun 2022 10:07:38 +0200
Subject: [PATCH] built v0.8.41

---
 Wonky.Client/Pages/CompanyNew.razor.cs  | 4 ++--
 Wonky.Client/Pages/CompanyView.razor.cs | 4 +++-
 Wonky.Client/wwwroot/appsettings.json   | 2 +-
 Wonky.Entity/DTO/CompanyDto.cs          | 3 ++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Wonky.Client/Pages/CompanyNew.razor.cs b/Wonky.Client/Pages/CompanyNew.razor.cs
index 6ac04537..2832fd6e 100644
--- a/Wonky.Client/Pages/CompanyNew.razor.cs
+++ b/Wonky.Client/Pages/CompanyNew.razor.cs
@@ -141,9 +141,9 @@ namespace Wonky.Client.Pages
             _companyObject.LastVisit = $"{_lastVisit:yyyy-MM-dd}";
             _companyObject.NextVisit = $"{_nextVisit:yyyy-MM-dd}";
             
-            if (!VatUtils.ValidateFormat(_companyObject.CountryCode, _companyObject.VatNumber) 
-                || !_companyObject.ValidDateSpan())
+            if (!_companyObject.ValidDateSpan())
             {
+                _toast.ShowError("Dato for næste besøg skal ligge efter sidste besøg.");
                 _formInvalid = true;
             }
             else
diff --git a/Wonky.Client/Pages/CompanyView.razor.cs b/Wonky.Client/Pages/CompanyView.razor.cs
index 3c818445..491951b7 100644
--- a/Wonky.Client/Pages/CompanyView.razor.cs
+++ b/Wonky.Client/Pages/CompanyView.razor.cs
@@ -85,7 +85,9 @@ public partial class CompanyView : IDisposable
         _company.CountryCode = ux.CountryCode.ToLower();
         
         _enableActivity = _company.ValidVat;
-        
+        // override if canvas which has account property as empty string or "NY"
+        _enableActivity = _company.Account == "NY" || string.IsNullOrWhiteSpace(_company.Account) ? 1 : 0;
+
         vatAddress = PrepareVatAddress(_company);
         
         if (_company.Interval == 0)
diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json
index d098a966..45ed8bbf 100644
--- a/Wonky.Client/wwwroot/appsettings.json
+++ b/Wonky.Client/wwwroot/appsettings.json
@@ -1,7 +1,7 @@
 {
     "appInfo": {
         "name": "Wonky Client",
-        "version": "0.8.40",
+        "version": "0.8.41",
         "isBeta": true,
         "image": "grumpy-coder.png"
     },
diff --git a/Wonky.Entity/DTO/CompanyDto.cs b/Wonky.Entity/DTO/CompanyDto.cs
index b872ffb8..4e5433ce 100644
--- a/Wonky.Entity/DTO/CompanyDto.cs
+++ b/Wonky.Entity/DTO/CompanyDto.cs
@@ -33,7 +33,7 @@ public class CompanyDto
     [MaxLength(30, ErrorMessage = "Du kan højst bruge 30 tegn")] 
     public string City { get; set; }
     
-    [Required(ErrorMessage = "ORG/VAT/CVR er ikke et gyldigt nummer")]
+    [MaxLength(20, ErrorMessage = "Du kan højst bruge 20 tegn")]
     public string VatNumber { get; set; } = "";
     
     public string CompanyId { get; set; } = "";
@@ -41,6 +41,7 @@ public class CompanyDto
     public string SalesRepId { get; set; } = "";
     
     public string BcId { get; set; } = "";
+    
     [MaxLength(100, ErrorMessage = "Du kan højst bruge 100 tegn")] 
     public string Address1 { get; set; } = "";