ultimate-jekyll-manager 0.0.290 → 0.0.293

package/CHANGELOG.md

@@ -17,6 +17,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ---
 ## [Unreleased]
 ### Added
+- Abandoned cart tracking on checkout page: creates a Firestore document in `payments-carts/{uid}` when authenticated users begin checkout, with a 15-minute first reminder delay
+- Backend sidebar auto-expands collapsible dropdown sections containing the currently active page link (desktop and mobile)
 - Email preferences page (`/portal/account/email-preferences`) for unsubscribe/resubscribe from marketing emails
 - Email masking on preferences page to prevent forwarded-email abuse (e.g., `ia***b@gm***.com`)
 - HMAC signature verification for unsubscribe links to prevent forged requests
@@ -27,6 +29,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Dev-only warning in FormManager for form fields missing `name` attributes (skipped by validation and `getData()`)
 
 ### Changed
+- Replace hardcoded discount codes with server-side validation via `payments/discount` API endpoint
+- Simplify payment intent payload: remove `auth`, `cancelUrl`, and `verification.status` fields; send `discountCode` from validated state
+- Form submit falls back to first visible payment button when Enter is pressed instead of throwing
+- Clear FormManager dirty state before redirect to avoid "leave site" prompt
+- Use proper adjective forms in subscription terms text (e.g., "annual" instead of "annually")
+- Add discount disclaimer to subscription terms when a discount code is applied
 - Align billing section to backend SSOT: consume unified subscription structure directly (3 statuses, `product.id` as object, `payment.price` in dollars, `cancellation.pending`, `trial.claimed` + `trial.expires`)
 - Use WM bindings (`data-wm-bind`) for billing plan heading, action button visibility, and cancel trigger instead of manual JS DOM manipulation
 - Standardize cancel, delete, and data-request forms to use FormManager built-in `required` validation instead of manual disabled toggle and checkbox throws
@@ -35,6 +43,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Checkout payment method buttons start hidden and are revealed via `data-wm-bind` when payment methods load
 - Remove development-only guard from click prevention logging in body.html
 
+### Removed
+- Remove hardcoded `DISCOUNT_CODES` map and `autoApplyWelcomeCoupon` (replaced by server-side validation)
+- Remove `generateCheckoutId` and `state.checkoutId` from checkout session
+- Unexport `resolvePrice` helper (internal-only usage)
+
 ### Fixed
 - Fix broken `</>` tag in checkout HTML causing page rendering to break
 - Fix checkout price display for APIs returning plain numbers instead of `{amount: N}` objects

package/TODO-NEW.md

@@ -0,0 +1,21 @@
+ALSO!!!
+I THINK THE SIGNUP EVENT IS NOT FIRING (the manual send that comes from the user to the server)
+
+also, singup takes a while to go thru make go fstrrrr
+
+on BEM, we need to store the brand data somewhere else besides ITW because thats stupid and takes too long to load
+
+also,, need to handle the auth error for too many signups that we manually throw via beforeCreate
+
+
+FOR ATTRIBUTION FIXES LOOK AT
+/Users/ian/Developer/Repositories/ITW-Creative-Works/ultimate-jekyll-manager/src/assets/js/core/auth.js
+/Users/ian/Developer/Repositories/ITW-Creative-Works/ultimate-jekyll-manager/src/assets/js/core/query-strings.js
+/Users/ian/Developer/Repositories/ITW-Creative-Works/ultimate-jekyll-manager/src/assets/js/core/exit-popup.js
+/Users/ian/Developer/Repositories/ITW-Creative-Works/ultimate-jekyll-manager/src/assets/js/pages/payment/checkout/modules/tracking.js
+and anywhere else with attribution.!!!!
+
+FOR TRACKING FIXES (JSUTSEARCH FOR TRACKING EVENTS)
+
+CHECK OUT LEGACY!!!
+/Users/ian/Developer/Repositories/_Legacy/ultimate-jekyll-legacy/.github/workflows/build.yml

