From b222a916e55e60be32536a7b48b4d09c6f95cfe5 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Mon, 16 Jan 2023 22:23:45 +0000
Subject: [PATCH]

---
 src/api/open-object-handler.js        | 12 +++----
 src/views/biz-license.vue             | 46 +++++++++++++++------------
 src/views/biz-product.vue             |  2 --
 src/views/biz-subscription-server.vue |  6 ++--
 4 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/src/api/open-object-handler.js b/src/api/open-object-handler.js
index 83bc63f..769a916 100644
--- a/src/api/open-object-handler.js
+++ b/src/api/open-object-handler.js
@@ -242,12 +242,12 @@ export default {
             });
             break;
 
-            case socktype.License:
-              vm.$router.push({
-                name: "license-edit",
-                params: { recordid: tid.id }
-              });
-              break;
+          case socktype.License:
+            vm.$router.push({
+              name: "license-edit",
+              params: { recordid: tid.id }
+            });
+            break;
 
           case socktype.TrialLicenseRequest:
             vm.$router.push({
diff --git a/src/views/biz-license.vue b/src/views/biz-license.vue
index 4dc0aa6..374707b 100644
--- a/src/views/biz-license.vue
+++ b/src/views/biz-license.vue
@@ -49,7 +49,6 @@
             ></gz-pick-list>
           </v-col>
           <v-col cols="12" sm="6" lg="4" xl="3">
-           <h5> TODO: REVOKED HERE IF REVOKED (set REGTO to "REVOKED")</h5>
             <v-text-field
               ref="regTo"
               v-model="obj.regTo"
@@ -238,9 +237,9 @@
               <v-col cols="12" sm="6" lg="4" xl="3">
                 <v-row dense no-gutters>
                   <v-checkbox
-                    class="mr-2"
                     ref="wbi"
                     v-model="obj.wbi"
+                    class="mr-2"
                     dense
                     :readonly="formState.readOnly"
                     label="WBI"
@@ -297,9 +296,9 @@
               <v-col cols="12" sm="6" lg="4" xl="3">
                 <v-row dense no-gutters>
                   <v-checkbox
-                    class="mr-2"
                     ref="ri"
                     v-model="obj.ri"
+                    class="mr-2"
                     dense
                     :readonly="formState.readOnly"
                     label="RI"
@@ -356,9 +355,9 @@
               <v-col cols="12" sm="6" lg="4" xl="3">
                 <v-row dense no-gutters>
                   <v-checkbox
-                    class="mr-2"
                     ref="mbi"
                     v-model="obj.mbi"
+                    class="mr-2"
                     dense
                     :readonly="formState.readOnly"
                     label="MBI"
@@ -417,9 +416,9 @@
               <v-col cols="12" sm="6" lg="4" xl="3">
                 <v-row dense no-gutters>
                   <v-checkbox
-                    class="mr-2"
                     ref="qbi"
                     v-model="obj.qbi"
+                    class="mr-2"
                     dense
                     :readonly="formState.readOnly"
                     label="QBI"
@@ -476,9 +475,9 @@
               <v-col cols="12" sm="6" lg="4" xl="3">
                 <v-row dense no-gutters>
                   <v-checkbox
-                    class="mr-2"
                     ref="importExportCSVDuplicate"
                     v-model="obj.importExportCSVDuplicate"
+                    class="mr-2"
                     dense
                     :readonly="formState.readOnly"
                     label="CSV Duplicate "
@@ -560,9 +559,9 @@
               <v-col cols="12" sm="6" lg="4" xl="3">
                 <v-row dense no-gutters>
                   <v-checkbox
-                    class="mr-2"
                     ref="quickNotification"
                     v-model="obj.quickNotification"
+                    class="mr-2"
                     dense
                     :readonly="formState.readOnly"
                     label="Quick Notification"
@@ -631,9 +630,9 @@
               <v-col cols="12" sm="6" lg="4" xl="3">
                 <v-row dense no-gutters>
                   <v-checkbox
-                    class="mr-2"
                     ref="exportToXLS"
                     v-model="obj.exportToXLS"
+                    class="mr-2"
                     dense
                     :readonly="formState.readOnly"
                     label="Export to XLS"
@@ -698,9 +697,9 @@
               <v-col cols="12" sm="6" lg="4" xl="3">
                 <v-row dense no-gutters>
                   <v-checkbox
-                    class="mr-2"
                     ref="outlookSchedule"
                     v-model="obj.outlookSchedule"
+                    class="mr-2"
                     dense
                     :readonly="formState.readOnly"
                     label="Outlook schedule"
@@ -767,9 +766,9 @@
               <v-col cols="12" sm="6" lg="4" xl="3">
                 <v-row dense no-gutters>
                   <v-checkbox
-                    class="mr-2"
                     ref="qboi"
                     v-model="obj.qboi"
+                    class="mr-2"
                     dense
                     :readonly="formState.readOnly"
                     label="QBOI"
@@ -826,9 +825,9 @@
               <v-col cols="12" sm="6" lg="4" xl="3">
                 <v-row dense no-gutters>
                   <v-checkbox
-                    class="mr-2"
                     ref="pti"
                     v-model="obj.pti"
+                    class="mr-2"
                     dense
                     :readonly="formState.readOnly"
                     label="PTI"
@@ -885,9 +884,9 @@
               <v-col cols="12" sm="6" lg="4" xl="3">
                 <v-row dense no-gutters>
                   <v-checkbox
-                    class="mr-2"
                     ref="oli"
                     v-model="obj.oli"
+                    class="mr-2"
                     dense
                     :readonly="formState.readOnly"
                     label="OLI"
@@ -1365,7 +1364,7 @@ export default {
         years: 1
       });
     },
