nodebb-plugin-calendar-onekite 11.2.6 → 11.2.8

package/lib/admin.js

@@ -228,6 +228,8 @@ admin.refuseReservation = async function (req, res) {
   if (!r) return res.status(404).json({ error: 'not-found' });
 
   r.status = 'refused';
+  r.refusedAt = Date.now();
+  r.refusedReason = String((req.body && (req.body.reason || req.body.refusedReason || req.body.refuseReason)) || '').trim();
   await dbLayer.saveReservation(r);
 
   try {
@@ -236,9 +238,12 @@ admin.refuseReservation = async function (req, res) {
       await sendEmail('calendar-onekite_refused', requester.email, 'Location matériel - Réservation refusée', {
         uid: parseInt(r.uid, 10),
         username: requester.username,
-        itemName: r.itemName,
+        itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
+        itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
+        dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
         start: formatFR(r.start),
         end: formatFR(r.end),
+        refusedReason: r.refusedReason || '',
       });
     }
   } catch (e) {}

package/lib/api.js

@@ -643,6 +643,7 @@ api.refuseReservation = async function (req, res) {
 
   r.status = 'refused';
   r.refusedAt = Date.now();
+  r.refusedReason = String((req.body && (req.body.reason || req.body.refusedReason || req.body.refuseReason)) || '').trim();
   await dbLayer.saveReservation(r);
 
   const requester = await user.getUserFields(r.uid, ['username', 'email']);
@@ -654,6 +655,7 @@ api.refuseReservation = async function (req, res) {
         dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
       start: formatFR(r.start),
       end: formatFR(r.end),
+      refusedReason: r.refusedReason || '',
     });
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-calendar-onekite",
-  "version": "11.2.6",
+  "version": "11.2.8",
   "description": "FullCalendar-based equipment reservation workflow with admin approval & HelloAsso payment for NodeBB",
   "main": "library.js",
   "license": "MIT",

package/plugin.json

@@ -31,5 +31,5 @@
   "acpScripts": [
     "public/admin.js"
   ],
-  "version": "1.0.48"
+  "version": "1.0.49"
 }

package/public/admin.js

@@ -408,8 +408,11 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
     });
   }
 
-  async function refuse(rid) {
-    return await fetchJson(`/api/v3/admin/plugins/calendar-onekite/reservations/${rid}/refuse`, { method: 'PUT' });
+  async function refuse(rid, payload) {
+    return await fetchJson(`/api/v3/admin/plugins/calendar-onekite/reservations/${rid}/refuse`, {
+      method: 'PUT',
+      body: JSON.stringify(payload || {}),
+    });
   }
 
   async function purge(year) {
@@ -453,6 +456,23 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
     const form = document.getElementById('onekite-settings-form');
     if (!form) return;
 
+    // Make the HelloAsso debug output readable in both light and dark ACP themes.
+    // NodeBB 4.x uses Bootstrap variables, so we can rely on CSS variables here.
+    (function injectAdminCss() {
+      const id = 'onekite-admin-css';
+      if (document.getElementById(id)) return;
+      const style = document.createElement('style');
+      style.id = id;
+      style.textContent = `
+        #onekite-debug-output.onekite-debug-output {
+          background: var(--bs-body-bg) !important;
+          color: var(--bs-body-color) !important;
+          border: 1px solid var(--bs-border-color) !important;
+        }
+      `;
+      document.head.appendChild(style);
+    })();
+
     // Load settings
     try {
       const s = await loadSettings();
@@ -528,6 +548,9 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
         const rid = btn.getAttribute('data-rid');
         if (!rid) return;
 
+        // Remove the row immediately on success for a snappier UX
+        const rowEl = btn.closest('tr') || btn.closest('.onekite-pending-row');
+
         try {
           if (action === 'approve') {
             const opts = timeOptions(5).map(t => `<option value="${t}">${t}</option>`).join('');
@@ -555,6 +578,7 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
                         const adminNote = (document.getElementById('onekite-admin-note')?.value || '').trim();
                         const pickupTime = (document.getElementById('onekite-pickup-time')?.value || '').trim();
                         await approve(rid, { adminNote, pickupTime });
+                        if (rowEl && rowEl.parentNode) rowEl.parentNode.removeChild(rowEl);
                         bootbox.alert('Réservation validée.');
                         resolve(true);
                       } catch (e) {
@@ -568,8 +592,38 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
               });
             });
           } else if (action === 'refuse') {
-            await refuse(rid);
-            bootbox.alert('Réservation refusée.');
+            const html = `
+              <div class="mb-3">
+                <label class="form-label">Raison du refus (incluse dans l'email)</label>
+                <textarea class="form-control" id="onekite-refuse-reason" rows="3" placeholder="Ex: matériel indisponible, dates impossibles, dossier incomplet..."></textarea>
+              </div>
+            `;
+            await new Promise((resolve) => {
+              bootbox.dialog({
+                title: 'Refuser la réservation',
+                message: html,
+                buttons: {
+                  cancel: { label: 'Annuler', className: 'btn-secondary', callback: () => resolve(false) },
+                  ok: {
+                    label: 'Refuser',
+                    className: 'btn-danger',
+                    callback: async () => {
+                      try {
+                        const reason = (document.getElementById('onekite-refuse-reason')?.value || '').trim();
+                        await refuse(rid, { reason });
+                        if (rowEl && rowEl.parentNode) rowEl.parentNode.removeChild(rowEl);
+                        bootbox.alert('Réservation refusée.');
+                        resolve(true);
+                      } catch (e) {
+                        showAlert('error', 'Refus impossible.');
+                        resolve(false);
+                      }
+                      return false;
+                    },
+                  },
+                },
+              });
+            });
           }
           await refreshPending();
         } catch (e) {

package/public/client.js

@@ -19,8 +19,8 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
           width: 100%;
           max-width: 100%;
           box-sizing: border-box;
-          padding-right: 3rem; /* leave room for caret */
-          min-width: 7rem;
+          padding-right: 2.25rem; /* leave room for caret */
+          min-width: 0;
           text-overflow: clip;
           white-space: nowrap;
         }
