nodebb-plugin-onekite-calendar 2.0.18 → 2.0.20

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog – calendar-onekite
 
+## 1.3.13
+- Réservations : il est désormais possible de réserver pour le jour même (seules les dates passées sont refusées).
+- Annulation : les validateurs peuvent annuler une réservation déjà payée.
+
 ## 1.3.12
 - Expiration automatique : envoi d’un email au demandeur avec la raison :
   - « Demande non prise en charge dans le temps imparti » (demande en attente)

package/lib/admin.js

@@ -432,6 +432,72 @@ admin.getAccounting = async function (req, res) {
   let paidCount = 0;
   let grandTotal = 0;
 
+  // Helper: calendar-day difference (end exclusive) from YYYY-MM-DD strings (UTC midnights).
+  const calendarDaysExclusiveYmd = (startYmd, endYmd) => {
+    try {
+      const s = String(startYmd || '').trim();
+      const e = String(endYmd || '').trim();
+      if (!/^\d{4}-\d{2}-\d{2}$/.test(s) || !/^\d{4}-\d{2}-\d{2}$/.test(e)) return null;
+      const [sy, sm, sd] = s.split('-').map((x) => parseInt(x, 10));
+      const [ey, em, ed] = e.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;
+    }
+  };
+
+  const yearFromTs = (ts) => {
+    const d = new Date(Number(ts));
+    return Number.isFinite(d.getTime()) ? d.getFullYear() : new Date().getFullYear();
+  };
+  const formSlugForYear = (y) => `locations-materiel-${y}`;
+
+  // Cache HelloAsso catalog price lookups by year to compute *per-item* totals.
+  // This prevents a bug where the full reservation total was previously counted on every item line.
+  let settingsCache = null;
+  let tokenCache = null;
+  const catalogByYear = new Map(); // year -> Map(itemId -> priceCents)
+  const getCatalogPriceMapForYear = async (year) => {
+    const y = Number(year);
+    if (!Number.isFinite(y)) return null;
+    if (catalogByYear.has(y)) return catalogByYear.get(y);
+    try {
+      if (!settingsCache) settingsCache = await meta.settings.get('calendar-onekite');
+      if (!settingsCache || !settingsCache.helloassoClientId || !settingsCache.helloassoClientSecret || !settingsCache.helloassoOrganizationSlug || !settingsCache.helloassoFormType) {
+        catalogByYear.set(y, null);
+        return null;
+      }
+      if (!tokenCache) {
+        tokenCache = await helloasso.getAccessToken({
+          env: settingsCache.helloassoEnv || 'prod',
+          clientId: settingsCache.helloassoClientId,
+          clientSecret: settingsCache.helloassoClientSecret,
+        });
+      }
+      if (!tokenCache) {
+        catalogByYear.set(y, null);
+        return null;
+      }
+
+      const { items: catalog } = await helloasso.listCatalogItems({
+        env: settingsCache.helloassoEnv,
+        token: tokenCache,
+        organizationSlug: settingsCache.helloassoOrganizationSlug,
+        formType: settingsCache.helloassoFormType,
+        formSlug: formSlugForYear(y),
+      });
+      const byId = new Map((catalog || []).map((it) => [String(it.id), (typeof it.price === 'number' ? it.price : 0)]));
+      catalogByYear.set(y, byId);
+      return byId;
+    } catch (e) {
+      catalogByYear.set(y, null);
+      return null;
+    }
+  };
+
   for (const rid of ids) {
     const r = await dbLayer.getReservation(rid);
     if (!r) continue;
@@ -473,14 +539,55 @@ admin.getAccounting = async function (req, res) {
 
     // Only count paid (non-free) reservations into revenue by item.
     if (!isFree) {
-      for (const name of itemNames) {
+      // Compute per-item totals (price_per_day * calendar_days) when possible.
+      // Fallback: split reservation total equally across items.
+      const idsForRes = (Array.isArray(r.itemIds) && r.itemIds.length) ? r.itemIds.map(String) : (r.itemId ? [String(r.itemId)] : []);
+      const days = calendarDaysExclusiveYmd(r.startDate, r.endDate) || 1;
+      const year = yearFromTs(start);
+
+      let perItemTotals = null; // Map(itemId -> euros)
+      const priceMap = await getCatalogPriceMapForYear(year);
+      if (priceMap && idsForRes.length) {
+        const m = new Map();
+        for (const id of idsForRes) {
+          const cents = priceMap.get(String(id)) || 0;
+          if (cents > 0) {
+            m.set(String(id), (cents * days) / 100);
+          }
+        }
+        // Use catalog-based totals only if we got at least one valid price.
+        if (m.size) perItemTotals = m;
+      }
+
+      const nItems = Math.max(1, itemNames.length || idsForRes.length || 1);
+      const fallbackEach = (Number(total) || 0) / nItems;
+
+      // Aggregate by *display name* (stable for admins), using the computed per-item totals.
+      // If we have ids and names, we try to align by index; otherwise we apply fallback.
+      for (let i = 0; i < itemNames.length; i++) {
+        const name = itemNames[i];
         const key = String(name || '').trim();
         if (!key) continue;
+        const id = idsForRes[i] != null ? String(idsForRes[i]) : null;
+        const per = (id && perItemTotals && perItemTotals.has(String(id))) ? perItemTotals.get(String(id)) : fallbackEach;
         const cur = byItem.get(key) || { item: key, count: 0, total: 0 };
         cur.count += 1;
-        cur.total += total;
+        cur.total += (Number(per) || 0);
         byItem.set(key, cur);
       }
+
+      // If we have ids but no names (edge cases), keep a reasonable summary by id.
+      if (!itemNames.length && idsForRes.length) {
+        for (const id of idsForRes) {
+          const key = String(id || '').trim();
+          if (!key) continue;
+          const per = (perItemTotals && perItemTotals.has(String(id))) ? perItemTotals.get(String(id)) : fallbackEach;
+          const cur = byItem.get(key) || { item: key, count: 0, total: 0 };
+          cur.count += 1;
+          cur.total += (Number(per) || 0);
+          byItem.set(key, cur);
+        }
+      }
     }
   }
 

package/lib/api.js

@@ -866,16 +866,16 @@ api.createReservation = async function (req, res) {
   // A validator is "free" only if the rental duration is within the configured threshold.
   const isValidatorFree = !!isValidator && (validatorFreeMaxDays <= 0 || nbDays <= validatorFreeMaxDays);
 
-  // Business rule: a reservation cannot start on the current day or in the past.
+  // Business rule: a reservation cannot start in the past.
   // We compare against server-local midnight. (Front-end also prevents it.)
   try {
     const today0 = new Date();
     today0.setHours(0, 0, 0, 0);
-    const tomorrow0 = today0.getTime() + 24 * 60 * 60 * 1000;
-    if (start < tomorrow0) {
+    const today0ts = today0.getTime();
+    if (start < today0ts) {
       return res.status(400).json({
         error: 'date-too-soon',
-        message: "Impossible de réserver pour aujourd’hui ou une date passée.",
+        message: "Impossible de réserver pour une date passée.",
       });
     }
   } catch (e) {

package/package.json

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

package/pkg/package/lib/admin.js

@@ -110,6 +110,7 @@ admin.listPending = async function (req, res) {
       .filter(v => Number.isInteger(v) && v > 0)));
 
     if (uids.length) {
+      // user.getUsersFields exists in NodeBB 4.x
       const users = await user.getUsersFields(uids, ['uid', 'username', 'userslug']);
       const byUid = new Map((users || []).filter(Boolean).map(u => [String(u.uid), u]));
       for (const r of pending) {
@@ -121,7 +122,7 @@ admin.listPending = async function (req, res) {
       }
     }
   } catch (e) {
-    // Best-effort only
+    // Best-effort only; keep API working even if user lookups fail
   }
 
   res.json(pending);
@@ -431,6 +432,72 @@ admin.getAccounting = async function (req, res) {
   let paidCount = 0;
   let grandTotal = 0;
 
+  // Helper: calendar-day difference (end exclusive) from YYYY-MM-DD strings (UTC midnights).
+  const calendarDaysExclusiveYmd = (startYmd, endYmd) => {
+    try {
+      const s = String(startYmd || '').trim();
+      const e = String(endYmd || '').trim();
+      if (!/^\d{4}-\d{2}-\d{2}$/.test(s) || !/^\d{4}-\d{2}-\d{2}$/.test(e)) return null;
+      const [sy, sm, sd] = s.split('-').map((x) => parseInt(x, 10));
+      const [ey, em, ed] = e.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;
+    }
+  };
+
+  const yearFromTs = (ts) => {
+    const d = new Date(Number(ts));
+    return Number.isFinite(d.getTime()) ? d.getFullYear() : new Date().getFullYear();
+  };
+  const formSlugForYear = (y) => `locations-materiel-${y}`;
+
+  // Cache HelloAsso catalog price lookups by year to compute *per-item* totals.
+  // This prevents a bug where the full reservation total was previously counted on every item line.
+  let settingsCache = null;
+  let tokenCache = null;
+  const catalogByYear = new Map(); // year -> Map(itemId -> priceCents)
+  const getCatalogPriceMapForYear = async (year) => {
+    const y = Number(year);
+    if (!Number.isFinite(y)) return null;
+    if (catalogByYear.has(y)) return catalogByYear.get(y);
+    try {
+      if (!settingsCache) settingsCache = await meta.settings.get('calendar-onekite');
+      if (!settingsCache || !settingsCache.helloassoClientId || !settingsCache.helloassoClientSecret || !settingsCache.helloassoOrganizationSlug || !settingsCache.helloassoFormType) {
+        catalogByYear.set(y, null);
+        return null;
+      }
+      if (!tokenCache) {
+        tokenCache = await helloasso.getAccessToken({
+          env: settingsCache.helloassoEnv || 'prod',
+          clientId: settingsCache.helloassoClientId,
+          clientSecret: settingsCache.helloassoClientSecret,
+        });
+      }
+      if (!tokenCache) {
+        catalogByYear.set(y, null);
+        return null;
+      }
+
+      const { items: catalog } = await helloasso.listCatalogItems({
+        env: settingsCache.helloassoEnv,
+        token: tokenCache,
+        organizationSlug: settingsCache.helloassoOrganizationSlug,
+        formType: settingsCache.helloassoFormType,
+        formSlug: formSlugForYear(y),
+      });
+      const byId = new Map((catalog || []).map((it) => [String(it.id), (typeof it.price === 'number' ? it.price : 0)]));
+      catalogByYear.set(y, byId);
+      return byId;
+    } catch (e) {
+      catalogByYear.set(y, null);
+      return null;
+    }
+  };
+
   for (const rid of ids) {
     const r = await dbLayer.getReservation(rid);
     if (!r) continue;
@@ -472,14 +539,55 @@ admin.getAccounting = async function (req, res) {
 
     // Only count paid (non-free) reservations into revenue by item.
     if (!isFree) {
-      for (const name of itemNames) {
+      // Compute per-item totals (price_per_day * calendar_days) when possible.
+      // Fallback: split reservation total equally across items.
+      const idsForRes = (Array.isArray(r.itemIds) && r.itemIds.length) ? r.itemIds.map(String) : (r.itemId ? [String(r.itemId)] : []);
+      const days = calendarDaysExclusiveYmd(r.startDate, r.endDate) || 1;
+      const year = yearFromTs(start);
+
+      let perItemTotals = null; // Map(itemId -> euros)
+      const priceMap = await getCatalogPriceMapForYear(year);
+      if (priceMap && idsForRes.length) {
+        const m = new Map();
+        for (const id of idsForRes) {
+          const cents = priceMap.get(String(id)) || 0;
+          if (cents > 0) {
+            m.set(String(id), (cents * days) / 100);
+          }
+        }
+        // Use catalog-based totals only if we got at least one valid price.
+        if (m.size) perItemTotals = m;
+      }
+
+      const nItems = Math.max(1, itemNames.length || idsForRes.length || 1);
+      const fallbackEach = (Number(total) || 0) / nItems;
+
+      // Aggregate by *display name* (stable for admins), using the computed per-item totals.
+      // If we have ids and names, we try to align by index; otherwise we apply fallback.
+      for (let i = 0; i < itemNames.length; i++) {
+        const name = itemNames[i];
         const key = String(name || '').trim();
         if (!key) continue;
+        const id = idsForRes[i] != null ? String(idsForRes[i]) : null;
+        const per = (id && perItemTotals && perItemTotals.has(String(id))) ? perItemTotals.get(String(id)) : fallbackEach;
         const cur = byItem.get(key) || { item: key, count: 0, total: 0 };
         cur.count += 1;
-        cur.total += total;
+        cur.total += (Number(per) || 0);
         byItem.set(key, cur);
       }
+
+      // If we have ids but no names (edge cases), keep a reasonable summary by id.
+      if (!itemNames.length && idsForRes.length) {
+        for (const id of idsForRes) {
+          const key = String(id || '').trim();
+          if (!key) continue;
+          const per = (perItemTotals && perItemTotals.has(String(id))) ? perItemTotals.get(String(id)) : fallbackEach;
+          const cur = byItem.get(key) || { item: key, count: 0, total: 0 };
+          cur.count += 1;
+          cur.total += (Number(per) || 0);
+          byItem.set(key, cur);
+        }
+      }
     }
   }
 

package/pkg/package/lib/api.js

@@ -866,16 +866,16 @@ api.createReservation = async function (req, res) {
   // A validator is "free" only if the rental duration is within the configured threshold.
   const isValidatorFree = !!isValidator && (validatorFreeMaxDays <= 0 || nbDays <= validatorFreeMaxDays);
 
-  // Business rule: a reservation cannot start on the current day or in the past.
+  // Business rule: a reservation cannot start in the past.
   // We compare against server-local midnight. (Front-end also prevents it.)
   try {
     const today0 = new Date();
     today0.setHours(0, 0, 0, 0);
-    const tomorrow0 = today0.getTime() + 24 * 60 * 60 * 1000;
-    if (start < tomorrow0) {
+    const today0ts = today0.getTime();
+    if (start < today0ts) {
       return res.status(400).json({
         error: 'date-too-soon',
-        message: "Impossible de réserver pour aujourd’hui ou une date passée.",
+        message: "Impossible de réserver pour une date passée.",
       });
     }
   } catch (e) {

package/pkg/package/package.json

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

package/pkg/package/plugin.json

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

package/pkg/package/public/client.js

@@ -1346,14 +1346,14 @@ function toDatetimeLocalValue(date) {
           return;
         }
 
-        // Business rule: reservations cannot start today or in the past.
+        // Business rule: reservations cannot start in the past.
         // (We validate again on the server, but this gives immediate feedback.)
         try {
           const startDateCheck = toLocalYmd(info.start);
           const todayCheck = toLocalYmd(new Date());
-          if (startDateCheck <= todayCheck) {
+          if (startDateCheck < todayCheck) {
             lastDateRuleToastAt = Date.now();
-            showAlert('error', "Impossible de réserver pour aujourd’hui ou une date passée.");
+            showAlert('error', "Impossible de réserver pour une date passée.");
             calendar.unselect();
             isDialogOpen = false;
             return;
@@ -1413,7 +1413,7 @@ function toDatetimeLocalValue(date) {
         } else if (code === '400' && payload && (payload.error === 'date-too-soon' || payload.code === 'date-too-soon')) {
           // If we already showed the client-side toast a moment ago, avoid a duplicate.
           if (!lastDateRuleToastAt || (Date.now() - lastDateRuleToastAt) > 1500) {
-            showAlert('error', String(payload.message || "Impossible de réserver pour aujourd’hui ou une date passée."));
+            showAlert('error', String(payload.message || "Impossible de réserver pour une date passée."));
           }
         } else {
           const msgRaw = payload && (payload.message || payload.error || payload.msg)
@@ -1699,7 +1699,13 @@ function toDatetimeLocalValue(date) {
         const ownerUid = String(ev.extendedProps && ev.extendedProps.uid ? ev.extendedProps.uid : '');
         const isOwner = uidNow && ownerUid && uidNow === ownerUid;
         const showModeration = canModerate && isPending;
-        const showCancel = isOwner && ['pending', 'awaiting_payment'].includes(status);
+        // Cancellation rules:
+        // - Owner: can cancel only before payment is completed.
+        // - Validators/admins (canModerate): can cancel even when already paid.
+        const showCancel = (
+          (isOwner && ['pending', 'awaiting_payment'].includes(status)) ||
+          (canModerate && ['pending', 'awaiting_payment', 'approved', 'paid'].includes(status))
+        );
         const paymentUrl = String((p && p.paymentUrl) || '');
         const showPay = isOwner && status === 'awaiting_payment' && /^https?:\/\//i.test(paymentUrl);
         const buttons = {

package/plugin.json

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

package/public/client.js

@@ -1356,14 +1356,14 @@ function toDatetimeLocalValue(date) {
           return;
         }
 
-        // Business rule: reservations cannot start today or in the past.
+        // Business rule: reservations cannot start in the past.
         // (We validate again on the server, but this gives immediate feedback.)
         try {
           const startDateCheck = toLocalYmd(info.start);
           const todayCheck = toLocalYmd(new Date());
-          if (startDateCheck <= todayCheck) {
+          if (startDateCheck < todayCheck) {
             lastDateRuleToastAt = Date.now();
-            showAlert('error', "Impossible de réserver pour aujourd’hui ou une date passée.");
+            showAlert('error', "Impossible de réserver pour une date passée.");
             calendar.unselect();
             isDialogOpen = false;
             return;
@@ -1423,7 +1423,7 @@ function toDatetimeLocalValue(date) {
         } else if (code === '400' && payload && (payload.error === 'date-too-soon' || payload.code === 'date-too-soon')) {
           // If we already showed the client-side toast a moment ago, avoid a duplicate.
           if (!lastDateRuleToastAt || (Date.now() - lastDateRuleToastAt) > 1500) {
-            showAlert('error', String(payload.message || "Impossible de réserver pour aujourd’hui ou une date passée."));
+            showAlert('error', String(payload.message || "Impossible de réserver pour une date passée."));
           }
         } else {
           const msgRaw = payload && (payload.message || payload.error || payload.msg)
@@ -1709,7 +1709,13 @@ function toDatetimeLocalValue(date) {
         const ownerUid = String(ev.extendedProps && ev.extendedProps.uid ? ev.extendedProps.uid : '');
         const isOwner = uidNow && ownerUid && uidNow === ownerUid;
         const showModeration = canModerate && isPending;
-        const showCancel = isOwner && ['pending', 'awaiting_payment'].includes(status);
+        // Cancellation rules:
+        // - Owner: can cancel only before payment is completed.
+        // - Validators/admins (canModerate): can cancel even when already paid.
+        const showCancel = (
+          (isOwner && ['pending', 'awaiting_payment'].includes(status)) ||
+          (canModerate && ['pending', 'awaiting_payment', 'approved', 'paid'].includes(status))
+        );
         const paymentUrl = String((p && p.paymentUrl) || '');
         const showPay = isOwner && status === 'awaiting_payment' && /^https?:\/\//i.test(paymentUrl);
         const buttons = {