web-manager 3.2.44 → 3.2.46

package/index.js

@@ -1204,9 +1204,12 @@ function Manager() {
       }
     })
     .then(function (data) {
-      var buildTimeCurrent = self.properties.global.buildTime || new Date(0);
+      var buildTimeCurrent = self.properties.global.buildTime;
       var buildTimeLive = new Date(data['npm-build'].timestamp);
 
+      // Set buildTimeCurrent to 1 hour ahead to account for the npm-build time which will ALWAYS be set to later since it happens later
+      buildTimeCurrent.setHours(buildTimeCurrent.getHours() + 1);
+
       // Log
       console.log('refreshNewVersion()', data, buildTimeCurrent, buildTimeLive);
 

package/lib/account.js

@@ -267,8 +267,9 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
 
   // @@@DEVELOPER
   // var date = '2024-04-23T00:07:29.183Z';
-  // var date = `2024-03-23T00:07:29.183Z`;
-  // account.plan.id = 'basic';
+  // // var date = `2024-03-23T00:07:29.183Z`;
+  // // account.plan.id = 'basic';
+  // account.plan.id = 'premium';
   // account.plan.trial = {
   //   activated: false,
   //   expires: {
@@ -281,6 +282,43 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
   //   timestampUNIX: Math.round(new Date(date).getTime() / 1000),
   // }
   // account.plan.status = 'cancelled';
+  // account.plan = {
+  //   "id": "premium",
+  //   "payment": {
+  //     "frequency": "monthly",
+  //     "startDate": {
+  //       "timestampUNIX": 1711373195,
+  //       "timestamp": "2024-03-25T13:26:35.000Z"
+  //     },
+  //     "updatedBy": {
+  //       "date": {
+  //         "timestamp": "2024-04-02T13:46:47.441Z",
+  //         "timestampUNIX": 1712065607
+  //       },
+  //       "event": {
+  //         "name": "subscription-profile-fixer",
+  //         "id": "subscription-profile-fixer"
+  //       }
+  //     },
+  //     "resourceId": "AzyrfuU82V0cZ87qp",
+  //     "orderId": "0908-176942-1223",
+  //     "active": false,
+  //     "processor": "chargebee"
+  //   },
+  //   "trial": {
+  //     "expires": {
+  //       "timestamp": "1970-01-01T00:00:00.000Z",
+  //       "timestampUNIX": 0
+  //     },
+  //     "activated": true
+  //   },
+  //   "expires": {
+  //     "timestampUNIX": 1714656799,
+  //     "timestamp": "2024-05-02T13:33:19.000Z"
+  //   },
+  //   "limits": {},
+  //   "status": "cancelled"
+  // },
 
   account.plan.limits = account.plan.limits || {};
   // account.plan.devices = account.plan.devices || 1;
@@ -516,11 +554,21 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
     // Change the status to 'failed' if the plan is suspended because room temperature IQ people think 'suspended' means 'cancelled'
     var visibleStatus = uppercase(account.plan.status === 'suspended' ? 'failed payment' : account.plan.status);
     // If user is on trial, start date is trial exp date
-    var visibleStartDate = account.plan.trial.activated ? account.plan.trial.expires.timestamp : account.plan.payment.startDate.timestamp;
+    var visibleStartDate = null;
     // If basic, just show account creation date
     if (unresolvedPlanId === defaultPlanId) {
       visibleStartDate = accountCreationDate;
       billingStatusEl.setAttribute('hidden', true);
+    } else {
+      if (account.plan.status === 'cancelled') {
+        visibleStartDate = account.plan.payment.startDate.timestamp;
+      } else {
+        if (account.plan.trial.activated) {
+          visibleStartDate = account.plan.trial.expires.timestamp;
+        }
+      }
+
+      visibleStartDate = visibleStartDate || accountCreationDate;
     }
     var visibleFrequency = account.plan.payment.frequency === 'unknown' ? 'monthly' : account.plan.payment.frequency;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web-manager",
-  "version": "3.2.44",
+  "version": "3.2.46",
   "description": "Easily access important variables such as the query string, current domain, and current page in a single object.",
   "main": "index.js",
   "scripts": {