@@ -125,10 +125,10 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
         <div class="col-12 col-md-6">
           <label class="form-label">Début</label>
           <div class="row g-2">
-            <div class="col-7">
+            <div class="col-6">
               <input type="date" class="form-control" id="onekite-se-start-date" value="${escapeHtml(toDateInputValue(seStart))}" />
             </div>
-            <div class="col-5">
+            <div class="col-6">
               <select class="form-select onekite-time-select" id="onekite-se-start-time">${seTimeOptions(seStartTime, false)}</select>
             </div>
           </div>
@@ -136,10 +136,10 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
         <div class="col-12 col-md-6">
           <label class="form-label">Fin</label>
           <div class="row g-2">
-            <div class="col-7">
+            <div class="col-6">
               <input type="date" class="form-control" id="onekite-se-end-date" value="${escapeHtml(toDateInputValue(seEnd))}" />
             </div>
-            <div class="col-5">
+            <div class="col-6">
               <select class="form-select onekite-time-select" id="onekite-se-end-time">${seTimeOptions(seEndTime, true)}</select>
             </div>
           </div>
@@ -602,9 +602,10 @@ function attachAddressAutocomplete(inputEl, onPick) {
     });
   }
 
-  async function refuseReservation(rid) {
+  async function refuseReservation(rid, payload) {
     return await fetchJson(`/api/v3/plugins/calendar-onekite/reservations/${rid}/refuse`, {
       method: 'PUT',
+      body: JSON.stringify(payload || {}),
     });
   }
 
@@ -784,6 +785,9 @@ function toDatetimeLocalValue(date) {
 
         function setMode(next) {
           mode = next;
+          if (mode === 'special') {
+            showAlert('info', 'Mode évènement : sélectionnez une date ou une plage');
+          }
           refreshDesktopModeButton();
           try {
             const mb = document.querySelector('#onekite-mobile-controls .onekite-mode-btn');
@@ -996,9 +1000,12 @@ function toDatetimeLocalValue(date) {
           }
           isDialogOpen = true;
           try {
-            // Default to a same-day event: 00:00 -> 23:59
-            const end = new Date(start.getTime() + (23 * 60 + 59) * 60 * 1000);
-            const payload = await openSpecialEventDialog({ start, end, allDay: true });
+            // Default to a same-day event in local time: 07:00 -> 23:59
+            const start2 = new Date(start);
+            start2.setHours(7, 0, 0, 0);
+            const end2 = new Date(start);
+            end2.setHours(23, 59, 0, 0);
+            const payload = await openSpecialEventDialog({ start: start2, end: end2, allDay: false });
             setMode('reservation');
             if (!payload) {
               isDialogOpen = false;
@@ -1123,12 +1130,18 @@ function toDatetimeLocalValue(date) {
         const canModerate = !!p.canModerate;
         const isPending = status === 'pending';
 
+        const refusedReason = String(p.refusedReason || p.refuseReason || '').trim();
+        const refusedReasonHtml = (status === 'refused' && refusedReason)
+          ? `<div class="mb-2"><strong>Raison du refus</strong><br>${escapeHtml(refusedReason)}</div>`
+          : '';
+
         const baseHtml = `
           ${userLine}
           <div class="mb-2"><strong>Matériel</strong><br>${itemsHtml}</div>
           <div class="mb-2"><strong>Période</strong><br>${period}</div>
           ${validatedByHtml}
           ${pickupHtml}
+          ${refusedReasonHtml}
           <div class="text-muted" style="font-size: 12px;">Statut: ${statusLabel(status)}</div>
         `;
 
@@ -1171,16 +1184,41 @@ function toDatetimeLocalValue(date) {
         }
         if (showModeration) {
           buttons.refuse = {
-            label: 'Supprimer',
+            label: 'Refuser',
             className: 'btn-outline-danger',
             callback: async () => {
-              try {
-                await refuseReservation(rid);
-                showAlert('success', 'Demande supprimée.');
-                calendar.refetchEvents();
-              } catch (e) {
-                showAlert('error', 'Suppression impossible.');
-              }
+              const html = `
+                <div class="mb-3">
+                  <label class="form-label">Raison du refus</label>
+                  <textarea class="form-control" id="onekite-refuse-reason" rows="3" placeholder="Ex: matériel indisponible, dates impossibles, dossier incomplet..."></textarea>
+                </div>
+              `;
+              return await new Promise((resolve) => {
+                bootbox.dialog({
+                  title: 'Refuser la réservation',
+                  message: html,
+                  buttons: {
+                    cancel: { label: 'Annuler', className: 'btn-secondary', callback: () => resolve(false) },
+                    ok: {
+                      label: 'Refuser',
+                      className: 'btn-danger',
+                      callback: async () => {
+                        try {
+                          const reason = (document.getElementById('onekite-refuse-reason')?.value || '').trim();
+                          await refuseReservation(rid, { reason });
+                          showAlert('success', 'Demande refusée.');
+                          calendar.refetchEvents();
+                          resolve(true);
+                        } catch (e) {
+                          showAlert('error', 'Refus impossible.');
+                          resolve(false);
+                        }
+                        return false;
+                      },
+                    },
+                  },
+                });
+              });
             },
           };
           buttons.approve = {

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

@@ -138,7 +138,7 @@
       <div class="tab-pane fade" id="onekite-tab-debug" role="tabpanel">
         <p class="text-muted">Teste la récupération du token et la liste du matériel (catalogue).</p>
         <button type="button" class="btn btn-secondary me-2" id="onekite-debug-run">Tester le chargement du matériel</button>
-        <pre id="onekite-debug-output" class="mt-3 p-3 bg-light" style="max-height: 360px; overflow: auto;"></pre>
+        <pre id="onekite-debug-output" class="mt-3 p-3 border rounded onekite-debug-output" style="max-height: 360px; overflow: auto;"></pre>
       </div>
 
       <div class="tab-pane fade" id="onekite-tab-accounting" role="tabpanel">

package/templates/emails/calendar-onekite_refused.tpl

@@ -1,7 +1,7 @@
 <p>Bonjour {username},</p>
 <p>Votre demande de location de matériel a été refusée.</p>
 
-<p><strong>Matériel</strong></p>
+<p><strong>Matériel réservé</strong></p>
 <ul>
 <!-- BEGIN itemNames -->
   <li>{itemNames}</li>
@@ -9,3 +9,7 @@
 </ul>
 
 <p>{dateRange}</p>
+
+<!-- IF refusedReason -->
+<p><strong>Raison du refus</strong><br>{refusedReason}</p>
+<!-- ENDIF refusedReason -->