Update portal for Omada vouchers

portal-payment-preview.html

@@ -640,7 +640,7 @@
         <div class="payment-head">
           <div>
             <h3>Pay the business directly</h3>
-            <p>Use the merchant ID below, then show payment confirmation and receive your WiFi code from the attendant.</p>
+            <p>Use the merchant ID below, then show payment confirmation and receive your Omada voucher code from the attendant.</p>
           </div>
           <div class="badge" id="active-provider-badge">Selcom</div>
         </div>
@@ -762,11 +762,11 @@ Use merchant ID 4412088 and complete the payment.</div>
       <p class="helper-note">The layout above gives the merchant ID more visual emphasis and keeps the instructions readable on narrow screens.</p>
 
       <div class="online-payment">
-        <label class="field-label" for="phone-input">Hotspot Manager Token</label>
-        <input class="phone-input" id="phone-input" type="text" placeholder="Enter token from Hotspot Manager" autocomplete="one-time-code">
-        <p class="input-hint">Enter the voucher/token created in Omada Hotspot Manager. It will be submitted as voucher access, the same way Omada authenticates hotspot tokens.</p>
+        <label class="field-label" for="phone-input">Omada Voucher Code</label>
+        <input class="phone-input" id="phone-input" type="text" placeholder="Enter voucher code" autocomplete="one-time-code">
+        <p class="input-hint">Enter the voucher code exactly as shown in Omada Hotspot Manager.</p>
         <div class="error-msg" id="select-error"></div>
-        <button class="primary-btn" id="pay-btn" type="button" disabled>Enter token</button>
+        <button class="primary-btn" id="pay-btn" type="button" disabled>Enter voucher</button>
       </div>
 
       <button class="token-cta" type="button" id="show-code-entry">
@@ -774,21 +774,21 @@ Use merchant ID 4412088 and complete the payment.</div>
         <div class="token-cta-row">
           <div>
             <span class="token-cta-title">Enter an existing code</span>
-            <span class="token-cta-copy">Paid the business already? Use your WiFi token here to connect immediately.</span>
+            <span class="token-cta-copy">Paid the business already? Enter your Omada voucher code here to connect immediately.</span>
           </div>
           <span class="token-cta-icon">→</span>
         </div>
       </button>
 
-      <div class="token-note">This hotspot is currently configured for direct business payment only. Choose one plan, pay the business above, and use the WiFi code you receive.</div>
+      <div class="token-note">This hotspot is currently configured for direct business payment only. Choose one plan, pay the business above, and enter the Omada voucher code you receive.</div>
       <div class="support-inline">Need help? Call 0748334009</div>
       </div>
 
       <div id="screen-waiting" class="screen">
         <div class="payment-status">
           <div class="spinner"></div>
-          <strong>Authenticating token</strong>
-          <span>Sending the Hotspot Manager token to Omada.</span>
+          <strong>Authenticating voucher</strong>
+          <span>Sending the Omada voucher code to the controller.</span>
           <div class="error-msg" id="payment-error"></div>
           <button class="ghost-btn" id="cancel-btn" type="button">Cancel</button>
         </div>
@@ -796,8 +796,8 @@ Use merchant ID 4412088 and complete the payment.</div>
 
       <div id="screen-code" class="screen">
         <div class="online-payment">
-          <label class="field-label" for="code-input">Hotspot Manager Token</label>
-          <input class="code-input" id="code-input" type="text" placeholder="Enter token">
+          <label class="field-label" for="code-input">Omada Voucher Code</label>
+          <input class="code-input" id="code-input" type="text" placeholder="Enter voucher code" autocomplete="one-time-code">
           <div class="error-msg" id="code-error"></div>
           <button class="primary-btn" id="code-submit-btn" type="button">Connect</button>
           <button class="ghost-btn" id="show-plans" type="button">Back to plans</button>
