nodebb-plugin-calendar-onekite 1.3.4 → 1.3.6

package/helloasso.js

@@ -33,7 +33,7 @@ async function getHelloAssoAccessToken() {
 
 async function createHelloAssoCheckoutIntent({ eid, rid, uid, itemId, quantity, amount }) {
   if (!HELLOASSO_ORG_SLUG || !HELLOASSO_FORM_SLUG) {
-    console.warn('[calendar-lite] HelloAsso non configuré, retournera une URL générique.');
+    console.warn('[calendar-onekite] HelloAsso non configuré, retournera une URL générique.');
     return 'https://www.helloasso.com/';
   }
 

package/library.js

@@ -99,7 +99,8 @@ async function updateEvent(eid, data) {
     allDay: data.allDay !== undefined ? (data.allDay ? 1 : 0) : existing.allDay,
     location: data.location !== undefined ? String(data.location) : existing.location,
     visibility: data.visibility !== undefined ? String(data.visibility) : existing.visibility,
-    bookingEnabled: data.bookingEnabled !== undefined ? (data.bookingEnabled ? 1 : 0) : (existing.bookingEnabled || 0),
+    bookingEnabled:
+      data.bookingEnabled !== undefined ? (data.bookingEnabled ? 1 : 0) : (existing.bookingEnabled || 0),
     bookingItems: JSON.stringify(bookingItems),
     updatedAt: String(Date.now()),
   };
@@ -140,7 +141,7 @@ async function getUpcomingEvents(limit = 5) {
 
 async function userCanCreate(uid) {
   if (!uid || uid === 0) return false;
-  const settings = await Settings.get('calendar-lite');
+  const settings = await Settings.get('calendar-onekite');
   if (!settings || !settings.allowedGroups) return false;
 
   const allowedSet = new Set(
@@ -159,7 +160,7 @@ async function userCanCreate(uid) {
 async function userCanBook(uid) {
   if (!uid || uid === 0) return false;
 
-  const settings = await Settings.get('calendar-lite');
+  const settings = await Settings.get('calendar-onekite');
   // Si pas configuré, on permet à tout le monde connecté
   if (!settings || !settings.allowedBookingGroups) return true;
 
@@ -224,6 +225,23 @@ function computePrice(event, reservation) {
   return unit * reservation.quantity * days;
 }
 
+/* ********* ADMIN PAGE (AJOUTÉ) ********* */
+
+async function renderAdminPage(req, res) {
+  try {
+    const settings = (await Settings.get('calendar-onekite')) || {};
+    res.render('admin/plugins/calendar-onekite', {
+      title: 'Calendar OneKite',
+      settings,
+    });
+  } catch (err) {
+    if (req.path && req.path.startsWith('/api/')) {
+      return res.status(500).json({ error: err.message });
+    }
+    res.status(500).send(err.message);
+  }
+}
+
 /* ********* INIT ********* */
 
 Plugin.init = async function (params) {
@@ -390,7 +408,7 @@ Plugin.init = async function (params) {
         status: 'pending_admin',
         helloAssoOrderId: null,
         createdAt: now,
-        pickupLocation: item.pickupLocation || ''
+        pickupLocation: item.pickupLocation || '',
       };
 
       allRes.push(reservation);
@@ -412,7 +430,7 @@ Plugin.init = async function (params) {
           pickupLocation: reservation.pickupLocation || 'Non précisé',
         });
       } catch (e) {
-        console.warn('[calendar-lite] email reservation-created error:', e.message);
+        console.warn('[calendar-onekite] email reservation-created error:', e.message);
       }
 
       res.json({
@@ -499,7 +517,7 @@ Plugin.init = async function (params) {
           days: reservation.days || 1,
         });
       } catch (e) {
-        console.warn('[calendar-lite] email reservation-approved error:', e.message);
+        console.warn('[calendar-onekite] email reservation-approved error:', e.message);
       }
 
       res.json({ success: true, checkoutUrl });
@@ -566,7 +584,6 @@ Plugin.init = async function (params) {
       const itemIndex = items.findIndex(i => i.id === reservation.itemId);
       if (itemIndex !== -1) {
         const item = items[itemIndex];
-        // plus de reservedTemp, la logique se base sur les réservations
         item.reserved = (item.reserved || 0) + reservation.quantity;
         items[itemIndex] = item;
       }
@@ -592,24 +609,24 @@ Plugin.init = async function (params) {
           days: reservation.days || 1,
         });
       } catch (e) {
-        console.warn('[calendar-lite] email payment-confirmed error:', e.message);
+        console.warn('[calendar-onekite] email payment-confirmed error:', e.message);
       }
 
       res.json({ ok: true });
     } catch (err) {
-      console.error('[calendar-lite] HelloAsso webhook error:', err);
+      console.error('[calendar-onekite] HelloAsso webhook error:', err);
       res.status(500).json({ error: err.message });
     }
   });
 
-  /* PAGE ADMIN PLUGIN */
+  /* PAGE ADMIN PLUGIN (CORRIGÉ) */
 
-  router.get('/admin/plugins/nodebb-plugin-calendar-onekite', middleware.admin.buildHeader, renderAdminPage);
-  router.get('/api/admin/plugins/nodebb-plugin-calendar-onekite', renderAdminPage);
+  router.get('/admin/plugins/calendar-onekite', middleware.admin.buildHeader, renderAdminPage);
+  router.get('/api/admin/plugins/calendar-onekite', renderAdminPage);
 
-  router.put('/api/admin/plugins/nodebb-plugin-calendar-onekite', middleware.admin.checkPrivileges, async (req, res) => {
+  router.put('/api/admin/plugins/calendar-onekite', middleware.admin.checkPrivileges, async (req, res) => {
     try {
-      await Settings.set('calendar-lite', req.body);
+      await Settings.set('calendar-onekite', req.body);
       res.json({ status: 'ok' });
     } catch (err) {
       res.status(500).json({ error: err.message });
@@ -708,9 +725,9 @@ function renderPlanningPage(req, res) {
 
 Plugin.addAdminNavigation = function (header) {
   header.plugins.push({
-    route: '/plugins/calendar-lite',
+    route: '/plugins/calendar-onekite',
     icon: 'fa fa-calendar',
-    name: 'Calendar Lite',
+    name: 'Calendar OneKite',
   });
   return header;
 };
@@ -727,7 +744,7 @@ Plugin.defineWidgets = async function (widgets) {
 
 Plugin.renderUpcomingWidget = async function (widget, callback) {
   try {
-    const settings = await Settings.get('calendar-lite') || {};
+    const settings = (await Settings.get('calendar-onekite')) || {};
     const limit = Number(widget.data.limit || settings.limit || 5);
     const events = await getUpcomingEvents(limit);
     const html = await appRef.renderAsync('widgets/calendar-upcoming', { events });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-calendar-onekite",
-  "version": "1.3.4",
+  "version": "1.3.6",
   "description": "",
   "repository": {
     "type": "git",

package/plugin.json

@@ -3,7 +3,7 @@
   "name": "Calendar Onekite",
   "description": "Calendrier + réservation de matériel + validation admin + paiement HelloAsso pour NodeBB v4",
   "url": "",
-  "version": "1.3.4",
+  "version": "1.3.6",
   "library": "./library.js",
   "staticDirs": {
     "static": "static"

package/static/js/admin.js

@@ -1,12 +1,12 @@
 'use strict';
 
 $(document).ready(function () {
-  if (!$('#calendar-lite-admin').length && !$('#calendar-planning').length) return;
+  if (!$('#calendar-onekite-admin').length && !$('#calendar-planning').length) return;
 
   const AdminCalendar = {
 
     initSettings: function () {
-      if (!$('#calendar-lite-admin').length) return;
+      if (!$('#calendar-onekite-admin').length) return;
       AdminCalendar.bindSettingsSave();
       AdminCalendar.loadPending();
     },
@@ -17,11 +17,11 @@ $(document).ready(function () {
     },
 
     bindSettingsSave: function () {
-      $('#calendar-lite-save').on('click', () => {
+      $('#calendar-onekite-save').on('click', () => {
         const settings = {
-          allowedGroups: $('#calendar-lite-groups').val(),
-          allowedBookingGroups: $('#calendar-lite-book-groups').val(),
-          limit: $('#calendar-lite-widget-limit').val()
+          allowedGroups: $('#calendar-onekite-groups').val(),
+          allowedBookingGroups: $('#calendar-onekite-book-groups').val(),
+          limit: $('#calendar-onekite-widget-limit').val()
         };
 
         $.ajax({

package/templates/admin/plugins/{calendar-lite.tpl → calendar-onekite.tpl}

@@ -1,4 +1,4 @@
-<div id="calendar-lite-admin">
+<div id="calendar-onekite-admin">
   <h2>Calendar Lite – Administration</h2>
 
   <h3>Réservations en attente</h3>
@@ -10,19 +10,20 @@
 
   <div class="form-group">
     <label>Groupes autorisés à créer / modifier des événements</label>
-    <input id="calendar-lite-groups" class="form-control" value="{settings.allowedGroups}">
+    <input id="calendar-onekite-groups" class="form-control" value="{settings.allowedGroups}">
     <small>Ex : administrators, moderators</small>
   </div>
 
+
   <div class="form-group">
     <label>Nombre d’événements dans le widget</label>
-    <input id="calendar-lite-widget-limit" type="number" class="form-control" value="{settings.limit}">
+    <input id="calendar-onekite-widget-limit" type="number" class="form-control" value="{settings.limit}">
     <label>Groupes autorisés à réserver</label>
-    <input id="calendar-lite-book-groups" class="form-control" value="{settings.allowedBookingGroups}">
+    <input id="calendar-onekite-book-groups" class="form-control" value="{settings.allowedBookingGroups}">
     <small>Ex : registered-users, membres, vip</small>
   </div>
 
-  <button id="calendar-lite-save" class="btn btn-primary">Enregistrer</button>
+  <button id="calendar-onekite-save" class="btn btn-primary">Enregistrer</button>
 </div>
 
-<script src="/plugins/nodebb-plugin-calendar-lite/static/js/admin.js"></script>
+<script src="/plugins/nodebb-plugin-calendar-onekite/static/js/admin.js"></script>