nodebb-plugin-onekite-calendar 1.0.29 → 1.0.31

package/lib/api.js

@@ -726,6 +726,22 @@ api.createReservation = async function (req, res) {
     return res.status(400).json({ error: "bad-dates" });
   }
 
+  // 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 {
+    const today0 = new Date();
+    today0.setHours(0, 0, 0, 0);
+    const tomorrow0 = today0.getTime() + 24 * 60 * 60 * 1000;
+    if (start < tomorrow0) {
+      return res.status(400).json({
+        error: 'date-too-soon',
+        message: "Impossible de réserver pour aujourd’hui ou une date passée.",
+      });
+    }
+  } catch (e) {
+    // If anything goes wrong, fail safe by allowing the normal flow.
+  }
+
   // Support both legacy single itemId and new itemIds[] payload
   const itemIds = Array.isArray(req.body.itemIds) ? req.body.itemIds.map(String) : ((req.body.itemId ? [String(req.body.itemId)] : []));
   const itemNames = Array.isArray(req.body.itemNames) ? req.body.itemNames.map(String) : (req.body.itemName ? [String(req.body.itemName)] : []);
@@ -1045,6 +1061,25 @@ api.cancelReservation = async function (req, res) {
     });
   } catch (e) {}
 
+
+  // Email requester
+  try {
+    const requesterUid = parseInt(r.uid, 10);
+    const requester = await user.getUserFields(requesterUid, ['username']);
+    const canceller = await user.getUserFields(uid, ['username']);
+    if (requesterUid) {
+      await sendEmail('calendar-onekite_cancelled', requesterUid, 'Location matériel - Réservation annulée', {
+        uid: requesterUid,
+        username: requester && requester.username ? requester.username : '',
+        itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
+        itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
+        dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
+        cancelledBy: canceller && canceller.username ? canceller.username : '',
+        cancelledByUrl: (canceller && canceller.username) ? `${normalizeBaseUrl(meta)}/user/${encodeURIComponent(String(canceller.username))}` : '',
+      });
+    }
+  } catch (e) {}
+
   return res.json({ ok: true, status: 'cancelled' });
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-onekite-calendar",
-  "version": "1.0.29",
+  "version": "1.0.31",
   "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": "1.0.29"
+  "version": "1.0.31"
 }

package/public/client.js

@@ -1187,6 +1187,21 @@ function toDatetimeLocalValue(date) {
             return;
           }
 
+          // Business rule: reservations cannot start today or 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) {
+              showAlert('error', "Impossible de réserver pour aujourd’hui ou une date passée.");
+              calendar.unselect();
+              isDialogOpen = false;
+              return;
+            }
+          } catch (e) {
+            // ignore
+          }
+
           if (!items || !items.length) {
             showAlert('error', 'Aucun matériel disponible (items HelloAsso non chargés).');
             calendar.unselect();
@@ -1227,6 +1242,8 @@ function toDatetimeLocalValue(date) {
             }
           } 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 if (code === '400' && payload && (payload.error === 'date-too-soon' || payload.code === 'date-too-soon')) {
+            showAlert('error', String(payload.message || "Impossible de réserver pour aujourd’hui ou une date passée."));
           } else {
             const msgRaw = payload && (payload.message || payload.error || payload.msg)
               ? String(payload.message || payload.error || payload.msg)

package/templates/emails/calendar-onekite_cancelled.tpl

@@ -0,0 +1,15 @@
+<p>Bonjour {username},</p>
+<p>Votre réservation de location de matériel a été annulée.</p>
+
+<p><strong>Matériel réservé</strong></p>
+<ul>
+<!-- BEGIN itemNames -->
+  <li>{itemNames}</li>
+<!-- END itemNames -->
+</ul>
+
+<p>{dateRange}</p>
+
+<!-- IF cancelledBy -->
+<p><strong>Annulée par :</strong> {cancelledBy}</p>
+<!-- ENDIF cancelledBy -->