nodebb-plugin-onekite-calendar 2.0.76 → 2.0.78

package/lib/admin.js

@@ -89,7 +89,6 @@ admin.approveReservation = async function (req, res) {
   r.pickupLat = String((req.body && req.body.pickupLat) || '').trim();
   r.pickupLon = String((req.body && req.body.pickupLon) || '').trim();
   r.approvedAt = Date.now();
-  r.paymentDeferred = !!(req.body && req.body.paymentDeferred);
 
   try {
     const approver = await user.getUserFields(req.uid, ['username']);

package/lib/api.js

@@ -1321,6 +1321,9 @@ api.createReservation = async function (req, res) {
 
   const isForSelf = (targetUid === uid);
 
+  // Explicit regularization flag: admin records a payment directly (any date, any target)
+  const isRegularization = !!isValidator && !!(req.body && req.body.isRegularization);
+
   // Free only when validator creates for themselves with a future date (within configured maxDays)
   const validatorFreeMaxDays = (() => {
     try {
@@ -1328,10 +1331,17 @@ api.createReservation = async function (req, res) {
       return Number.isFinite(v) ? v : 0;
     } catch (e) { return 0; }
   })();
-  const isValidatorFree = !!isValidator && isForSelf && !isPastDate && (validatorFreeMaxDays <= 0 || nbDays <= validatorFreeMaxDays);
+  const isValidatorFree = !!isValidator && !isRegularization && isForSelf && !isPastDate && (validatorFreeMaxDays <= 0 || nbDays <= validatorFreeMaxDays);
+
+  // Past-dated reservation for self → paid immediately (no checkbox needed)
+  const isRegularizationSelf = !!isValidator && !isRegularization && isForSelf && isPastDate;
+  // Past-dated reservation for a third party without explicit regularization → awaiting_payment
+  const isRegularizationOther = !!isValidator && !isRegularization && !isForSelf && isPastDate;
 
-  // Regularization: past-dated reservation created by a validator → paid immediately with amount
-  const isRegularization = !!isValidator && isPastDate;
+  const isAutoPaid = isValidatorFree || isRegularizationSelf || isRegularization;
+  const resolvedStatus = isAutoPaid ? 'paid'
+    : isRegularizationOther ? 'awaiting_payment'
+    : 'pending';
 
   const resv = {
     rid,
@@ -1348,14 +1358,15 @@ api.createReservation = async function (req, res) {
     end,
     startDate,
     endDate,
-    status: (isValidatorFree || isRegularization) ? 'paid' : 'pending',
+    status: resolvedStatus,
     createdAt: now,
-    paidAt: (isValidatorFree || isRegularization) ? now : 0,
-    approvedBy: (isValidatorFree || isRegularization) ? uid : 0,
-    approvedByUsername: (isValidatorFree || isRegularization) ? (creatorUsername || '') : '',
+    paidAt: isAutoPaid ? now : 0,
+    approvedAt: (isAutoPaid || isRegularizationOther) ? now : 0,
+    approvedBy: (isAutoPaid || isRegularizationOther) ? uid : 0,
+    approvedByUsername: (isAutoPaid || isRegularizationOther) ? (creatorUsername || '') : '',
     isFree: !!isValidatorFree,
     total: isValidatorFree ? 0 : (isNaN(total) ? 0 : total),
-    manuallyPaid: isRegularization ? true : undefined,
+    manuallyPaid: (isRegularizationSelf || isRegularization) ? true : undefined,
   };
 
   // Validator self-reservations are FREE (no payment required) and tracked separately in accounting.
@@ -1368,7 +1379,8 @@ api.createReservation = async function (req, res) {
 
   // Audit
   const auditAction = isValidatorFree ? 'reservation_self_checked'
-    : isRegularization ? 'reservation_manually_paid'
+    : (isRegularizationSelf || isRegularization) ? 'reservation_manually_paid'
+    : isRegularizationOther ? 'reservation_regularization_other'
     : 'reservation_requested';
   await auditLog(auditAction, uid, {
     targetType: 'reservation',
@@ -1385,14 +1397,13 @@ api.createReservation = async function (req, res) {
     status: resv.status,
   });
 
-  if (!isValidatorFree && !isRegularization) {
+  if (!isValidatorFree && !isRegularizationSelf && !isRegularization) {
 
 
   // Notify groups by email (NodeBB emailer config)
   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);
@@ -1424,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`,
             });
           }
@@ -1443,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, {
@@ -1459,7 +1486,25 @@ api.createReservation = async function (req, res) {
 
   }
 
-  res.json({ ok: true, rid, status: resv.status, autoPaid: !!(isValidatorFree || isRegularization) });
+  // 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 });
 };
 
 api.searchUsers = async function (req, res) {

package/lib/scheduler.js

@@ -224,7 +224,6 @@ async function processAwaitingPayment(preIds, preReservations) {
     const rid = ids[i];
     const r = reservations[i];
     if (!r || r.status !== 'awaiting_payment') continue;
-    if (r.paymentDeferred) continue;
 
     const approvedAt = parseInt(r.approvedAt || r.validatedAt || 0, 10) || 0;
     if (!approvedAt) continue;

package/package.json

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

package/public/admin.js

@@ -838,10 +838,6 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
                 <label class="form-label">Heure de récupération</label>
                 <select class="form-select" id="onekite-pickup-time">${opts}</select>
               </div>
-              <div class="form-check mb-2">
-                <input class="form-check-input" type="checkbox" id="onekite-payment-deferred" />
-                <label class="form-check-label" for="onekite-payment-deferred">Paiement différé <span class="text-muted" style="font-size:12px;">(pas d'annulation automatique)</span></label>
-              </div>
               <div class="text-muted" style="font-size:12px;">Ces infos seront appliquées aux ${rids.length} demandes sélectionnées.</div>
             `;
             const dlg = bootbox.dialog({
@@ -860,9 +856,8 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
                         const pickupTime = (document.getElementById('onekite-pickup-time')?.value || '').trim();
                         const pickupLat = (document.getElementById('onekite-pickup-lat')?.value || '').trim();
                         const pickupLon = (document.getElementById('onekite-pickup-lon')?.value || '').trim();
-                        const paymentDeferred = !!(document.getElementById('onekite-payment-deferred')?.checked);
                         for (const rr of rids) {
-                          await approve(rr, { pickupAddress, notes, pickupTime, pickupLat, pickupLon, paymentDeferred });
+                          await approve(rr, { pickupAddress, notes, pickupTime, pickupLat, pickupLon });
                         }
                         showAlert('success', `${rids.length} demande(s) validée(s).`);
                         await refreshPending();
@@ -1015,10 +1010,6 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
                 <label class="form-label">Heure de récupération</label>
                 <select class="form-select" id="onekite-pickup-time">${opts}</select>
               </div>
-              <div class="form-check mb-2">
-                <input class="form-check-input" type="checkbox" id="onekite-payment-deferred" />
-                <label class="form-check-label" for="onekite-payment-deferred">Paiement différé <span class="text-muted" style="font-size:12px;">(pas d'annulation automatique)</span></label>
-              </div>
             `;
 
             const dlg = bootbox.dialog({
@@ -1037,8 +1028,7 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
                         const pickupTime = (document.getElementById('onekite-pickup-time')?.value || '').trim();
                         const pickupLat = (document.getElementById('onekite-pickup-lat')?.value || '').trim();
                         const pickupLon = (document.getElementById('onekite-pickup-lon')?.value || '').trim();
-                        const paymentDeferred = !!(document.getElementById('onekite-payment-deferred')?.checked);
-                        await approve(rid, { pickupAddress, notes, pickupTime, pickupLat, pickupLon, paymentDeferred });
+                        await approve(rid, { pickupAddress, notes, pickupTime, pickupLat, pickupLon });
                         if (rowEl && rowEl.parentNode) rowEl.parentNode.removeChild(rowEl);
                         showAlert('success', 'Demande validée.');
                         await refreshPending();

package/public/client.js

@@ -1229,6 +1229,12 @@ function toDatetimeLocalValue(date) {
         <label style="font-size:13px; font-weight:600; margin-bottom:3px; display:block;">Pour (pseudo, vide = moi-même)</label>
         <input type="text" class="form-control form-control-sm" id="onekite-target-username" placeholder="Pseudo de l'adhérent" autocomplete="off">
       </div>
+      <div class="mb-2">
+        <div class="form-check">
+          <input class="form-check-input" type="checkbox" id="onekite-regularization">
+          <label class="form-check-label" for="onekite-regularization" style="font-size:13px;">Régularisation <span class="text-muted" style="font-size:12px;">(passe directement en payé)</span></label>
+        </div>
+      </div>
     ` : '';
 
     const messageHtml = `
@@ -1280,7 +1286,8 @@ function toDatetimeLocalValue(date) {
               // Return the effective end date (exclusive) because duration shortcuts can
               // change the range without updating the original FullCalendar selection.
               const targetUsername = isValidatorMode ? ((document.getElementById('onekite-target-username') || {}).value || '').trim() : '';
-              resolve({ itemIds, itemNames, total, days, endDate: toLocalYmd(end), targetUsername });
+              const isRegularization = isValidatorMode ? !!((document.getElementById('onekite-regularization') || {}).checked) : false;
+              resolve({ itemIds, itemNames, total, days, endDate: toLocalYmd(end), targetUsername, isRegularization });
             },
           },
         },
@@ -1568,6 +1575,7 @@ function toDatetimeLocalValue(date) {
               total: chosen.total,
             };
             if (chosen.targetUsername) reqPayload.targetUsername = chosen.targetUsername;
+            if (chosen.isRegularization) reqPayload.isRegularization = true;
             const resp = await requestReservation(reqPayload);
             if (resp && (resp.autoPaid || String(resp.status) === 'paid')) {
               showAlert('success', chosen.targetUsername ? `Réservation confirmée pour ${chosen.targetUsername}.` : 'Réservation confirmée.');
@@ -1659,6 +1667,7 @@ function toDatetimeLocalValue(date) {
               total: chosen.total,
             };
             if (chosen.targetUsername) reqPayload.targetUsername = chosen.targetUsername;
+            if (chosen.isRegularization) reqPayload.isRegularization = true;
             const resp = await requestReservation(reqPayload);
             if (resp && (resp.autoPaid || String(resp.status) === 'paid')) {
               showAlert('success', chosen.targetUsername ? `Réservation confirmée pour ${chosen.targetUsername}.` : 'Réservation confirmée.');

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>