nodebb-plugin-calendar-onekite 11.1.63 → 11.1.65

package/lib/admin.js

@@ -348,6 +348,7 @@ admin.getAccounting = async function (req, res) {
     const r = await dbLayer.getReservation(rid);
     if (!r) continue;
     if (String(r.status) !== 'paid') continue;
+    if (r.accPurgedAt) continue;
     const start = parseInt(r.start, 10);
     if (!Number.isFinite(start)) continue;
     if (start < minTs || start >= maxTs) continue;
@@ -434,4 +435,45 @@ admin.exportAccountingCsv = async function (req, res) {
   return res.send(csv);
 };
 
+
+admin.purgeAccounting = async function (req, res) {
+  const qFrom = String((req.query && req.query.from) || '').trim();
+  const qTo = String((req.query && req.query.to) || '').trim();
+  const parseDay = (s) => {
+    if (!/^\d{4}-\d{2}-\d{2}$/.test(s)) return null;
+    const [y, m, d] = s.split('-').map((x) => parseInt(x, 10));
+    const dt = new Date(Date.UTC(y, m - 1, d));
+    const ts = dt.getTime();
+    return Number.isFinite(ts) ? ts : null;
+  };
+  const fromTs = parseDay(qFrom);
+  const toTs = parseDay(qTo);
+
+  const now = new Date();
+  const defaultTo = Date.UTC(now.getUTCFullYear() + 100, 0, 1); // far future
+  const defaultFrom = Date.UTC(1970, 0, 1);
+  const minTs = fromTs ?? defaultFrom;
+  const maxTs = toTs ?? defaultTo;
+
+  const ids = await dbLayer.listAllReservationIds(200000);
+  let purged = 0;
+  const ts = Date.now();
+
+  for (const rid of ids) {
+    const r = await dbLayer.getReservation(rid);
+    if (!r) continue;
+    if (String(r.status) !== 'paid') continue;
+    const start = parseInt(r.start, 10);
+    if (!Number.isFinite(start)) continue;
+    if (start < minTs || start >= maxTs) continue;
+
+    r.accPurgedAt = ts;
+    await dbLayer.saveReservation(r);
+    purged++;
+  }
+
+  return res.json({ ok: true, purged });
+};
+
+
 module.exports = admin;

package/lib/helloassoWebhook.js

@@ -295,7 +295,20 @@ async function handler(req, res, next) {
       return res.json({ ok: true, ignored: true });
     }
 
+    // Ignore incomplete Payment events (HelloAsso sometimes omits metadata and checkoutIntentId on Payment webhooks).
+    // We rely on Order events (or checkoutIntent mappings) for reliable reconciliation.
+    const _eventType = String((payload && payload.eventType) || '').toLowerCase();
+    const _rid = getReservationIdFromPayload(payload);
+    const _checkoutIntentId = getCheckoutIntentIdFromPayload(payload);
+    if (_eventType === 'payment' && !_rid && !_checkoutIntentId) {
+      return res.json({ ok: true, ignored: true, incompletePayment: true });
+    }
+
     const paymentId = payload && payload.data ? (payload.data.id || payload.data.paymentId) : null;
+    // If we can't identify the payment, acknowledge and ignore (prevents accidental crashes).
+    if (!paymentId) {
+      return res.json({ ok: true, ignored: true, missingPaymentId: true });
+    }
     if (await alreadyProcessed(paymentId)) {
       return res.json({ ok: true, duplicate: true });
     }

package/library.js

@@ -97,6 +97,7 @@ Plugin.init = async function (params) {
     // Accounting / exports
     router.get(`${base}/accounting`, ...adminMws, admin.getAccounting);
     router.get(`${base}/accounting.csv`, ...adminMws, admin.exportAccountingCsv);
+    router.post(`${base}/accounting/purge`, ...adminMws, admin.purgeAccounting);
   });
 
   // HelloAsso callback endpoint (hardened)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-calendar-onekite",
-  "version":"11.1.63",
+  "version": "11.1.65",
   "description": "FullCalendar-based equipment reservation workflow with admin approval & HelloAsso payment for NodeBB",
   "main": "library.js",
   "license": "MIT",
@@ -8,4 +8,4 @@
     "node": ">=18"
   },
   "dependencies": {}
-}
+}

package/plugin.json

@@ -27,5 +27,5 @@
   "acpScripts": [
     "public/admin.js"
   ],
-  "version": "1.0.31"
-}
+  "version": "1.0.33"
+}

package/public/admin.js

@@ -516,6 +516,7 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
     const accTo = document.getElementById('onekite-acc-to');
     const accRefresh = document.getElementById('onekite-acc-refresh');
     const accExport = document.getElementById('onekite-acc-export');
+    const accPurge = document.getElementById('onekite-acc-purge');
     const accSummary = document.querySelector('#onekite-acc-summary tbody');
     const accRows = document.querySelector('#onekite-acc-rows tbody');
 
@@ -584,6 +585,32 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
         const url = `/api/v3/admin/plugins/calendar-onekite/accounting.csv${qs ? `?${qs}` : ''}`;
         window.open(url, '_blank');
       });
+
+      if (accPurge) {
+        accPurge.addEventListener('click', async () => {
+          const ok = window.confirm('Purger la comptabilité pour la période sélectionnée ?
+Cela masquera ces réservations dans l\'onglet Comptabilisation (sans modifier leur statut payé).');
+          if (!ok) return;
+          try {
+            const params = new URLSearchParams();
+            if (accFrom && accFrom.value) params.set('from', accFrom.value);
+            if (accTo && accTo.value) params.set('to', accTo.value);
+            const qs = params.toString();
+            const url = `/api/v3/admin/plugins/calendar-onekite/accounting/purge${qs ? `?${qs}` : ''}`;
+            const res = await fetchJson(url, { method: 'POST' });
+            if (res && res.ok) {
+              showAlert('success', `Compta purgée : ${res.purged || 0} réservation(s).`);
+              const data = await fetchAccounting();
+              renderAccounting(data);
+            } else {
+              showAlert('error', 'Purge impossible.');
+            }
+          } catch (e) {
+            showAlert('error', 'Purge impossible.');
+          }
+        });
+      }
+
     }
   }
 

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

@@ -122,6 +122,7 @@
           <div>
             <button type="button" class="btn btn-primary" id="onekite-acc-refresh">Rafraîchir</button>
             <button type="button" class="btn btn-outline-secondary" id="onekite-acc-export">Exporter CSV</button>
+            <button type="button" class="btn btn-outline-danger" id="onekite-acc-purge">Purger la compta</button>
           </div>
         </div>