From e2f43a3e02616d1719ece55717fadc6cea361bbc Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Sun, 14 Jun 2020 18:18:40 +0000
Subject: [PATCH]

---
 ayanova/src/main.js               |  3 ++
 ayanova/src/views/adm-license.vue | 54 +++++++++++++++++++++++++++++--
 2 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/ayanova/src/main.js b/ayanova/src/main.js
index 29e77c99..63cb606a 100644
--- a/ayanova/src/main.js
+++ b/ayanova/src/main.js
@@ -209,6 +209,9 @@ Vue.prototype.$ay = {
   dev: DEV_MODE,
   t: function(tKey) {
     return translation.get(tKey);
+  },
+  dt: function(timestamp) {
+    return locale.utcDateToShortDateAndTimeLocalized(timestamp);
   }
 };
 new Vue({
diff --git a/ayanova/src/views/adm-license.vue b/ayanova/src/views/adm-license.vue
index ba8352ca..4539ce34 100644
--- a/ayanova/src/views/adm-license.vue
+++ b/ayanova/src/views/adm-license.vue
@@ -4,8 +4,57 @@
       <v-form ref="form">
         <v-row>
           <gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
-          <template v-if="showLicenseUi() == 'ok'"> normal license ui</template>
+          <template v-if="showLicenseUi() == 'ok'">
+            <!-- Normal active license UI -->
+            <div>
+            
+              <span class="ml-1 ml-sm-6 text-body-2 text-sm-body-1"
+                >{{ $ay.t("RegisteredUser") }}:
+              </span>
+              <span class="body-2">{{ currentLicenseInfo.licensedTo }}</span>
+
+              <div>
+                <span class="ml-6 body-1">{{ $ay.t("DatabaseID") }}: </span>
+                <span class="body-2">{{ currentLicenseInfo.serverDbId }}</span>
+              </div>
+              <div>
+                <span class="ml-6 body-1">{{ $ay.t("LicenseSerial") }}: </span>
+                <span class="body-2">{{ currentLicenseInfo.keySerial }}</span>
+              </div>
+              <div>
+                <span class="ml-6 body-1"
+                  >{{ $ay.t("LicenseExpiration") }}:
+                </span>
+                <span class="body-2">{{
+                  $ay.dt(currentLicenseInfo.licenseExpiration)
+                }}</span>
+              </div>
+              <div>
+                <span class="ml-6 body-1">{{ $ay.t("SupportedUntil") }}: </span>
+                <span class="body-2">{{
+                  $ay.dt(currentLicenseInfo.maintenanceExpiration)
+                }}</span>
+              </div>
+
+              <v-divider class="mt-6"></v-divider>
+              <v-subheader
+                :data-cy="!!$ay.dev ? 'aboutlicensedoptions' : false"
+                >{{ $ay.t("LicensedOptions") }}</v-subheader
+              >
+
+              <div
+                v-for="item in currentLicenseInfo.features"
+                :key="item.Feature"
+              >
+                <span class="ml-6 body-1">{{ item.Feature }}</span>
+                <span class="body-2">{{
+                  item.Count ? ": " + item.Count : ""
+                }}</span>
+              </div>
+            </div></template
+          >
           <template v-if="showLicenseUi() == 'revoked'">
+            <!-- Revoked license UI -->
             Revoked license ui</template
           >
           <template
@@ -14,6 +63,7 @@
                 showLicenseUi() == 'neednotrial'
             "
           >
+            <!-- No license at all UI -->
             <v-col cols="12">
               <h2 class="mb-6 ml-1">{{ $ay.t("NoLicenseTitle") }}</h2>
               <v-expansion-panels focusable>
@@ -90,7 +140,6 @@
                     $ay.t("PurchaseLicense")
                   }}</v-expansion-panel-header>
                   <v-expansion-panel-content>
-                    <!-- Future purchase in app but for now -->
                     <v-col cols="12">
                       <v-btn
                         :href="purchaseLink()"
@@ -109,7 +158,6 @@
                     $ay.t("HaveLicense")
                   }}</v-expansion-panel-header>
                   <v-expansion-panel-content>
-                    <!-- Future purchase in app but for now -->
                     <v-col cols="12">
                       <v-btn @click="helpRestore()" class="mt-4 mr-4">{{
                         $ay.t("HelpRestore")