nodebb-plugin-onekite-calendar 2.0.83 → 2.0.85

package/lib/admin.js

@@ -8,7 +8,6 @@ const nconf = require.main.require('nconf');
 
 const shared = require('./shared');
 const {
-  forumBaseUrl,
   formatFR,
   sendEmail,
   buildCalendarLinks,
@@ -111,39 +110,67 @@ admin.approveReservation = async function (req, res) {
   let paymentUrl = null;
   if (token) {
     const requester = await user.getUserFields(r.uid, ['username', 'email']);
-    // r.total is stored as an estimated total in euros; HelloAsso expects cents.
-    const totalAmount = Math.max(0, Math.round((Number(r.total) || 0) * 100));
-    const base = forumBaseUrl();
-    const returnUrl = base ? `${base}/calendar` : '';
-    const webhookUrl = base ? `${base}/plugins/calendar-onekite/helloasso` : '';
     const year = new Date(Number(r.start)).getFullYear();
-    const intent = await helloasso.createCheckoutIntent({
-      env,
-      token,
-      organizationSlug: settings.helloassoOrganizationSlug,
-      formType: settings.helloassoFormType,
-      // Form slug is derived from the year
-      formSlug: `locations-materiel-${year}`,
-      totalAmount,
-      payerEmail: requester && requester.email,
-      // User return/back/error URLs must be real pages; webhook uses the plugin endpoint.
-      callbackUrl: returnUrl,
-      webhookUrl: webhookUrl,
-      itemName: buildHelloAssoItemName('Réservation matériel Onekite', r.itemNames || (r.itemName ? [r.itemName] : []), r.start, r.end),
-      containsDonation: false,
-      metadata: {
-        reservationId: String(rid),
-        items: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])).filter(Boolean),
-        dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
-      },
-    });
-    paymentUrl = intent && (intent.paymentUrl || intent.redirectUrl)
-      ? (intent.paymentUrl || intent.redirectUrl)
-      : (typeof intent === 'string' ? intent : null);
-    if (intent && intent.checkoutIntentId) {
-      r.checkoutIntentId = intent.checkoutIntentId;
+    const formSlug = autoFormSlugForYear(year);
+
+    // Recompute total from HelloAsso catalog (same logic as api.js approve path)
+    // to ensure the checkout amount is always up-to-date with actual item prices.
+    let recomputedTotalCents = null;
+    try {
+      const { items: catalog } = await helloasso.listCatalogItems({
+        env,
+        token,
+        organizationSlug: settings.helloassoOrganizationSlug,
+        formType: settings.helloassoFormType,
+        formSlug,
+      });
+      const byId = new Map((catalog || []).map((it) => [String(it.id), (typeof it.price === 'number' ? it.price : 0)]));
+      const ids = (Array.isArray(r.itemIds) ? r.itemIds : (r.itemId ? [r.itemId] : [])).map(String);
+      const days = calendarDaysExclusiveYmd(r.startDate, r.endDate) || 1;
+      const sumCentsPerDay = ids.reduce((acc, id) => acc + (byId.get(id) || 0), 0);
+      if (sumCentsPerDay > 0) {
+        recomputedTotalCents = Math.max(0, Math.round(sumCentsPerDay * days));
+        r.total = recomputedTotalCents / 100;
+      }
+    } catch (e) {
+      // ignore recompute failures; fallback to stored total
     }
+
+    const totalAmount = (typeof recomputedTotalCents === 'number')
+      ? recomputedTotalCents
+      : Math.max(0, Math.round((Number(r.total) || 0) * 100));
+
+    if (!totalAmount) {
+      console.warn('[calendar-onekite] HelloAsso totalAmount is 0 (approve ACP) — skipping checkout intent', { rid, total: r.total });
+    } else {
+      const returnUrl = normalizeReturnUrl();
+      const webhookUrl = normalizeCallbackUrl(settings.helloassoCallbackUrl);
+      const intent = await helloasso.createCheckoutIntent({
+        env,
+        token,
+        organizationSlug: settings.helloassoOrganizationSlug,
+        formType: settings.helloassoFormType,
+        formSlug,
+        totalAmount,
+        payerEmail: requester && requester.email,
+        callbackUrl: returnUrl,
+        webhookUrl: webhookUrl,
+        itemName: buildHelloAssoItemName('Réservation matériel Onekite', r.itemNames || (r.itemName ? [r.itemName] : []), r.start, r.end),
+        containsDonation: false,
+        metadata: {
+          reservationId: String(rid),
+          items: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])).filter(Boolean),
+          dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
+        },
+      });
+      paymentUrl = intent && (intent.paymentUrl || intent.redirectUrl)
+        ? (intent.paymentUrl || intent.redirectUrl)
+        : (typeof intent === 'string' ? intent : null);
+      if (intent && intent.checkoutIntentId) {
+        r.checkoutIntentId = intent.checkoutIntentId;
+      }
     }
