nodebb-plugin-onekite-calendar 2.0.2 → 2.0.4

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog – calendar-onekite
 
+## 1.2.11
+- ACP : ajout de la recherche automatique d’adresse (autocomplete Nominatim) dans la modale de validation (unitaire + batch), comme sur le calendrier
+
+## 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)
 

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();
@@ -729,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 {
@@ -802,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,
@@ -920,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,
@@ -929,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.2",
+  "version": "2.0.4",
   "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.2"
+  "version": "2.0.4"
 }

package/public/admin.js

@@ -187,6 +187,148 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
     return { lat, lon, displayName: hit.display_name || q };
   }
 
+  // Lightweight address autocomplete (OpenStreetMap Nominatim)
+  // Designed to work inside Bootstrap "input-group" without moving DOM nodes.
+  async function searchAddresses(query, limit) {
+    const q = String(query || '').trim();
+    const lim = Math.min(10, Math.max(1, Number(limit) || 6));
+    if (q.length < 3) return [];
+    const url = `https://nominatim.openstreetmap.org/search?format=jsonv2&addressdetails=1&limit=${lim}&q=${encodeURIComponent(q)}`;
+    const res = await fetch(url, {
+      method: 'GET',
+      headers: {
+        'Accept': 'application/json',
+        'Accept-Language': 'fr',
+      },
+    });
+    if (!res.ok) return [];
+    const arr = await res.json();
+    if (!Array.isArray(arr)) return [];
+    return arr.map((hit) => {
+      const lat = Number(hit.lat);
+      const lon = Number(hit.lon);
+      return {
+        displayName: hit.display_name || q,
+        lat: Number.isFinite(lat) ? lat : null,
+        lon: Number.isFinite(lon) ? lon : null,
+      };
+    }).filter(h => h && h.displayName);
+  }
+
+  function attachAddressAutocomplete(inputEl, onPick) {
+    if (!inputEl) return;
+    if (inputEl.getAttribute('data-onekite-autocomplete') === '1') return;
+    inputEl.setAttribute('data-onekite-autocomplete', '1');
+
+    const anchor = inputEl.closest('.input-group') || inputEl.parentNode;
+    if (!anchor) return;
+
+    // Ensure positioning context
+    if (getComputedStyle(anchor).position === 'static') {
+      anchor.style.position = 'relative';
+    }
+
+    const menu = document.createElement('div');
+    menu.className = 'onekite-autocomplete-menu';
+    menu.style.position = 'absolute';
+    menu.style.left = '0';
+    menu.style.right = '0';
+    menu.style.top = '100%';
+    menu.style.zIndex = '2000';
+    menu.style.background = '#fff';
+    menu.style.border = '1px solid rgba(0,0,0,.15)';
+    menu.style.borderTop = '0';
+    menu.style.maxHeight = '220px';
+    menu.style.overflowY = 'auto';
+    menu.style.display = 'none';
+    menu.style.borderRadius = '0 0 .375rem .375rem';
+    menu.style.boxShadow = '0 .25rem .75rem rgba(0,0,0,.08)';
+    anchor.appendChild(menu);
+
+    let timer = null;
+    let lastQuery = '';
+    let busy = false;
+
+    function hide() {
+      menu.style.display = 'none';
+      menu.innerHTML = '';
+    }
+
+    function show(hits) {
+      if (!hits || !hits.length) {
+        hide();
+        return;
+      }
+      menu.innerHTML = '';
+      hits.forEach((h) => {
+        const btn = document.createElement('button');
+        btn.type = 'button';
+        btn.className = 'onekite-autocomplete-item';
+        btn.textContent = h.displayName;
+        btn.style.display = 'block';
+        btn.style.width = '100%';
+        btn.style.textAlign = 'left';
+        btn.style.padding = '.35rem .5rem';
+        btn.style.border = '0';
+        btn.style.background = 'transparent';
+        btn.style.cursor = 'pointer';
+        btn.addEventListener('click', () => {
+          inputEl.value = h.displayName;
+          hide();
+          try { onPick && onPick(h); } catch (e) {}
+        });
+        btn.addEventListener('mouseenter', () => { btn.style.background = 'rgba(0,0,0,.05)'; });
+        btn.addEventListener('mouseleave', () => { btn.style.background = 'transparent'; });
+        menu.appendChild(btn);
+      });
+      menu.style.display = 'block';
+    }
+
+    async function run(q) {
+      if (busy) return;
+      busy = true;
+      try {
+        const hits = await searchAddresses(q, 6);
+        if (String(inputEl.value || '').trim() !== q) return; // ignore stale
+        show(hits);
+      } catch (e) {
+        hide();
+      } finally {
+        busy = false;
+      }
+    }
+
+    inputEl.addEventListener('input', () => {
+      const q = String(inputEl.value || '').trim();
+      lastQuery = q;
+      if (timer) clearTimeout(timer);
+      if (q.length < 3) {
+        hide();
+        return;
+      }
+      timer = setTimeout(() => run(lastQuery), 250);
+    });
+
+    inputEl.addEventListener('focus', () => {
+      const q = String(inputEl.value || '').trim();
+      if (q.length >= 3) {
+        if (timer) clearTimeout(timer);
+        timer = setTimeout(() => run(q), 150);
+      }
+    });
+
+    inputEl.addEventListener('keydown', (e) => {
+      if (e.key === 'Escape') hide();
+    });
+
+    // Close when clicking outside (once per menu)
+    document.addEventListener('click', (e) => {
+      try {
+        if (!anchor.contains(e.target)) hide();
+      } catch (err) {}
+    });
+  }
+
   function formToObject(form) {
     const out = {};
     new FormData(form).forEach((v, k) => {
@@ -698,6 +840,19 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
                     } catch (e) {}
                   });
                 }
+
+                // Autocomplete like on the calendar validation modal
+                const addrInput = document.getElementById('onekite-pickup-address');
+                attachAddressAutocomplete(addrInput, (h) => {
+                  try {
+                    if (!h || !Number.isFinite(Number(h.lat)) || !Number.isFinite(Number(h.lon))) return;
+                    const lat = Number(h.lat);
+                    const lon = Number(h.lon);
+                    marker.setLatLng([lat, lon]);
+                    map.setView([lat, lon], 16);
+                    setLatLon(lat, lon);
+                  } catch (e) {}
+                });
                 setTimeout(() => { try { map.invalidateSize(); } catch (e) {} }, 250);
               } catch (e) {}
             });
@@ -887,6 +1042,14 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
                     }
                   });
                 }
+
+                // Autocomplete like on the calendar validation modal
+                attachAddressAutocomplete(addrInput, (h) => {
+                  try {
+                    if (!h || !Number.isFinite(Number(h.lat)) || !Number.isFinite(Number(h.lon))) return;
+                    setMarker(Number(h.lat), Number(h.lon), 16);
+                  } catch (e) {}
+                });
               } catch (e) {
                 // ignore
               }

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();
@@ -997,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' : ''})`;
             }