nodebb-plugin-onekite-calendar 2.0.82 → 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/api.js

@@ -31,6 +31,7 @@ const {
   signCalendarLink,
   ymdToCompact,
   dtToGCalUtc,
+  getSetting,
 } = shared;
 
 const helloasso = require('./helloasso');
@@ -757,6 +758,8 @@ api.leaveSpecialEvent = async function (req, res) {
 api.getCapabilities = async function (req, res) {
   const settings = await getSettings();
   const uid = req.uid || 0;
+  const pendingHoldMinutes = parseInt(getSetting(settings, 'pendingHoldMinutes', '5'), 10) || 5;
+  const paymentHoldMinutes = parseInt(getSetting(settings, 'paymentHoldMinutes', getSetting(settings, 'holdMinutes', '60')), 10) || 60;
   if (!uid) {
     return res.json({
       canModerate: false,
@@ -765,6 +768,8 @@ api.getCapabilities = async function (req, res) {
       canCreateOuting: false,
       canCreateReservation: false,
       specialEventCategoryCid: 0,
+      pendingHoldMinutes,
+      paymentHoldMinutes,
     });
   }
   const [canMod, canSpecialC, canSpecialD, canReq] = await Promise.all([
@@ -781,6 +786,8 @@ api.getCapabilities = async function (req, res) {
     canCreateOuting: canMod || canReq,
     canCreateReservation: canReq,
     specialEventCategoryCid: parseInt(settings && settings.specialEventCategoryId, 10) || 0,
+    pendingHoldMinutes,
+    paymentHoldMinutes,
   });
 };
 
@@ -1369,7 +1376,69 @@ api.createReservation = async function (req, res) {
     manuallyPaid: (isRegularizationSelf || isRegularization) ? true : undefined,
   };
 
-  // Validator self-reservations are FREE (no payment required) and tracked separately in accounting.
+  // For past-date reservations created for another user (isRegularizationOther):
+  // create the HelloAsso checkout intent immediately so the user has a payment link right away.
+  if (isRegularizationOther) {
+    try {
+      const token = await helloasso.getAccessToken({ env: settings.helloassoEnv || 'prod', clientId: settings.helloassoClientId, clientSecret: settings.helloassoClientSecret });
+      const payer = await user.getUserFields(targetUid, ['email']);
+      const year = yearFromTs(resv.start);
+      const days = (startDate && endDate) ? (calendarDaysExclusiveYmd(startDate, endDate) || 1) : nbDays;
+
+      let recomputedTotalCents = null;
+      try {
+        const { items: catalog } = await helloasso.listCatalogItems({
+          env: settings.helloassoEnv,
+          token,
+          organizationSlug: settings.helloassoOrganizationSlug,
+          formType: settings.helloassoFormType,
+          formSlug: autoFormSlugForYear(year),
+        });
+        const byId = new Map((catalog || []).map((it) => [String(it.id), (typeof it.price === 'number' ? it.price : 0)]));
+        const ids = itemIds.map(String);
+        const sumCentsPerDay = ids.reduce((acc, id) => acc + (byId.get(id) || 0), 0);
+        if (sumCentsPerDay > 0) {
+          recomputedTotalCents = Math.max(0, Math.round(sumCentsPerDay * days));
+          resv.total = recomputedTotalCents / 100;
+        }
+      } catch (e) {}
+
+      const intent = await helloasso.createCheckoutIntent({
+        env: settings.helloassoEnv,
+        token,
+        organizationSlug: settings.helloassoOrganizationSlug,
+        formType: settings.helloassoFormType,
+        formSlug: autoFormSlugForYear(year),
+        totalAmount: (() => {
+          const cents = (typeof recomputedTotalCents === 'number')
+            ? recomputedTotalCents
+            : Math.max(0, Math.round((Number(resv.total) || 0) * 100));
+          if (!cents) console.warn('[calendar-onekite] HelloAsso totalAmount is 0 (regularizationOther)', { rid });
+          return cents;
+        })(),
+        payerEmail: payer && payer.email ? payer.email : '',
+        callbackUrl: normalizeReturnUrl(),
+        webhookUrl: normalizeCallbackUrl(settings.helloassoCallbackUrl),
+        itemName: buildHelloAssoItemName('', resv.itemNames || [], resv.start, resv.end),
+        containsDonation: false,
+        metadata: {
+          reservationId: String(rid),
+          items: resv.itemNames || [],
+          dateRange: `Du ${formatFR(resv.start)} au ${formatFR(resv.end)}`,
+        },
+      });
+      const intentPaymentUrl = intent && (intent.paymentUrl || intent.redirectUrl) ? (intent.paymentUrl || intent.redirectUrl) : (typeof intent === 'string' ? intent : null);
+      const intentCheckoutId = intent && intent.checkoutIntentId ? String(intent.checkoutIntentId) : null;
+      if (intentPaymentUrl) {
+        resv.paymentUrl = intentPaymentUrl;
+        if (intentCheckoutId) resv.checkoutIntentId = intentCheckoutId;
+      } else {
+        console.warn('[calendar-onekite] HelloAsso payment link not created (regularizationOther)', { rid });
+      }
+    } catch (e) {
+      console.warn('[calendar-onekite] Failed to create HelloAsso checkout for regularizationOther', e && e.message ? e.message : e);
+    }
+  }
 
   // Save
   await dbLayer.saveReservation(resv);
@@ -1456,15 +1525,48 @@ api.createReservation = async function (req, res) {
   // Notify target user when a validator created the reservation on their behalf
   if (!isForSelf) {
     try {
-      await sendEmail('calendar-onekite_pending_for_you', targetUid, 'Location matériel - Demande créée en votre nom', {
-        uid: targetUid,
-        username: targetUsername,
-        createdBy: creatorUsername,
-        itemName: (resv.itemNames || []).join(', '),
-        itemNames: resv.itemNames || [],
-        dateRange: `Du ${formatFR(start)} au ${formatFR(end)}`,
-        total: resv.total || 0,
-      });
+      if (isRegularizationOther) {
+        // Reservation is already awaiting_payment: send the approved email with payment link
+        await sendEmail('calendar-onekite_approved', targetUid, 'Location matériel - Réservation validée', {
+          uid: targetUid,
+          username: targetUsername,
+          itemName: (resv.itemNames || []).join(', '),
+          itemNames: resv.itemNames || [],
+          dateRange: `Du ${formatFR(start)} au ${formatFR(end)}`,
+          start: formatFR(start),
+          end: formatFR(end),
+          pickupAddress: '',
+          notes: '',
+          pickupTime: '',
+          pickupLat: '',
+          pickupLon: '',
+          mapUrl: '',
+          paymentUrl: resv.paymentUrl || '',
+          validatedBy: creatorUsername || '',
+          validatedByUrl: creatorUsername ? `${forumBaseUrl()}/user/${encodeURIComponent(String(creatorUsername))}` : '',
+          ...buildCalendarLinks({
+            type: 'reservation',
+            id: String(resv.rid),
+            uid: targetUid,
+            title: (resv.itemNames && resv.itemNames.length) ? `Location - ${resv.itemNames.join(', ')}` : 'Location',
+            details: (resv.itemNames && resv.itemNames.length) ? `Matériel: ${resv.itemNames.join(', ')}` : '',
+            location: '',
+            allDay: true,
+            startYmd: startDate || new Date(start).toISOString().slice(0, 10),
+            endYmd: endDate || new Date(end).toISOString().slice(0, 10),
+          }),
+        });
+      } else {
+        await sendEmail('calendar-onekite_pending_for_you', targetUid, 'Location matériel - Demande créée en votre nom', {
+          uid: targetUid,
+          username: targetUsername,
+          createdBy: creatorUsername,
+          itemName: (resv.itemNames || []).join(', '),
+          itemNames: resv.itemNames || [],
+          dateRange: `Du ${formatFR(start)} au ${formatFR(end)}`,
+          total: resv.total || 0,
+        });
+      }
     } catch (e) {
       console.warn('[calendar-onekite] Failed to send pending_for_you email', e && e.message ? e.message : e);
     }

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.82",
+  "version": "2.0.84",
   "description": "FullCalendar-based equipment reservation workflow with admin approval & HelloAsso payment for NodeBB",
   "main": "library.js",
   "license": "MIT",

package/public/client.js

@@ -1123,6 +1123,13 @@ function toDatetimeLocalValue(date) {
     return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}T${pad(d.getHours())}:${pad(d.getMinutes())}`;
   }
 
+  function fmtDuration(minutes) {
+    if (minutes < 60) return `${minutes} min`;
+    const h = Math.floor(minutes / 60);
+    const rem = minutes % 60;
+    return rem ? `${h} h ${rem} min` : `${h} h`;
+  }
+
   async function openReservationDialog(selectionInfo, items, opts) {
     const isValidatorMode = !!(opts && opts.isValidator);
     const start = selectionInfo.start;
@@ -1237,6 +1244,15 @@ function toDatetimeLocalValue(date) {
       </div>
     ` : '';
 
+    const holdPending = parseInt((opts && opts.pendingHoldMinutes), 10) || 5;
+    const holdPayment = parseInt((opts && opts.paymentHoldMinutes), 10) || 60;
+    const delayBannerHtml = `
+      <div class="mt-2 p-2 rounded" style="font-size: 12px; background: var(--bs-info-bg-subtle, #cff4fc); border: 1px solid var(--bs-info-border-subtle, #9eeaf9); color: var(--bs-info-text-emphasis, #055160);">
+        <strong>Délais :</strong>
+        validation sous <strong>${fmtDuration(holdPending)}</strong> · paiement sous <strong>${fmtDuration(holdPayment)}</strong> après validation
+      </div>
+    `;
+
     const messageHtml = `
       <div class="mb-2" id="onekite-period"><strong>Période</strong><br>${formatDt(start)} → ${formatDt(endDisplay)} <span class="text-muted" id="onekite-days">(${days} jour${days > 1 ? 's' : ''})</span></div>
       ${shortcutsHtml}
@@ -1253,6 +1269,7 @@ function toDatetimeLocalValue(date) {
         <div id="onekite-total" style="font-size: 18px;"><strong>0,00 €</strong></div>
       </div>
       <div class="text-muted" style="font-size: 12px;">Les matériels grisés sont déjà réservés ou en attente.</div>
+      ${delayBannerHtml}
     `;
 
     return new Promise((resolve) => {
@@ -1429,6 +1446,8 @@ function toDatetimeLocalValue(date) {
     const canCreateReservation = !!caps.canCreateReservation;
     const isValidator = !!caps.isValidator;
     const specialEventCategoryCid = parseInt(caps.specialEventCategoryCid, 10) || 0;
+    const pendingHoldMinutes = parseInt(caps.pendingHoldMinutes, 10) || 5;
+    const paymentHoldMinutes = parseInt(caps.paymentHoldMinutes, 10) || 60;
 
     // Creation chooser: Location / Prévision de sortie / Évènement (si autorisé).
 
@@ -1577,7 +1596,7 @@ function toDatetimeLocalValue(date) {
               showAlert('error', 'Aucun matériel disponible (items HelloAsso non chargés).');
               return;
             }
-            const chosen = await openReservationDialog(sel, items, { isValidator });
+            const chosen = await openReservationDialog(sel, items, { isValidator, pendingHoldMinutes, paymentHoldMinutes });
             if (!chosen || !chosen.itemIds || !chosen.itemIds.length) return;
             const startDate = toLocalYmd(sel.start);
             const endDate = (chosen && chosen.endDate) ? String(chosen.endDate) : toLocalYmd(sel.end);
@@ -1669,7 +1688,7 @@ function toDatetimeLocalValue(date) {
               showAlert('error', 'Aucun matériel disponible (items HelloAsso non chargés).');
               return;
             }
-            const chosen = await openReservationDialog(sel, items, { isValidator });
+            const chosen = await openReservationDialog(sel, items, { isValidator, pendingHoldMinutes, paymentHoldMinutes });
             if (!chosen || !chosen.itemIds || !chosen.itemIds.length) return;
             const startDate = toLocalYmd(sel.start);
             const endDate = (chosen && chosen.endDate) ? String(chosen.endDate) : toLocalYmd(sel.end);