@@ -807,7 +807,7 @@ Use merchant ID 4412088 and complete the payment.</div>
       <div id="screen-success" class="screen">
         <div class="success-panel">
           <strong>Connected</strong>
-          <span>The Hotspot Manager token was accepted.</span>
+          <span>The Omada voucher code was accepted.</span>
           <div class="code-value" id="success-code">----</div>
           <span id="success-meta"></span>
         </div>
@@ -994,10 +994,10 @@ Use merchant ID 4412088 and complete the payment.</div>
     function updatePayButton() {
       if (!authButton) return;
       if (currentToken()) {
-        authButton.textContent = "Authenticate Token";
+        authButton.textContent = "Authenticate Voucher";
         authButton.disabled = false;
       } else {
-        authButton.textContent = "Enter token";
+        authButton.textContent = "Enter voucher";
         authButton.disabled = true;
       }
     }
@@ -1020,7 +1020,7 @@ Use merchant ID 4412088 and complete the payment.</div>
     function authenticateToken(token, errorElement) {
       clearError(errorElement);
       if (!token) {
-        showError(errorElement, "Enter the Hotspot Manager token.");
+        showError(errorElement, "Enter the Omada voucher code.");
         return;
       }
       if (!submitUrl) {
@@ -1047,7 +1047,7 @@ Use merchant ID 4412088 and complete the payment.</div>
             isCommited = true;
             landingUrl = data.result || landingUrl;
             if (successCode) successCode.textContent = token;
-            if (successMeta) successMeta.textContent = "Hotspot Manager token accepted. Redirecting...";
+            if (successMeta) successMeta.textContent = "Omada voucher accepted. Redirecting...";
             showScreen("success");
             window.location.href = landingUrl;
           } else {

public/engine.js

@@ -257,10 +257,7 @@
 
   if (codeInput) {
     codeInput.addEventListener('input', () => {
-      // Auto-insert dash after 4 chars
-      let v = codeInput.value.toUpperCase().replace(/[^A-Z0-9]/g, '');
-      if (v.length > 4) v = v.slice(0, 4) + '-' + v.slice(4, 8);
-      codeInput.value = v;
+      codeInput.value = codeInput.value.replace(/[^a-zA-Z0-9]/g, '').slice(0, 32);
     });
   }
 
@@ -268,8 +265,8 @@
     codeSubmitBtn.addEventListener('click', async () => {
       clearError('code-error');
       const code = codeInput?.value?.trim();
-      if (!code || code.length < 9) {
-        return showError('code-error', 'Enter a valid 8-character code (XXXX-XXXX).');
+      if (!code || code.length < 6) {
+        return showError('code-error', 'Enter the voucher code exactly as shown.');
       }
       if (!P.clientMac) {
         return showError('code-error', 'Open this portal from the WiFi login page on the device you want to connect.');

src/jobs/index.js

@@ -7,6 +7,7 @@ const pollAlerts       = require('./pollAlerts.job');
 const suspendDevices   = require('./suspendDevices.job');
 const billingReminders = require('./billingReminders.job');
 const syncVoucherGroups = require('./syncVoucherGroups.job');
+const syncPortalTemplates = require('./syncPortalTemplates.job');
 
 function runVoucherGroupSync() {
   syncVoucherGroups().catch(err => {
@@ -14,6 +15,12 @@ function runVoucherGroupSync() {
   });
 }
 
+function runPortalTemplateSync() {
+  syncPortalTemplates().catch(err => {
+    console.warn('[portal-template] background sync failed:', err.message);
+  });
+}
+
 // adoptDevices — triggered on-demand from POST /api/devices/:id/adopt (not a cron job)
 // pollSessions — browser triggers every 1 min while dashboard is open (throttled server-side);
 //                cron below is the fallback when no dashboard is open
@@ -29,6 +36,7 @@ function initJobs() {
 
   // Retry Omada voucher-group setup after boot/config changes.
   setTimeout(runVoucherGroupSync, 10_000);
+  setTimeout(runPortalTemplateSync, 20_000);
 
   // Hourly
   cron.schedule('0 * * * *', runVoucherGroupSync);

src/jobs/syncPortalTemplates.job.js

@@ -0,0 +1,48 @@
+const db = require('../config/db');
+const omada = require('../services/omada');
+
+async function syncPortalTemplates() {
+  if (!omada.isOpenApiConfigured()) {
+    return;
+  }
+
+  const devices = await db.query(
+    `SELECT id, omada_site_id, omada_portal_id, omada_ssid_id
+     FROM devices
+     WHERE omada_site_id IS NOT NULL
+       AND omada_site_id <> ''
+       AND omada_portal_id IS NOT NULL
+       AND omada_portal_id <> ''
+       AND omada_ssid_id IS NOT NULL
+       AND omada_ssid_id <> ''
+     ORDER BY id ASC
+     LIMIT 50`
+  );
+
+  if (!devices.length) {
+    return;
+  }
+
+  console.log(`[portal-template] Syncing ${devices.length} Omada captive portal page(s)`);
+
+  for (const device of devices) {
+    try {
+      const imported = await omada.importAndAttachPortalPage(
+        device.omada_site_id,
+        device.omada_portal_id,
+        device.omada_ssid_id
+      );
+      if (imported?.importedPortalPageId) {
+        await db.query(
+          `UPDATE devices SET omada_imported_portal_page_id = ? WHERE id = ?`,
+          [imported.importedPortalPageId, device.id]
+        );
+      }
+      console.log(`[portal-template] device=${device.id} imported=${imported?.importedPortalPageId || 'none'}`);
+    } catch (err) {
+      console.warn(`[portal-template] sync failed for device ${device.id}:`, err.message);
+    }
+  }
+}
+
+module.exports = syncPortalTemplates;

src/routes/plans.routes.js

@@ -176,17 +176,61 @@ router.put('/:id', async (req, res) => {
 });
 
 // DELETE /api/plans/:id  (soft delete — deactivate)
+async function deletePlanRow(plan, { force = false } = {}) {
+  const refs = await db.queryOne(
+    `SELECT
+        (SELECT COUNT(*) FROM payments WHERE plan_id = ?) AS payment_refs,
+        (SELECT COUNT(*) FROM access_tokens WHERE plan_id = ?) AS token_refs`,
+    [plan.id, plan.id]
+  );
+
+  const paymentRefs = Number(refs?.payment_refs || 0);
+  const tokenRefs = Number(refs?.token_refs || 0);
+  if (paymentRefs > 0 || tokenRefs > 0) {
+    if (!force) {
+      const err = new Error('Plan has sales or tokens attached and cannot be permanently deleted');
+      err.status = 409;
+      err.refs = { payment_refs: paymentRefs, token_refs: tokenRefs };
+      throw err;
+    }
+    await db.query('UPDATE wifi_plans SET is_active = 0 WHERE id = ? AND client_id = ?', [plan.id, plan.client_id]);
+    return {
+      mode: 'deactivated',
+      refs: { payment_refs: paymentRefs, token_refs: tokenRefs },
+    };
+  }
+
+  await db.query('DELETE FROM wifi_plans WHERE id = ? AND client_id = ?', [plan.id, plan.client_id]);
+  return {
+    mode: 'deleted',
+    refs: { payment_refs: paymentRefs, token_refs: tokenRefs },
+  };
+}
+
 router.delete('/:id', async (req, res) => {
   try {
-    const plan = await db.query(
-      'SELECT p.id FROM wifi_plans p JOIN devices d ON d.id = p.device_id WHERE p.id = ? AND d.client_id = ? LIMIT 1',
+    const plan = await db.queryOne(
+      'SELECT p.id, p.client_id FROM wifi_plans p JOIN devices d ON d.id = p.device_id WHERE p.id = ? AND d.client_id = ? LIMIT 1',
       [req.params.id, req.client.id]
-    ).then(r => r[0]);
+    );
     if (!plan) return res.status(404).json({ error: 'Plan not found' });
 
-    await db.query('UPDATE wifi_plans SET is_active = 0 WHERE id = ?', [req.params.id]);
-    res.json({ message: 'Plan deactivated' });
+    const result = await deletePlanRow(plan, {
+      force: req.query.force === '1' || req.query.force === 'true',
+    });
+    res.json({
+      message: result.mode === 'deleted' ? 'Plan permanently deleted' : 'Plan has history and was deactivated',
+      ...result,
+    });
   } catch (err) {
+    if (err.status === 409) {
+      return res.status(409).json({
+        error: err.message,
+        refs: err.refs,
+        hint: 'Use DELETE /api/plans/:id?force=1 to deactivate plans that already have sales or tokens.',
+      });
+    }
+    console.error('[plans/delete]', err.message);
     res.status(500).json({ error: 'Failed to delete plan' });
   }
 });
@@ -204,22 +248,12 @@ router.delete('/:id/permanent', async (req, res) => {
     );
     if (!plan) return res.status(404).json({ error: 'Plan not found' });
 
-    const refs = await db.queryOne(
-      `SELECT
-          (SELECT COUNT(*) FROM payments WHERE plan_id = ?) AS payment_refs,
-          (SELECT COUNT(*) FROM access_tokens WHERE plan_id = ?) AS token_refs`,
-      [plan.id, plan.id]
-    );
-
-    if ((refs.payment_refs || 0) > 0 || (refs.token_refs || 0) > 0) {
-      return res.status(409).json({
-        error: 'Plan has sales or tokens attached and cannot be permanently deleted',
-      });
-    }
-
-    await db.query('DELETE FROM wifi_plans WHERE id = ? AND client_id = ?', [plan.id, req.client.id]);
-    res.json({ message: 'Plan permanently deleted' });
+    const result = await deletePlanRow(plan, { force: false });
+    res.json({ message: 'Plan permanently deleted', ...result });
   } catch (err) {
+    if (err.status === 409) {
+      return res.status(409).json({ error: err.message, refs: err.refs });
+    }
     console.error('[plans/permanent-delete]', err.message);
     res.status(500).json({ error: 'Failed to permanently delete plan' });
   }

src/routes/portal.routes.js

@@ -461,7 +461,7 @@ router.post('/:siteId/auth', portalAuthLimiter, async (req, res) => {
   }
 
   const mac = clientMac.toUpperCase().replace(/:/g, '-');
-  const normalizedCode = code.toUpperCase();
+  const normalizedCode = String(code).trim();
   const trace = createAuthTrace({ siteId, mac, code: normalizedCode });
 
   try {
@@ -471,7 +471,7 @@ router.post('/:siteId/auth', portalAuthLimiter, async (req, res) => {
       `SELECT t.*, d.omada_site_id
        FROM access_tokens t
        JOIN devices d ON d.id = t.device_id
-       WHERE t.code = ? AND d.omada_site_id = ? LIMIT 1`,
+       WHERE BINARY t.code = ? AND d.omada_site_id = ? LIMIT 1`,
       [normalizedCode, siteId]
     ).then(r => r[0]);
     trace.step('token_lookup_complete', token ? {

src/views/screens/portal.ejs

@@ -779,7 +779,7 @@
           <div class="manual-pay-head">
             <div>
               <h3>Pay the business directly</h3>
-              <p>Use the number below, then show payment confirmation and get your WiFi code from the attendant.</p>
+              <p>Use the number below, then show payment confirmation and get your Omada voucher code from the attendant.</p>
             </div>
             <div class="manual-pay-badge"><%= String(paymentProvider || '').toUpperCase() %></div>
           </div>
@@ -806,14 +806,14 @@
             <div class="manual-pay-steps">
               <div class="manual-pay-step"><span class="step-no">1</span><span>Choose your plan from this page.</span></div>
               <div class="manual-pay-step"><span class="step-no">2</span><span>Pay the business using the merchant ID above.</span></div>
-              <div class="manual-pay-step"><span class="step-no">3</span><span>Use the WiFi code you receive to connect.</span></div>
+              <div class="manual-pay-step"><span class="step-no">3</span><span>Enter the voucher code exactly as shown to connect.</span></div>
             </div>
           </div>
         </div>
       <% } %>
 
       <div class="divider" <% if (!showOnlinePayment) { %>style="display:none;"<% } %>><span>Pay via Mobile Money</span></div>
-      <p class="payment-note" <% if (!showOnlinePayment) { %>style="display:none;"<% } %>>Prefer instant activation? Enter your own number below to pay online and receive your WiFi code automatically.</p>
+      <p class="payment-note" <% if (!showOnlinePayment) { %>style="display:none;"<% } %>>Prefer instant activation? Enter your own number below to pay online and receive an Omada voucher automatically.</p>
 
       <div class="input-wrap" <% if (!showOnlinePayment) { %>style="display:none;"<% } %>>
         <label class="field-label" for="phone-input">Phone Number</label>
@@ -833,7 +833,7 @@
 
       <% if (!showOnlinePayment) { %>
         <div class="quick-access-note" style="margin-top:18px;">
-          This hotspot is currently configured for direct business payment only. Pay the business above and use the WiFi code you receive.
+          This hotspot is currently configured for direct business payment only. Pay the business above and enter the Omada voucher code you receive.
         </div>
       <% } %>
 
@@ -844,9 +844,9 @@
                 <span class="token-entry-cta-title">Enter an existing code</span>
                 <span class="token-entry-cta-copy">
                   <% if (showDirectPayment) { %>
-                    Paid the business already? Use your WiFi token here to connect immediately.
+                    Paid the business already? Enter your Omada voucher code here to connect immediately.
                   <% } else { %>
-                    Returning customer? Reuse your WiFi code here instead of buying a new plan.
+                    Returning customer? Reuse your voucher code here instead of buying a new plan.
                   <% } %>
                 </span>
               </span>
@@ -860,7 +860,7 @@
 
           <% if (showDirectPayment) { %>
             <div class="quick-access-note">
-              Already paid the business directly? Ask for your token, then use <strong>Enter an existing code</strong> to connect here.
+              Already paid the business directly? Ask for your voucher, then use <strong>Enter an existing code</strong> to connect here.
             </div>
           <% } %>
           <% if (portal.customize.supportPhone) { %>
@@ -885,8 +885,8 @@
       <!-- SCREEN 3: Code entry (reconnect) -->
       <div id="screen-code" class="screen">
         <div class="input-wrap">
-          <label class="field-label" for="code-input">WiFi Access Code</label>
-          <input class="arch-input code-style" type="text" id="code-input" placeholder="XXXX-XXXX" maxlength="9">
+          <label class="field-label" for="code-input">Omada Voucher Code</label>
+          <input class="arch-input code-style" type="text" id="code-input" placeholder="Enter voucher code" maxlength="32" autocomplete="one-time-code">
         </div>
         <div class="error-msg" id="code-error"></div>
         <button class="btn-primary" id="code-submit-btn">Authenticate</button>
@@ -898,7 +898,7 @@
         <div class="success-badge">Connected</div>
         <h2 class="success-headline">You're online.</h2>
         <div class="code-panel">
-          <span class="field-label">Your WiFi Code — Save to Reconnect</span>
+          <span class="field-label">Your Omada Voucher Code - Save to Reconnect</span>
           <div class="code-value" id="success-code">—</div>
         </div>
         <div class="meta-grid" id="success-meta"></div>