From 5f9ae8d641dae34b85fcf7c521f96ff234bc44a9 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Tue, 16 Jun 2020 23:25:11 +0000
Subject: [PATCH]

---
 .vscode/launch.json                                       | 2 +-
 server/AyaNova/Controllers/GlobalBizSettingsController.cs | 2 ++
 server/AyaNova/resource/de.json                           | 4 +++-
 server/AyaNova/resource/en.json                           | 4 +++-
 server/AyaNova/resource/es.json                           | 4 +++-
 server/AyaNova/resource/fr.json                           | 4 +++-
 server/AyaNova/util/License.cs                            | 1 +
 7 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 42e3bc09..47a5435c 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -44,7 +44,7 @@
         //"AYANOVA_LOG_LEVEL": "Debug",
         "AYANOVA_DEFAULT_TRANSLATION": "en",
         //TRANSLATION MUST BE en for Integration TESTING
-       // "AYANOVA_PERMANENTLY_ERASE_DATABASE": "true",
+        "AYANOVA_PERMANENTLY_ERASE_DATABASE": "true",
         "AYANOVA_DB_CONNECTION": "Server=localhost;Username=postgres;Password=raven;Database=AyaNova;",
         "AYANOVA_USE_URLS": "http://*:7575;",
         "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
diff --git a/server/AyaNova/Controllers/GlobalBizSettingsController.cs b/server/AyaNova/Controllers/GlobalBizSettingsController.cs
index aaad24a3..c2e93331 100644
--- a/server/AyaNova/Controllers/GlobalBizSettingsController.cs
+++ b/server/AyaNova/Controllers/GlobalBizSettingsController.cs
@@ -112,7 +112,9 @@ namespace AyaNova.Api.Controllers
                 SearchCaseSensitiveOnly = AyaNova.Util.ServerGlobalBizSettings.SearchCaseSensitiveOnly,
                 //used to drive UI in case of unlicensed or attention required
                 LicenseStatus = AyaNova.Core.License.ActiveKey.Status,
+                MaintenanceExpired = AyaNova.Core.License.ActiveKey.MaintenanceExpired,
                 DbId = AyaNova.Core.License.ActiveKey.DbId
+                
             };
 
             return Ok(ApiOkResponse.Response(ret));
diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json
index 803568ce..20de60d6 100644
--- a/server/AyaNova/resource/de.json
+++ b/server/AyaNova/resource/de.json
@@ -1830,5 +1830,7 @@
   "SeedLevelHuge":"Riesig - sehr großer Datensatz, die Generierung dauert einige Minuten",
   "StartJob":"Job starten",
   "JobCompleted":"Arbeit erledigt",
-  "JobFailed":"Job fehlgeschlagen"
+  "JobFailed":"Job fehlgeschlagen",
+  "MaintenanceExpired":"Maintenance expired",
+  "MaintenanceExpiredNote":"The support and updates subscription has now expired\nAyaNova can not be updated and support is no longer available"
 }
\ No newline at end of file
diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json
index 5a8b6331..4040d411 100644
--- a/server/AyaNova/resource/en.json
+++ b/server/AyaNova/resource/en.json
@@ -1830,6 +1830,8 @@
   "SeedLevelHuge":"Huge - very large dataset, will take a few minutes to generate",
   "StartJob":"Start job",
   "JobCompleted":"Job completed",
-  "JobFailed":"Job failed"
+  "JobFailed":"Job failed",
+  "MaintenanceExpired":"Maintenance expired",
+  "MaintenanceExpiredNote":"The support and updates subscription has now expired\nAyaNova can not be updated and support is no longer available"
 
 }
\ No newline at end of file
diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json
index af0d5d54..03234b28 100644
--- a/server/AyaNova/resource/es.json
+++ b/server/AyaNova/resource/es.json
@@ -1830,5 +1830,7 @@
   "SeedLevelHuge":"Enorme conjunto de datos muy grande, tomará unos minutos generar",
   "StartJob":"Comenzar trabajo",
   "JobCompleted":"Trabajo completo",
-  "JobFailed":"Trabajo fallido"
+  "JobFailed":"Trabajo fallido",
+  "MaintenanceExpired":"Maintenance expired",
+  "MaintenanceExpiredNote":"The support and updates subscription has expired\nAyaNova can no longer be updated and support is not available"
 }
\ No newline at end of file
diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json
index 2997d53b..2993e90f 100644
--- a/server/AyaNova/resource/fr.json
+++ b/server/AyaNova/resource/fr.json
@@ -1830,5 +1830,7 @@
   "SeedLevelHuge":"Énorme - très grand ensemble de données, il faudra quelques minutes pour générer",
   "StartJob":"Commencer le travail",
   "JobCompleted":"Travail terminé",
-  "JobFailed":"Le travail a échoué"
+  "JobFailed":"Le travail a échoué",
+  "MaintenanceExpired":"Maintenance expired",
+  "MaintenanceExpiredNote":"The support and updates subscription has expired\nAyaNova can no longer be updated and support is not available"
 }
\ No newline at end of file
diff --git a/server/AyaNova/util/License.cs b/server/AyaNova/util/License.cs
index d0265019..48f0ab34 100644
--- a/server/AyaNova/util/License.cs
+++ b/server/AyaNova/util/License.cs
@@ -222,6 +222,7 @@ namespace AyaNova.Core
             {
                 get
                 {
+                    return true;
                     return MaintenanceExpiration < DateTime.Now;
                 }
             }