-    dtAddToAll: function(span) {
+    dtAddToAll: function(span, revoke) {
       //iterate all the dates, if there is a value entered then add on to it's existing value time period
       //if no date entered then add on it now plus time period
       /*
@@ -1378,7 +1377,7 @@ export default {
       //all pgroups have maint expire valid
       addToDate(this, "maintenanceExpire", span);
 
-      if (this.obj.pGroup == 3) {
+      if (this.obj.pGroup == 3 || revoke == true) {
         // RavenSubscription = 3
         addToDate(this, "licenseExpire", span);
       }
@@ -1587,6 +1586,10 @@ async function clickHandler(menuItem) {
       case "delete":
         m.vm.remove();
         break;
+      case "revoke":
+        m.vm.obj.regTo = "REVOKED";
+        m.vm.dtAddToAll({ days: -1 }, true);
+        break;
       case "new":
         m.vm.$router.push({
           name: "license-edit",
@@ -1718,12 +1721,15 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  //   menuOptions.menuItems.push({
-  //     title: "QuoteList",
-  //     icon: "$sockiPencilAlt",
-  //     key: FORM_KEY + ":QuoteList",
-  //     vm: vm
-  //   });
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  menuOptions.menuItems.push({
+    title: "Revoke",
+    notrans: true,
+    icon: "$sockiSkullCrossbones",
+    key: FORM_KEY + ":revoke",
+    vm: vm
+  });
 
   //   menuOptions.menuItems.push({
   //     title: "PMList",
diff --git a/src/views/biz-product.vue b/src/views/biz-product.vue
index 726d42c..30659a7 100644
--- a/src/views/biz-product.vue
+++ b/src/views/biz-product.vue
@@ -679,6 +679,4 @@ async function populateSelectionLists(vm) {
   await window.$gz.enums.fetchEnumList("productgroup");
   vm.selectLists.pGroups = window.$gz.enums.getSelectionList("productgroup");
 }
-
-
 </script>
diff --git a/src/views/biz-subscription-server.vue b/src/views/biz-subscription-server.vue
index 145b162..041a4fc 100644
--- a/src/views/biz-subscription-server.vue
+++ b/src/views/biz-subscription-server.vue
@@ -238,7 +238,7 @@
             ></v-checkbox>
           </v-col>
 
-          <v-col cols="12" sm="6" lg="4" xl="3" v-if="obj.trial">
+          <v-col v-if="obj.trial" cols="12" sm="6" lg="4" xl="3">
             <v-text-field
               ref="trialCompany"
               v-model="obj.trialCompany"
@@ -251,7 +251,7 @@
             ></v-text-field>
           </v-col>
 
-          <v-col cols="12" sm="6" lg="4" xl="3" v-if="obj.trial">
+          <v-col v-if="obj.trial" cols="12" sm="6" lg="4" xl="3">
             <v-text-field
               ref="trialContact"
               v-model="obj.trialContact"
@@ -264,7 +264,7 @@
             ></v-text-field>
           </v-col>
 
-          <v-col cols="12" sm="6" lg="4" xl="3" v-if="obj.trial">
+          <v-col v-if="obj.trial" cols="12" sm="6" lg="4" xl="3">
             <gz-email
               ref="trialEmail"
               v-model="obj.trialEmail"