nodebb-plugin-calendar-onekite 11.1.13 → 11.1.15

package/lib/admin.js

@@ -59,13 +59,36 @@ admin.approveReservation = async function (req, res) {
   let paymentUrl = null;
   if (token) {
     const requester = await user.getUserData(r.uid);
+    // Determine amount from HelloAsso items (pricing comes from HelloAsso)
+    let totalAmount = 0;
+    try {
+      const items = await helloasso.listItems({
+        env,
+        token,
+        organizationSlug: settings.helloassoOrganizationSlug,
+        formType: settings.helloassoFormType,
+        formSlug: settings.helloassoFormSlug,
+      });
+      const normalized = (items || []).map((it) => ({
+        id: String(it.id || it.itemId || it.reference || it.name),
+        price: it.price || it.amount || it.unitPrice || 0,
+      })).filter(it => it.id);
+      const match = normalized.find(it => it.id === String(r.itemId));
+      totalAmount = match ? parseInt(match.price, 10) || 0 : 0;
+    } catch (e) {
+      totalAmount = 0;
+    }
+
+    if (!totalAmount) {
+      return res.status(400).json({ error: 'item-price-not-found' });
+    }
     paymentUrl = await helloasso.createCheckoutIntent({
       env,
       token,
       organizationSlug: settings.helloassoOrganizationSlug,
       formType: settings.helloassoFormType,
       formSlug: settings.helloassoFormSlug,
-      totalAmount: parseInt(settings.defaultAmount || '0', 10) || 0,
+      totalAmount,
       payerEmail: requester && requester.email,
     });
   }

package/lib/db.js

@@ -21,8 +21,11 @@ async function removeReservation(rid) {
 }
 
 async function listReservationIdsByStartRange(startTs, endTs, limit = 1000) {
-  // NodeBB db supports sortedSetGetRangeByScore
-  return await db.sortedSetGetRangeByScore(KEY_ZSET, startTs, endTs, 0, limit);
+  // NodeBB db method name is getSortedSetRangeByScore(set, start, stop, min, max)
+  // (start/stop are index offsets, min/max are score range)
+  const start = 0;
+  const stop = Math.max(0, (parseInt(limit, 10) || 1000) - 1);
+  return await db.getSortedSetRangeByScore(KEY_ZSET, start, stop, startTs, endTs);
 }
 
 async function listAllReservationIds(limit = 5000) {

package/package.json

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

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

@@ -52,11 +52,6 @@
           <input class="form-control" name="helloassoFormSlug">
         </div>
 
-        <div class="mb-3">
-          <label class="form-label">Montant par défaut (centimes)</label>
-          <input class="form-control" name="defaultAmount" type="number" min="0" value="0">
-        </div>
-
         <button type="button" class="btn btn-primary" id="onekite-save">Enregistrer</button>
       </form>