nodebb-plugin-onekite-calendar 2.0.1 → 2.0.3

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog – calendar-onekite
 
+## 1.2.10
+- HelloAsso : calcul des jours 100% fiable (différence en jours calendaires Y/M/J, sans dépendance aux heures/au fuseau/DST)
+- FullCalendar : endDate traitée comme exclusive partout (UI + checkout)
+- HelloAsso : montant du checkout recalculé côté serveur à partir du catalogue (prix/jour × nbJours)
+
+## 1.2.9
+- Modale réservation : retour du grisé des matériels indisponibles (API events expose à nouveau itemIds)
+
+## 1.2.8
+- Popup réservation : correction « Durée rapide » (la période envoyée correspond bien à la durée sélectionnée)
+
 ## 1.2.7
 - UI : suppression du bouton flottant mobile « + Réserver »
 - Client : nettoyage du code associé (suppression du bloc FAB)

package/lib/api.js

@@ -226,6 +226,24 @@ function toTs(v) {
   return d.getTime();
 }
 
+// Calendar-day difference (end exclusive) computed purely from Y/M/D.
+// Uses UTC midnights to avoid any dependency on local timezone or DST.
+function calendarDaysExclusiveYmd(startYmd, endYmd) {
+  try {
+    const m1 = /^\d{4}-\d{2}-\d{2}$/.exec(String(startYmd || '').trim());
+    const m2 = /^\d{4}-\d{2}-\d{2}$/.exec(String(endYmd || '').trim());
+    if (!m1 || !m2) return null;
+    const [sy, sm, sd] = startYmd.split('-').map((x) => parseInt(x, 10));
+    const [ey, em, ed] = endYmd.split('-').map((x) => parseInt(x, 10));
+    const sUtc = Date.UTC(sy, sm - 1, sd);
+    const eUtc = Date.UTC(ey, em - 1, ed);
+    const diff = Math.floor((eUtc - sUtc) / (24 * 60 * 60 * 1000));
+    return Math.max(1, diff);
+  } catch (e) {
+    return null;
+  }
+}
+
 function yearFromTs(ts) {
   const d = new Date(Number(ts));
   return Number.isFinite(d.getTime()) ? d.getFullYear() : new Date().getFullYear();
@@ -468,6 +486,10 @@ api.getEvents = async function (req, res) {
           rid: p.rid,
           status: p.status,
           uid: p.uid,
+          // Needed client-side to gray out unavailable items in the reservation modal.
+          // Not sensitive: it is already visible in event titles and prevents double booking.
+          itemIds: Array.isArray(p.itemIds) ? p.itemIds.map(String) : [],
+          itemIdLine: p.itemIdLine ? String(p.itemIdLine) : '',
           canModerate: canMod,
           ...(widgetMode ? { reservedByUsername: String(r.username || '') } : {}),
         },
@@ -725,12 +747,19 @@ api.createReservation = async function (req, res) {
   const ok = await canRequest(uid, settings, startPreview);
   if (!ok) return res.status(403).json({ error: 'not-allowed' });
 
-  const start = parseInt(toTs(req.body.start), 10);
-  const end = parseInt(toTs(req.body.end), 10);
+  const startRaw = req.body.start;
+  const endRaw = req.body.end;
+  const start = parseInt(toTs(startRaw), 10);
+  const end = parseInt(toTs(endRaw), 10);
   if (!Number.isFinite(start) || !Number.isFinite(end) || end <= start) {
     return res.status(400).json({ error: "bad-dates" });
   }
 
+  // Keep the original date-only strings when available. This allows
+  // calendar-day calculations that are 100% independent of hours/timezones/DST.
+  const startDate = (typeof startRaw === 'string' && /^\d{4}-\d{2}-\d{2}$/.test(startRaw.trim())) ? startRaw.trim() : null;
+  const endDate = (typeof endRaw === 'string' && /^\d{4}-\d{2}-\d{2}$/.test(endRaw.trim())) ? endRaw.trim() : null;
+
   // Business rule: a reservation cannot start on the current day or in the past.
   // We compare against server-local midnight. (Front-end also prevents it.)
   try {
@@ -798,6 +827,8 @@ api.createReservation = async function (req, res) {
     itemName: (itemNames[0] || itemIds[0]),
     start,
     end,
+    startDate,
+    endDate,
     status: 'pending',
     createdAt: now,
     total: isNaN(total) ? 0 : total,
@@ -916,6 +947,33 @@ api.approveReservation = async function (req, res) {
     const token = await helloasso.getAccessToken({ env: settings2.helloassoEnv || 'prod', clientId: settings2.helloassoClientId, clientSecret: settings2.helloassoClientSecret });
     const payer = await user.getUserFields(r.uid, ['email']);
     const year = yearFromTs(r.start);
+
+    // Reliable calendar-day count (end is EXCLUSIVE, FullCalendar rule)
+    const days = calendarDaysExclusiveYmd(r.startDate, r.endDate) || 1;
+
+    // Recompute total from HelloAsso catalog to avoid any dependency on hours/DST
+    // and to ensure checkout amount is always consistent.
+    let recomputedTotalCents = null;
+    try {
+      const { items: catalog } = await helloasso.listCatalogItems({
+        env: settings2.helloassoEnv,
+        token,
+        organizationSlug: settings2.helloassoOrganizationSlug,
+        formType: settings2.helloassoFormType,
+        formSlug: autoFormSlugForYear(year),
+      });
+      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 sumCentsPerDay = ids.reduce((acc, id) => acc + (byId.get(String(id)) || 0), 0);
+      if (sumCentsPerDay > 0) {
+        recomputedTotalCents = Math.max(0, Math.round(sumCentsPerDay * days));
+        // Keep stored total in sync (euros) for emails/UX.
+        r.total = recomputedTotalCents / 100;
+      }
+    } catch (e) {
+      // ignore recompute failures; fallback to stored total
+    }
+
     const intent = await helloasso.createCheckoutIntent({
       env: settings2.helloassoEnv,
       token,
@@ -925,7 +983,9 @@ api.approveReservation = async function (req, res) {
       formSlug: autoFormSlugForYear(year),
       // r.total is stored as an estimated total in euros; HelloAsso expects cents.
       totalAmount: (() => {
-        const cents = Math.max(0, Math.round((Number(r.total) || 0) * 100));
+        const cents = (typeof recomputedTotalCents === 'number')
+          ? recomputedTotalCents
+          : Math.max(0, Math.round((Number(r.total) || 0) * 100));
         if (!cents) {
           console.warn('[calendar-onekite] HelloAsso totalAmount is 0 (approve API)', { rid, total: r.total });
         }

package/package.json

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

package/plugin.json

@@ -39,5 +39,5 @@
   "acpScripts": [
     "public/admin.js"
   ],
-  "version": "2.0.1"
+  "version": "2.0.3"
 }

package/public/client.js

@@ -806,6 +806,17 @@ function attachAddressAutocomplete(inputEl, onPick) {
     return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}`;
   }
 
+  // Calendar-day difference with end treated as EXCLUSIVE (FullCalendar rule).
+  // Ignores hours/timezones/DST by projecting local Y/M/D onto UTC midnights.
+  function calendarDaysExclusive(startDate, endDate) {
+    const s = new Date(startDate);
+    const e = new Date(endDate);
+    const sUtc = Date.UTC(s.getFullYear(), s.getMonth(), s.getDate());
+    const eUtc = Date.UTC(e.getFullYear(), e.getMonth(), e.getDate());
+    const diff = Math.floor((eUtc - sUtc) / (24 * 60 * 60 * 1000));
+    return Math.max(1, diff);
+  }
+
 function toDatetimeLocalValue(date) {
     const d = new Date(date);
     const pad = (n) => String(n).padStart(2, '0');
@@ -816,9 +827,9 @@ function toDatetimeLocalValue(date) {
     const start = selectionInfo.start;
     let end = selectionInfo.end;
 
-    // days (end is exclusive in FullCalendar)
-    const msPerDay = 24 * 60 * 60 * 1000;
-    let days = Math.max(1, Math.round((end.getTime() - start.getTime()) / msPerDay));
+    // Days (end is exclusive in FullCalendar) — compute in calendar days only
+    // (no dependency on hours, timezone or DST).
+    let days = calendarDaysExclusive(start, end);
 
     // Fetch existing events overlapping the selection to disable already reserved items.
     let blocked = new Set();
@@ -923,7 +934,9 @@ function toDatetimeLocalValue(date) {
               const itemNames = cbs.map(cb => cb.getAttribute('data-name'));
               const sum = cbs.reduce((acc, cb) => acc + (parseFloat(cb.getAttribute('data-price') || '0') || 0), 0);
               const total = (sum / 100) * days;
-              resolve({ itemIds, itemNames, total, days });
+              // Return the effective end date (exclusive) because duration shortcuts can
+              // change the range without updating the original FullCalendar selection.
+              resolve({ itemIds, itemNames, total, days, endDate: toLocalYmd(end) });
             },
           },
         },
@@ -995,7 +1008,7 @@ function toDatetimeLocalValue(date) {
             // end is exclusive -> add nd days to start
             end = new Date(start);
             end.setDate(end.getDate() + nd);
-            days = nd;
+            days = calendarDaysExclusive(start, end);
             if (daysEl) {
               daysEl.textContent = `(${days} jour${days > 1 ? 's' : ''})`;
             }
@@ -1258,7 +1271,10 @@ function toDatetimeLocalValue(date) {
         }
         // Send date strings (no hours) so reservations are day-based.
         const startDate = toLocalYmd(info.start);
-        const endDate = toLocalYmd(info.end);
+        // NOTE: FullCalendar's `info.end` reflects the original selection.
+        // If the user used "Durée rapide", the effective end date is held
+        // inside the dialog (returned as `chosen.endDate`).
+        const endDate = (chosen && chosen.endDate) ? String(chosen.endDate) : toLocalYmd(info.end);
         await requestReservation({
           start: startDate,
           end: endDate,