nodebb-plugin-calendar-onekite 11.1.46 → 11.1.48

package/lib/admin.js

@@ -25,7 +25,8 @@ async function sendEmail(template, toEmail, subject, data) {
         return;
       }
       if (emailer.send.length === 3) {
-        await emailer.send(template, toEmail, data);
+        const dataWithSubject = Object.assign({}, data || {}, subject ? { subject } : {});
+        await emailer.send(template, toEmail, dataWithSubject);
         return;
       }
       await emailer.send(template, toEmail, subject, data);
@@ -35,6 +36,26 @@ async function sendEmail(template, toEmail, subject, data) {
   }
 }
 
+function normalizeCallbackUrl(configured, meta) {
+  const base = (meta && meta.config && (meta.config.url || meta.config['url'])) ? (meta.config.url || meta.config['url']) : '';
+  let url = (configured || '').trim();
+  if (!url) {
+    url = base ? `${base}/helloasso` : '';
+  }
+  if (url && url.startsWith('/') && base) {
+    url = `${base}${url}`;
+  }
+  return url;
+}
+
+function normalizeReturnUrl(meta) {
+  const base = (meta && meta.config && (meta.config.url || meta.config['url'])) ? (meta.config.url || meta.config['url']) : '';
+  const b = String(base || '').trim().replace(/\/$/, '');
+  if (!b) return '';
+  return `${b}/calendar`;
+}
+
+
 const dbLayer = require('./db');
 const helloasso = require('./helloasso');
 
@@ -89,6 +110,9 @@ admin.approveReservation = async function (req, res) {
     clientId: settings.helloassoClientId,
     clientSecret: settings.helloassoClientSecret,
   });
