nodebb-plugin-equipment-calendar 9.0.0 → 9.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-equipment-calendar",
-  "version": "9.0.0",
+  "version": "9.0.2",
   "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": "3.0.0-stable4p-admin-save-alert",
+  "version": "3.0.0-stable4q-acp-save-calendar-fixes",
   "minver": "4.7.1"
 }

package/public/js/client.js

@@ -1,4 +1,4 @@
-require(['jquery', 'bootstrap', 'bootbox'], function ($, bootstrap, bootbox) {
+require(['jquery', 'bootstrap'], function ($, bootstrap) {
 'use strict';
 /* global window, document, FullCalendar */
 
@@ -54,38 +54,6 @@ require(['jquery', 'bootstrap', 'bootbox'], function ($, bootstrap, bootbox) {
     } catch (e) { return iso; }
   }
 
-
-  function escapeHtml(str) {
-    return String(str || '').replace(/[&<>"']/g, function (c) {
-      return ({ '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;' })[c];
-    });
-  }
-
-  function ecDoAction(rid, action, eventObj) {
-    try {
-      const csrf = window.EC_CSRF || (window.config && window.config.csrf_token) || '';
-      return fetch((config.relative_path || '') + '/api/equipment/reservations/' + encodeURIComponent(rid) + '/action', {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json', 'x-csrf-token': csrf },
-        body: JSON.stringify({ action: action })
-      }).then(function (r) {
-        return r.json().catch(function () { return {}; }).then(function (j) { return { ok: r.ok, json: j }; });
-      }).then(function (res) {
-        if (!res.ok || (res.json && res.json.error)) {
-          if (window.app && app.alertError) app.alertError((res.json && res.json.error) ? res.json.error : 'Erreur');
-          return false;
-        }
-        if (action === 'delete') {
-          try { eventObj.remove(); } catch (e) {}
-        } else {
-          try { eventObj.setExtendedProp('status', action === 'approve' ? 'approved' : 'rejected'); } catch (e) {}
-        }
-        if (window.app && app.alertSuccess) app.alertSuccess('OK');
-        return true;
-      });
-    } catch (e) { return false; }
-  }
-
 function updateTotalPrice() {
     try {
       const sel = document.getElementById('ec-item-ids');
@@ -172,6 +140,7 @@ function updateTotalPrice() {
       dayMaxEventRows: true,
       displayEventTime: false,
         timeZone: 'UTC',
+        locale: 'fr',
       events: events,
       select: function (info) {
         if (!window.EC_CAN_CREATE) return;
@@ -182,34 +151,15 @@ function updateTotalPrice() {
       },
       dateClick: function (info) {
         if (!window.EC_CAN_CREATE) return;
-        openCreateModal(String(info.dateStr||'').slice(0,10), String(info.dateStr||'').slice(0,10));
+        openCreateModal(info.dateStr, info.dateStr);
       },
       eventClick: function (info) {
-        try {
-          info.jsEvent && info.jsEvent.preventDefault && info.jsEvent.preventDefault();
-          const ep = info.event.extendedProps || {};
-          const rid = ep.rid || info.event.id;
-          const status = ep.status || 'pending';
-          const title = info.event.title || 'Reservation';
-          const start = String(info.event.startStr || '').slice(0,10);
-          const end = String(info.event.endStr || '').slice(0,10);
-          const total = ep.total || 0;
-
-          let msg = '<div><strong>' + escapeHtml(title) + '</strong></div>';
-          msg += '<div>Periode: ' + escapeHtml(start) + ' -> ' + escapeHtml(end) + '</div>';
-          msg += '<div>Statut: ' + escapeHtml(status) + '</div>';
-          if (total) msg += '<div>Total: ' + escapeHtml(String(total)) + ' EUR</div>';
-
-          const buttons = { close: { label: 'Fermer', className: 'btn-secondary' } };
-
-          if (window.EC_IS_APPROVER) {
-            buttons.approve = { label: 'Valider', className: 'btn-success', callback: function () { return ecDoAction(rid, 'approve', info.event); } };
-            buttons.reject = { label: 'Rejeter', className: 'btn-warning', callback: function () { return ecDoAction(rid, 'reject', info.event); } };
-            buttons.delete = { label: 'Supprimer', className: 'btn-danger', callback: function () { return ecDoAction(rid, 'delete', info.event); } };
-          }
-
-          bootbox.dialog({ title: 'Reservation', message: msg, buttons: buttons });
-        } catch (e) {}
+        // simple details popup
+        const r = info.event.extendedProps || {};
+        const title = info.event.title || 'Réservation';
+        const start = info.event.startStr || '';
+        const end = info.event.endStr ? addDaysIsoLocal(info.event.endStr, -1) : '';
+        bootbox.alert(`<strong>${title}</strong><br>Du ${start} au ${end}<br>Statut: ${r.status || ''}`);
       },
     });
 

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

@@ -1,3 +1,4 @@
+
 <div class="acp-page-container">
   <div class="d-flex align-items-center justify-content-between flex-wrap gap-2">
     <h1 class="mb-0">Equipment Calendar</h1>
@@ -25,34 +26,26 @@
       </div>
     </div>
 
-    <div class="card card-body mb-3">
-      <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" data-field="paymentTimeoutMinutes" value="{settings.paymentTimeoutMinutes}">
-      </div>
-    </div>
-
     <div class="card card-body mb-3">
       <h5>HelloAsso</h5>
-      <div class="mb-3">
-        <label class="form-label">API Base URL (prod/sandbox)</label>
-        <input class="form-control" type="text" name="ha_apiBaseUrl" data-field="ha_apiBaseUrl" value="{settings.ha_apiBaseUrl}">
-        <div class="form-text">Prod: <code>https://api.helloasso.com</code> — Sandbox: <code>https://api.helloasso-sandbox.com</code></div>
-      </div>
-      <div class="mb-3">
-        <label class="form-label">Organization slug</label>
-        <input class="form-control" type="text" name="ha_organizationSlug" data-field="ha_organizationSlug" value="{settings.ha_organizationSlug}">
-      </div>
-      <div class="mb-3">
-        <label class="form-label">Client ID</label>
-        <input class="form-control" type="text" name="ha_clientId" data-field="ha_clientId" value="{settings.ha_clientId}">
-      </div>
-      <div class="mb-3">
-        <label class="form-label">Client Secret</label>
-        <input class="form-control" type="password" name="ha_clientSecret" data-field="ha_clientSecret" value="{settings.ha_clientSecret}">
-      </div>
       <div class="row g-3">
+        <div class="col-md-6">
+          <label class="form-label">Client ID</label>
+          <input class="form-control" type="text" name="ha_clientId" data-field="ha_clientId" value="{settings.ha_clientId}">
+        </div>
+        <div class="col-md-6">
+          <label class="form-label">Client Secret</label>
+          <input class="form-control" type="password" name="ha_clientSecret" data-field="ha_clientSecret" value="{settings.ha_clientSecret}">
+        </div>
+        <div class="col-md-6">
+          <label class="form-label">Organization slug</label>
+          <input class="form-control" type="text" name="ha_organizationSlug" data-field="ha_organizationSlug" value="{settings.ha_organizationSlug}">
+        </div>
+        <div class="col-md-6">
+          <label class="form-label">Return URL base (callback)</label>
+          <input class="form-control" type="text" name="ha_returnUrl" data-field="ha_returnUrl" value="{settings.ha_returnUrl}" placeholder="https://www.onekite.com">
+          <div class="form-text">Le plugin ajoutera automatiquement le chemin de callback.</div>
+        </div>
         <div class="col-md-6">
           <label class="form-label">Form Type</label>
           <input class="form-control" type="text" name="ha_itemsFormType" data-field="ha_itemsFormType" value="{settings.ha_itemsFormType}" placeholder="shop">
@@ -62,14 +55,30 @@
           <input class="form-control" type="text" name="ha_itemsFormSlug" data-field="ha_itemsFormSlug" value="{settings.ha_itemsFormSlug}" placeholder="locations-materiel-2026">
         </div>
       </div>
-      <div class="mb-0 mt-3">
-        <label class="form-label">Préfixe itemName (checkout)</label>
-        <input class="form-control" type="text" name="ha_calendarItemNamePrefix" data-field="ha_calendarItemNamePrefix" value="{settings.ha_calendarItemNamePrefix}">
+    </div>
+
+    <div class="card card-body mb-3">
+      <h5>Calendrier</h5>
+      <div class="row g-3">
+        <div class="col-md-6">
+          <label class="form-label">Vue par défaut</label>
+          <select class="form-select" name="defaultView" data-field="defaultView">
+            <option value="dayGridMonth">Mois</option>
+            <option value="timeGridWeek">Semaine</option>
+            <option value="listWeek">Liste</option>
+          </select>
+        </div>
+        <div class="col-md-6">
+          <label class="form-label">Timezone</label>
+          <input class="form-control" type="text" name="timezone" data-field="timezone" value="{settings.timezone}">
+        </div>
+        <div class="col-md-6">
+          <label class="form-label">Timeout paiement (minutes)</label>
+          <input class="form-control" type="number" min="1" name="paymentTimeoutMinutes" data-field="paymentTimeoutMinutes" value="{settings.paymentTimeoutMinutes}">
+        </div>
       </div>
     </div>
 
     <button id="save" class="btn btn-primary" type="button">Enregistrer</button>
   </div>
-
-  
 </div>