nodebb-plugin-calendar-onekite 10.0.18 → 11.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-calendar-onekite",
-  "version": "10.0.18",
+  "version": "11.1.0",
   "description": "Calendar & equipment booking workflow for NodeBB (FullCalendar + HelloAsso)",
   "main": "library.js",
   "license": "MIT",

package/public/lib/admin.js

@@ -3,175 +3,201 @@
 /* global $, app, bootbox */
 
 (function () {
-  async function getSettings() {
+  function getSettings() {
     return $.getJSON('/api/calendar-onekite/settings');
   }
 
-  async function saveSettings(data) {
+  function saveSettings(data) {
     return $.ajax({
       url: '/api/admin/calendar-onekite/settings',
       method: 'POST',
       contentType: 'application/json',
-      data: JSON.stringify(data)
+      data: JSON.stringify(data || {})
     });
   }
 
-  async function syncItems() {
+  function syncItems() {
     return $.ajax({
       url: '/api/admin/calendar-onekite/sync-items',
       method: 'POST'
     });
   }
 
-  async function purge(year) {
+  function purgeYear(year) {
     return $.ajax({
       url: '/api/admin/calendar-onekite/purge',
-      method: 'POST',
-      contentType: 'application/json',
-      data: JSON.stringify({ year })
+      method: 'POST'
+,      contentType: 'application/json',
+      data: JSON.stringify({ year: year })
     });
   }
 
-  async function listPending() {
+  function listPending() {
     return $.getJSON('/api/admin/calendar-onekite/pending');
   }
 
-  async function approve(id) {
-    return $.ajax({ url: `/api/admin/calendar-onekite/reservations/${id}/approve`, method: 'PUT' });
+  function approve(id) {
+    return $.ajax({
+      url: '/api/admin/calendar-onekite/reservations/' + id + '/approve',
+      method: 'PUT'
+    });
+  }
+
+  function refuse(id) {
+    return $.ajax({
+      url: '/api/admin/calendar-onekite/reservations/' + id + '/refuse',
+      method: 'PUT'
+    });
   }
 
-  async function refuse(id) {
-    return $.ajax({ url: `/api/admin/calendar-onekite/reservations/${id}/refuse`, method: 'PUT' });
+  function safeErr(e) {
+    try {
+      if (e && e.responseJSON && e.responseJSON.error) return e.responseJSON.error;
+    } catch (err) {}
+    return 'Erreur';
+  }
+
+  function fillForm(settings) {
+    var $form = $('.calendar-onekite-settings');
+    Object.keys(settings || {}).forEach(function (k) {
+      $form.find('[name="' + k + '"]').val(settings[k]);
+    });
   }
 
   function readForm() {
-    const data = {};
-    $('.calendar-onekite-settings').find('input, select, textarea').each(function () {
-      const $el = $(this);
-      const name = $el.attr('name');
+    var data = {};
+    $('.calendar-onekite-settings').find('input,select,textarea').each(function () {
+      var $el = $(this);
+      var name = $el.attr('name');
       if (!name) return;
       data[name] = $el.val();
     });
     return data;
   }
 
-  function fillForm(settings) {
-    Object.keys(settings || {}).forEach((key) => {
-      const $el = $(`.calendar-onekite-settings [name="${key}"]`);
-      if ($el.length) $el.val(settings[key]);
-    });
-  }
-
   function renderPending(list) {
-    if (!list || !list.length) {
-      $('#onekite-pending').html('<div class="text-muted">Aucune demande en attente.</div>');
-      return;
+    var $p = $('#onekite-pending');
+    $p.empty();
+
+    function row(r, type) {
+      var btns = '';
+      if (type === 'pending') {
+        btns = ''
+          + '<button class="btn btn-sm btn-success me-1" data-approve="' + r.id + '"><i class="fa fa-check"></i> Approve</button>'
+          + '<button class="btn btn-sm btn-outline-danger" data-refuse="' + r.id + '"><i class="fa fa-times"></i> Refuse</button>';
+      } else {
+        btns = r.paymentUrl ? ('<a class="btn btn-sm btn-outline-primary" href="' + r.paymentUrl + '" target="_blank" rel="noopener"><i class="fa fa-credit-card"></i> Lien paiement</a>') : '';
+      }
+
+      return ''
+        + '<tr>'
+        + '<td>#' + r.id + '</td>'
+        + '<td>' + (r.itemName || '') + '</td>'
+        + '<td>' + (new Date(Number(r.start))).toLocaleString() + '</td>'
+        + '<td>' + (new Date(Number(r.end))).toLocaleString() + '</td>'
+        + '<td>' + (r.username || '') + '</td>'
+        + '<td><code>' + (r.status || '') + '</code></td>'
+        + '<td class="text-end">' + btns + '</td>'
+        + '</tr>';
     }
 
-    const rows = list.map(r => {
-      const start = new Date(parseInt(r.start, 10)).toLocaleString();
-      const end = new Date(parseInt(r.end, 10)).toLocaleString();
-      const expires = r.expiresAt ? new Date(parseInt(r.expiresAt, 10)).toLocaleString() : '';
-
-      return `
-        <tr>
-          <td>${r.id}</td>
-          <td>${$('<div>').text(r.username || '').html()}</td>
-          <td>${$('<div>').text(r.itemName || '').html()}</td>
-          <td>${start} → ${end}</td>
-          <td>${expires}</td>
-          <td class="text-end">
-            <button class="btn btn-sm btn-success" data-action="approve" data-id="${r.id}"><i class="fa fa-check"></i></button>
-            <button class="btn btn-sm btn-danger" data-action="refuse" data-id="${r.id}"><i class="fa fa-times"></i></button>
-          </td>
-        </tr>
-      `;
-    }).join('');
-
-    $('#onekite-pending').html(`
-      <div class="table-responsive">
-        <table class="table table-sm">
-          <thead>
-            <tr>
-              <th>ID</th>
-              <th>Membre</th>
-              <th>Matériel</th>
-              <th>Plage</th>
-              <th>Expire</th>
-              <th></th>
-            </tr>
-          </thead>
-          <tbody>${rows}</tbody>
-        </table>
-      </div>
-    `);
+    var html = '';
+    var pending = (list && list.pending) ? list.pending : [];
+    var awaiting = (list && list.awaiting_payment) ? list.awaiting_payment : [];
+
+    html += '<h5 class="mt-4">Demandes en attente</h5>';
+    html += '<div class="table-responsive"><table class="table table-sm">'
+      + '<thead><tr><th>ID</th><th>Matériel</th><th>Début</th><th>Fin</th><th>Utilisateur</th><th>Statut</th><th></th></tr></thead><tbody>';
+    if (!pending.length) html += '<tr><td colspan="7" class="text-muted">Aucune</td></tr>';
+    pending.forEach(function (r) { html += row(r, 'pending'); });
+    html += '</tbody></table></div>';
+
+    html += '<h5 class="mt-4">Validées (en attente de paiement)</h5>';
+    html += '<div class="table-responsive"><table class="table table-sm">'
+      + '<thead><tr><th>ID</th><th>Matériel</th><th>Début</th><th>Fin</th><th>Utilisateur</th><th>Statut</th><th></th></tr></thead><tbody>';
+    if (!awaiting.length) html += '<tr><td colspan="7" class="text-muted">Aucune</td></tr>';
+    awaiting.forEach(function (r) { html += row(r, 'awaiting'); });
+    html += '</tbody></table></div>';
+
+    $p.html(html);
+
+    $p.find('[data-approve]').off('click').on('click', function () {
+      var id = $(this).attr('data-approve');
+      approve(id).done(function (resp) {
+        if (resp && resp.paymentUrl) {
+          app.alertSuccess('Validé. Lien de paiement créé.');
+        } else {
+          app.alertSuccess('Validé.');
+        }
+        refreshPending();
+      }).fail(function (e) {
+        app.alertError(safeErr(e));
+      });
+    });
+
+    $p.find('[data-refuse]').off('click').on('click', function () {
+      var id = $(this).attr('data-refuse');
+      refuse(id).done(function () {
+        app.alertSuccess('Refusé.');
+        refreshPending();
+      }).fail(function (e) {
+        app.alertError(safeErr(e));
+      });
+    });
   }
 
-  async function refreshPending() {
-    const list = await listPending();
-    renderPending(list);
+  function refreshPending() {
+    listPending().done(function (list) {
+      renderPending(list);
+    }).fail(function () {
+      $('#onekite-pending').html('<div class="text-danger">Impossible de charger la liste.</div>');
+    });
   }
 
-  async function init() {
-    try {
-      const settings = await getSettings();
+  function boot() {
+    getSettings().done(function (settings) {
       fillForm(settings);
-      await refreshPending();
-    } catch (e) {
-      app.alertError(e && e.responseJSON && e.responseJSON.error ? e.responseJSON.error : 'Erreur');
-    }
+    });
 
-    $('#onekite-save').on('click', async function () {
-      try {
-        const data = readForm();
-        await saveSettings(data);
-        app.alertSuccess('Enregistré');
-      } catch (e) {
-        app.alertError(e && e.responseJSON && e.responseJSON.error ? e.responseJSON.error : 'Erreur');
-      }
+    // Save settings
+    $('#onekite-save').on('click', function () {
+      var data = readForm();
+      saveSettings(data).done(function () {
+        app.alertSuccess('Paramètres enregistrés.');
+      }).fail(function (e) {
+        app.alertError(safeErr(e));
+      });
     });
 
-    $('#onekite-sync-items').on('click', async function (ev) {
-      ev.preventDefault();
-      try {
-        await syncItems();
-        app.alertSuccess('Items synchronisés depuis HelloAsso');
-      } catch (e) {
-        app.alertError(e && e.responseJSON && e.responseJSON.error ? e.responseJSON.error : 'Erreur sync');
-      }
+    // Sync items
+    $('#onekite-sync-items').on('click', function () {
+      syncItems().done(function (resp) {
+        app.alertSuccess('Synchronisation OK (' + (resp.count || 0) + ' items).');
+      }).fail(function (e) {
+        app.alertError(safeErr(e));
+      });
     });
 
-    $('#onekite-purge').on('click', async function () {
-      const year = parseInt($('[name="purgeYear"]').val(), 10);
-      if (!year || year < 1970) {
+    // Purge
+    $('#onekite-purge').on('click', function () {
+      var year = parseInt($('#onekite-purge-year').val(), 10);
+      if (!year) {
         app.alertError('Année invalide');
         return;
       }
-      bootbox.confirm(`Confirmer la purge de l'année ${year} ?`, async function (ok) {
+      bootbox.confirm('Purger toutes les réservations de ' + year + ' ?', function (ok) {
         if (!ok) return;
-        try {
-          await purge(year);
-          app.alertSuccess('Purge effectuée');
-          await refreshPending();
-        } catch (e) {
-          app.alertError(e && e.responseJSON && e.responseJSON.error ? e.responseJSON.error : 'Erreur purge');
-        }
+        purgeYear(year).done(function (resp) {
+          app.alertSuccess('Purge OK (' + (resp.purged || 0) + ').');
+          refreshPending();
+        }).fail(function (e) {
+          app.alertError(safeErr(e));
+        });
       });
     });
 
-    $('#onekite-pending').on('click', 'button[data-action]', async function () {
-      const id = $(this).attr('data-id');
-      const action = $(this).attr('data-action');
-      try {
-        if (action === 'approve') await approve(id);
-        if (action === 'refuse') await refuse(id);
-        app.alertSuccess('OK');
-        await refreshPending();
-      } catch (e) {
-        app.alertError(e && e.responseJSON && e.responseJSON.error ? e.responseJSON.error : 'Erreur');
-      }
-    });
+    refreshPending();
   }
 
-  $(document).ready(init);
+  $(boot);
 })();