src/views/biz-subscription.vue

@@ -972,8 +972,8 @@ async function clickHandler(menuItem) {
           }
 
           const RAVEN_PERPETUAL_PRODUCT_SOCKEYE_ID = 4;
-          // const RAVEN_SUBSCRIPTION_MONTHLY_PRODUCT_SOCKEYE_ID = 22;
+          const RAVEN_SUBSCRIPTION_MONTHLY_PRODUCT_SOCKEYE_ID = 22;
-          // const RAVEN_SUBSCRIPTION_YEARLY_PRODUCT_SOCKEYE_ID = 24;
+          const RAVEN_SUBSCRIPTION_YEARLY_PRODUCT_SOCKEYE_ID = 24;
           // const PRODUCT_INTERNAL_ID = [
           //   { id: 19, name: "AyaNova Lite ", active: true },
           //   {
@@ -1008,7 +1008,7 @@ async function clickHandler(menuItem) {
 
           //generate license from subscription values here
           //copied from biz-license default record values
-          var l = {
+          let l = {
             id: 0,
             concurrency: 0,
             created: window.$gz.locale.nowUTC8601String(),
@@ -1076,20 +1076,20 @@ async function clickHandler(menuItem) {
             case 2: //Raven perpetual
               {
                 l.dbId = m.vm.obj.dbId;
-                l.customerUsers=null;
+                l.customerUsers = null;
-                l.maxDataGB=null;
+                l.maxDataGB = null;
                 //iterate items, count up users and find the furthest future expiry date
-                var newestDate = window.$gz.locale.nowUTC8601String();
+                let newestDate = window.$gz.locale.nowUTC8601String();
-                var totalUserCount = 0;
+                let totalUserCount = 0;
                 m.vm.obj.items.forEach(z => {
                   if (
                     z.active &&
-                    z.productId == RAVEN_PERPETUAL_PRODUCT_SOCKEYE_ID
+                    (z.productId ==
+                      RAVEN_SUBSCRIPTION_MONTHLY_PRODUCT_SOCKEYE_ID ||
+                      z.productId ==
+                        RAVEN_SUBSCRIPTION_YEARLY_PRODUCT_SOCKEYE_ID)
                   ) {
                     totalUserCount += z.quantity;
-
-                    // // eslint-disable-next-line
-                    // debugger;
                     if (
                       window.$gz.locale.d1IsBeforeD2FromUTC8601String(
                         newestDate,
@@ -1106,8 +1106,33 @@ async function clickHandler(menuItem) {
               break;
             case 3: //RavenSubscription
               {
-                l = {};
+                l.dbId = m.vm.obj.dbId;
+                l.customerUsers = 250;
+                l.maxDataGB = 20;
+                //iterate items, count up users and find the furthest future expiry date
+                let newestDate = window.$gz.locale.nowUTC8601String();
+                let totalUserCount = 0;
+                m.vm.obj.items.forEach(z => {
+                  if (
+                    z.active &&
+                    z.productId == RAVEN_PERPETUAL_PRODUCT_SOCKEYE_ID
+                  ) {
+                    totalUserCount += z.quantity;
+                    if (
+                      window.$gz.locale.d1IsBeforeD2FromUTC8601String(
+                        newestDate,
+                        z.expireDate
+                      )
+                    ) {
+                      newestDate = z.expireDate;
+                    }
+                  }
+                });
+                l.users = totalUserCount;
+                l.maintenanceExpire = newestDate;
+                l.licenseExpire = newestDate;
               }
+
               break;
           }
 
@@ -1267,7 +1292,7 @@ async function populateSelectionLists(vm) {
 //
 //
 function addToDate(dateValue, span) {
-  var newDate = dateValue;
+  let newDate = dateValue;
   if (newDate == null) {
     newDate = window.$gz.locale.addDurationToUTC8601String(
       window.$gz.locale.nowUTC8601String(),