nodebb-plugin-onekite-calendar 2.0.75 → 2.0.76

package/lib/admin.js

@@ -89,6 +89,7 @@ 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/scheduler.js

@@ -224,6 +224,7 @@ 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.75",
+  "version": "2.0.76",
   "description": "FullCalendar-based equipment reservation workflow with admin approval & HelloAsso payment for NodeBB",
   "main": "library.js",
   "license": "MIT",

package/public/admin.js

@@ -838,6 +838,10 @@ 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({
@@ -856,8 +860,9 @@ 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 });
+                          await approve(rr, { pickupAddress, notes, pickupTime, pickupLat, pickupLon, paymentDeferred });
                         }
                         showAlert('success', `${rids.length} demande(s) validée(s).`);
                         await refreshPending();
@@ -1010,6 +1015,10 @@ 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({
@@ -1028,7 +1037,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();
-                        await approve(rid, { pickupAddress, notes, pickupTime, pickupLat, pickupLon });
+                        const paymentDeferred = !!(document.getElementById('onekite-payment-deferred')?.checked);
+                        await approve(rid, { pickupAddress, notes, pickupTime, pickupLat, pickupLon, paymentDeferred });
                         if (rowEl && rowEl.parentNode) rowEl.parentNode.removeChild(rowEl);
                         showAlert('success', 'Demande validée.');
                         await refreshPending();