nodebb-plugin-onekite-calendar 2.0.19 → 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/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.19",
+  "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/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.19"
+  "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 = {