nodebb-plugin-equipment-calendar 0.9.0 → 0.9.8

package/library.js

@@ -129,9 +129,11 @@ async function createHelloAssoCheckoutIntent(settings,
   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].price, 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) {
@@ -296,11 +298,11 @@ async function getActiveItems(settings) {
       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 price = typeof price === 'number' ? price : 0;
+      const price = (typeof priceRaw === 'number' ? priceRaw : parseInt(priceRaw, 10)) || 0;
 
       return {
         id: id || name,
@@ -837,7 +839,7 @@ async function handleHelloAssoTest(req, res) {
     // force=1 skips in-memory cache and refresh_token; clear=1 wipes stored refresh token
     haTokenCache = null;
     await getHelloAssoAccessToken(settings,
-    saved, { force, clearStored: clear });
+{ force, clearStored: clear });
     const items = await fetchHelloAssoItems(settings);
     const list = Array.isArray(items) ? items : (Array.isArray(items.data) ? items.data : []);
     count = list.length;
@@ -860,8 +862,7 @@ async function handleHelloAssoTest(req, res) {
     message,
     count,
     settings,
-    saved,
-    sampleItems,
+sampleItems,
     hasSampleItems,
     hasSampleItems: sampleItems && sampleItems.length > 0,
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-equipment-calendar",
-  "version": "0.9.0",
+  "version": "0.9.8",
   "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.2",
+  "version": "0.5.7",
   "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;
+  }