Putting paid purchase and trial enforcement back in place for 1.0

tconfrey · Jun 5, 2024 · 7b0fec2 · 7b0fec2
1 parent 3c79528
commit 7b0fec2
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 16 deletions.
diff --git a/app/configManager.js b/app/configManager.js
@@ -313,6 +313,9 @@ const configManager = (() => {
         // open/close settings panel
 
         const iconColor = (getProp('BTTheme') == 'LIGHT') ? 'LIGHT' : 'DARK';
+        const installDate = new Date(getProp('BTInstallDate'));
+        const today = new Date();
+        const daysSinceInstall = Math.floor((today - installDate) / (24 * 60 * 60 * 1000));
 
         if ($('#actions').is(':visible'))
             toggleActionsDisplay();                       // can't have both open
@@ -331,15 +334,16 @@ const configManager = (() => {
             $('#topBar img').removeClass(['DARK', 'LIGHT']).addClass('DARK');
             $("#content").fadeOut(250);
             $("body").css("overflow", "hidden");          // don't allow table to be scrolled
-            /* !!!!!!! Temp remove supporter overlay  !!!!!!!! */
+
+            // fade in and maybe out the overlay to shut off non-supporter features if not supporter
             if (BTId) return;
+            // No BTId but might be still in trial period. Fade in overlay
             setTimeout(() => {
                 $("#youShallNotPass").fadeIn();
             }, 1000);
-            setTimeout(() => {
-                $("#youShallNotPass").fadeOut();
-            }, 20000);
-            /* !!!!!!! Temp remove supporter overlay  !!!!!!!! */
+            // fade out overlay if trial still on ie < 30 days since install
+            if (daysSinceInstall <= 30)
+                setTimeout(() => {$("#youShallNotPass").fadeOut();}, 10000);
         }
     }
 

diff --git a/app/index.html b/app/index.html
@@ -81,11 +81,8 @@
             <span>+ ADD A NEW TOP LEVEL TOPIC</span>
         </div>
       </div>
-      <div class="settingsActions" id="settings" style="margin-bottom: 5px" onclick="$('#youShallNotPass').hide()">
+      <div class="settingsActions" id="settings" style="margin-bottom: 5px">
         <div id="youShallNotPass">
-          <img class="panelClose" type="image" alt="Reveal" title="Reveal Supporter Zone"
-               src="resources/close.png"  height="17" width="20"
-               onclick="$('#youShallNotPass').hide()">
           <p id="warningBanner">Supporter<br/>Zone</p>
         </div>
           <img class="panelClose" type="image" alt="Close" title="Close"
@@ -266,9 +263,9 @@
           <div id="settingsSubscriptionAdd">
             <div class="settingsSubText">You are using BrainTool for free.<br/>Please consider supporting BrainTool with a purchase. Thank you!</div>
             <div id="settingsSubscriptionButtons" class="settingsInput">
-              <button onClick="handlePurchase(Monthly)" class="subButton">$1.33/ Month</button>
-              <button onclick="handlePurchase(Annual)"  class="subButton">$10.66/ Year</button>
-              <button onclick="handlePurchase(OTP)"  class="subButton">Lifetime $21<br/><i><small>(now free)</small></i></button>
+              <button onClick="handlePurchase(Monthly)" class="subButton">Month $1.33</button>
+              <button onclick="handlePurchase(Annual)"  class="subButton">Year $10.66</button>
+              <button onclick="handlePurchase(OTP)"  class="subButton">Lifetime $20.99</button>
             </div>
             <i>Coupons applied at checkout</i>
             <div class="settingsFootnote">

diff --git a/app/subscriptionManager.js b/app/subscriptionManager.js
@@ -321,13 +321,12 @@ async function subscribe(productPrice) {
     }
 }
 
-const ReleaseCandidate = true;
 async function purchase(productPrice) {
     // similar to above but One-Time-purchase
     const baseURL = window.location.href.split('?')[0];     // drop any preexisting '?purchase=xyz' arg
     const checkoutSession = {
         mode: "payment",
-        price: OTP, // One-time price created in Stripe
+        price: OTP,                                         // One-time price created in Stripe
 	    allow_promotion_codes: true,
         success_url: baseURL+ '?purchase=' + encodeURIComponent('product'),
         cancel_url: baseURL + '?purchase=' + encodeURIComponent('cancelled'),
@@ -344,7 +343,6 @@ async function purchase(productPrice) {
 	        if (sessionId) {
 	            // We have a session, let's redirect to Checkout
 	            // Init Stripe
-                if (ReleaseCandidate) {RCPurchase(sessionId); return;}      // !!! REMOVE FROM PROD and update FB Rules!!!
                 const stripeKey = configManager.getProp('STRIPE_KEY');
 	            const stripe = Stripe(stripeKey);
 	            stripe.redirectToCheckout({ sessionId });
@@ -357,6 +355,7 @@ async function purchase(productPrice) {
     }
 }
 
+/*
 async function RCPurchase(sessionId) {
     // Skip Stripe processing to allow free license for RC. Stripe won't charge 0 for a product or give 100% discount
 
@@ -382,6 +381,7 @@ async function RCPurchase(sessionId) {
         updateLicenseSettings();
     });
 }
+*/
 
 async function getStripePortalURL() {
     // Billing portal handler

diff --git a/extension/images/Overview.png b/extension/images/Overview.png
diff --git a/extension/resources/gridBackground.png b/extension/resources/gridBackground.png
diff --git a/pricing.md b/pricing.md
@@ -91,6 +91,6 @@ Nag-free
 <br/><br/>
 <p>
 <b>
-$1.33/M, $10.66/Y, $21 One-time
+$1.33/M, $10.66/Y, $20.99 One-time
 </b>
 </p>