web-manager 3.2.40 → 3.2.42

package/lib/account.js

@@ -237,8 +237,8 @@ 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 = {};
@@ -450,6 +450,7 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
 
     var updateURL = new URL(cancelURL);
     var referralURL = new URL(window.location.origin || window.location.host);
+    var accountCreationDate = new Date(+self.utilities.get(firebaseUser, 'metadata.createdAt', '0'));
 
     function _setAuthItem(selector, value) {
       self.dom.select(selector).each(function(e, i) {
@@ -465,9 +466,9 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
     referralURL.searchParams.set('aff', account.affiliate.code)
 
     authCreatedEl.setInnerHTML(
-      new Date(+self.utilities.get(firebaseUser, 'metadata.createdAt', '0'))
+      new Date(accountCreationDate)
       .toLocaleString(undefined, {
-        weekday: 'long', year: 'numeric', month: 'long', day: 'numeric',
+        year: 'numeric', month: 'long', day: 'numeric',
       })
     )
     authPhoneInput.setInnerHTML(firebaseUser.phoneNumber).setValue(firebaseUser.phoneNumber)
@@ -477,8 +478,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) {
@@ -509,9 +510,9 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
     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 basic, just show account creation date
     if (isBasicPlan) {
-      // Set as start of this month
-      visibleStartDate = new Date(now.getFullYear(), now.getMonth(), 1).toISOString();
+      visibleStartDate = accountCreationDate;
     }
     var visibleFrequency = account.plan.payment.frequency === 'unknown' ? 'monthly' : account.plan.payment.frequency;
 
@@ -528,7 +529,7 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
       billingStatusColorEl.addClass('bg-soft-danger').addClass('text-danger');
     }
     billingStartDateEl.setInnerHTML(new Date(visibleStartDate).toLocaleString(undefined, {
-      weekday: 'long', year: 'numeric', month: 'long', day: 'numeric',
+      year: 'numeric', month: 'long', day: 'numeric',
     }));
     billingExpirationDateEl.setInnerHTML(isBasicPlan && daysTillExpire < 366
       ? '<i class="fas fa-exclamation-triangle mr-1"></i> Expires in ' + daysTillExpire + ' days '
@@ -575,6 +576,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.40",
+  "version": "3.2.42",
   "description": "Easily access important variables such as the query string, current domain, and current page in a single object.",
   "main": "index.js",
   "scripts": {
@@ -31,9 +31,9 @@
     }
   },
   "dependencies": {
-    "@sentry/browser": "^7.98.0",
+    "@sentry/browser": "^7.108.0",
     "cookieconsent": "^3.1.1",
     "firebase": "^9.23.0",
     "lazysizes": "^5.3.2"
   }
-}
+}