nodebb-plugin-onekite-calendar 2.0.83 → 2.0.84

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;
@@ -441,6 +468,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;

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/package.json

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