nodebb-plugin-onekite-calendar 2.0.77 → 2.0.79

package/lib/api.js

@@ -1404,7 +1404,6 @@ api.createReservation = async function (req, res) {
   try {
     const notifyGroups = normalizeAllowedGroups(settings.notifyGroups);
     if (notifyGroups.length) {
-      const requester = await user.getUserFields(uid, ['username', 'email']);
       const itemsLabel = (resv.itemNames || []).join(', ');
       for (const g of notifyGroups) {
         const members = await getMembersByGroupIdentifier(g);
@@ -1436,15 +1435,14 @@ api.createReservation = async function (req, res) {
             await sendEmail('calendar-onekite_pending', u, 'Location matériel - Demande de réservation', {
               uid: u,
               username: md && md.username ? md.username : '',
-              requester: requester.username,
+              requester: targetUsername,
+              createdBy: isForSelf ? '' : (creatorUsername || ''),
               itemName: itemsLabel,
               itemNames: resv.itemNames || [],
               dateRange: `Du ${formatFR(start)} au ${formatFR(end)}`,
               start: formatFR(start),
               end: formatFR(end),
               total: resv.total || 0,
-              // Link to the plugin ACP page so managers can process the request quickly.
-              // Kept as `adminUrl` to match the email template placeholder.
               adminUrl: `${forumBaseUrl()}/admin/plugins/calendar-onekite`,
             });
           }
@@ -1455,6 +1453,23 @@ api.createReservation = async function (req, res) {
     console.warn('[calendar-onekite] Failed to send pending email', e && e.message ? e.message : e);
   }
 
+  // Notify target user when a validator created the reservation on their behalf
+  if (!isForSelf) {
+    try {
+      await sendEmail('calendar-onekite_pending_for_you', targetUid, 'Location matériel - Demande créée en votre nom', {
+        uid: targetUid,
+        username: targetUsername,
+        createdBy: creatorUsername,
+        itemName: (resv.itemNames || []).join(', '),
+        itemNames: resv.itemNames || [],
+        dateRange: `Du ${formatFR(start)} au ${formatFR(end)}`,
+        total: resv.total || 0,
+      });
+    } catch (e) {
+      console.warn('[calendar-onekite] Failed to send pending_for_you email', e && e.message ? e.message : e);
+    }
+  }
+
   // Discord webhook (optional)
   try {
     await discord.notifyReservationRequested(settings, {
@@ -1471,6 +1486,24 @@ api.createReservation = async function (req, res) {
 
   }
 
+  // When a validator explicitly regularizes a reservation for another user (directly paid,
+  // no HelloAsso), the main notification block is skipped. Still notify the target user.
+  if (isRegularization && !isForSelf) {
+    try {
+      await sendEmail('calendar-onekite_paid', targetUid, 'Location matériel - Réservation confirmée', {
+        uid: targetUid,
+        username: targetUsername,
+        itemName: (resv.itemNames || []).join(', '),
+        itemNames: resv.itemNames || [],
+        dateRange: `Du ${formatFR(start)} au ${formatFR(end)}`,
+        icsUrl: '',
+        googleCalUrl: '',
+      });
+    } catch (e) {
+      console.warn('[calendar-onekite] Failed to send regularization paid email', e && e.message ? e.message : e);
+    }
+  }
+
   res.json({ ok: true, rid, status: resv.status, autoPaid: isAutoPaid });
 };
 

package/package.json

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

package/public/client.js

@@ -1241,7 +1241,10 @@ function toDatetimeLocalValue(date) {
       <div class="mb-2" id="onekite-period"><strong>Période</strong><br>${formatDt(start)} → ${formatDt(endDisplay)} <span class="text-muted" id="onekite-days">(${days} jour${days > 1 ? 's' : ''})</span></div>
       ${shortcutsHtml}
       ${forUserHtml}
-      <div class="mb-2"><strong>Matériel</strong></div>
+      <div class="mb-1"><strong>Matériel</strong></div>
+      <div class="mb-2">
+        <input type="text" id="onekite-item-search" class="form-control form-control-sm" placeholder="Rechercher un matériel…" autocomplete="off">
+      </div>
       <div id="onekite-items" class="mb-2" style="max-height: 320px; overflow: auto; border: 1px solid var(--bs-border-color, #ddd); border-radius: 6px; padding: 6px;">
         ${rows}
       </div>
@@ -1359,6 +1362,17 @@ function toDatetimeLocalValue(date) {
         document.querySelectorAll('.onekite-item-cb').forEach(cb => cb.addEventListener('change', refreshTotal));
         refreshTotal();
 
+        const searchEl = document.getElementById('onekite-item-search');
+        if (searchEl) {
+          searchEl.addEventListener('input', () => {
+            const q = searchEl.value.trim().toLowerCase();
+            document.querySelectorAll('#onekite-items [data-itemid]').forEach((row) => {
+              const name = ((row.querySelector('input.onekite-item-cb') || {}).getAttribute('data-name') || '').toLowerCase();
+              row.style.display = (!q || name.includes(q)) ? '' : 'none';
+            });
+          });
+        }
+
         // Duration shortcuts (single-day selections): update end/days + refresh blocked items
         const shortcutsWrap = document.getElementById('onekite-duration-shortcuts');
         if (shortcutsWrap) {

package/templates/emails/calendar-onekite_pending.tpl

@@ -3,6 +3,10 @@
 
 <p><strong>Demandeur :</strong> {requester}</p>
 
+<!-- IF createdBy -->
+<p><strong>Créée par :</strong> {createdBy}</p>
+<!-- ENDIF createdBy -->
+
 <p><strong>Matériel</strong></p>
 <ul>
 <!-- BEGIN itemNames -->

package/templates/emails/calendar-onekite_pending_for_you.tpl

@@ -0,0 +1,15 @@
+<p>Bonjour {username},</p>
+<p>Une demande de réservation de matériel a été créée en votre nom par {createdBy}.</p>
+
+<p><strong>Matériel</strong></p>
+<ul>
+<!-- BEGIN itemNames -->
+  <li>{itemNames}</li>
+<!-- END itemNames -->
+</ul>
+
+<p>{dateRange}</p>
+
+<p><strong>Total estimé :</strong> {total} €</p>
+
+<p>Vous recevrez un email avec les instructions de paiement une fois la demande validée par un responsable.</p>