nodebb-plugin-calendar-onekite 11.1.38 → 11.1.40

package/lib/admin.js

@@ -4,6 +4,14 @@ const meta = require.main.require('./src/meta');
 const user = require.main.require('./src/user');
 const emailer = require.main.require('./src/emailer');
 
+function formatFR(tsOrIso) {
+  const d = new Date(typeof tsOrIso === 'string' && /^[0-9]+$/.test(tsOrIso) ? parseInt(tsOrIso, 10) : tsOrIso);
+  const dd = String(d.getDate()).padStart(2, '0');
+  const mm = String(d.getMonth() + 1).padStart(2, '0');
+  const yyyy = d.getFullYear();
+  return `${dd}/${mm}/${yyyy}`;
+}
+
 async function sendEmail(template, toEmail, subject, data) {
   if (!toEmail) return;
   try {
@@ -68,7 +76,7 @@ admin.approveReservation = async function (req, res) {
   const r = await dbLayer.getReservation(rid);
   if (!r) return res.status(404).json({ error: 'not-found' });
 
-  r.status = 'approved';
+  r.status = 'awaiting_payment';
   r.adminNote = String((req.body && (req.body.adminNote || req.body.note)) || '').trim();
   r.pickupTime = String((req.body && (req.body.pickupTime || req.body.pickup)) || '').trim();
   r.approvedAt = Date.now();
@@ -85,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,
@@ -116,6 +103,7 @@ admin.approveReservation = async function (req, res) {
       formSlug: settings.helloassoFormSlug,
       totalAmount,
       payerEmail: requester && requester.email,
+      callbackUrl: 'https://api.onekite.com/helloasso',
     });
   }
 
@@ -129,11 +117,11 @@ admin.approveReservation = async function (req, res) {
   try {
     const requester = await user.getUserFields(r.uid, ['username', 'email']);
     if (requester && requester.email) {
-      await sendEmail('calendar-onekite_approved', requester.email, 'Demande de réservation matériel - Validée', {
+      await sendEmail('calendar-onekite_approved', requester.email, 'Demande de réservation de matériel', {
         username: requester.username,
         itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
-        start: new Date(parseInt(r.start, 10)).toISOString(),
-        end: new Date(parseInt(r.end, 10)).toISOString(),
+        start: formatFR(r.start),
+        end: formatFR(r.end),
         paymentUrl: paymentUrl || '',
         adminNote: r.adminNote || '',
         pickupTime: r.pickupTime || '',
@@ -158,8 +146,8 @@ admin.refuseReservation = async function (req, res) {
       await sendEmail('calendar-onekite_refused', requester.email, 'Demande de réservation matériel - Refusée', {
         username: requester.username,
         itemName: r.itemName,
-        start: new Date(parseInt(r.start, 10)).toISOString(),
-        end: new Date(parseInt(r.end, 10)).toISOString(),
+        start: formatFR(r.start),
+        end: formatFR(r.end),
       });
     }
   } catch (e) {}

package/lib/api.js

@@ -45,6 +45,15 @@ function overlap(aStart, aEnd, bStart, bEnd) {
   return aStart < bEnd && bStart < aEnd;
 }
 
+
+function formatFR(tsOrIso) {
+  const d = new Date(typeof tsOrIso === 'string' && /^[0-9]+$/.test(tsOrIso) ? parseInt(tsOrIso, 10) : tsOrIso);
+  const dd = String(d.getDate()).padStart(2, '0');
+  const mm = String(d.getMonth() + 1).padStart(2, '0');
+  const yyyy = d.getFullYear();
+  return `${dd}/${mm}/${yyyy}`;
+}
+
 function toTs(v) {
   if (!v) return NaN;
   const d = new Date(v);
@@ -73,7 +82,7 @@ async function canValidate(uid, settings) {
 
 function eventsFor(resv) {
   const status = resv.status;
-  const icons = { pending: '⏳', awaiting_payment: '⏳', approved: '✅', paid: '✅', refused: '⛔' };
+  const icons = { pending: '⏳', awaiting_payment: '💳', paid: '✅' };
   const startIsoDate = new Date(parseInt(resv.start, 10)).toISOString().slice(0, 10);
   const endIsoDate = new Date(parseInt(resv.end, 10)).toISOString().slice(0, 10);
 
@@ -97,8 +106,10 @@ function eventsFor(resv) {
         rid: resv.rid,
         status,
         uid: resv.uid,
-        itemIds: [itemId].filter(Boolean),
-        itemNames: [itemName].filter(Boolean),
+        itemIds: itemIds.filter(Boolean),
+        itemNames: itemNames.filter(Boolean),
+        itemIdLine: itemId,
+        itemNameLine: itemName,
       },
     });
   }
@@ -123,7 +134,7 @@ api.getEvents = async function (req, res) {
     const r = await dbLayer.getReservation(rid);
     if (!r) continue;
     // Only show active statuses
-    if (!['pending', 'awaiting_payment', 'approved', 'paid'].includes(r.status)) continue;
+    if (!['pending', 'awaiting_payment', 'paid'].includes(r.status)) continue;
     const rStart = parseInt(r.start, 10);
     const rEnd = parseInt(r.end, 10);
     if (!(rStart < endTs && startTs < rEnd)) continue; // overlap check
@@ -218,7 +229,6 @@ api.createReservation = async function (req, res) {
   const rid = crypto.randomUUID();
 
   const resv = {
-    rid,
     uid,
     itemIds,
     itemNames: itemNames.length ? itemNames : itemIds,
@@ -249,14 +259,13 @@ api.createReservation = async function (req, res) {
             await sendEmail(
               'calendar-onekite_pending',
               md.email,
-              'Demande de réservation matériel - Nouvelle demande',
+              'Demande de réservation de matériel',
               {
                 username: md.username,
                 requester: requester.username,
                 itemName: itemsLabel,
-                start: new Date(start).toISOString(),
-                end: new Date(end).toISOString(),
-                rid,
+                start: formatFR(start),
+                end: formatFR(end),
                 total: resv.total || 0,
               }
             );
@@ -284,20 +293,43 @@ api.approveReservation = async function (req, res) {
   if (!r) return res.status(404).json({ error: 'not-found' });
   if (r.status !== 'pending') return res.status(400).json({ error: 'bad-status' });
 
-  r.status = 'approved';
+  r.status = 'awaiting_payment';
   r.adminNote = String((req.body && req.body.adminNote) || '').trim();
   r.pickupTime = String((req.body && req.body.pickupTime) || '').trim();
   r.approvedAt = Date.now();
+  // Create HelloAsso payment link on validation
+  try {
+    const settings2 = await meta.settings.get('calendar-onekite');
+    const token = await helloasso.getAccessToken(settings2);
+    const payer = await user.getUserFields(r.uid, ['email']);
+    const paymentUrl = await helloasso.createCheckoutIntent({
+      env: settings2.helloassoEnv,
+      token,
+      organizationSlug: settings2.helloassoOrganizationSlug,
+      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)),
+      payerEmail: payer && payer.email ? payer.email : '',
+      callbackUrl: 'https://api.onekite.com/helloasso',
+    });
+    if (paymentUrl) {
+      r.paymentUrl = paymentUrl;
+    }
+  } catch (e) {
+    // ignore payment link errors, admin can retry
+  }
+
   await dbLayer.saveReservation(r);
 
   // Email requester
   const requester = await user.getUserFields(r.uid, ['username', 'email']);
   if (requester && requester.email) {
-    await sendEmail('calendar-onekite_approved', requester.email, 'Demande de réservation matériel - Validée', {
+    await sendEmail('calendar-onekite_approved', requester.email, 'Demande de réservation de matériel', {
       username: requester.username,
       itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
-      start: new Date(parseInt(r.start, 10)).toISOString(),
-      end: new Date(parseInt(r.end, 10)).toISOString(),
+      start: formatFR(r.start),
+      end: formatFR(r.end),
       adminNote: r.adminNote || '',
       pickupTime: r.pickupTime || '',
       paymentUrl: r.paymentUrl || '',
@@ -326,8 +358,8 @@ api.refuseReservation = async function (req, res) {
     await sendEmail('calendar-onekite_refused', requester.email, 'Demande de réservation matériel - Supprimée', {
       username: requester.username,
       itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
-      start: new Date(parseInt(r.start, 10)).toISOString(),
-      end: new Date(parseInt(r.end, 10)).toISOString(),
+      start: formatFR(r.start),
+      end: formatFR(r.end),
     });
   }
 

package/lib/helloasso.js

@@ -174,7 +174,7 @@ async function listCatalogItems({ env, token, organizationSlug, formType, formSl
   };
 }
 
-async function createCheckoutIntent({ env, token, organizationSlug, formType, formSlug, totalAmount, payerEmail }) {
+async function createCheckoutIntent({ env, token, organizationSlug, formType, formSlug, totalAmount, payerEmail, callbackUrl }) {
   if (!token || !organizationSlug) return null;
   // Checkout intents are created at organization level.
   const url = `${baseUrl(env)}/v5/organizations/${encodeURIComponent(organizationSlug)}/checkout-intents`;
@@ -182,9 +182,9 @@ async function createCheckoutIntent({ env, token, organizationSlug, formType, fo
     totalAmount: totalAmount,
     initialAmount: totalAmount,
     payer: payerEmail ? { email: payerEmail } : undefined,
-    backUrl: '',
-    errorUrl: '',
-    returnUrl: '',
+    backUrl: callbackUrl || '',
+    errorUrl: callbackUrl || '',
+    returnUrl: callbackUrl || '',
   };
   const { status, json } = await requestJson('POST', url, { Authorization: `Bearer ${token}` }, payload);
   if (status >= 200 && status < 300 && json) {

package/package.json

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

package/public/admin.js

@@ -42,6 +42,7 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
     });
   }
 
+  
   function renderPending(list) {
     const wrap = document.getElementById('onekite-pending');
     if (!wrap) return;
@@ -52,28 +53,101 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
       return;
     }
 
+    const fmtFR = (ts) => {
+      const d = new Date(parseInt(ts, 10));
+      const dd = String(d.getDate()).padStart(2, '0');
+      const mm = String(d.getMonth() + 1).padStart(2, '0');
+      const yyyy = d.getFullYear();
+      const hh = String(d.getHours()).padStart(2, '0');
+      const mi = String(d.getMinutes()).padStart(2, '0');
+      return `${dd}/${mm}/${yyyy} ${hh}:${mi}`;
+    };
+
     for (const r of list) {
-      const created = r.createdAt ? new Date(parseInt(r.createdAt, 10)).toLocaleString('fr-FR') : '';
-      const itemNames = Array.isArray(r.itemNames) && r.itemNames.length ? r.itemNames : [r.itemName || r.itemId];
-      for (const name of itemNames) {
-        const div = document.createElement('div');
-        div.className = 'list-group-item';
-        div.innerHTML = `
-          <div class="d-flex justify-content-between align-items-center">
-            <div><strong>${escapeHtml(name)}</strong></div>
-            <div class="text-muted" style="font-size: 0.85rem;">${escapeHtml(created)}</div>
+      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 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 || 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>
+            <button class="btn btn-success btn-sm">Valider</button>
+          </div>
+        </div>
+      `;
+      const [refuseBtn, approveBtn] = div.querySelectorAll('button');
+      refuseBtn.addEventListener('click', async () => {
+        if (!confirm('Rejeter cette demande ?')) return;
+        try {
+          // 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) {
+          showAlert('error', 'Rejet impossible.');
+        }
+      });
+
+      approveBtn.addEventListener('click', async () => {
+        const opts = (() => {
+          const out = [];
+          for (let h = 0; h < 24; h++) {
+            for (let m = 0; m < 60; m += 5) {
+              out.push(`${String(h).padStart(2, '0')}:${String(m).padStart(2, '0')}`);
+            }
+          }
+          return out;
+        })().map(t => `<option value="${t}">${t}</option>`).join('');
+
+        const html = `
+          <div class="mb-3">
+            <label class="form-label">Note (lieu de récupération)</label>
+            <textarea class="form-control" id="onekite-admin-note" placeholder="Matériel à récupérer à l'adresse : ..."></textarea>
           </div>
-          <div class="text-muted" style="font-size: 0.9rem;">${new Date(parseInt(r.start,10)).toLocaleDateString('fr-FR')} → ${new Date(parseInt(r.end,10)).toLocaleDateString('fr-FR')}</div>
-          <div class="mt-2">
-            <button class="btn btn-sm btn-success me-1" data-action="approve" data-rid="${r.rid}">Valider</button>
-            <button class="btn btn-sm btn-outline-danger" data-action="refuse" data-rid="${r.rid}">Refuser</button>
+          <div class="mb-2">
+            <label class="form-label">Heure de récupération</label>
+            <select class="form-select" id="onekite-pickup-time">${opts}</select>
           </div>
         `;
-        wrap.appendChild(div);
-      }
+
+        bootbox.dialog({
+          title: 'Valider la demande',
+          message: html,
+          buttons: {
+            cancel: { label: 'Annuler', className: 'btn-secondary' },
+            ok: {
+              label: 'Valider',
+              className: 'btn-success',
+              callback: async () => {
+                try {
+                  const adminNote = (document.getElementById('onekite-admin-note')?.value || '').trim();
+                  const pickupTime = (document.getElementById('onekite-pickup-time')?.value || '').trim();
+                  // 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) {
+                  showAlert('error', 'Validation impossible.');
+                }
+              },
+            },
+          },
+        });
+        return false;
+      });
+
+      wrap.appendChild(div);
     }
   }
 
+
   function timeOptions(stepMinutes) {
     const step = stepMinutes || 5;
     const out = [];

package/public/client.js

@@ -7,6 +7,17 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
   // interactions or quick re-renders.
   let isDialogOpen = false;
 
+  function statusLabel(s) {
+    const map = {
+      pending: 'En attente',
+      awaiting_payment: 'Validée – paiement en attente',
+      paid: 'Payée',
+      rejected: 'Rejetée',
+      expired: 'Expirée',
+    };
+    return map[String(s || '')] || String(s || '');
+  }
+
   function showAlert(type, msg) {
     try {
       if (alerts && typeof alerts[type] === 'function') {
@@ -234,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;
         }
@@ -260,7 +278,7 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
         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>Période</strong><br>${period}</div>
-          <div class="text-muted" style="font-size: 12px;">Statut: ${String(status)}</div>
+          <div class="text-muted" style="font-size: 12px;">Statut: ${statusLabel(status)}</div>
         `;
 
         const showModeration = canModerate && isPending;

package/templates/emails/calendar-onekite_approved.tpl

@@ -6,11 +6,12 @@
   <li>Fin : {end}</li>
 </ul>
 <!-- IF pickupTime -->
-<p><strong>Heure de récupération :</strong> {pickupTime}</p>
-<!-- ENDIF pickupTime -->
+<p><strong>Heure de récupération :</strong> {pickupTime}<!-- IF adminNote --> à {adminNote}<!-- ENDIF adminNote --></p>
+<!-- ELSE -->
 <!-- IF adminNote -->
-<p><strong>Note :</strong><br>{adminNote}</p>
+<p><strong>Heure de récupération :</strong> xx:xx à {adminNote}</p>
 <!-- ENDIF adminNote -->
+<!-- ENDIF pickupTime -->
 <!-- IF paymentUrl -->
 <p>Lien de paiement : <a href="{paymentUrl}">{paymentUrl}</a></p>
 <!-- ENDIF paymentUrl -->

package/templates/emails/calendar-onekite_pending.tpl

@@ -5,6 +5,5 @@
   <li>Matériel : {itemName}</li>
   <li>Début : {start}</li>
   <li>Fin : {end}</li>
-  <li>ID : {rid}</li>
 </ul>
 <p>Validation/refus via l’ACP.</p>