+  }
 
   if (paymentUrl) {
     r.paymentUrl = paymentUrl;
@@ -335,6 +362,20 @@ admin.purgeSpecialEventsByYear = async function (req, res) {
   return res.json({ ok: true, removed: count });
 };
 
+admin.listGroups = async function (req, res) {
+  try {
+    const Groups = require.main.require('./src/groups');
+    const q = String((req.query && req.query.q) || '').trim().toLowerCase();
+    const names = await Groups.getGroups('groups:createtime', 0, 500);
+    const filtered = q
+      ? (names || []).filter(n => n && String(n).toLowerCase().includes(q))
+      : (names || []).filter(Boolean);
+    res.json(filtered.slice(0, 100));
+  } catch (e) {
+    res.json([]);
+  }
+};
+
 admin.purgeOutingsByYear = async function (req, res) {
   const year = (req.body && req.body.year ? String(req.body.year) : '').trim();
   if (!/^\d{4}$/.test(year)) {
@@ -441,6 +482,44 @@ admin.debugHelloAsso = async function (req, res) {
       out.soldItems = { ok: false, error: String(e && e.message ? e.message : e), count: 0, sample: [] };
     }
 
+    // Test checkout intent creation with a 1-cent amount to validate URL format.
+    // This creates a real (but minimal) intent — it will expire quickly and can be ignored.
+    out.checkoutIntentTest = { ok: false };
+    try {
+      const callbackUrl = normalizeReturnUrl();
+      const webhookUrl = normalizeCallbackUrl(settings.helloassoCallbackUrl);
+      if (!callbackUrl) {
+        out.checkoutIntentTest = { ok: false, error: 'callbackUrl empty — forum base URL not configured' };
+      } else {
+        const intent = await helloasso.createCheckoutIntent({
+          env,
+          token,
+          organizationSlug: settings.helloassoOrganizationSlug,
+          formType: settings.helloassoFormType,
+          formSlug: `locations-materiel-${new Date().getFullYear()}`,
+          totalAmount: 100,
+          payerEmail: '',
+          callbackUrl,
+          webhookUrl,
+          itemName: '[TEST] Vérification lien paiement',
+          containsDonation: false,
+          metadata: { debug: 'true' },
+        });
+        if (intent && intent.paymentUrl) {
+          out.checkoutIntentTest = {
+            ok: true,
+            checkoutIntentId: intent.checkoutIntentId,
+            paymentUrl: intent.paymentUrl,
+            note: 'Cet intent de test (1 cent) peut être ignoré — il expirera automatiquement',
+          };
+        } else {
+          out.checkoutIntentTest = { ok: false, error: 'no paymentUrl in response', raw: intent };
+        }
+      }
+    } catch (e) {
+      out.checkoutIntentTest = { ok: false, error: String(e && e.message ? e.message : e) };
+    }
+
     return res.json(out);
   } catch (e) {
     out.ok = false;
@@ -642,12 +721,6 @@ admin.getAccounting = async function (req, res) {
 };
 
 admin.exportAccountingCsv = async function (req, res) {
-  // Reuse the same logic and emit a CSV.
-  const fakeRes = { json: (x) => x };
-  const data = await admin.getAccounting(req, fakeRes);
-  // If getAccounting returned via res.json, data is undefined; rebuild by calling logic directly.
-  // Easiest: call getAccounting's internals by fetching the endpoint logic via HTTP is not possible here.
-  // So we re-run getAccounting but capture output by monkeypatching.
   let payload;
   await admin.getAccounting(req, { json: (x) => { payload = x; return x; } });
   if (!payload || !payload.ok) {

package/lib/helloasso.js

@@ -306,7 +306,17 @@ async function createCheckoutIntent({ env, token, organizationSlug, formType, fo
   };
   const { status, json } = await requestJson('POST', url, { Authorization: `Bearer ${token}` }, payload);
   if (status >= 200 && status < 300 && json) {
-    return { paymentUrl: (json.redirectUrl || json.checkoutUrl || json.url || null), checkoutIntentId: (json.id || json.checkoutIntentId || null), raw: json };
+    const redirectUrl = json.redirectUrl || json.checkoutUrl || json.url || null;
+    // Always log so the URL format is visible in NodeBB logs (helps diagnose 404s).
+    // eslint-disable-next-line no-console
+    console.log('[calendar-onekite] HelloAsso checkout-intent created', {
+      status,
+      checkoutIntentId: json.id || json.checkoutIntentId || null,
+      redirectUrl,
+      env,
+      organizationSlug,
+    });
+    return { paymentUrl: redirectUrl, checkoutIntentId: (json.id || json.checkoutIntentId || null), raw: json };
   }
   // Log the error payload to help diagnose configuration issues (slug, env, urls, amount, etc.)
   try {

package/library.js

@@ -107,6 +107,7 @@ Plugin.init = async function (params) {
   router.get(`${adminBase}/settings`, ...adminMws, admin.getSettings);
   router.put(`${adminBase}/settings`, ...adminMws, admin.saveSettings);
 
+  router.get(`${adminBase}/groups`, ...adminMws, admin.listGroups);
   router.get(`${adminBase}/pending`, ...adminMws, admin.listPending);
   router.put(`${adminBase}/reservations/:rid/approve`, ...adminMws, admin.approveReservation);
   router.put(`${adminBase}/reservations/:rid/refuse`, ...adminMws, admin.refuseReservation);

package/package.json

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

package/public/admin.js

@@ -345,6 +345,129 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
     });
   }
 
+  // Cached list of NodeBB groups (fetched once per ACP session)
+  let groupsCache = null;
+
+  async function loadGroups() {
+    if (groupsCache) return groupsCache;
+    try {
+      const data = await fetchJson('/api/v3/admin/plugins/calendar-onekite/groups');
+      groupsCache = Array.isArray(data) ? data : [];
+    } catch (e) {
+      groupsCache = [];
+    }
+    return groupsCache;
+  }
+
+  // Autocomplete for CSV group inputs (creatorGroups, validatorGroups, etc.)
+  // Reuses the same .onekite-autocomplete-* CSS as address autocomplete.
+  function attachGroupCsvAutocomplete(inputEl) {
+    if (!inputEl || inputEl.getAttribute('data-onekite-group-ac') === '1') return;
+    inputEl.setAttribute('data-onekite-group-ac', '1');
+
+    const anchor = (inputEl.closest && inputEl.closest('.input-group'))
+      ? inputEl.closest('.input-group')
+      : (inputEl.parentNode || document.body);
+
+    try {
+      const cs = window.getComputedStyle(anchor);
+      if (!cs || cs.position === 'static') anchor.style.position = 'relative';
+    } catch (e) {
+      anchor.style.position = 'relative';
+    }
+
+    const menu = document.createElement('div');
+    menu.className = 'onekite-autocomplete-menu';
+    menu.style.position = 'absolute';
+    menu.style.left = '0';
+    menu.style.right = '0';
+    menu.style.top = '100%';
+    menu.style.zIndex = '2000';
+    menu.style.borderTop = '0';
+    menu.style.maxHeight = '220px';
+    menu.style.overflowY = 'auto';
+    menu.style.display = 'none';
+    menu.style.borderRadius = '0 0 .375rem .375rem';
+    anchor.appendChild(menu);
+
+    function hide() {
+      menu.style.display = 'none';
+      menu.innerHTML = '';
+    }
+
+    function getCurrentToken() {
+      const val = inputEl.value;
+      const cursor = typeof inputEl.selectionStart === 'number' ? inputEl.selectionStart : val.length;
+      const before = val.slice(0, cursor);
+      const commaIdx = before.lastIndexOf(',');
+      return before.slice(commaIdx + 1).trimStart();
+    }
+
+    function replaceCurrentToken(replacement) {
+      const val = inputEl.value;
+      const cursor = typeof inputEl.selectionStart === 'number' ? inputEl.selectionStart : val.length;
+      const before = val.slice(0, cursor);
+      const after = val.slice(cursor);
+      const commaIdx = before.lastIndexOf(',');
+      const prefix = commaIdx >= 0 ? before.slice(0, commaIdx + 1) + ' ' : '';
+      const rest = after.replace(/^[\s,]+/, '');
+      inputEl.value = prefix + replacement + (rest ? ', ' + rest : '');
+      const newPos = prefix.length + replacement.length;
+      try { inputEl.setSelectionRange(newPos, newPos); } catch (e) {}
+    }
+
+    async function showSuggestions() {
+      const token = getCurrentToken();
+      if (token.length < 1) { hide(); return; }
+      const groups = await loadGroups();
+      const q = token.toLowerCase();
+      const existing = new Set(
+        inputEl.value.split(',').map(s => s.trim().toLowerCase()).filter(Boolean)
+      );
+      const matches = groups
+        .filter(g => String(g).toLowerCase().includes(q) && !existing.has(String(g).toLowerCase()))
+        .slice(0, 8);
+      if (!matches.length) { hide(); return; }
+      menu.innerHTML = '';
+      matches.forEach(g => {
+        const btn = document.createElement('button');
+        btn.type = 'button';
+        btn.className = 'onekite-autocomplete-item';
+        btn.textContent = g;
+        btn.style.display = 'block';
+        btn.style.width = '100%';
+        btn.style.textAlign = 'left';
+        btn.style.padding = '.35rem .5rem';
+        btn.style.border = '0';
+        btn.style.cursor = 'pointer';
+        btn.addEventListener('mousedown', (e) => {
+          e.preventDefault();
+          replaceCurrentToken(g);
+          hide();
+          inputEl.focus();
+        });
+        menu.appendChild(btn);
+      });
+      menu.style.display = 'block';
+    }
+
+    let timer = null;
+    inputEl.addEventListener('input', () => {
+      if (timer) clearTimeout(timer);
+      timer = setTimeout(showSuggestions, 150);
+    });
+    inputEl.addEventListener('click', () => {
+      if (timer) clearTimeout(timer);
+      timer = setTimeout(showSuggestions, 100);
+    });
+    inputEl.addEventListener('keydown', (e) => {
+      if (e.key === 'Escape') hide();
+    });
+    document.addEventListener('click', (e) => {
+      try { if (!anchor.contains(e.target)) hide(); } catch (err) {}
+    });
+  }
+
   function formToObject(form) {
     const out = {};
     new FormData(form).forEach((v, k) => {
@@ -546,31 +669,17 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
   }
 
   async function purgeSpecialEvents(year) {
-    try {
-      return await fetchJson('/api/v3/admin/plugins/calendar-onekite/special-events/purge', {
-        method: 'POST',
-        body: JSON.stringify({ year }),
-      });
-    } catch (e) {
-      return await fetchJson('/api/v3/admin/plugins/calendar-onekite/special-events/purge', {
-        method: 'POST',
-        body: JSON.stringify({ year }),
-      });
-    }
+    return await fetchJson('/api/v3/admin/plugins/calendar-onekite/special-events/purge', {
+      method: 'POST',
+      body: JSON.stringify({ year }),
+    });
   }
 
   async function purgeOutings(year) {
-    try {
-      return await fetchJson('/api/v3/admin/plugins/calendar-onekite/outings/purge', {
-        method: 'POST',
-        body: JSON.stringify({ year }),
-      });
-    } catch (e) {
-      return await fetchJson('/api/v3/admin/plugins/calendar-onekite/outings/purge', {
-        method: 'POST',
-        body: JSON.stringify({ year }),
-      });
-    }
+    return await fetchJson('/api/v3/admin/plugins/calendar-onekite/outings/purge', {
+      method: 'POST',
+      body: JSON.stringify({ year }),
+    });
   }
 
   async function markPaid(rid, payload) {
@@ -581,11 +690,7 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
   }
 
   async function debugHelloAsso() {
-    try {
-      return await fetchJson('/api/v3/admin/plugins/calendar-onekite/debug');
-    } catch (e) {
-      return await fetchJson('/api/v3/admin/plugins/calendar-onekite/debug');
-    }
+    return await fetchJson('/api/v3/admin/plugins/calendar-onekite/debug');
   }
 
   async function loadAccounting(from, to) {
@@ -617,6 +722,12 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
       document.head.appendChild(style);
     })();
 
+    // Attach group autocomplete to all CSV group fields (loads groups list lazily on first keystroke)
+    ['creatorGroups', 'validatorGroups', 'notifyGroups', 'specialCreatorGroups', 'specialDeleterGroups'].forEach(name => {
+      const el = form.querySelector(`[name="${name}"]`);
+      if (el) attachGroupCsvAutocomplete(el);
+    });
+
     // Load settings
     try {
       const s = await loadSettings();