nodebb-plugin-equipment-calendar 1.0.1 → 1.0.3

package/library.js

@@ -29,7 +29,7 @@ const DEFAULT_SETTINGS = {
   notifyGroup: 'administrators',
   // JSON array of items: [{ "id": "cam1", "name": "Caméra A", "price": 5000, "location": "Stock A", "active": true }]
   itemsJson: '[]',
-  itemsSource: 'manual',
+  
   ha_itemsFormType: '',
   ha_itemsFormSlug: '',
   
@@ -275,47 +275,20 @@ async function fetchHelloAssoItems(settings) {
   return out;
 }
 
-function parseItems(itemsJson) {
-  try {
-    const arr = JSON.parse(itemsJson || '[]');
-    if (!Array.isArray(arr)) return [];
-    return arr.map(it => ({
-      id: String(it.id || '').trim(),
-      name: String(it.name || '').trim(),
-      price: Number(it.price || 0),
-      location: String(it.location || '').trim(),
-      active: it.active !== false,
-    })).filter(it => it.id && it.name);
-  } catch (e) {
-    return [];
-  }
-}
 
-async function getActiveItems(settings) {
-  const source = String(settings.itemsSource || 'manual');
-  if (source === 'helloasso') {
-    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 priceRaw =
-        (it.price && (it.price.value || it.price.amount)) ||
-        (it.amount && (it.amount.value || it.amount)) ||
-        it.price;
-      const price = (typeof priceRaw === 'number' ? priceRaw : parseInt(priceRaw, 10)) || 0;
-
-      return {
-        id: id || name,
-        name,
-        price,
-        active: true,
-        source: 'helloasso',
-      };
-    }).filter(i => i.id);
-  }
 
-  // manual
-  return parseItems(settings.itemsJson).filter(i => i.active);
+async function getActiveItems() {
+  const settings = await getSettings();
+  const rawItems = await fetchHelloAssoItems(settings);
+  // Normalize
+  const items = (Array.isArray(rawItems) ? rawItems : []).map((it) => ({
+    id: String(it.id || '').trim(),
+    name: String(it.name || '').trim(),
+    price: String(it.price || '0').trim(),
+    active: true,
+  })).filter(it => it.id && it.name);
+
+  return items;
 }
 
 async function getSettings() {
@@ -1426,8 +1399,7 @@ async function handleAdminSave(req, res) {
       creatorGroups: String(req.body.creatorGroups || DEFAULT_SETTINGS.creatorGroups),
       approverGroup: String(req.body.approverGroup || DEFAULT_SETTINGS.approverGroup),
       notifyGroup: String(req.body.notifyGroup || DEFAULT_SETTINGS.notifyGroup),
-      itemsJson: String(req.body.itemsJson || DEFAULT_SETTINGS.itemsJson),
-      itemsSource: String(req.body.itemsSource || DEFAULT_SETTINGS.itemsSource),
+      itemsJson: '[]',
       ha_itemsFormType: String(req.body.ha_itemsFormType || DEFAULT_SETTINGS.ha_itemsFormType),
       ha_itemsFormSlug: String(req.body.ha_itemsFormSlug || DEFAULT_SETTINGS.ha_itemsFormSlug),
       

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-equipment-calendar",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "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.6.2",
+  "version": "0.6.3",
   "minver": "4.7.1"
 }

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

@@ -33,23 +33,9 @@
       </div>
     </div>
 
+    
     <div class="card card-body mb-3">
-      <h5>Matériel</h5>
-
-      <div class="mb-3">
-        <label class="form-label">Source du matériel</label>
-        <select class="form-select" name="itemsSource">
-          <option value="manual" {{{ if view_itemsSourceManual }}}selected{{{ end }}}>Manuel (JSON)</option>
-          <option value="helloasso" {{{ if view_itemsSourceHelloasso }}}selected{{{ end }}}>HelloAsso (catalogue)</option>
-        </select>
-      </div>
-
-      <div class="mb-3">
-        <label class="form-label">Matériel (JSON) — utilisé si Source = Manuel</label>
-        <textarea class="form-control" name="itemsJson" rows="8">{settings.itemsJson}</textarea>
-        <div class="form-text">Format: <code>[{"id":"cam1","name":"Caméra","price":50,"active":true}]</code> — <code>price</code> en euros (unitaire / jour).</div>
-      </div>
-
+      <h5>Paiement</h5>
       <div class="mb-0">
         <label class="form-label">Timeout paiement (minutes)</label>
         <input class="form-control" type="number" min="1" name="paymentTimeoutMinutes" value="{settings.paymentTimeoutMinutes}">
@@ -57,7 +43,7 @@
       </div>
     </div>
 
-    <div class="card card-body mb-3">
+<div class="card card-body mb-3">
       <h5>HelloAsso</h5>
 
       <div class="mb-3">