+        if (!token) {
+          console.warn('[calendar-onekite] HelloAsso access token not obtained (approve ACP)', { rid: r && r.rid });
+        }
 
   let paymentUrl = null;
   if (token) {

package/lib/api.js

@@ -3,6 +3,7 @@
 const crypto = require('crypto');
 
 const meta = require.main.require('./src/meta');
+const nconf = require.main.require('nconf');
 const user = require.main.require('./src/user');
 const groups = require.main.require('./src/groups');
 
@@ -17,6 +18,16 @@ async function sendEmail(template, toEmail, subject, data) {
   try {
     // Newer NodeBB builds expose sendToEmail
     if (typeof emailer.sendToEmail === 'function') {
+      if (emailer.sendToEmail.length >= 4) {
+        await emailer.sendToEmail(template, toEmail, subject, data);
+        return;
+      }
+      if (emailer.sendToEmail.length === 3) {
+        const dataWithSubject = Object.assign({}, data || {}, subject ? { subject } : {});
+        await emailer.sendToEmail(template, toEmail, dataWithSubject);
+        return;
+      }
+      // Fallback
       await emailer.sendToEmail(template, toEmail, subject, data);
       return;
     }
@@ -27,8 +38,10 @@ async function sendEmail(template, toEmail, subject, data) {
         return;
       }
       // Some builds: (template, email, data)
+      // In that case, subject is expected inside `data.subject`.
       if (emailer.send.length === 3) {
-        await emailer.send(template, toEmail, data);
+        const dataWithSubject = Object.assign({}, data || {}, subject ? { subject } : {});
+        await emailer.send(template, toEmail, dataWithSubject);
         return;
       }
       // Fallback: try 4-args anyway
@@ -41,6 +54,42 @@ async function sendEmail(template, toEmail, subject, data) {
   }
 }
 
+function normalizeBaseUrl(meta) {
+  // Prefer meta.config.url, fallback to nconf.get('url')
+  let base = (meta && meta.config && (meta.config.url || meta.config['url'])) ? (meta.config.url || meta.config['url']) : '';
+  if (!base) {
+    base = String(nconf.get('url') || '').trim();
+  }
+  base = String(base || '').trim().replace(/\/$/, '');
+  // Ensure absolute with scheme
+  if (base && !/^https?:\/\//i.test(base)) {
+    base = `https://${base.replace(/^\/\//, '')}`;
+  }
+  return base;
+}
+
+function normalizeCallbackUrl(configured, meta) {
+  const base = normalizeBaseUrl(meta);
+  let url = (configured || '').trim();
+  if (!url) {
+    url = base ? `${base}/helloasso` : '';
+  }
+  if (url && url.startsWith('/') && base) {
+    url = `${base}${url}`;
+  }
+  // Ensure scheme for absolute URLs
+  if (url && !/^https?:\/\//i.test(url)) {
+    url = `https://${url.replace(/^\/\//, '')}`;
+  }
+  return url;
+}
+
+function normalizeReturnUrl(meta) {
+  const base = normalizeBaseUrl(meta);
+  return base ? `${base}/calendar` : '';
+}
+
+
 function overlap(aStart, aEnd, bStart, bEnd) {
   return aStart < bEnd && bStart < aEnd;
 }
@@ -168,6 +217,9 @@ api.getItems = async function (req, res) {
     clientId: settings.helloassoClientId,
     clientSecret: settings.helloassoClientSecret,
   });
+    if (!token) {
+      console.warn('[calendar-onekite] HelloAsso access token not obtained (approve API)', { rid });
+    }
 
   if (!token) {
     return res.json([]);
@@ -321,11 +373,18 @@ api.approveReservation = async function (req, res) {
       formType: settings2.helloassoFormType,
       formSlug: settings2.helloassoFormSlug,
       // r.total is stored as an estimated total in euros; HelloAsso expects cents.
-      totalAmount: Math.max(0, Math.round((Number(r.total) || 0) * 100)),
+      totalAmount: (() => {
+        const cents = Math.max(0, Math.round((Number(r.total) || 0) * 100));
+        if (!cents) {
+          console.warn('[calendar-onekite] HelloAsso totalAmount is 0 (approve API)', { rid, total: r.total });
+        }
+        return cents;
+      })(),
       payerEmail: payer && payer.email ? payer.email : '',
       // By default, point to the forum base url so the webhook hits this NodeBB instance.
       // Can be overridden via ACP setting `helloassoCallbackUrl`.
-      callbackUrl: (settings2.helloassoCallbackUrl || (meta.config && meta.config.url ? `${meta.config.url}/helloasso` : '')),
+      callbackUrl: normalizeReturnUrl(meta),
+      webhookUrl: normalizeCallbackUrl(settings2.helloassoCallbackUrl, meta),
       itemName: 'Réservation matériel OneKite',
       containsDonation: false,
       metadata: { reservationId: String(rid) },

package/lib/helloasso.js

@@ -174,8 +174,15 @@ async function listCatalogItems({ env, token, organizationSlug, formType, formSl
   };
 }
 
-async function createCheckoutIntent({ env, token, organizationSlug, formType, formSlug, totalAmount, payerEmail, callbackUrl, itemName, containsDonation, metadata }) {
+async function createCheckoutIntent({ env, token, organizationSlug, formType, formSlug, totalAmount, payerEmail, callbackUrl, webhookUrl, itemName, containsDonation, metadata }) {
   if (!token || !organizationSlug) return null;
+  if (!callbackUrl || !/^https?:\/\//i.test(String(callbackUrl))) {
+    console.warn('[calendar-onekite] HelloAsso invalid return/back/error URL', { callbackUrl });
+    return null;
+  }
+  if (webhookUrl && !/^https?:\/\//i.test(String(webhookUrl))) {
+    console.warn('[calendar-onekite] HelloAsso invalid webhook URL', { webhookUrl });
+  }
   // Checkout intents are created at organization level.
   const url = `${baseUrl(env)}/v5/organizations/${encodeURIComponent(organizationSlug)}/checkout-intents`;
   const payload = {
@@ -188,15 +195,21 @@ async function createCheckoutIntent({ env, token, organizationSlug, formType, fo
     backUrl: callbackUrl || '',
     errorUrl: callbackUrl || '',
     returnUrl: callbackUrl || '',
-    notificationUrl: callbackUrl || '',
+    notificationUrl: webhookUrl || callbackUrl || '',
   };
   const { status, json } = await requestJson('POST', url, { Authorization: `Bearer ${token}` }, payload);
   if (status >= 200 && status < 300 && json) {
     return json.redirectUrl || json.checkoutUrl || json.url || null;
   }
+  // Log the error payload to help diagnose configuration issues (slug, env, urls, amount, etc.)
+  try {
+    // eslint-disable-next-line no-console
+    console.warn('[calendar-onekite] HelloAsso checkout-intent failed', { status, json });
+  } catch (e) { /* ignore */ }
   return null;
 }
 
+
 module.exports = {
   getAccessToken,
   listItems,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-calendar-onekite",
-  "version": "11.1.46",
+  "version": "11.1.48",
   "description": "FullCalendar-based equipment reservation workflow with admin approval & HelloAsso payment for NodeBB",
   "main": "library.js",
   "license": "MIT",

package/public/admin.js

@@ -77,7 +77,7 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
     for (const r of list) {
       const created = r.createdAt ? fmtFR(r.createdAt) : '';
       const itemNames = Array.isArray(r.itemNames) && r.itemNames.length ? r.itemNames : [r.itemName || r.itemId].filter(Boolean);
-      const itemsHtml = itemNames.map(n => `<div>• ${escapeHtml(String(n))}</div>`).join('');
+      const itemsHtml = `<ul style="margin: 0 0 10px 18px;">${itemNames.map(n => `<li>${escapeHtml(String(n))}</li>`).join('')}</ul>`;
       const div = document.createElement('div');
       div.className = 'list-group-item';
       div.innerHTML = `
@@ -107,9 +107,12 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
       });
 
       approveBtn.addEventListener('click', async () => {
+        const itemNamesModal = Array.isArray(r.itemNames) && r.itemNames.length ? r.itemNames : [r.itemName || r.itemId].filter(Boolean);
+        const itemsHtmlModal = `<ul style="margin: 0 0 10px 18px;">${itemNamesModal.map(n => `<li>${escapeHtml(String(n))}</li>`).join('')}</ul>`;
+
         const opts = (() => {
           const out = [];
-          for (let h = 0; h < 24; h++) {
+          for (let h = 7; h < 24; h++) {
             for (let m = 0; m < 60; m += 5) {
               out.push(`${String(h).padStart(2, '0')}:${String(m).padStart(2, '0')}`);
             }
@@ -162,7 +165,7 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
   function timeOptions(stepMinutes) {
     const step = stepMinutes || 5;
     const out = [];
-    for (let h = 0; h < 24; h++) {
+    for (let h = 7; h < 24; h++) {
       for (let m = 0; m < 60; m += step) {
         const hh = String(h).padStart(2, '0');
         const mm = String(m).padStart(2, '0');

package/public/client.js

@@ -286,14 +286,20 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
         const p = ev.extendedProps || {};
         const rid = p.rid || ev.id;
         const status = p.status || '';
-        const itemsLabel = Array.isArray(p.itemNames) ? p.itemNames.join(', ') : (ev.title || '');
+        const itemsHtml = (() => {
+        const names = Array.isArray(p.itemNames) ? p.itemNames : (p.itemName ? [p.itemName] : []);
+        if (names.length) {
+          return `<ul style="margin:0 0 0 1.1rem; padding:0;">${names.map(n => `<li>${String(n).replace(/</g,'&lt;').replace(/>/g,'&gt;')}</li>`).join('')}</ul>`;
+        }
+        return String(ev.title || '').replace(/</g,'&lt;').replace(/>/g,'&gt;');
+      })();
         const period = `${formatDt(ev.start)} → ${formatDt(ev.end)}`;
 
         const canModerate = !!p.canModerate;
         const isPending = status === 'pending';
 
         const baseHtml = `
-          <div class="mb-2"><strong>Matériel</strong><br>${String(itemsLabel).replace(/</g, '&lt;').replace(/>/g, '&gt;')}</div>
+          <div class="mb-2"><strong>Matériel</strong><br>${itemsHtml}</div>
           <div class="mb-2"><strong>Période</strong><br>${period}</div>
           <div class="text-muted" style="font-size: 12px;">Statut: ${statusLabel(status)}</div>
         `;
@@ -339,9 +345,11 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
             label: 'Valider',
             className: 'btn-success',
             callback: async () => {
+              const itemNames = Array.isArray(p.itemNames) && p.itemNames.length ? p.itemNames : String(itemsLabel || '').split(',').map(s => s.trim()).filter(Boolean);
+              const itemsHtml = itemNames.map(n => `<li>${String(n).replace(/</g, '&lt;').replace(/>/g, '&gt;')}</li>`).join('');
               const opts = (() => {
                 const out = [];
-                for (let h = 0; h < 24; h++) {
+                for (let h = 7; h < 24; h++) {
                   for (let m = 0; m < 60; m += 5) {
                     out.push(`${String(h).padStart(2, '0')}:${String(m).padStart(2, '0')}`);
                   }
@@ -416,4 +424,4 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
   return {
     init,
   };
-});
+});

package/templates/emails/calendar-onekite_approved.tpl

@@ -19,5 +19,10 @@
 <!-- ENDIF pickupTime -->
 
 <!-- IF paymentUrl -->
-<p><strong>Lien de paiement :</strong> <a href="{paymentUrl}">{paymentUrl}</a></p>
+<p>
+  <a href="{paymentUrl}" style="display:inline-block;padding:12px 18px;border-radius:6px;text-decoration:none;border:1px solid #333;">
+    Payer maintenant
+  </a>
+</p>
+<p style="font-size: 12px; color: #666;">Si le bouton ne fonctionne pas, utilisez ce lien : <a href="{paymentUrl}">{paymentUrl}</a></p>
 <!-- ENDIF paymentUrl -->