nodebb-plugin-onekite-calendar 2.0.37 → 2.0.39

package/lib/helloassoWebhook.js

@@ -326,6 +326,7 @@ async function handler(req, res, next) {
         itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
         dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
         paymentReceiptUrl: r.paymentReceiptUrl || '',
+        pickupTime: r.pickupTime || '',
         pickupAddress: r.pickupAddress || '',
         mapUrl,
       });

package/lib/widgets.js

@@ -271,10 +271,31 @@ widgets.renderTwoWeeksWidget = async function (data) {
         wrap.appendChild(dot);
         return { domNodes: [wrap] };
       },
+      // IMPORTANT: disable HTTP caching here.
+      // Some NodeBB setups add ETag/304 on API routes; fetch(...).json() will
+      // then fail because 304 responses have no body, which prevents the widget
+      // from updating on refetchEvents(). We add a cache-buster and request
+      // no-store to guarantee a fresh JSON payload.
       events: function(info, successCallback, failureCallback) {
-        const qs = new URLSearchParams({ start: info.startStr, end: info.endStr, widget: '1' });
-        fetch(eventsEndpoint + '?' + qs.toString(), { credentials: 'same-origin' })
-          .then((r) => r.json())
+        const qs = new URLSearchParams({
+          start: info.startStr,
+          end: info.endStr,
+          widget: '1',
+          _: String(Date.now()),
+        });
+        fetch(eventsEndpoint + '?' + qs.toString(), {
+          credentials: 'same-origin',
+          cache: 'no-store',
+          headers: { 'Cache-Control': 'no-cache' },
+        })
+          .then((r) => {
+            if (!r.ok) {
+              const err = new Error(String(r.status || 'fetch_failed'));
+              err.status = r.status;
+              throw err;
+            }
+            return r.json();
+          })
           .then((json) => successCallback(json || []))
           .catch((e) => failureCallback(e));
       },
@@ -405,6 +426,22 @@ dateClick: function() { window.location.href = calUrl; },
       }
     } catch (e) {}
 
+    // Fallback refresh: in case sockets are unavailable or blocked by proxies,
+    // refetch periodically and when the tab becomes visible.
+    try {
+      window.__oneKiteWidgetIntervals = window.__oneKiteWidgetIntervals || {};
+      if (!window.__oneKiteWidgetIntervals[containerId]) {
+        window.__oneKiteWidgetIntervals[containerId] = setInterval(() => {
+          try { calendar.refetchEvents(); } catch (e) {}
+        }, 60000);
+      }
+      document.addEventListener('visibilitychange', () => {
+        try {
+          if (!document.hidden) calendar.refetchEvents();
+        } catch (e) {}
+      }, { passive: true });
+    } catch (e) {}
+
     // Mobile swipe (left/right) to navigate weeks
     try {
       let touchStartX = null;

package/package.json

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

package/plugin.json

@@ -39,5 +39,5 @@
   "acpScripts": [
     "public/admin.js"
   ],
-  "version": "2.0.37"
+  "version": "2.0.39"
 }

package/public/client.js

@@ -545,6 +545,9 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
       if (!cal || typeof cal.refetchEvents !== 'function') return;
       clearTimeout(window.__onekiteRefetchTimer);
       window.__onekiteRefetchTimer = setTimeout(() => {
+        // Clear the in-memory JSON cache so status/color changes are fetched
+        // immediately (otherwise an unchanged ETag may keep stale colors).
+        try { invalidateEventsCache(); } catch (e) {}
         try { cal.refetchEvents(); } catch (e) {}
       }, 150);
     } catch (e) {}

package/templates/emails/calendar-onekite_approved.tpl

@@ -19,11 +19,11 @@
 <!-- ENDIF pickupTime -->
 
 <!-- IF pickupAddress -->
-<p><strong>Adresse de récupération :</strong><br>{pickupAddress}</p>
+<p><strong>Adresse de récupération :</strong> {pickupAddress}</p>
 <!-- ENDIF pickupAddress -->
 
 <!-- IF mapUrl -->
-<p style="font-size: 12px; color: #666;"><strong>Voir sur la carte :</strong> <a href="{mapUrl}">OpenStreetMap</a</p>
+<p style="font-size: 12px; color: #666;"><strong>Voir sur la carte :</strong> <a href="{mapUrl}">OpenStreetMap</a></p>
 <!-- ENDIF mapUrl -->
 
 <!-- IF notes -->

package/templates/emails/calendar-onekite_paid.tpl

@@ -15,7 +15,7 @@
 <!-- ENDIF pickupTime -->
 
 <!-- IF pickupAddress -->
-<p><strong>Adresse de récupération :</strong><br>{pickupAddress}</p>
+<p><strong>Adresse de récupération :</strong> {pickupAddress}</p>
 <!-- ENDIF pickupAddress -->
 
 <!-- IF mapUrl -->