web-manager 3.2.15 → 3.2.16

package/lib/account.js

@@ -294,10 +294,12 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
     }
   }
 
-  var planExpireDate = new Date(account.plan.expires.timestamp);
   var now = new Date();
+  var planExpireDate = new Date(account.plan.expires.timestamp);
   var daysTillExpire = Math.floor((planExpireDate - now) / 86400000);
   var difference = (planExpireDate.getTime() - now.getTime()) / (24 * 3600 * 1000);
+  var trialExpireDate = new Date(account.plan.trial.expires.timestamp);
+  var daysTillTrialExpire = Math.floor((trialExpireDate - now) / 86400000);
   var startDate = new Date(account.plan.payment.startDate.timestamp);
   var planIsActive = difference > -1 && account.plan.id !== defaultPlanId;
   var planIsSuspended = account.plan.status === 'suspended';
@@ -392,6 +394,7 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
     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');
+    var billingTrialExpirationDateEl = self.dom.select('.auth-billing-trial-expiration-date-element');
 
     var $referralCount = self.dom.select('.auth-referral-count-element');
     var $referralCode = self.dom.select('.auth-referral-code-element');
@@ -425,19 +428,22 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
     )
     authPhoneInput.setInnerHTML(firebaseUser.phoneNumber).setValue(firebaseUser.phoneNumber)
 
+    updateURL.searchParams.set('orderId', account.plan.payment.orderId);
+    updateURL.searchParams.set('resourceId', account.plan.payment.resourceId);
+
     billingUpdateBtn.setAttribute('hidden', true).setAttribute('href', updateURL.toString());
     billingSubscribeBtn.setAttribute('hidden', true);
     billingSuspendedMessageEl.setAttribute('hidden');
+    billingTrialExpirationDateEl.setAttribute('hidden');
 
-    updateURL.searchParams.set('orderId', account.plan.payment.orderId);
-    updateURL.searchParams.set('resourceId', account.plan.payment.resourceId);
-
+    // Update active UI
     if (planIsActive) {
       billingUpdateBtn.removeAttribute('hidden');
     } else {
       billingSubscribeBtn.removeAttribute('hidden');
     }
 
+    // Update suspended UI
     if (planIsSuspended) {
       billingUpdateBtn.removeAttribute('hidden');
       billingSubscribeBtn.setAttribute('hidden', true);
@@ -445,6 +451,14 @@ Account.prototype._resolveAccount = function (firebaseUser, account, options) {
       billingSuspendedMessageEl.removeAttribute('hidden');
     }
 
+    // Update trial UI
+    if (account.plan.trial.activated) {
+      billingTrialExpirationDateEl
+      .removeAttribute('hidden')
+      .setInnerHTML('<i class="fas fa-gift mr-1"></i> Your free trial expires in ' + daysTillTrialExpire + ' days');
+    }
+
+    // Update billing UI
     billingPlanId.setInnerHTML(uppercase(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() : '');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web-manager",
-  "version": "3.2.15",
+  "version": "3.2.16",
   "description": "Easily access important variables such as the query string, current domain, and current page in a single object.",
   "main": "index.js",
   "scripts": {
@@ -36,4 +36,4 @@
     "firebase": "^9.23.0",
     "lazysizes": "^5.3.2"
   }
-}
+}