nodebb-plugin-equipment-calendar 0.8.6 → 0.9.1

package/library.js

@@ -27,12 +27,12 @@ const DEFAULT_SETTINGS = {
   creatorGroups: 'registered-users',
   approverGroup: 'administrators',
   notifyGroup: 'administrators',
-  // JSON array of items: [{ "id": "cam1", "name": "Caméra A", "priceCents": 5000, "location": "Stock A", "active": true }]
+  // JSON array of items: [{ "id": "cam1", "name": "Caméra A", "price": 5000, "location": "Stock A", "active": true }]
   itemsJson: '[]',
   itemsSource: 'manual',
   ha_itemsFormType: '',
   ha_itemsFormSlug: '',
-  ha_locationMapJson: '{}',
+  
   ha_calendarItemNamePrefix: 'Location matériel',
   paymentTimeoutMinutes: 10,
   // HelloAsso
@@ -49,18 +49,11 @@ const DEFAULT_SETTINGS = {
 };
 
 
-function parseLocationMap(locationMapJson) {
-  try {
-    const obj = JSON.parse(locationMapJson || '{}');
-    return (obj && typeof obj === 'object') ? obj : {};
-  } catch (e) {
-    return {};
-  }
-}
 
 let haTokenCache = null; // { accessToken, refreshToken, expMs }
 
-async function getHelloAssoAccessToken(settings, opts = {}) {
+async function getHelloAssoAccessToken(settings,
+    saved, opts = {}) {
   const now = Date.now();
   if (!opts.force && haTokenCache && haTokenCache.accessToken && haTokenCache.expMs && now < haTokenCache.expMs - 30_000) {
     return haTokenCache.accessToken;
@@ -121,7 +114,8 @@ async function getHelloAssoAccessToken(settings, opts = {}) {
 }
 
 
-async function createHelloAssoCheckoutIntent(settings, bookingId, reservations) {
+async function createHelloAssoCheckoutIntent(settings,
+    saved, bookingId, reservations) {
   const org = String(settings.ha_organizationSlug || '').trim();
   if (!org) throw new Error('HelloAsso organization slug missing');
 
@@ -135,9 +129,11 @@ async function createHelloAssoCheckoutIntent(settings, bookingId, reservations)
   items.forEach(i => { byId[i.id] = i; });
 
   const names = reservations.map(r => (byId[r.itemId] && byId[r.itemId].name) || r.itemId);
+  const days = reservations.length ? Math.max(1, Math.round((reservations[0].endMs - reservations[0].startMs) / (24*60*60*1000))) : 1;
   const totalAmount = reservations.reduce((sum, r) => {
-    const price = (byId[r.itemId] && parseInt(byId[r.itemId].priceCents, 10)) || 0;
-    return sum + (Number.isFinite(price) ? price : 0);
+    const priceEuro = (byId[r.itemId] && parseFloat(byId[r.itemId].price)) || 0;
+    const priceCents = Math.round((Number.isFinite(priceEuro) ? priceEuro : 0) * 100);
+    return sum + (priceCents * days);
   }, 0);
 
   if (!totalAmount || totalAmount <= 0) {
@@ -180,7 +176,8 @@ async function createHelloAssoCheckoutIntent(settings, bookingId, reservations)
   return await resp.json();
 }
 
-async function fetchHelloAssoCheckoutIntent(settings, checkoutIntentId) {
+async function fetchHelloAssoCheckoutIntent(settings,
+    saved, checkoutIntentId) {
   const org = String(settings.ha_organizationSlug || '').trim();
   const token = await getHelloAssoAccessToken(settings);
   const url = `https://api.helloasso.com/v5/organizations/${encodeURIComponent(org)}/checkout-intents/${encodeURIComponent(checkoutIntentId)}`;
@@ -248,8 +245,8 @@ async function fetchHelloAssoItems(settings) {
     const name = String(it.name || it.label || it.title || '').trim() || (tierName ? String(tierName) : id);
     if (!id || !name) return;
     const amount = it.amount || it.price || it.unitPrice || it.totalAmount || it.initialAmount;
-    const priceCents = (typeof amount === 'number' ? amount : parseInt(amount, 10)) || 0;
-    out.push({ id, name, priceCents: String(priceCents), location: '' });
+    const price = (typeof amount === 'number' ? amount : parseInt(amount, 10)) || 0;
+    out.push({ id, name, price: String(price), location: '' });
   }
 
   // Try a few known layouts
@@ -285,7 +282,7 @@ function parseItems(itemsJson) {
     return arr.map(it => ({
       id: String(it.id || '').trim(),
       name: String(it.name || '').trim(),
-      priceCents: Number(it.priceCents || 0),
+      price: Number(it.price || 0),
       location: String(it.location || '').trim(),
       active: it.active !== false,
     })).filter(it => it.id && it.name);
@@ -297,23 +294,20 @@ function parseItems(itemsJson) {
 async function getActiveItems(settings) {
   const source = String(settings.itemsSource || 'manual');
   if (source === 'helloasso') {
-    const rawItems = await fetchHelloAssoItems(settings);
-    const locMap = parseLocationMap(settings.ha_locationMapJson);
-    return (rawItems || []).map((it) => {
+    const rawItems = await fetchHelloAssoItems(settings);    return (rawItems || []).map((it) => {
       const id = String(it.id || it.itemId || it.reference || it.slug || it.name || '').trim();
       const name = String(it.name || it.label || it.title || id).trim();
       // Price handling is not displayed in the public calendar, keep a field if you want later
-      const price =
+      const priceRaw =
         (it.price && (it.price.value || it.price.amount)) ||
         (it.amount && (it.amount.value || it.amount)) ||
         it.price;
-      const priceCents = typeof price === 'number' ? price : 0;
+      const price = (typeof priceRaw === 'number' ? priceRaw : parseInt(priceRaw, 10)) || 0;
 
       return {
         id: id || name,
         name,
-        location: String(locMap[id] || ''),
-        priceCents,
+        price,
         active: true,
         source: 'helloasso',
       };
@@ -513,14 +507,15 @@ async function helloAssoGetAccessToken(settings) {
   return resp.data.access_token;
 }
 
-async function helloAssoCreateCheckout(settings, token, reservation, item) {
+async function helloAssoCreateCheckout(settings,
+    saved, token, reservation, item) {
   // Minimal: create a checkout intent and return redirectUrl
   // This endpoint/payload may need adaptation depending on your HelloAsso setup.
   const org = settings.ha_organizationSlug;
   if (!org) throw new Error('HelloAsso organizationSlug missing');
 
   const url = `https://api.helloasso.com/v5/organizations/${encodeURIComponent(org)}/checkout-intents`;
-  const amountCents = Math.max(0, Number(item.priceCents || 0));
+  const amountCents = Math.max(0, Number(item.price || 0));
 
   const payload = {
     totalAmount: amountCents,
@@ -771,6 +766,7 @@ async function renderAdminReservationsPage(req, res) {
   res.render('admin/plugins/equipment-calendar-reservations', {
     title: 'Equipment Calendar - Réservations',
     settings,
+    saved,
     rows: pageRows,
     hasRows: pageRows.length > 0,
     itemOptions: itemOptions.map(o => ({ ...o, selected: o.id === itemId })),
@@ -842,7 +838,8 @@ async function handleHelloAssoTest(req, res) {
     const clear = String(req.query.clear || '') === '1';
     // force=1 skips in-memory cache and refresh_token; clear=1 wipes stored refresh token
     haTokenCache = null;
-    await getHelloAssoAccessToken(settings, { force, clearStored: clear });
+    await getHelloAssoAccessToken(settings,
+    saved, { force, clearStored: clear });
     const items = await fetchHelloAssoItems(settings);
     const list = Array.isArray(items) ? items : (Array.isArray(items.data) ? items.data : []);
     count = list.length;
@@ -865,6 +862,7 @@ async function handleHelloAssoTest(req, res) {
     message,
     count,
     settings,
+    saved,
     sampleItems,
     hasSampleItems,
     hasSampleItems: sampleItems && sampleItems.length > 0,
@@ -873,9 +871,11 @@ async function handleHelloAssoTest(req, res) {
 
 async function renderAdminPage(req, res) {
   const settings = await getSettings();
+  const saved = String(req.query.saved || '') === '1';
   res.render('admin/plugins/equipment-calendar', {
     title: 'Equipment Calendar',
     settings,
+    saved,
     saved: req.query && String(req.query.saved || '') === '1',
     purged: req.query && parseInt(req.query.purged, 10) || 0,
     view_dayGridMonth: (settings.defaultView || 'dayGridMonth') === 'dayGridMonth',
@@ -900,7 +900,8 @@ async function handleHelloAssoCallback(req, res) {
 
   try {
     if (!checkoutIntentId) throw new Error('checkoutIntentId manquant');
-    const checkout = await fetchHelloAssoCheckoutIntent(settings, checkoutIntentId);
+    const checkout = await fetchHelloAssoCheckoutIntent(settings,
+    saved, checkoutIntentId);
 
     const paid = isCheckoutPaid(checkout);
     if (paid) {
@@ -1150,7 +1151,8 @@ async function renderApprovalsPage(req, res) {
 
 // --- Actions ---
 
-async function createReservationForItem(req, res, settings, itemId, startMs, endMs, notesUser, bookingId) {
+async function createReservationForItem(req, res, settings,
+    saved, itemId, startMs, endMs, notesUser, bookingId) {
   const items = await getActiveItems(settings);
   const item = items.find(i => i.id === itemId);
   if (!item) {
@@ -1194,7 +1196,8 @@ async function handleCreateReservation(req, res) {
     const itemIdsRaw = String(req.body.itemIds || req.body.itemId || '').trim();
   const itemIds = itemIdsRaw.split(',').map(s => s.trim()).filter(Boolean);
   if (!itemIds.length) {
-    return res.status(400).send('itemId required');
+    req.flash('error', 'Veuillez sélectionner au moins un matériel.');
+    return res.redirect('/equipment/calendar');
   }
     const item = items.find(i => i.id === itemId);
     if (!item) return res.status(400).send('Invalid item');
@@ -1274,7 +1277,8 @@ async function handleApproveReservation(req, res) {
         return res.status(400).send('HelloAsso not configured');
       }
       const token = await helloAssoGetAccessToken(settings);
-      const checkout = await helloAssoCreateCheckout(settings, token, reservation, item);
+      const checkout = await helloAssoCreateCheckout(settings,
+    saved, token, reservation, item);
       reservation.ha_checkoutIntentId = checkout.checkoutIntentId;
       reservation.ha_paymentUrl = checkout.paymentUrl;
     }
@@ -1426,7 +1430,7 @@ async function handleAdminSave(req, res) {
       itemsSource: String(req.body.itemsSource || DEFAULT_SETTINGS.itemsSource),
       ha_itemsFormType: String(req.body.ha_itemsFormType || DEFAULT_SETTINGS.ha_itemsFormType),
       ha_itemsFormSlug: String(req.body.ha_itemsFormSlug || DEFAULT_SETTINGS.ha_itemsFormSlug),
-      ha_locationMapJson: String(req.body.ha_locationMapJson || DEFAULT_SETTINGS.ha_locationMapJson),
+      
       ha_clientId: String(req.body.ha_clientId || ''),
       ha_clientSecret: String(req.body.ha_clientSecret || ''),
       ha_organizationSlug: String(req.body.ha_organizationSlug || ''),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-equipment-calendar",
-  "version": "0.8.6",
+  "version": "0.9.1",
   "description": "Equipment reservation calendar for NodeBB (FullCalendar, approvals, HelloAsso payments)",
   "main": "library.js",
   "scripts": {

package/plugin.json

@@ -25,6 +25,6 @@
   "scripts": [
     "public/js/client.js"
   ],
-  "version": "0.5.0",
+  "version": "0.5.6",
   "minver": "4.7.1"
 }

package/public/js/client.js

@@ -1,3 +1,29 @@
+
+  function updateTotalPrice() {
+    try {
+      const sel = document.getElementById('ec-item-ids');
+      const out = document.getElementById('ec-total-price');
+      const daysEl = document.getElementById('ec-total-days');
+      if (!sel || !out) return;
+      let total = 0;
+      Array.from(sel.selectedOptions || []).forEach(opt => {
+        const p = parseFloat(opt.getAttribute('data-price') || '0');
+        if (!Number.isNaN(p)) total += p;
+      });
+      const days = getReservationDays();
+      const finalTotal = total * days;
+      if (daysEl) {
+        daysEl.textContent = days + (days > 1 ? ' jours' : ' jour');
+      }
+      const txt = Number.isInteger(finalTotal) ? String(finalTotal) : finalTotal.toFixed(2);
+      out.textContent = txt + ' €';
+    } catch (e) {}
+  });
+      const txt = Number.isInteger(total) ? String(total) : total.toFixed(2);
+      out.textContent = txt + ' €';
+    } catch (e) {}
+  }
+
 'use strict';
 /* global window, document, FullCalendar, bootbox */
 
@@ -174,3 +200,14 @@
     initCalendar();
   }
 }());
+
+  const ecItemSel = document.getElementById('ec-item-ids');
+  if (ecItemSel) { ecItemSel.addEventListener('change', updateTotalPrice); updateTotalPrice(); }
+
+  function getReservationDays() {
+    const startMs = parseInt(document.getElementById('ec-start-ms')?.value || '0', 10);
+    const endMs = parseInt(document.getElementById('ec-end-ms')?.value || '0', 10);
+    if (!startMs || !endMs || endMs <= startMs) return 1;
+    const days = Math.round((endMs - startMs) / (24*60*60*1000));
+    return days > 0 ? days : 1;
+  }

package/public/templates/admin/plugins/equipment-calendar.tpl

@@ -28,55 +28,14 @@
     <div class="alert alert-warning">
       Le champ "Matériel" doit être un JSON valide (array). Exemple :
       <pre class="mb-0">[
-  { "id": "cam1", "name": "Caméra A", "priceCents": 50, "location": "Stock A", "active": true },
-  { "id": "light1", "name": "Projecteur", "priceCents": 20, "location": "Stock B", "active": true }
+  { "id": "cam1", "name": "Caméra A", "price": 50, "": "Stock A", "active": true },
+  { "id": "light1", "name": "Projecteur", "price": 20, "": "Stock B", "active": true }
 ]</pre>
-      <div class="mt-2">Note : <strong>priceCents est en euros</strong> dans ce plugin (ex: 50 = 50€).</div>
+      <div class="mt-2">Note : <strong>price est en euros</strong> dans ce plugin (ex: 50 = 50€).</div>
     </div>
 
     <div class="card card-body mb-3">
       <h5>Permissions</h5>
-      <div class="mb-3">
-        <label class="form-label">Groupes autorisés à créer (CSV)</label>
-        <input name="creatorGroups" class="form-control" value="{settings.creatorGroups}">
-      </div>
-      <div class="mb-3">
-        <label class="form-label">Groupe validateur</label>
-        <input name="approverGroup" class="form-control" value="{settings.approverGroup}">
-      </div>
-      <div class="mb-3">
-        <label class="form-label">Groupe notifié (emails/notifs)</label>
-        <input name="notifyGroup" class="form-control" value="{settings.notifyGroup}">
-      </div>
-      <div class="form-check">
-        <input class="form-check-input" type="checkbox" name="showRequesterToAll" id="showRequesterToAll" {{{ if view_showRequesterToAll }}}checked{{{ end }}}>
-        <label class="form-check-label" for="showRequesterToAll">Afficher le demandeur à tout le monde</label>
-      </div>
-    </div>
-
-    <div class="card card-body mb-3">
-      <h5>Matériel</h5>
-      <div class="mb-3">
-        <label class="form-label">Source</label>
-        <select class="form-select" name="itemsSource">
-          <option value="manual">Manuel (JSON)</option>
-          <option value="helloasso">HelloAsso (articles d’un formulaire)</option>
-        </select>
-        <div class="form-text">Si HelloAsso est choisi, la liste du matériel est récupérée via l’API HelloAsso (items d’un formulaire).</div>
-      </div>
-
-      <div class="mb-3">
-        <label class="form-label">HelloAsso formType (ex: shop, event, membership, donation)</label>
-        <input class="form-control" name="ha_itemsFormType" value="{settings.ha_itemsFormType}">
-      </div>
-      <div class="mb-3">
-        <label class="form-label">HelloAsso formSlug</label>
-        <input class="form-control" name="ha_itemsFormSlug" value="{settings.ha_itemsFormSlug}">
-      </div>
-      <div class="mb-3">
-        <label class="form-label">Mapping lieux (JSON) par id d’article HelloAsso</label>
-        <textarea class="form-control" rows="4" name="ha_locationMapJson">{settings.ha_locationMapJson}</textarea>
-        <div class="form-text">Ex: { "12345": "Local A", "67890": "Local B" }</div>
       </div>
 
       <div class="mb-3">