package/dist/assets/css/core/_utilities.scss

@@ -78,3 +78,25 @@ button *, a * {
     opacity: $i * 0.1 !important;
   }
 }
+
+// ============================================
+// Sidebar
+// ============================================
+.sidebar {
+  width: 280px;
+  min-width: 280px;
+}
+
+.sidebar-logo {
+  min-height: 57px;
+
+  a {
+    overflow: hidden;
+  }
+
+  span {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+}

package/dist/assets/js/pages/payment/checkout/index.js

@@ -2,7 +2,7 @@
 import { FormManager } from '__main_assets__/js/libs/form-manager.js';
 import { fetchAppConfig, fetchTrialEligibility, warmupServer, createPaymentIntent } from './modules/api.js';
 import { state, buildBindingsState, resolveProcessor, FREQUENCIES, getAvailableFrequencies } from './modules/state.js';
-import { applyDiscountCode, autoApplyWelcomeCoupon } from './modules/discount.js';
+import { applyDiscountCode } from './modules/discount.js';
 import { initializeRecaptcha } from './modules/recaptcha.js';
 import { trackBeginCheckout, trackAddPaymentInfo } from './modules/tracking.js';
 
@@ -30,24 +30,38 @@ function showError(message) {
   updateUI();
 }
 
-// Generate unique checkout session ID
-function generateCheckoutId() {
-  const urlParams = new URLSearchParams(window.location.search);
-  const existing = urlParams.get('checkoutId');
-  if (existing) return existing;
+// Create/reset abandoned cart tracker in Firestore (fire-and-forget)
+function trackAbandonedCart(webManager, product, state) {
+  const user = webManager.auth().getUser();
+  if (!user) {
+    return;
+  }
 
-  const timestamp = Date.now().toString(36);
-  const random1 = Math.random().toString(36).substring(2, 8);
-  const random2 = Math.random().toString(36).substring(2, 8);
-  return `CHK-${timestamp}-${random1}-${random2}`.toUpperCase();
+  const uid = user.uid;
+  const now = Math.floor(Date.now() / 1000);
+  const nowISO = new Date().toISOString();
+  const FIRST_REMINDER_DELAY = 900; // 15 minutes
+
+  webManager.firestore().doc(`payments-carts/${uid}`).set({
+    id: uid,
+    owner: uid,
+    status: 'pending',
+    productId: product.id,
+    type: product.type || 'subscription',
+    frequency: state.frequency || null,
+    reminderIndex: 0,
+    nextReminderAt: now + FIRST_REMINDER_DELAY,
+    metadata: {
+      created: { timestamp: nowISO, timestampUNIX: now },
+      updated: { timestamp: nowISO, timestampUNIX: now },
+    },
+  })
+    .catch((e) => console.warn('Failed to track abandoned cart:', e));
 }
 
 // Initialize checkout
 async function initializeCheckout() {
   try {
-    // Generate session ID
-    state.checkoutId = generateCheckoutId();
-
     // Parse URL params
     const urlParams = new URLSearchParams(window.location.search);
     const productId = urlParams.get('product');
@@ -150,8 +164,8 @@ async function initializeCheckout() {
     // Track begin_checkout
     trackBeginCheckout(state);
 
-    // Auto-apply welcome coupon
-    autoApplyWelcomeCoupon(formManager, updateUI);
+    // Create/reset abandoned cart tracker (fire-and-forget, authenticated only)
+    trackAbandonedCart(webManager, product, state);
 
   } catch (error) {
     console.error('Checkout initialization failed:', error);
@@ -179,13 +193,12 @@ function setupForm() {
 
   // Form submission (payment)
   formManager.on('submit', async ({ $submitButton }) => {
-    if (!$submitButton) {
-      throw new Error('Please choose a payment method.');
-    }
-
-    const paymentMethod = $submitButton.getAttribute('data-payment-method');
+    // Fall back to first visible payment button if Enter was pressed without clicking one
+    const $btn = $submitButton
+      || document.querySelector('#checkout-form button[data-payment-method]:not([hidden])');
+    const paymentMethod = $btn?.getAttribute('data-payment-method');
     if (!paymentMethod) {
-      throw new Error('Invalid payment method selected.');
+      throw new Error('Please choose a payment method.');
     }
 
     // Track payment info
@@ -202,6 +215,9 @@ function setupForm() {
       formData: formManager.getData(),
     });
 
+    // Clear dirty state so FormManager doesn't trigger "leave site" prompt
+    formManager.setDirty(false);
+
     // Redirect to processor checkout
     window.location.href = response.url;
 
@@ -214,7 +230,7 @@ function setupForm() {
   if ($applyDiscountBtn) {
     $applyDiscountBtn.addEventListener('click', () => {
       const data = formManager.getData();
-      applyDiscountCode(data.discount, updateUI);
+      applyDiscountCode(data.discount, updateUI, webManager);
     });
   }
 

package/dist/assets/js/pages/payment/checkout/modules/api.js

@@ -30,6 +30,16 @@ export async function fetchTrialEligibility(webManager) {
   }
 }
 
+// Validate a discount code via backend
+export async function validateDiscountCode(webManager, code) {
+  const response = await fetch(`${webManager.getApiUrl()}/backend-manager/payments/discount`, {
+    response: 'json',
+    query: { code },
+  });
+
+  return response;
+}
+
 // Fire-and-forget server warmup
 export function warmupServer(webManager) {
   fetch(`${webManager.getApiUrl()}/backend-manager/payments/intent`, {
@@ -43,28 +53,22 @@ export async function createPaymentIntent({ webManager, state, processor, formDa
   // Get reCAPTCHA token
   const recaptchaToken = await getRecaptchaToken('payment_intent');
 
-  // User info
-  const user = webManager.auth().getUser();
+  // Discount code from form data (validated server-side)
+  const discountCode = state.discountCode || '';
 
-  // Discount code from form data
-  const discountCode = state.discountPercent > 0
-    ? (formData.discount || '').trim().toUpperCase()
-    : undefined;
+  // Supplemental form data (everything except fields we handle explicitly)
+  const supplemental = { ...formData };
+  delete supplemental.frequency;
+  delete supplemental.discount;
 
-  // Build payload (flat fields to match backend schema)
+  // Build payload
   const payload = {
     processor,
     productId: state.product.id,
     frequency: state.frequency,
     trial: state.trialEligible,
-    auth: {
-      uid: user?.uid || '',
-      email: user?.email || '',
-    },
     attribution: webManager.storage().get('attribution', {}),
-    cancelUrl: window.location.href,
     verification: {
-      status: 'pending',
       'g-recaptcha-response': recaptchaToken || '',
     },
   };
@@ -74,11 +78,7 @@ export async function createPaymentIntent({ webManager, state, processor, formDa
     payload.discount = discountCode;
   }
 
-  if (formData) {
-    // Clean form data -- remove fields we handle explicitly
-    const supplemental = { ...formData };
-    delete supplemental.frequency;
-    delete supplemental.discount;
+  if (Object.keys(supplemental).length > 0) {
     payload.supplemental = supplemental;
   }
 

package/dist/assets/js/pages/payment/checkout/modules/discount.js

@@ -1,12 +1,26 @@
 // Discount code logic for checkout
-import { state, DISCOUNT_CODES } from './state.js';
+import { state } from './state.js';
+import { validateDiscountCode } from './api.js';
+
+// Cached webManager reference (set on first call)
+let _webManager = null;
+
+/**
+ * Apply a discount code via server-side validation
+ * @param {string} code - Discount code to validate
+ * @param {Function} updateUI - Callback to refresh bindings
+ * @param {object} webManager - WebManager instance (required on first call)
+ */
+export async function applyDiscountCode(code, updateUI, webManager) {
+  if (webManager) {
+    _webManager = webManager;
+  }
 
-// Apply a discount code
-// updateUI callback decouples this from the bindings system
-export async function applyDiscountCode(code, updateUI) {
   code = (code || '').trim().toUpperCase();
 
   if (!code) {
+    state.discountCode = null;
+    state.discountPercent = 0;
     state.discountUI = { loading: false, success: false, error: true, message: 'Please enter a discount code' };
     updateUI();
     return;
@@ -16,22 +30,24 @@ export async function applyDiscountCode(code, updateUI) {
   state.discountUI = { loading: true, success: false, error: false, message: '' };
   updateUI();
 
-  // Simulate API delay (TODO: replace with real API call)
-  await new Promise(resolve => setTimeout(resolve, 800));
+  try {
+    const result = await validateDiscountCode(_webManager, code);
 
-  if (DISCOUNT_CODES[code]) {
-    state.discountPercent = DISCOUNT_CODES[code];
-    state.discountUI = { loading: false, success: true, error: false, message: `Discount applied: ${state.discountPercent}% off` };
-  } else {
+    if (result.valid) {
+      state.discountCode = result.code;
+      state.discountPercent = result.percent;
+      state.discountUI = { loading: false, success: true, error: false, message: `Discount applied: ${result.percent}% off` };
+    } else {
+      state.discountCode = null;
+      state.discountPercent = 0;
+      state.discountUI = { loading: false, success: false, error: true, message: 'Invalid discount code' };
+    }
+  } catch (e) {
+    console.warn('Discount validation failed:', e);
+    state.discountCode = null;
     state.discountPercent = 0;
-    state.discountUI = { loading: false, success: false, error: true, message: 'Invalid discount code' };
+    state.discountUI = { loading: false, success: false, error: true, message: 'Unable to validate discount code. Please try again.' };
   }
 
   updateUI();
 }
-
-// Auto-apply welcome coupon
-export function autoApplyWelcomeCoupon(formManager, updateUI) {
-  formManager.setData({ discount: 'WELCOME15' });
-  applyDiscountCode('WELCOME15', updateUI);
-}

package/dist/assets/js/pages/payment/checkout/modules/recaptcha.js

@@ -56,6 +56,20 @@ export async function initializeRecaptcha(siteKey, webManager) {
 
 // Get reCAPTCHA token
 export async function getRecaptchaToken(action = 'checkout') {
+  /* @dev-only:start */
+  {
+    const devRecaptcha = new URLSearchParams(window.location.search).get('_dev_recaptcha');
+    if (devRecaptcha === 'invalid') {
+      console.warn('[Checkout Dev] Sending invalid reCAPTCHA token');
+      return 'invalid-dev-token';
+    }
+    if (devRecaptcha === 'empty') {
+      console.warn('[Checkout Dev] Sending empty reCAPTCHA token');
+      return '';
+    }
+  }
+  /* @dev-only:end */
+
   if (!recaptchaReady || !recaptchaSiteKey) {
     console.warn('reCAPTCHA not initialized');
     return null;

package/dist/assets/js/pages/payment/checkout/modules/state.js

@@ -6,13 +6,6 @@ import { calculatePrices } from './pricing.js';
 // All supported billing frequencies
 export const FREQUENCIES = ['daily', 'weekly', 'monthly', 'annually'];
 
-// Hardcoded discount codes (TODO: move to API)
-export const DISCOUNT_CODES = {
-  'FLASH20': 20,
-  'SAVE10': 10,
-  'WELCOME15': 15,
-};
-
 // Minimal mutable state
 export const state = {
   // From API (stored once, never transformed)
@@ -22,15 +15,13 @@ export const state = {
 
   // User selections
   frequency: 'annually',
+  discountCode: null,
   discountPercent: 0,
   trialEligible: false,
 
   // UI state
   discountUI: { loading: false, success: false, error: false, message: '' },
   error: { show: false, message: '' },
-
-  // Session
-  checkoutId: null,
 };
 
 // Resolve which processor handles a payment method
@@ -52,7 +43,7 @@ export function resolveProcessor(paymentMethod) {
 }
 
 // Resolve price for a frequency (handles both `{ amount: N }` and plain `N` formats)
-export function resolvePrice(product, frequency) {
+function resolvePrice(product, frequency) {
   const entry = product?.prices?.[frequency];
   if (entry == null) return 0;
   return typeof entry === 'object' ? (entry.amount || 0) : Number(entry) || 0;
@@ -122,7 +113,7 @@ export function buildBindingsState(webManager) {
         recurringAmount: formatCurrency(prices.recurring),
         recurringPeriod: frequencyLabels[cycle] || cycle,
         showTerms: isSubscription,
-        termsText: buildTermsText(product, cycle, hasFreeTrial, prices),
+        termsText: buildTermsText(product, cycle, hasFreeTrial, prices, state.discountPercent > 0),
       },
       trial: {
         show: hasFreeTrial,
@@ -170,10 +161,11 @@ function formatCurrency(amount) {
 const FREQUENCY_DAYS = { daily: 1, weekly: 7, monthly: 30, annually: 365 };
 
 // Build subscription terms text
-function buildTermsText(product, cycle, hasFreeTrial, prices) {
+function buildTermsText(product, cycle, hasFreeTrial, prices, hasDiscount) {
   if (!product || product.type !== 'subscription') return '';
 
-  const periodText = cycle;
+  const periodAdjectiveMap = { daily: 'daily', weekly: 'weekly', monthly: 'monthly', annually: 'annual' };
+  const periodText = periodAdjectiveMap[cycle] || cycle;
   const renewalDate = new Date();
   const daysToAdd = hasFreeTrial
     ? (product.trial?.days || 7)
@@ -186,9 +178,11 @@ function buildTermsText(product, cycle, hasFreeTrial, prices) {
     year: 'numeric',
   });
 
+  const discountNote = hasDiscount ? ' Discount code applies to first payment only and is not available with PayPal.' : '';
+
   if (hasFreeTrial) {
-    return `You won't be charged for your free trial. On ${formatted}, your ${periodText} subscription will start and you'll be charged ${formatCurrency(prices.recurring)} plus applicable tax. Cancel anytime before then.`;
+    return `You won't be charged for your free trial. On ${formatted}, your ${periodText} subscription will start and you'll be charged ${formatCurrency(prices.recurring)} plus applicable tax. Cancel anytime before then.${discountNote}`;
   }
 
-  return `Your ${periodText} subscription will start today and renew on ${formatted} for ${formatCurrency(prices.recurring)} plus applicable tax. Cancel anytime.`;
+  return `Your ${periodText} subscription will start today and renew on ${formatted} for ${formatCurrency(prices.recurring)} plus applicable tax. Cancel anytime.${discountNote}`;
 }

package/dist/defaults/dist/_includes/admin/sections/sidebar.json

@@ -1,6 +1,7 @@
 {
   logo: {
-    href: '/'
+    href: '/',
+    class: 'filter-adaptive',
   },
   links: [
     {

package/dist/defaults/dist/_includes/themes/classy/backend/sections/sidebar.html

@@ -37,8 +37,17 @@
         {% elsif link.dropdown %}
           <!-- Collapsible Dropdown -->
           {% capture link_id %}sidebar-collapse-{{ forloop.index }}{% endcapture %}
+          {% assign dropdown_has_active = false %}
+          {% for child in link.dropdown %}
+            {% unless child.divider %}
+              {% capture _check_active %}{% urlmatches child.href, "active" %}{% endcapture %}
+              {% if _check_active == "active" %}
+                {% assign dropdown_has_active = true %}
+              {% endif %}
+            {% endunless %}
+          {% endfor %}
           <li class="mb-1">
-            <button class="btn btn-toggle d-inline-flex align-items-center justify-content-between rounded py-2 px-3 border-0 collapsed" data-bs-toggle="collapse" data-bs-target="#{{ link_id }}" aria-expanded="false">
+            <button class="btn btn-toggle d-inline-flex align-items-center justify-content-between rounded py-2 px-3 border-0 {% unless dropdown_has_active %}collapsed{% endunless %}" data-bs-toggle="collapse" data-bs-target="#{{ link_id }}" aria-expanded="{{ dropdown_has_active }}">
               <span class="d-inline-flex align-items-center">
                 {% if link.icon %}
                   {% uj_icon link.icon, "fa-xl me-3" %}
@@ -46,7 +55,7 @@
                 {{ link.label }}
               </span>
             </button>
-            <div class="collapse" id="{{ link_id }}">
+            <div class="collapse {% if dropdown_has_active %}show{% endif %}" id="{{ link_id }}">
               <ul class="btn-toggle-nav list-unstyled fw-normal pb-1 small">
                 {% for child in link.dropdown %}
                   {% if child.divider %}
@@ -157,8 +166,17 @@
           </li>
         {% elsif link.dropdown %}
           {% capture link_id %}mobile-collapse-{{ forloop.index }}{% endcapture %}
+          {% assign dropdown_has_active = false %}
+          {% for child in link.dropdown %}
+            {% unless child.divider %}
+              {% capture _check_active %}{% urlmatches child.href, "active" %}{% endcapture %}
+              {% if _check_active == "active" %}
+                {% assign dropdown_has_active = true %}
+              {% endif %}
+            {% endunless %}
+          {% endfor %}
           <li class="mb-1">
-            <button class="btn btn-toggle d-inline-flex align-items-center justify-content-between rounded py-2 px-3 border-0 collapsed" data-bs-toggle="collapse" data-bs-target="#{{ link_id }}" aria-expanded="false">
+            <button class="btn btn-toggle d-inline-flex align-items-center justify-content-between rounded py-2 px-3 border-0 {% unless dropdown_has_active %}collapsed{% endunless %}" data-bs-toggle="collapse" data-bs-target="#{{ link_id }}" aria-expanded="{{ dropdown_has_active }}">
               <span class="d-inline-flex align-items-center">
                 {% if link.icon %}
                   {% uj_icon link.icon, "fa-xl me-3" %}
@@ -166,7 +184,7 @@
                 {{ link.label }}
               </span>
             </button>
-            <div class="collapse" id="{{ link_id }}">
+            <div class="collapse {% if dropdown_has_active %}show{% endif %}" id="{{ link_id }}">
               <ul class="btn-toggle-nav list-unstyled fw-normal pb-1 small">
                 {% for child in link.dropdown %}
                   {% if child.divider %}

package/dist/defaults/dist/_layouts/themes/classy/frontend/pages/payment/checkout.html

@@ -139,6 +139,14 @@ web_manager:
                 <option value="chargebee">Chargebee</option>
               </select>
             </div>
+            <div class="mb-2">
+              <label class="form-label mb-1 text-body-secondary">reCAPTCHA</label>
+              <select data-dev-param="_dev_recaptcha" class="form-select form-select-sm">
+                <option value="">(normal)</option>
+                <option value="invalid">Send invalid token</option>
+                <option value="empty">Send empty token</option>
+              </select>
+            </div>
             <button id="checkout-dev-apply" class="btn btn-primary btn-sm w-100 fw-bold">Apply &amp; Reload</button>
           </div>
         </div>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ultimate-jekyll-manager",
-  "version": "0.0.290",
+  "version": "0.0.293",
   "description": "Ultimate Jekyll dependency manager",
   "main": "dist/index.js",
   "exports": {