web-manager 3.2.39 → 3.2.41

package/lib/account.js

@@ -237,8 +237,11 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
   var timestampUNIXOld = 0;
 
   // TODO: ADD THESE THINGS: USAGE RESOVLER ETC
-  console.log('++++++account', JSON.stringify(account, null, 2));
-  console.log('++++++options', JSON.stringify(options, null, 2));
+  console.log('++++++account 1', JSON.stringify(account, null, 2));
+  console.log('++++++options 1', JSON.stringify(options, null, 2));
+
+  // @@@DEVELOPER
+  // account.plan = {};
 
   // Resolve auth
   account.auth = account.auth || {};
@@ -262,6 +265,17 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
   account.plan.trial.expires.timestamp = new Date(account.plan.trial.expires.timestamp || 0).toISOString()
   account.plan.trial.expires.timestampUNIX = Math.round(new Date(account.plan.trial.expires.timestamp || 0).getTime() / 1000);
 
+  // @@@DEVELOPER
+  // account.plan.id = 'basic';
+  // account.plan.trial = {
+  //   activated: false,
+  //   expires: {
+  //     timestamp: new Date('2024-04-23T00:07:29.183Z').toISOString(),
+  //     timestampUNIX: Math.round(new Date('2024-04-23T00:07:29.183Z').getTime() / 1000),
+  //   }
+  // }
+  // account.plan.status = 'suspended';
+
   account.plan.limits = account.plan.limits || {};
   // account.plan.devices = account.plan.devices || 1;
 
@@ -324,6 +338,8 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
     account.plan.id = defaultPlanId;
   }
 
+  var isBasicPlan = account.plan.id === defaultPlanId;
+
   // Resolve oAuth2
   account.oauth2 = account.oauth2 || {};
   // account.oauth2.google = account.oauth2.google || {};
@@ -331,7 +347,6 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
 
   // Resolve roles
   account.roles = account.roles || {};
-  // account.roles.betaTester = account.plan.id === defaultPlanId ? false : account.roles.betaTester === true || account.roles.betaTester === 'true';
   account.roles.betaTester = account.roles.betaTester === true || account.roles.betaTester === 'true';
   account.roles.developer = account.roles.developer === true || account.roles.developer === 'true';
   account.roles.admin = account.roles.admin === true || account.roles.admin === 'true';
@@ -418,6 +433,8 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
     var billingUpdateBtn = self.dom.select('.auth-billing-update-btn');
     var billingPlanId = self.dom.select('.auth-billing-plan-id-element');
     var billingFrequencyEl = self.dom.select('.auth-billing-frequency-element');
+    var billingStatusEl = self.dom.select('.auth-billing-status-element');
+    var billingStatusColorEl = self.dom.select('.auth-billing-status-color-element');
     var billingStartDateEl = self.dom.select('.auth-billing-start-date-element');
     var billingExpirationDateEl = self.dom.select('.auth-billing-expiration-date-element');
     var billingSuspendedMessageEl = self.dom.select('.auth-billing-suspended-message-element');
@@ -460,8 +477,8 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
 
     billingUpdateBtn.setAttribute('hidden', true).setAttribute('href', updateURL.toString());
     billingSubscribeBtn.setAttribute('hidden', true);
-    billingSuspendedMessageEl.setAttribute('hidden');
-    billingTrialExpirationDateEl.setAttribute('hidden');
+    billingSuspendedMessageEl.setAttribute('hidden', true);
+    billingTrialExpirationDateEl.setAttribute('hidden', true);
 
     // Update active UI
     if (planIsActive) {
@@ -488,11 +505,32 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
       .setInnerHTML('<i class="fas fa-gift mr-1"></i> Your free trial expires in ' + daysTillTrialExpire + ' days');
     }
 
+    // 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;
+    if (isBasicPlan) {
+      // Set as start of this month
+      visibleStartDate = new Date(now.getFullYear(), now.getMonth(), 1).toISOString();
+    }
+    var visibleFrequency = account.plan.payment.frequency === 'unknown' ? 'monthly' : account.plan.payment.frequency;
+
     // Update billing UI
     billingPlanId.setInnerHTML(splitDashesAndUppercase(account.plan.id));
-    billingFrequencyEl.setInnerHTML(account.plan.id !== defaultPlanId ? ' (billed ' + uppercase(account.plan.payment.frequency) + ')' : '');
-    billingStartDateEl.setInnerHTML(account.plan.id !== defaultPlanId ? ' - Purchased ' + getMonth(startDate) + ' ' + startDate.getDate() + ', ' + startDate.getFullYear() : '');
-    billingExpirationDateEl.setInnerHTML(account.plan.id !== defaultPlanId && daysTillExpire < 366
+    billingFrequencyEl.setInnerHTML(visibleFrequency);
+    billingStatusEl.setInnerHTML(visibleStatus);
+    billingStatusColorEl
+      .removeClass('bg-soft-success').removeClass('bg-soft-danger').removeClass('bg-soft-warning')
+      .removeClass('text-success').removeClass('text-danger').removeClass('text-warning')
+    if (account.plan.status === 'active') {
+      billingStatusColorEl.addClass('bg-soft-success').addClass('text-success');
+    } else {
+      billingStatusColorEl.addClass('bg-soft-danger').addClass('text-danger');
+    }
+    billingStartDateEl.setInnerHTML(new Date(visibleStartDate).toLocaleString(undefined, {
+      weekday: 'long', year: 'numeric', month: 'long', day: 'numeric',
+    }));
+    billingExpirationDateEl.setInnerHTML(isBasicPlan && daysTillExpire < 366
       ? '<i class="fas fa-exclamation-triangle mr-1"></i> Expires in ' + daysTillExpire + ' days '
       : '');
 
@@ -537,6 +575,10 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
       }
     })
 
+    // TODO: ADD THESE THINGS: USAGE RESOVLER ETC
+    console.log('++++++account 2', JSON.stringify(account, null, 2));
+    console.log('++++++options 2', JSON.stringify(options, null, 2));
+
   } catch (e) {
     if (typeof window !== 'undefined') {
       console.error('Unable to set DOM elements', e);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web-manager",
-  "version": "3.2.39",
+  "version": "3.2.41",
   "description": "Easily access important variables such as the query string, current domain, and current page in a single object.",
   "main": "index.js",
   "scripts": {
@@ -31,7 +31,7 @@
     }
   },
   "dependencies": {
-    "@sentry/browser": "^7.98.0",
+    "@sentry/browser": "^7.108.0",
     "cookieconsent": "^3.1.1",
     "firebase": "^9.23.0",
     "lazysizes": "^5.3.2"