nodebb-plugin-calendar-onekite 2.0.0 → 2.1.0

package/README.md

@@ -19,3 +19,10 @@ If you need offline / no-CDN, tell me and I will vendor the files under static/v
 - Pages: /calendar, /calendar/my-reservations
 - Admin: /admin/plugins/calendar-onekite, /admin/calendar/planning
 - API: available under /api/... and /api/v3/... (NodeBB v4 client helper uses /api/v3)
+
+
+## v2.1 inventory model
+- Global locations/inventory in ACP (locationsJson/inventoryJson)
+- Events select allowed inventory item IDs (bookingItemIds)
+- Availability is global per (itemId, locationId) across all events
+- Admin planning is graphical (FullCalendar) with filters

package/library.js

@@ -21,11 +21,28 @@ function getEventKey(eid) {
 
 function mountApiBoth(router, method, path, ...handlers) {
   const m = String(method).toLowerCase();
-  if (typeof router[m] !== 'function') throw new Error(`Unsupported router method: ${method}`);
   router[m]('/api' + path, ...handlers);
   router[m]('/api/v3' + path, ...handlers);
 }
 
+async function getParsedSettings() {
+  const s = (await Settings.get(SETTINGS_KEY)) || {};
+  const parseJson = (str, fallback) => {
+    try { return JSON.parse(str || ''); } catch { return fallback; }
+  };
+
+  const locations = parseJson(s.locationsJson, [
+    { id: 'arnaud', name: 'Chez Arnaud' },
+    { id: 'siege', name: 'Siège Onekite' },
+  ]);
+
+  const inventory = parseJson(s.inventoryJson, [
+    { id: 'wing', name: 'Aile Wing', price: 5, stockByLocation: { arnaud: 1, siege: 0 } },
+  ]);
+
+  return { ...s, locations, inventory };
+}
+
 async function nextReservationId() {
   const rid = await db.incrObjectField('global', 'nextCalendarRid');
   return String(rid);
@@ -50,7 +67,10 @@ async function createEvent(data, uid) {
   const now = Date.now();
   const startTs = Number(new Date(data.start).getTime()) || now;
   const endTs = Number(new Date(data.end).getTime()) || startTs;
-  const bookingItems = Array.isArray(data.bookingItems) ? data.bookingItems : [];
+
+  const bookingItemIds = Array.isArray(data.bookingItemIds)
+    ? data.bookingItemIds.map(String)
+    : [];
 
   const eventObj = {
     eid: String(eid),
@@ -71,7 +91,7 @@ async function createEvent(data, uid) {
     visibility: String(data.visibility || 'public'),
 
     bookingEnabled: data.bookingEnabled ? 1 : 0,
-    bookingItems: JSON.stringify(bookingItems),
+    bookingItems: JSON.stringify(bookingItemIds), // stores IDs only
     reservations: JSON.stringify([]),
   };
 
@@ -92,9 +112,18 @@ async function updateEvent(eid, data) {
   const startTs = data.start ? new Date(data.start).getTime() : new Date(existing.start).getTime();
   const endTs = data.end ? new Date(data.end).getTime() : new Date(existing.end).getTime();
 
-  const bookingItems = Array.isArray(data.bookingItems)
-    ? data.bookingItems
-    : JSON.parse(existing.bookingItems || '[]');
+  const existingIds = (() => {
+    try {
+      const arr = JSON.parse(existing.bookingItems || '[]');
+      return Array.isArray(arr) ? arr.map(String) : [];
+    } catch {
+      return [];
+    }
+  })();
+
+  const bookingItemIds = Array.isArray(data.bookingItemIds)
+    ? data.bookingItemIds.map(String)
+    : existingIds;
 
   const updated = {
     ...existing,
@@ -106,7 +135,7 @@ async function updateEvent(eid, data) {
     location: data.location !== undefined ? String(data.location) : existing.location,
     visibility: data.visibility !== undefined ? String(data.visibility) : existing.visibility,
     bookingEnabled: data.bookingEnabled !== undefined ? (data.bookingEnabled ? 1 : 0) : (existing.bookingEnabled || 0),
-    bookingItems: JSON.stringify(bookingItems),
+    bookingItems: JSON.stringify(bookingItemIds),
     updatedAt: String(Date.now()),
   };
 
@@ -125,13 +154,11 @@ async function getEventsBetween(start, end) {
   const endTs = new Date(end).getTime();
   const eids = await db.getSortedSetRangeByScore(EVENTS_SET_KEY, 0, -1, startTs, endTs);
   if (!eids || !eids.length) return [];
+
   const keys = eids.map(id => getEventKey(id));
   const events = await db.getObjects(keys);
 
-  return (events || []).filter(Boolean).map(ev => ({
-    ...ev,
-    bookingItems: JSON.parse(ev.bookingItems || '[]'),
-  }));
+  return (events || []).filter(Boolean);
 }
 
 async function getUpcomingEvents(limit = 5) {
@@ -212,47 +239,61 @@ async function setRsvp(eid, uid, status) {
   return updated;
 }
 
+/* ---------------- Reservations data helpers ---------------- */
+
+async function getAllReservations() {
+  const eids = await db.getSortedSetRange(EVENTS_SET_KEY, 0, -1);
+  const out = [];
+  for (const eid of eids) {
+    const ev = await getEvent(eid);
+    if (!ev) continue;
+    const resList = (() => {
+      try { return JSON.parse(ev.reservations || '[]'); } catch { return []; }
+    })();
+    for (const r of resList) {
+      out.push({ event: ev, reservation: r });
+    }
+  }
+  return out;
+}
+
 /* ---------------- Pricing ---------------- */
 
-function computePrice(event, reservation) {
-  const items = JSON.parse(event.bookingItems || '[]');
-  const item = items.find(i => i.id === reservation.itemId);
-  if (!item) return 0;
-  const unit = Number(item.price || 0);
+function computePrice(inventoryItem, reservation) {
+  const unit = Number(inventoryItem?.price || 0);
   const days = Number(reservation.days || 1);
   return unit * Number(reservation.quantity || 0) * days;
 }
 
 /* ---------------- Renderers ---------------- */
 
-function renderCalendarPage(req, res) {
-  res.render('calendar', { title: 'Calendrier' });
-}
-
-function renderMyReservationsPage(req, res) {
-  res.render('calendar-my-reservations', { title: 'Mes réservations' });
-}
-
-function renderPlanningPage(req, res) {
-  res.render('admin/calendar-planning', { title: 'Planning des réservations' });
-}
+function renderCalendarPage(req, res) { res.render('calendar', { title: 'Calendrier' }); }
+function renderMyReservationsPage(req, res) { res.render('calendar-my-reservations', { title: 'Mes réservations' }); }
+function renderPlanningPage(req, res) { res.render('admin/calendar-planning', { title: 'Planning' }); }
 
 async function renderAdminPage(req, res) {
   try {
     const settings = (await Settings.get(SETTINGS_KEY)) || {};
-    res.render('admin/plugins/calendar-onekite', {
-      title: 'Calendar OneKite',
-      settings,
-    });
-  } catch (err) {
-    if (req.path && req.path.startsWith('/api/')) {
-      return res.status(500).json({ error: err.message });
+    // Provide defaults JSON strings if empty
+    if (!settings.locationsJson) {
+      settings.locationsJson = JSON.stringify([
+        { id: 'arnaud', name: 'Chez Arnaud' },
+        { id: 'siege', name: 'Siège Onekite' },
+      ], null, 2);
     }
-    res.status(500).send(err.message);
+    if (!settings.inventoryJson) {
+      settings.inventoryJson = JSON.stringify([
+        { id: 'wing', name: 'Aile Wing', price: 5, stockByLocation: { arnaud: 1, siege: 0 } },
+      ], null, 2);
+    }
+
+    res.render('admin/plugins/calendar-onekite', { title: 'Calendar OneKite', settings });
+  } catch (err) {
+    res.status(500).json({ error: err.message });
   }
 }
 
-/* ---------------- Admin handlers ---------------- */
+/* ---------------- Admin APIs ---------------- */
 
 async function adminGetPending(req, res) {
   try {
@@ -271,37 +312,42 @@ async function adminGetPending(req, res) {
   }
 }
 
+async function adminSaveSettings(req, res) {
+  try {
+    await Settings.set(SETTINGS_KEY, req.body);
+    res.json({ status: 'ok' });
+  } catch (err) {
+    res.status(500).json({ error: err.message });
+  }
+}
+
 async function adminValidateReservation(req, res) {
   try {
     const rid = req.params.rid;
-    const eids = await db.getSortedSetRange(EVENTS_SET_KEY, 0, -1);
-
-    let targetEvent = null;
-    let reservation = null;
+    const all = await getAllReservations();
 
-    for (const eid of eids) {
-      const event = await getEvent(eid);
-      if (!event) continue;
-      const reservations = JSON.parse(event.reservations || '[]');
-      const r = reservations.find(rr => rr.rid === rid);
-      if (r) {
-        targetEvent = event;
-        reservation = r;
-        break;
-      }
+    let target = null;
+    for (const row of all) {
+      if (String(row.reservation.rid) === String(rid)) { target = row; break; }
     }
+    if (!target) return res.status(404).json({ error: 'Réservation introuvable' });
+
+    const { event } = target;
+    const reservation = target.reservation;
 
-    if (!reservation) return res.status(404).json({ error: 'Réservation introuvable' });
     if (reservation.status !== 'pending_admin') return res.status(400).json({ error: 'Réservation déjà traitée' });
 
     reservation.status = 'awaiting_payment';
-    const resList = JSON.parse(targetEvent.reservations || '[]');
-    const idx = resList.findIndex(r => r.rid === rid);
+
+    const resList = JSON.parse(event.reservations || '[]');
+    const idx = resList.findIndex(r => String(r.rid) === String(rid));
     resList[idx] = reservation;
-    targetEvent.reservations = JSON.stringify(resList);
-    await db.setObject(getEventKey(targetEvent.eid), targetEvent);
+    event.reservations = JSON.stringify(resList);
+    await db.setObject(getEventKey(event.eid), event);
 
-    const amount = computePrice(targetEvent, reservation);
+    const settings = await getParsedSettings();
+    const invItem = settings.inventory.find(i => String(i.id) === String(reservation.itemId));
+    const amount = computePrice(invItem, reservation);
 
     const checkoutUrl = await helloAsso.createHelloAssoCheckoutIntent({
       eid: reservation.eid,
@@ -315,11 +361,11 @@ async function adminValidateReservation(req, res) {
     try {
       await emailer.send('calendar-reservation-approved', reservation.uid, {
         subject: 'Votre réservation a été validée',
-        eventTitle: targetEvent.title,
-        itemName: reservation.itemId,
+        eventTitle: event.title,
+        itemName: invItem?.name || reservation.itemId,
         quantity: reservation.quantity,
         checkoutUrl,
-        pickupLocation: reservation.pickupLocation || 'Non précisé',
+        pickupLocation: reservation.pickupLocationName || reservation.locationId || 'Non précisé',
         dateStart: reservation.dateStart,
         dateEnd: reservation.dateEnd,
         days: reservation.days || 1,
@@ -338,14 +384,13 @@ async function adminCancelReservation(req, res) {
   try {
     const rid = req.params.rid;
     const eids = await db.getSortedSetRange(EVENTS_SET_KEY, 0, -1);
-
     let found = false;
+
     for (const eid of eids) {
       const event = await getEvent(eid);
       if (!event) continue;
-
       const reservations = JSON.parse(event.reservations || '[]');
-      const idx = reservations.findIndex(rr => rr.rid === rid);
+      const idx = reservations.findIndex(r => String(r.rid) === String(rid));
       if (idx !== -1) {
         reservations[idx].status = 'cancelled';
         event.reservations = JSON.stringify(reservations);
@@ -364,35 +409,34 @@ async function adminCancelReservation(req, res) {
 
 async function adminGetPlanning(req, res) {
   try {
-    const now = new Date();
-    const eids = await db.getSortedSetRangeByScore(EVENTS_SET_KEY, 0, -1, now.getTime(), '+inf');
-    const rows = [];
+    const settings = await getParsedSettings();
+    const locMap = new Map(settings.locations.map(l => [String(l.id), l.name || l.id]));
+    const invMap = new Map(settings.inventory.map(i => [String(i.id), i.name || i.id]));
 
-    for (const eid of eids) {
-      const event = await getEvent(eid);
-      if (!event) continue;
+    const all = await getAllReservations();
+    const rows = [];
 
-      const items = JSON.parse(event.bookingItems || '[]');
-      const reservations = JSON.parse(event.reservations || '[]');
+    for (const row of all) {
+      const event = row.event;
+      const r = row.reservation;
+      if (!r) continue;
+      if (!['pending_admin', 'awaiting_payment', 'paid'].includes(String(r.status))) continue;
 
-      reservations
-        .filter(r => r.status === 'pending_admin' || r.status === 'awaiting_payment' || r.status === 'paid')
-        .forEach(r => {
-          const item = items.find(i => i.id === r.itemId);
-          rows.push({
-            eid: event.eid,
-            eventTitle: event.title,
-            itemId: r.itemId,
-            itemName: item ? item.name : r.itemId,
-            uid: r.uid,
-            quantity: r.quantity,
-            dateStart: r.dateStart,
-            dateEnd: r.dateEnd,
-            days: r.days || daysBetween(r.dateStart, r.dateEnd),
-            status: r.status,
-            pickupLocation: r.pickupLocation || 'Non précisé',
-          });
-        });
+      rows.push({
+        rid: r.rid,
+        eid: event.eid,
+        eventTitle: event.title,
+        itemId: r.itemId,
+        itemName: invMap.get(String(r.itemId)) || r.itemId,
+        uid: r.uid,
+        quantity: r.quantity,
+        dateStart: r.dateStart,
+        dateEnd: r.dateEnd,
+        days: r.days || daysBetween(r.dateStart, r.dateEnd),
+        status: r.status,
+        locationId: r.locationId,
+        pickupLocation: r.pickupLocationName || locMap.get(String(r.locationId)) || 'Non précisé',
+      });
     }
 
     rows.sort((a, b) => new Date(a.dateStart) - new Date(b.dateStart));
@@ -402,22 +446,29 @@ async function adminGetPlanning(req, res) {
   }
 }
 
-async function adminSaveSettings(req, res) {
+/* ---------------- Public APIs ---------------- */
+
+async function inventoryApi(req, res) {
   try {
-    await Settings.set(SETTINGS_KEY, req.body);
-    res.json({ status: 'ok' });
+    const settings = await getParsedSettings();
+    res.json({
+      locations: settings.locations || [],
+      inventory: settings.inventory || [],
+    });
   } catch (err) {
     res.status(500).json({ error: err.message });
   }
 }
 
-/* ---------------- My reservations API ---------------- */
-
 async function myReservations(req, res) {
   try {
     const uid = String(req.user?.uid || 0);
     if (!uid || uid === '0') return res.status(403).json({ error: 'Non connecté' });
 
+    const settings = await getParsedSettings();
+    const locMap = new Map(settings.locations.map(l => [String(l.id), l.name || l.id]));
+    const invMap = new Map(settings.inventory.map(i => [String(i.id), i.name || i.id]));
+
     const eids = await db.getSortedSetRange(EVENTS_SET_KEY, 0, -1);
     const result = [];
 
@@ -425,19 +476,15 @@ async function myReservations(req, res) {
       const event = await getEvent(eid);
       if (!event) continue;
 
-      const items = JSON.parse(event.bookingItems || '[]');
       const reservations = JSON.parse(event.reservations || '[]');
-
       reservations
         .filter(r => String(r.uid) === uid)
         .forEach(r => {
-          const item = items.find(i => i.id === r.itemId);
           result.push({
             ...r,
             eventTitle: event.title,
-            eventStart: event.start,
-            eventEnd: event.end,
-            itemName: item ? item.name : r.itemId,
+            itemName: invMap.get(String(r.itemId)) || r.itemId,
+            pickupLocation: r.pickupLocationName || locMap.get(String(r.locationId)) || '',
           });
         });
     }
@@ -449,55 +496,72 @@ async function myReservations(req, res) {
   }
 }
 
-/* ---------------- Booking ---------------- */
-
 async function bookReservation(req, res) {
   try {
     const uid = req.user?.uid || 0;
     const eid = req.params.eid;
-    const { itemId, quantity, dateStart, dateEnd } = req.body;
+    const { itemId, quantity, dateStart, dateEnd, locationId } = req.body;
 
     if (!await userCanBook(uid)) {
       return res.status(403).json({ error: 'Vous n’êtes pas autorisé à réserver du matériel.' });
     }
-    if (!dateStart || !dateEnd) {
-      return res.status(400).json({ error: 'Dates de début et de fin obligatoires.' });
+    if (!dateStart || !dateEnd || !itemId || !locationId) {
+      return res.status(400).json({ error: 'itemId, locationId, dateStart, dateEnd obligatoires.' });
     }
     if (String(dateEnd) < String(dateStart)) {
       return res.status(400).json({ error: 'La date de fin doit être ≥ la date de début.' });
     }
 
-    const event = await getEvent(eid);
-    if (!event) return res.status(404).json({ error: 'Événement introuvable' });
-    if (!Number(event.bookingEnabled)) return res.status(400).json({ error: 'Réservation désactivée' });
+    const settings = await getParsedSettings();
+    const loc = settings.locations.find(l => String(l.id) === String(locationId));
+    if (!loc) return res.status(400).json({ error: 'Lieu invalide.' });
+
+    const invItem = settings.inventory.find(i => String(i.id) === String(itemId));
+    if (!invItem) return res.status(400).json({ error: 'Matériel invalide.' });
 
-    const items = JSON.parse(event.bookingItems || '[]');
-    const item = items.find(i => i.id === itemId);
-    if (!item) return res.status(400).json({ error: 'Matériel introuvable' });
+    const stockTotal = Number(invItem.stockByLocation?.[String(locationId)] || 0);
+    if (stockTotal <= 0) return res.status(400).json({ error: 'Stock indisponible sur ce lieu.' });
 
     const q = Number(quantity);
     if (!q || q <= 0) return res.status(400).json({ error: 'Quantité invalide' });
 
-    const allRes = JSON.parse(event.reservations || '[]');
-
-    const overlapping = allRes.filter(r => {
-      if (r.itemId !== itemId) return false;
-      if (r.status === 'cancelled') return false;
+    const event = await getEvent(eid);
+    if (!event) return res.status(404).json({ error: 'Événement introuvable' });
+    if (!Number(event.bookingEnabled)) return res.status(400).json({ error: 'Réservation désactivée' });
 
-      const startR = new Date(r.dateStart);
-      const endR = new Date(r.dateEnd);
-      const startN = new Date(dateStart);
-      const endN = new Date(dateEnd);
+    // Ensure item is allowed for this event
+    const allowedIds = (() => {
+      try {
+        const arr = JSON.parse(event.bookingItems || '[]');
+        return Array.isArray(arr) ? arr.map(String) : [];
+      } catch {
+        return [];
+      }
+    })();
+    if (!allowedIds.includes(String(itemId))) {
+      return res.status(400).json({ error: 'Ce matériel n’est pas autorisé pour cet événement.' });
+    }
 
-      return !(endN < startR || startN > endR);
-    });
+    // Global availability: check overlaps across all events reservations (same itemId + locationId)
+    const all = await getAllReservations();
+    const overlapping = all
+      .map(x => x.reservation)
+      .filter(r => r && String(r.itemId) === String(itemId))
+      .filter(r => String(r.locationId) === String(locationId))
+      .filter(r => String(r.status) !== 'cancelled')
+      .filter(r => {
+        const startR = new Date(r.dateStart);
+        const endR = new Date(r.dateEnd);
+        const startN = new Date(dateStart);
+        const endN = new Date(dateEnd);
+        return !(endN < startR || startN > endR);
+      });
 
     const used = overlapping.reduce((sum, r) => sum + Number(r.quantity || 0), 0);
-    const available = Number(item.total || 0) - used;
-    if (q > available) return res.status(400).json({ error: 'Matériel indisponible pour ces dates.' });
+    const available = stockTotal - used;
+    if (q > available) return res.status(400).json({ error: `Stock insuffisant sur ce lieu (dispo: ${available}).` });
 
     const rid = await nextReservationId();
-    const now = Date.now();
     const nbDays = daysBetween(dateStart, dateEnd);
 
     const reservation = {
@@ -505,31 +569,32 @@ async function bookReservation(req, res) {
       eid: String(eid),
       uid: String(uid),
       itemId: String(itemId),
+      locationId: String(locationId),
+      pickupLocationName: String(loc.name || loc.id),
       quantity: q,
       dateStart,
       dateEnd,
       days: nbDays,
       status: 'pending_admin',
       helloAssoOrderId: null,
-      createdAt: now,
-      pickupLocation: String(item.pickupLocation || ''),
+      createdAt: Date.now(),
     };
 
-    allRes.push(reservation);
-    event.reservations = JSON.stringify(allRes);
+    const resList = JSON.parse(event.reservations || '[]');
+    resList.push(reservation);
+    event.reservations = JSON.stringify(resList);
     await db.setObject(getEventKey(eid), event);
 
     try {
       await emailer.send('calendar-reservation-created', uid, {
         subject: 'Votre demande de réservation a été envoyée',
         eventTitle: event.title,
-        item: item.name,
+        item: invItem.name || invItem.id,
         quantity: reservation.quantity,
-        date: new Date().toLocaleString('fr-FR'),
         dateStart,
         dateEnd,
         days: nbDays,
-        pickupLocation: reservation.pickupLocation || 'Non précisé',
+        pickupLocation: reservation.pickupLocationName,
       });
     } catch (e) {
       console.warn('[calendar-onekite] email reservation-created error:', e.message);
@@ -545,7 +610,7 @@ async function bookReservation(req, res) {
   }
 }
 
-/* ---------------- Webhook ---------------- */
+/* ---------------- HelloAsso webhook ---------------- */
 
 async function helloAssoWebhook(req, res) {
   try {
@@ -565,7 +630,7 @@ async function helloAssoWebhook(req, res) {
     if (!event) throw new Error('Event not found');
 
     const reservations = JSON.parse(event.reservations || '[]');
-    const idx = reservations.findIndex(r => r.rid === rid);
+    const idx = reservations.findIndex(r => String(r.rid) === String(rid));
     if (idx === -1) throw new Error('Reservation not found');
 
     const reservation = reservations[idx];
@@ -578,13 +643,16 @@ async function helloAssoWebhook(req, res) {
     event.reservations = JSON.stringify(reservations);
     await db.setObject(getEventKey(eid), event);
 
+    const settings = await getParsedSettings();
+    const invItem = settings.inventory.find(i => String(i.id) === String(reservation.itemId));
+
     try {
       await emailer.send('calendar-payment-confirmed', reservation.uid, {
         subject: 'Votre paiement a été confirmé',
         eventTitle: event.title,
-        itemName: reservation.itemId,
+        itemName: invItem?.name || reservation.itemId,
         quantity: reservation.quantity,
-        pickupLocation: reservation.pickupLocation || 'Non précisé',
+        pickupLocation: reservation.pickupLocationName || reservation.locationId || 'Non précisé',
         dateStart: reservation.dateStart,
         dateEnd: reservation.dateEnd,
         days: reservation.days || 1,
@@ -644,13 +712,13 @@ Plugin.init = async function (params) {
   appRef = params.app;
 
   // Pages
-  router.get('/calendar', middleware.buildHeader, renderCalendarPage);
-  router.get('/calendar/my-reservations', middleware.buildHeader, renderMyReservationsPage);
+  router.get('/calendar', middleware.buildHeader, (req, res) => res.render('calendar', { title: 'Calendrier' }));
+  router.get('/calendar/my-reservations', middleware.buildHeader, (req, res) => res.render('calendar-my-reservations', { title: 'Mes réservations' }));
 
-  router.get('/admin/calendar/planning', middleware.admin.buildHeader, renderPlanningPage);
+  router.get('/admin/calendar/planning', middleware.admin.buildHeader, (req, res) => res.render('admin/calendar-planning', { title: 'Planning' }));
   router.get('/admin/plugins/calendar-onekite', middleware.admin.buildHeader, renderAdminPage);
 
-  // Ajaxify admin page under /api and /api/v3
+  // Admin page (ajaxify)
   mountApiBoth(router, 'get', '/admin/plugins/calendar-onekite', middleware.admin.checkPrivileges, renderAdminPage);
 
   // Settings save
@@ -662,12 +730,10 @@ Plugin.init = async function (params) {
   mountApiBoth(router, 'post', '/admin/calendar/reservation/:rid/cancel', middleware.admin.checkPrivileges, adminCancelReservation);
   mountApiBoth(router, 'get', '/admin/calendar/planning', middleware.admin.checkPrivileges, adminGetPlanning);
 
-  // Planning page ajaxify helper
-  router.get('/api/admin/calendar/planning/page', renderPlanningPage);
-  router.get('/api/v3/admin/calendar/planning/page', renderPlanningPage);
+  // Public inventory
+  mountApiBoth(router, 'get', '/calendar/inventory', inventoryApi);
 
-  // Public APIs + v3
-  // Events list (FullCalendar)
+  // Events list for FullCalendar
   mountApiBoth(router, 'get', '/calendar/events', async (req, res) => {
     try {
       const { start, end } = req.query;
@@ -713,13 +779,29 @@ Plugin.init = async function (params) {
     }
   });
 
+  // Event details: enrich with bookingItemIds + resolved items
   mountApiBoth(router, 'get', '/calendar/event/:eid', async (req, res) => {
     try {
+      const settings = await getParsedSettings();
+      const invMap = new Map(settings.inventory.map(i => [String(i.id), i]));
+
       const event = await getEvent(req.params.eid);
       if (!event) return res.status(404).json({ error: 'Événement introuvable' });
-      const items = JSON.parse(event.bookingItems || '[]');
-      const reservations = JSON.parse(event.reservations || '[]');
-      res.json({ ...event, bookingItems: items, reservations });
+
+      const bookingItemIds = (() => {
+        try {
+          const arr = JSON.parse(event.bookingItems || '[]');
+          return Array.isArray(arr) ? arr.map(String) : [];
+        } catch { return []; }
+      })();
+
+      const bookingItems = bookingItemIds.map(id => invMap.get(String(id))).filter(Boolean);
+
+      const reservations = (() => {
+        try { return JSON.parse(event.reservations || '[]'); } catch { return []; }
+      })();
+
+      res.json({ ...event, bookingItemIds, bookingItems, reservations });
     } catch (err) {
       res.status(500).json({ error: err.message });
     }
@@ -756,7 +838,7 @@ Plugin.init = async function (params) {
   // My reservations
   mountApiBoth(router, 'get', '/calendar/my-reservations', middleware.ensureLoggedIn, myReservations);
 
-  // HelloAsso webhook (keep non-v3 public path + v3 mirror if needed)
+  // HelloAsso webhook
   router.post('/api/calendar/helloasso/webhook', helloAssoWebhook);
   router.post('/api/v3/calendar/helloasso/webhook', helloAssoWebhook);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-calendar-onekite",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "Calendar + equipment booking + admin approval + HelloAsso payments for NodeBB v4 (no-jQuery UI)",
   "main": "library.js",
   "license": "MIT",

package/plugin.json

@@ -3,7 +3,7 @@
   "name": "Calendar Onekite",
   "description": "Calendrier + réservation matériel + validation admin + paiement HelloAsso pour NodeBB v4 (no-jQuery UI)",
   "url": "",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "library": "./library.js",
   "staticDirs": {
     "static": "static"

package/static/js/admin-planning.js

@@ -0,0 +1,133 @@
+define('plugins/nodebb-plugin-calendar-onekite/static/js/admin-planning', ['api', 'alerts'], function (api, alerts) {
+  'use strict';
+
+  const STATE = { inited:false, fc:null, locations:[], inventory:[], rows:[] };
+
+  function qs(sel, root=document){ return root.querySelector(sel); }
+  function escapeHtml(s){
+    return String(s ?? '').replaceAll('&','&amp;').replaceAll('<','&lt;').replaceAll('>','&gt;')
+      .replaceAll('"','&quot;').replaceAll("'","&#039;");
+  }
+
+  async function loadInventory() {
+    const data = await api.get('/calendar/inventory');
+    STATE.locations = Array.isArray(data?.locations) ? data.locations : [];
+    STATE.inventory = Array.isArray(data?.inventory) ? data.inventory : [];
+  }
+
+  async function loadPlanningRows() {
+    STATE.rows = await api.get('/admin/calendar/planning');
+    if (!Array.isArray(STATE.rows)) STATE.rows = [];
+  }
+
+  function fillFilters() {
+    const locSel = qs('#planning-filter-location');
+    const itemSel = qs('#planning-filter-item');
+    if (!locSel || !itemSel) return;
+
+    locSel.innerHTML = '<option value="">Tous</option>' + STATE.locations.map(l =>
+      `<option value="${escapeHtml(l.id)}">${escapeHtml(l.name||l.id)}</option>`
+    ).join('');
+
+    itemSel.innerHTML = '<option value="">Tous</option>' + STATE.inventory.map(i =>
+      `<option value="${escapeHtml(i.id)}">${escapeHtml(i.name||i.id)}</option>`
+    ).join('');
+  }
+
+  function colorForStatus(status) {
+    // don't hardcode colors in code for charts rule? This isn't matplotlib; ok.
+    if (status === 'paid') return '#d4edda';
+    if (status === 'awaiting_payment') return '#fff3cd';
+    if (status === 'pending_admin') return '#cfe2ff';
+    return '#e2e3e5';
+  }
+
+  function toFcEvents() {
+    const loc = qs('#planning-filter-location')?.value || '';
+    const item = qs('#planning-filter-item')?.value || '';
+    const status = qs('#planning-filter-status')?.value || '';
+
+    return STATE.rows
+      .filter(r => !loc || r.locationId === loc)
+      .filter(r => !item || r.itemId === item)
+      .filter(r => !status || r.status === status)
+      .map(r => {
+        // FullCalendar end is exclusive; add 1 day for all-day style ranges
+        const end = new Date(r.dateEnd);
+        end.setDate(end.getDate() + 1);
+
+        return {
+          id: String(r.rid),
+          title: `${r.itemName} x${r.quantity} — ${r.pickupLocation} — uid ${r.uid}`,
+          start: r.dateStart,
+          end: end.toISOString().slice(0,10),
+          allDay: true,
+          backgroundColor: colorForStatus(r.status),
+          borderColor: colorForStatus(r.status),
+          extendedProps: r,
+        };
+      });
+  }
+
+  function renderCalendar() {
+    const el = qs('#planning-calendar');
+    if (!el) return;
+    const FC = window.FullCalendar;
+    if (!FC) return alerts.error('FullCalendar non chargé');
+
+    if (STATE.fc) {
+      STATE.fc.removeAllEvents();
+      STATE.fc.addEventSource(toFcEvents());
+      return;
+    }
+
+    STATE.fc = new FC.Calendar(el, {
+      initialView: 'timeGridWeek',
+      height: 'auto',
+      locale: 'fr',
+      firstDay: 1,
+      headerToolbar: { left: 'prev,next today', center: 'title', right: 'timeGridWeek,dayGridMonth,listWeek' },
+      events: toFcEvents(),
+      eventClick: (arg) => {
+        const r = arg.event.extendedProps || {};
+        alerts.success(`RID ${r.rid} — ${r.status}`);
+      },
+    });
+    STATE.fc.render();
+  }
+
+  function bindFilters() {
+    ['#planning-filter-location', '#planning-filter-item', '#planning-filter-status'].forEach(sel => {
+      qs(sel)?.addEventListener('change', () => renderCalendar());
+    });
+  }
+
+  async function initOnce() {
+    if (STATE.inited) return;
+    if (!qs('#planning-calendar')) return;
+    STATE.inited = true;
+
+    try {
+      await Promise.all([loadInventory(), loadPlanningRows()]);
+      fillFilters();
+      bindFilters();
+      renderCalendar();
+    } catch (e) {
+      alerts.error(e?.message || e);
+    }
+  }
+
+  function resetIfLeft() {
+    if (!qs('#planning-calendar')) {
+      STATE.inited = false;
+      STATE.fc = null;
+      STATE.rows = [];
+    }
+  }
+
+  const obs = new MutationObserver(() => { resetIfLeft(); initOnce(); });
+  obs.observe(document.body, { childList:true, subtree:true });
+  initOnce();
+
+  return { init: initOnce };
+});

package/static/js/admin.js

@@ -13,10 +13,19 @@ define('plugins/nodebb-plugin-calendar-onekite/static/js/admin', ['api', 'alerts
   }
 
   async function saveSettings() {
+    const locationsJson = qs('#calendar-onekite-locations')?.value || '[]';
+    const inventoryJson = qs('#calendar-onekite-inventory')?.value || '[]';
+
+    // Validate JSON early to avoid saving broken config
+    try { JSON.parse(locationsJson || '[]'); } catch { return alerts.error('JSON Lieux invalide'); }
+    try { JSON.parse(inventoryJson || '[]'); } catch { return alerts.error('JSON Inventaire invalide'); }
+
     const settings = {
       allowedGroups: qs('#calendar-onekite-groups')?.value || '',
       allowedBookingGroups: qs('#calendar-onekite-book-groups')?.value || '',
       limit: qs('#calendar-onekite-widget-limit')?.value || '',
+      locationsJson,
+      inventoryJson,
       helloassoApiBase: qs('#calendar-onekite-helloasso-apibase')?.value || '',
       helloassoOrganizationSlug: qs('#calendar-onekite-helloasso-org')?.value || '',
       helloassoFormSlug: qs('#calendar-onekite-helloasso-form')?.value || '',

package/static/js/calendar.js

@@ -8,6 +8,9 @@ define('plugins/nodebb-plugin-calendar-onekite/static/js/calendar', ['api', 'ale
     currentEid: null,
     canCreate: false,
     canBook: false,
+    locations: [],
+    inventory: [],
+    currentEvent: null,
   };
 
   function qs(sel, root = document) { return root.querySelector(sel); }
@@ -51,6 +54,17 @@ define('plugins/nodebb-plugin-calendar-onekite/static/js/calendar', ['api', 'ale
     }
   }
 
+  async function loadInventory() {
+    try {
+      const data = await api.get('/calendar/inventory');
+      STATE.locations = Array.isArray(data?.locations) ? data.locations : [];
+      STATE.inventory = Array.isArray(data?.inventory) ? data.inventory : [];
+    } catch (e) {
+      STATE.locations = [];
+      STATE.inventory = [];
+    }
+  }
+
   function bindModalClose() {
     qsa('.calendar-close').forEach(btn => {
       btn.addEventListener('click', () => hide(btn.closest('.calendar-modal')));
@@ -59,6 +73,7 @@ define('plugins/nodebb-plugin-calendar-onekite/static/js/calendar', ['api', 'ale
 
   function resetEventModal() {
     STATE.currentEid = null;
+    STATE.currentEvent = null;
     qs('#event-modal-title').textContent = 'Nouvel événement';
     qs('#event-title').value = '';
     qs('#event-description').value = '';
@@ -67,49 +82,46 @@ define('plugins/nodebb-plugin-calendar-onekite/static/js/calendar', ['api', 'ale
     qs('#event-allDay').checked = false;
     qs('#event-location').value = '';
     qs('#event-bookingEnabled').checked = false;
-    qs('#booking-items').innerHTML = '<p>Aucun matériel.</p>';
+
+    renderBookingChecklist([]);
 
     qs('#event-delete').style.display = 'none';
     qs('#event-reserve').style.display = STATE.canBook ? 'inline-block' : 'none';
   }
 
-  function renderBookingItems(items) {
+  function renderBookingChecklist(selectedIds) {
     const root = qs('#booking-items');
     if (!root) return;
-    if (!Array.isArray(items) || items.length === 0) {
-      root.innerHTML = '<p>Aucun matériel.</p>';
+
+    const sel = new Set((selectedIds || []).map(String));
+    if (!STATE.inventory.length) {
+      root.innerHTML = '<p class="text-muted">Aucun matériel (configurez l’inventaire dans l’admin).</p>';
       return;
     }
-    root.innerHTML = items.map((it, idx) => `
-      <div class="onekite-item" data-idx="${idx}">
-        <div class="form-group"><label>Nom</label><input class="form-control js-item-name" value="${escapeHtml(it.name||'')}"></div>
-        <div class="form-group"><label>ID</label><input class="form-control js-item-id" value="${escapeHtml(it.id||'')}"></div>
-        <div class="form-group"><label>Total dispo</label><input type="number" class="form-control js-item-total" value="${Number(it.total||0)}" min="0"></div>
-        <div class="form-group"><label>Prix / jour</label><input type="number" class="form-control js-item-price" value="${Number(it.price||0)}" min="0"></div>
-        <div class="form-group"><label>Lieu retrait</label><input class="form-control js-item-pickup" value="${escapeHtml(it.pickupLocation||'')}"></div>
-        <button class="btn btn-sm btn-danger js-item-remove">Supprimer</button>
-        <hr>
-      </div>
-    `).join('');
+
+    root.innerHTML = STATE.inventory.map(item => {
+      const checked = sel.has(String(item.id)) ? 'checked' : '';
+      return `
+        <div class="form-check">
+          <label class="form-check-label">
+            <input class="form-check-input js-book-item" type="checkbox" value="${escapeHtml(item.id)}" ${checked}>
+            ${escapeHtml(item.name || item.id)} — ${Number(item.price||0)} €/jour
+          </label>
+        </div>
+      `;
+    }).join('');
   }
 
-  function readBookingItemsFromModal() {
-    const blocks = qsa('#booking-items .onekite-item');
-    const items = [];
-    for (const b of blocks) {
-      const name = b.querySelector('.js-item-name')?.value?.trim() || '';
-      const id = b.querySelector('.js-item-id')?.value?.trim() || '';
-      const total = Number(b.querySelector('.js-item-total')?.value || 0);
-      const price = Number(b.querySelector('.js-item-price')?.value || 0);
-      const pickupLocation = b.querySelector('.js-item-pickup')?.value?.trim() || '';
-      if (!id) continue;
-      items.push({ id, name, total, price, pickupLocation });
-    }
-    return items;
+  function readSelectedItemIds() {
+    return qsa('.js-book-item')
+      .filter(el => el.checked)
+      .map(el => String(el.value));
   }
 
   function fillEventModal(ev) {
     STATE.currentEid = String(ev.eid);
+    STATE.currentEvent = ev;
+
     qs('#event-modal-title').textContent = 'Éditer l’événement';
     qs('#event-title').value = ev.title || '';
     qs('#event-description').value = ev.description || '';
@@ -119,7 +131,8 @@ define('plugins/nodebb-plugin-calendar-onekite/static/js/calendar', ['api', 'ale
     qs('#event-location').value = ev.location || '';
     qs('#event-bookingEnabled').checked = !!Number(ev.bookingEnabled);
 
-    renderBookingItems(ev.bookingItems || []);
+    const ids = Array.isArray(ev.bookingItemIds) ? ev.bookingItemIds : (Array.isArray(ev.bookingItems) ? ev.bookingItems.map(x => x.id) : []);
+    renderBookingChecklist(ids);
 
     qs('#event-delete').style.display = STATE.canCreate ? 'inline-block' : 'none';
     qs('#event-reserve').style.display = STATE.canBook ? 'inline-block' : 'none';
@@ -154,7 +167,7 @@ define('plugins/nodebb-plugin-calendar-onekite/static/js/calendar', ['api', 'ale
       allDay: qs('#event-allDay').checked,
       location: qs('#event-location').value || '',
       bookingEnabled: qs('#event-bookingEnabled').checked,
-      bookingItems: readBookingItemsFromModal(),
+      bookingItemIds: readSelectedItemIds(),
       visibility: 'public',
     };
 
@@ -184,107 +197,70 @@ define('plugins/nodebb-plugin-calendar-onekite/static/js/calendar', ['api', 'ale
       hide(qs('#calendar-event-modal'));
       STATE.fc?.refetchEvents();
     } catch (e) {
-      // Some NodeBB api wrappers don't have del(); fallback to fetch
-      try {
-        const csrf = window.config?.csrf_token || window.config?.csrfToken;
-        const res = await fetch(`/api/v3/calendar/event/${encodeURIComponent(STATE.currentEid)}`, {
-          method: 'DELETE',
-          headers: csrf ? { 'x-csrf-token': csrf } : {},
-          credentials: 'same-origin',
-        });
-        if (!res.ok) throw new Error(await res.text());
-        alerts.success('Événement supprimé');
-        hide(qs('#calendar-event-modal'));
-        STATE.fc?.refetchEvents();
-      } catch (e2) {
-        alerts.error(e2?.message || e2);
-      }
+      alerts.error(e?.message || e);
     }
   }
 
-  function addBookingItemRow() {
-    const root = qs('#booking-items');
-    if (!root) return;
-    if (root.textContent.includes('Aucun matériel')) root.innerHTML = '';
-
-    root.insertAdjacentHTML('beforeend', `
-      <div class="onekite-item">
-        <div class="form-group"><label>Nom</label><input class="form-control js-item-name" value=""></div>
-        <div class="form-group"><label>ID</label><input class="form-control js-item-id" value=""></div>
-        <div class="form-group"><label>Total dispo</label><input type="number" class="form-control js-item-total" value="0" min="0"></div>
-        <div class="form-group"><label>Prix / jour</label><input type="number" class="form-control js-item-price" value="0" min="0"></div>
-        <div class="form-group"><label>Lieu retrait</label><input class="form-control js-item-pickup" value=""></div>
-        <button class="btn btn-sm btn-danger js-item-remove">Supprimer</button>
-        <hr>
-      </div>
-    `);
-  }
+  /* ---------- Reservation UI ---------- */
 
-  function bindEventModalButtons() {
-    qs('#event-save')?.addEventListener('click', saveEvent);
-    qs('#event-delete')?.addEventListener('click', deleteEvent);
-    qs('#event-add-item')?.addEventListener('click', addBookingItemRow);
+  function renderLocationSelect(selected) {
+    const sel = qs('#reserve-location');
+    if (!sel) return;
+    const opts = STATE.locations.map(l => `<option value="${escapeHtml(l.id)}">${escapeHtml(l.name||l.id)}</option>`).join('');
+    sel.innerHTML = opts || '<option value="">(aucun lieu)</option>';
+    if (selected) sel.value = selected;
+  }
 
-    qs('#booking-items')?.addEventListener('click', (ev) => {
-      const t = ev.target;
-      if (!(t instanceof HTMLElement)) return;
-      if (t.classList.contains('js-item-remove')) {
-        t.closest('.onekite-item')?.remove();
-      }
-    });
+  function openReserveModal(event, prefillDates) {
+    qs('#reserve-title').textContent = `Réserver – ${event.title || ''}`;
 
-    // Reservation flow: open reserve modal and fill items
-    qs('#event-reserve')?.addEventListener('click', async () => {
-      if (!STATE.canBook) return alerts.error('Vous n’êtes pas autorisé à réserver.');
-      if (!STATE.currentEid) return;
+    renderLocationSelect(STATE.locations[0]?.id || '');
 
-      try {
-        const ev = await api.get(`/calendar/event/${encodeURIComponent(STATE.currentEid)}`);
-        openReserveModal(ev);
-      } catch (e) {
-        alerts.error(e?.message || e);
-      }
-    });
-  }
+    const allowed = new Set((event.bookingItemIds || []).map(String));
+    const items = STATE.inventory.filter(i => allowed.has(String(i.id)));
 
-  function openReserveModal(event) {
-    // Fill title
-    qs('#reserve-title').textContent = `Réserver – ${event.title || ''}`;
-    const items = Array.isArray(event.bookingItems) ? event.bookingItems : [];
     const reserveItems = qs('#reserve-items');
     reserveItems.innerHTML = items.length ? items.map(it => `
       <div class="form-check">
         <label class="form-check-label">
           <input class="form-check-input js-reserve-item" type="radio" name="reserveItem" value="${escapeHtml(it.id)}">
-          ${escapeHtml(it.name || it.id)} (dispo: ${Number(it.total||0)}, ${Number(it.price||0)} €/jour) — retrait: ${escapeHtml(it.pickupLocation||'')}
+          ${escapeHtml(it.name || it.id)} (${Number(it.price||0)} €/jour)
         </label>
       </div>
-    `).join('') : '<p>Aucun matériel réservable.</p>';
+    `).join('') : '<p>Aucun matériel réservable pour cet événement.</p>';
 
-    // Pre-fill dates from event
-    const start = new Date(event.start);
-    const end = new Date(event.end);
     const toDateInput = (d) => `${d.getFullYear()}-${pad(d.getMonth()+1)}-${pad(d.getDate())}`;
-    qs('#reserve-start').value = toDateInput(start);
-    qs('#reserve-end').value = toDateInput(end);
+
+    if (prefillDates?.dateStart && prefillDates?.dateEnd) {
+      qs('#reserve-start').value = prefillDates.dateStart;
+      qs('#reserve-end').value = prefillDates.dateEnd;
+    } else {
+      const start = new Date(event.start);
+      const end = new Date(event.end);
+      qs('#reserve-start').value = toDateInput(start);
+      qs('#reserve-end').value = toDateInput(end);
+    }
 
     show(qs('#calendar-reserve-modal'));
   }
 
   async function submitReservationFromModal() {
     const itemId = qs('input[name="reserveItem"]:checked')?.value;
+    const locationId = qs('#reserve-location')?.value;
     const dateStart = qs('#reserve-start')?.value;
     const dateEnd = qs('#reserve-end')?.value;
     const quantity = Number(qs('#reserve-quantity')?.value || 1);
 
     if (!STATE.currentEid) return alerts.error('Aucun événement sélectionné.');
     if (!itemId) return alerts.error('Choisissez un matériel.');
+    if (!locationId) return alerts.error('Choisissez un lieu.');
     if (!dateStart || !dateEnd) return alerts.error('Choisissez des dates.');
     if (quantity <= 0) return alerts.error('Quantité invalide.');
 
     try {
       const res = await api.post(`/calendar/event/${encodeURIComponent(STATE.currentEid)}/book`, {
         itemId,
+        locationId,
         quantity,
         dateStart,
         dateEnd,
@@ -292,16 +268,47 @@ define('plugins/nodebb-plugin-calendar-onekite/static/js/calendar', ['api', 'ale
       alerts.success(res?.message || 'Demande envoyée.');
       hide(qs('#calendar-reserve-modal'));
       hide(qs('#calendar-event-modal'));
-      STATE.fc?.refetchEvents();
     } catch (e) {
       alerts.error(e?.message || e);
     }
   }
 
+  function bindEventModalButtons() {
+    qs('#event-save')?.addEventListener('click', saveEvent);
+    qs('#event-delete')?.addEventListener('click', deleteEvent);
+
+    // Reservation flow: open reserve modal from event
+    qs('#event-reserve')?.addEventListener('click', async () => {
+      if (!STATE.canBook) return alerts.error('Vous n’êtes pas autorisé à réserver.');
+      if (!STATE.currentEid) return;
+
+      try {
+        const ev = await api.get(`/calendar/event/${encodeURIComponent(STATE.currentEid)}`);
+        openReserveModal(ev);
+      } catch (e) {
+        alerts.error(e?.message || e);
+      }
+    });
+  }
+
   function bindReserveModalButtons() {
+    // Add location select if missing (back-compat)
+    if (!qs('#reserve-location')) {
+      const itemsRoot = qs('#reserve-items');
+      if (itemsRoot) {
+        itemsRoot.insertAdjacentHTML('beforebegin', `
+          <div class="form-group">
+            <label>Lieu de retrait</label>
+            <select id="reserve-location" class="form-control"></select>
+          </div>
+        `);
+      }
+    }
     qs('#reserve-confirm')?.addEventListener('click', submitReservationFromModal);
   }
 
+  /* ---------- FullCalendar ---------- */
+
   function buildCalendar() {
     const el = qs('#calendar');
     if (!el) return;
@@ -319,7 +326,7 @@ define('plugins/nodebb-plugin-calendar-onekite/static/js/calendar', ['api', 'ale
         center: 'title',
         right: 'dayGridMonth,timeGridWeek,timeGridDay,listWeek',
       },
-      selectable: STATE.canCreate,
+      selectable: (STATE.canCreate || STATE.canBook),
       selectMirror: true,
       editable: STATE.canCreate,
       eventDurationEditable: STATE.canCreate,
@@ -343,8 +350,22 @@ define('plugins/nodebb-plugin-calendar-onekite/static/js/calendar', ['api', 'ale
         }
       },
 
-      select: (sel) => {
-        openEventModalNew({ start: sel.startStr, end: sel.endStr });
+      // C mode: selection can create OR open reservation helper
+      select: async (sel) => {
+        const dateStart = sel.startStr.slice(0,10);
+        // FullCalendar end is exclusive; show end-1 day for date inputs
+        const endDate = new Date(sel.end);
+        endDate.setDate(endDate.getDate() - 1);
+        const dateEnd = `${endDate.getFullYear()}-${pad(endDate.getMonth()+1)}-${pad(endDate.getDate())}`;
+
+        if (STATE.canCreate) {
+          openEventModalNew({ start: sel.startStr, end: sel.endStr });
+          return;
+        }
+        if (STATE.canBook) {
+          alerts.info('Cliquez sur un événement, puis "Réserver" pour lier la réservation à un événement.');
+          return;
+        }
       },
 
       eventClick: (arg) => {
@@ -400,11 +421,14 @@ define('plugins/nodebb-plugin-calendar-onekite/static/js/calendar', ['api', 'ale
     bindEventModalButtons();
     bindReserveModalButtons();
 
-    loadPermissions().then(() => {
-      const btn = qs('#calendar-new-event');
-      if (btn) btn.style.display = STATE.canCreate ? 'inline-block' : 'none';
-      buildCalendar();
-    });
+    Promise.all([loadPermissions(), loadInventory()])
+      .then(() => {
+        const btn = qs('#calendar-new-event');
+        if (btn) btn.style.display = STATE.canCreate ? 'inline-block' : 'none';
+        // default inventory checklist for new event
+        renderBookingChecklist([]);
+        buildCalendar();
+      });
   }
 
   function resetIfLeft() {
@@ -412,6 +436,7 @@ define('plugins/nodebb-plugin-calendar-onekite/static/js/calendar', ['api', 'ale
       STATE.inited = false;
       STATE.fc = null;
       STATE.currentEid = null;
+      STATE.currentEvent = null;
     }
   }
 

package/templates/admin/calendar-planning.tpl

@@ -1,25 +1,35 @@
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/fullcalendar@6.1.15/index.global.min.css">
+<link rel="stylesheet" href="/plugins/nodebb-plugin-calendar-onekite/static/css/calendar-onekite.css">
+
 <div id="calendar-planning">
-  <h2>Planning des réservations</h2>
-  <table class="table">
-    <thead>
-      <tr>
-        <th>Événement</th>
-        <th>Matériel</th>
-        <th>Lieu retrait</th>
-        <th>UID</th>
-        <th>Quantité</th>
-        <th>Début</th>
-        <th>Fin</th>
-        <th>Jours</th>
-        <th>Statut</th>
-      </tr>
-    </thead>
-    <tbody id="planning-body">
-      <tr><td colspan="9">Chargement…</td></tr>
-    </tbody>
-  </table>
+  <h2>Planning (graphique)</h2>
+
+  <div class="row mb-3">
+    <div class="col-md-4">
+      <label>Lieu</label>
+      <select id="planning-filter-location" class="form-control"></select>
+    </div>
+    <div class="col-md-4">
+      <label>Matériel</label>
+      <select id="planning-filter-item" class="form-control"></select>
+    </div>
+    <div class="col-md-4">
+      <label>Statut</label>
+      <select id="planning-filter-status" class="form-control">
+        <option value="">Tous</option>
+        <option value="pending_admin">pending_admin</option>
+        <option value="awaiting_payment">awaiting_payment</option>
+        <option value="paid">paid</option>
+      </select>
+    </div>
+  </div>
+
+  <div id="planning-calendar"></div>
 </div>
 
+<script src="https://cdn.jsdelivr.net/npm/fullcalendar@6.1.15/index.global.min.js"></script>
 <script>
-require(['plugins/nodebb-plugin-calendar-onekite/static/js/admin'], function () {});
+require(['plugins/nodebb-plugin-calendar-onekite/static/js/admin-planning'], function (Mod) {
+  Mod.init && Mod.init();
+});
 </script>

package/templates/admin/plugins/calendar-onekite.tpl

@@ -25,6 +25,24 @@
     <input id="calendar-onekite-widget-limit" type="number" class="form-control" value="{settings.limit}">
   </div>
 
+  <hr>
+  <h3>Lieux & Inventaire (global)</h3>
+  <p class="text-muted">
+    Les stocks sont globaux et séparés par lieu. Format JSON.
+  </p>
+
+  <div class="form-group">
+    <label>Lieux (locations)</label>
+    <textarea id="calendar-onekite-locations" class="form-control" rows="4">{settings.locationsJson}</textarea>
+    <small>Ex: [{"id":"arnaud","name":"Chez Arnaud"},{"id":"siege","name":"Siège Onekite"}]</small>
+  </div>
+
+  <div class="form-group">
+    <label>Inventaire (inventory)</label>
+    <textarea id="calendar-onekite-inventory" class="form-control" rows="6">{settings.inventoryJson}</textarea>
+    <small>Ex: [{"id":"wing","name":"Aile Wing","price":5,"stockByLocation":{"arnaud":1,"siege":0}}]</small>
+  </div>
+
   <hr>
   <h3>HelloAsso</h3>
   <div class="form-group">

package/templates/calendar.tpl

@@ -52,8 +52,11 @@
       <label><input type="checkbox" id="event-bookingEnabled"> Activer les réservations</label>
     </div>
 
-    <div id="booking-items"></div>
-    <button id="event-add-item" class="btn btn-secondary btn-sm">+ Ajouter un matériel</button>
+    <div class="form-group">
+      <label>Matériel autorisé pour cet événement</label>
+      <div id="booking-items"></div>
+      <small class="text-muted">Le stock est global par lieu (configuré dans l’admin du plugin).</small>
+    </div>
 
     <div style="margin-top: 20px;">
       <button id="event-save" class="btn btn-primary">Enregistrer</button>
@@ -70,6 +73,11 @@
     <h3 id="reserve-title"></h3>
     <div id="reserve-items"></div>
 
+    <div class="form-group">
+      <label>Lieu de retrait</label>
+      <select id="reserve-location" class="form-control"></select>
+    </div>
+
     <div class="form-group">
       <label>Date de début</label>
       <input type="date" id="reserve-start" class="form-control">