nodebb-plugin-onekite-calendar 2.0.33 → 2.0.35

package/lib/api.js

@@ -1042,6 +1042,9 @@ api.createReservation = async function (req, res) {
               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: `${normalizeBaseUrl(meta)}/admin/plugins/calendar-onekite`,
             });
           }
         }

package/lib/helloassoWebhook.js

@@ -313,6 +313,12 @@ async function handler(req, res, next) {
     const requesterUid = parseInt(r.uid, 10);
     const requester = await user.getUserFields(requesterUid, ['username']);
     if (requesterUid) {
+      const latNum = Number(r.pickupLat);
+      const lonNum = Number(r.pickupLon);
+      const mapUrl = (Number.isFinite(latNum) && Number.isFinite(lonNum))
+        ? `https://www.openstreetmap.org/?mlat=${encodeURIComponent(String(latNum))}&mlon=${encodeURIComponent(String(lonNum))}#map=18/${encodeURIComponent(String(latNum))}/${encodeURIComponent(String(lonNum))}`
+        : '';
+
       await sendEmail('calendar-onekite_paid', requesterUid, 'Location matériel - Paiement reçu', {
         uid: requesterUid,
         username: requester && requester.username ? requester.username : '',
@@ -320,6 +326,8 @@ 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 || '',
+        pickupAddress: r.pickupAddress || '',
+        mapUrl,
       });
     }
 
@@ -346,4 +354,4 @@ async function handler(req, res, next) {
 
 module.exports = {
   handler,
-};
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-onekite-calendar",
-  "version": "2.0.33",
+  "version": "2.0.35",
   "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.33"
+  "version": "2.0.35"
 }

package/templates/emails/calendar-onekite_approved.tpl

@@ -1,5 +1,5 @@
 <p>Bonjour {username},</p>
-<p>Votre réservation a été validée.</p>
+<p>Votre réservation est validée. Veuillez procéder à son règlement.</p>
 
 <!-- IF validatedBy -->
 <p><strong>Validée par :</strong> <a href="{validatedByUrl}">{validatedBy}</a></p>
@@ -16,6 +16,10 @@
 
 <!-- IF pickupTime -->
 <p><strong>Heure de récupération :</strong> {pickupTime}</p>
+
+<!-- IF pickupAddress -->
+<p><strong>Adresse :</strong> {pickupAddress}</p>
+<!-- ENDIF pickupAddress -->
 <!-- ENDIF pickupTime -->
 
 <!-- IF pickupAddress -->
@@ -23,7 +27,7 @@
 <!-- ENDIF pickupAddress -->
 
 <!-- IF mapUrl -->
-<p style="font-size: 12px; color: #666;">Voir sur la carte : <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

@@ -10,6 +10,14 @@
 
 <p>{dateRange}</p>
 
+
+<!-- IF pickupAddress -->
+<p><strong>Adresse :</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>
+<!-- ENDIF mapUrl -->
 <!-- IF paymentReceiptUrl -->
 <p><strong>Reçu :</strong> <a href="{paymentReceiptUrl}">{paymentReceiptUrl}</a></p>
 <!-- ENDIF paymentReceiptUrl -->