nodebb-plugin-calendar-onekite 11.1.39 → 11.1.41

package/lib/admin.js

@@ -93,29 +93,8 @@ admin.approveReservation = async function (req, res) {
   let paymentUrl = null;
   if (token) {
     const requester = await user.getUserFields(r.uid, ['username', 'email']);
-    // Determine amount from HelloAsso items (pricing comes from HelloAsso)
-    let totalAmount = 0;
-    try {
-      const items = await helloasso.listItems({
-        env,
-        token,
-        organizationSlug: settings.helloassoOrganizationSlug,
-        formType: settings.helloassoFormType,
-        formSlug: settings.helloassoFormSlug,
-      });
-      const normalized = (items || []).map((it) => ({
-        id: String(it.id || it.itemId || it.reference || it.name),
-        price: it.price || it.amount || it.unitPrice || 0,
-      })).filter(it => it.id);
-      const match = normalized.find(it => it.id === String(r.itemId));
-      totalAmount = match ? parseInt(match.price, 10) || 0 : 0;
-    } catch (e) {
-      totalAmount = 0;
-    }
-
-    if (!totalAmount) {
-      return res.status(400).json({ error: 'item-price-not-found' });
-    }
+    // 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));
     paymentUrl = await helloasso.createCheckoutIntent({
       env,
       token,
@@ -124,11 +103,17 @@ admin.approveReservation = async function (req, res) {
       formSlug: settings.helloassoFormSlug,
       totalAmount,
       payerEmail: requester && requester.email,
+      callbackUrl: 'https://api.onekite.com/helloasso',
+      itemName: 'Réservation matériel OneKite',
+      containsDonation: false,
+      metadata: { reservationId: String(rid) },
     });
   }
 
   if (paymentUrl) {
     r.paymentUrl = paymentUrl;
+  } else {
+    console.warn('[calendar-onekite] HelloAsso payment link not created (approve ACP)', { rid });
   }
 
   await dbLayer.saveReservation(r);

package/lib/api.js

@@ -103,7 +103,7 @@ function eventsFor(resv) {
       start: startIsoDate,
       end: endIsoDate,
       extendedProps: {
-        rid: resv.
+        rid: resv.rid,
         status,
         uid: resv.uid,
         itemIds: itemIds.filter(Boolean),
@@ -308,12 +308,18 @@ api.approveReservation = async function (req, res) {
       organizationSlug: settings2.helloassoOrganizationSlug,
       formType: settings2.helloassoFormType,
       formSlug: settings2.helloassoFormSlug,
-      totalAmount: parseInt(r.total || 0, 10),
+      // r.total is stored as an estimated total in euros; HelloAsso expects cents.
+      totalAmount: Math.max(0, Math.round((Number(r.total) || 0) * 100)),
       payerEmail: payer && payer.email ? payer.email : '',
       callbackUrl: 'https://api.onekite.com/helloasso',
+      itemName: 'Réservation matériel OneKite',
+      containsDonation: false,
+      metadata: { reservationId: String(rid) },
     });
     if (paymentUrl) {
       r.paymentUrl = paymentUrl;
+    } else {
+      console.warn('[calendar-onekite] HelloAsso payment link not created (approve API)', { rid });
     }
   } catch (e) {
     // ignore payment link errors, admin can retry

package/lib/helloasso.js

@@ -174,14 +174,17 @@ async function listCatalogItems({ env, token, organizationSlug, formType, formSl
   };
 }
 
-async function createCheckoutIntent({ env, token, organizationSlug, formType, formSlug, totalAmount, payerEmail, callbackUrl }) {
+async function createCheckoutIntent({ env, token, organizationSlug, formType, formSlug, totalAmount, payerEmail, callbackUrl, itemName, containsDonation, metadata }) {
   if (!token || !organizationSlug) return null;
   // Checkout intents are created at organization level.
   const url = `${baseUrl(env)}/v5/organizations/${encodeURIComponent(organizationSlug)}/checkout-intents`;
   const payload = {
     totalAmount: totalAmount,
     initialAmount: totalAmount,
+    itemName: itemName || 'Réservation matériel',
+    containsDonation: (typeof containsDonation === 'boolean' ? containsDonation : false),
     payer: payerEmail ? { email: payerEmail } : undefined,
+    metadata: metadata || undefined,
     backUrl: callbackUrl || '',
     errorUrl: callbackUrl || '',
     returnUrl: callbackUrl || '',

package/package.json

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

package/public/admin.js

@@ -66,15 +66,15 @@ 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>• ${esc(String(n))}</div>`).join('');
+      const itemsHtml = itemNames.map(n => `<div>• ${escapeHtml(String(n))}</div>`).join('');
       const div = document.createElement('div');
       div.className = 'list-group-item';
       div.innerHTML = `
         <div class="d-flex justify-content-between align-items-start gap-2">
           <div style="min-width: 0;">
-            <div><strong>${itemsHtml || esc(r.itemName || '')}</strong></div>
-            <div class="text-muted" style="font-size: 12px;">Créée: ${esc(created)}</div>
-            <div class="text-muted" style="font-size: 12px;">Période: ${esc(new Date(parseInt(r.start, 10)).toLocaleDateString('fr-FR'))} → ${esc(new Date(parseInt(r.end, 10)).toLocaleDateString('fr-FR'))}</div>
+            <div><strong>${itemsHtml || escapeHtml(r.itemName || '')}</strong></div>
+            <div class="text-muted" style="font-size: 12px;">Créée: ${escapeHtml(created)}</div>
+            <div class="text-muted" style="font-size: 12px;">Période: ${escapeHtml(new Date(parseInt(r.start, 10)).toLocaleDateString('fr-FR'))} → ${escapeHtml(new Date(parseInt(r.end, 10)).toLocaleDateString('fr-FR'))}</div>
           </div>
           <div class="d-flex gap-2">
             <button class="btn btn-outline-danger btn-sm">Rejeter</button>
@@ -86,7 +86,8 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
       refuseBtn.addEventListener('click', async () => {
         if (!confirm('Rejeter cette demande ?')) return;
         try {
-          await fetchJson(`/api/v3/admin/plugins/calendar-onekite/pending/${encodeURIComponent(r.rid)}/refuse`, { method: 'POST', body: JSON.stringify({}) });
+          // Server route: PUT /api/v3/admin/plugins/calendar-onekite/reservations/:rid/refuse
+          await fetchJson(`/api/v3/admin/plugins/calendar-onekite/reservations/${encodeURIComponent(r.rid)}/refuse`, { method: 'PUT' });
           showAlert('success', 'Demande rejetée.');
           await loadPending();
         } catch (e) {
@@ -128,7 +129,8 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
                 try {
                   const adminNote = (document.getElementById('onekite-admin-note')?.value || '').trim();
                   const pickupTime = (document.getElementById('onekite-pickup-time')?.value || '').trim();
-                  await fetchJson(`/api/v3/admin/plugins/calendar-onekite/pending/${encodeURIComponent(r.rid)}/approve`, { method: 'POST', body: JSON.stringify({ adminNote, pickupTime }) });
+                  // Server route: PUT /api/v3/admin/plugins/calendar-onekite/reservations/:rid/approve
+                  await fetchJson(`/api/v3/admin/plugins/calendar-onekite/reservations/${encodeURIComponent(r.rid)}/approve`, { method: 'PUT', body: JSON.stringify({ adminNote, pickupTime }) });
                   showAlert('success', 'Demande validée.');
                   await loadPending();
                 } catch (e) {

package/public/client.js

@@ -245,7 +245,14 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
           calendar.unselect();
           isDialogOpen = false;
         } catch (e) {
-          showAlert('error', 'Impossible de créer la demande (droits/groupe ?).');
+          const code = String(e && e.message || '');
+          if (code === '403') {
+            showAlert('error', 'Impossible de créer la demande : droits insuffisants (groupe).');
+          } else if (code === '409') {
+            showAlert('error', 'Impossible : au moins un matériel est déjà réservé ou en attente sur cette période.');
+          } else {
+            showAlert('error', 'Erreur lors de la création de la demande.');
+          }
           calendar.unselect();
           isDialogOpen = false;
         }