nodebb-plugin-calendar-onekite 11.1.61 → 11.1.62

package/lib/admin.js

@@ -135,7 +135,7 @@ admin.approveReservation = async function (req, res) {
 
   // If admin configured a Shop form, we can't create a cart programmatically with the standard Checkout API.
   // We therefore redirect the user to the shop page so the transaction is recorded in the Shop form.
-  if (settings.helloassoFormType === 'Shop' && settings.helloassoOrganizationSlug && settings.helloassoFormSlug) {
+  if (String(settings.helloassoFormType || '').toLowerCase() === 'shop' && settings.helloassoOrganizationSlug && settings.helloassoFormSlug) {
     const frontBase = (env === 'sandbox') ? 'https://www.helloasso-sandbox.com' : 'https://www.helloasso.com';
     // Add rid as UTM for easier manual reconciliation on HelloAsso side (may not be returned in webhooks).
     paymentUrl = `${frontBase}/associations/${encodeURIComponent(settings.helloassoOrganizationSlug)}/boutiques/${encodeURIComponent(settings.helloassoFormSlug)}?utm_source=nodebb&utm_medium=calendar&utm_campaign=location&utm_content=${encodeURIComponent(String(rid))}`;

package/lib/api.js

@@ -398,7 +398,8 @@ api.approveReservation = async function (req, res) {
     r.expectedTotalAmount = cents;
 
     // If a Shop form is configured, redirect to the Shop page so the payment is recorded in the shop.
-    if (settings2.helloassoFormType === 'Shop' && settings2.helloassoOrganizationSlug && settings2.helloassoFormSlug) {
+    // The stored value can vary in casing depending on the ACP select.
+    if (String(settings2.helloassoFormType || '').toLowerCase() === 'shop' && settings2.helloassoOrganizationSlug && settings2.helloassoFormSlug) {
       const frontBase = (env2 === 'sandbox') ? 'https://www.helloasso-sandbox.com' : 'https://www.helloasso.com';
       r.paymentUrl = `${frontBase}/associations/${encodeURIComponent(settings2.helloassoOrganizationSlug)}/boutiques/${encodeURIComponent(settings2.helloassoFormSlug)}?utm_source=nodebb&utm_medium=calendar&utm_campaign=location&utm_content=${encodeURIComponent(String(rid))}`;
     } else {

package/lib/helloassoWebhook.js

@@ -420,8 +420,9 @@ async function handler(req, res, next) {
       const formType = getFormTypeFromPayload(payload).toLowerCase();
       const formSlug = getFormSlugFromPayload(payload);
       if (formType === 'shop' && String(settings.helloassoFormType || '').toLowerCase() === 'shop') {
-        // If a specific shop slug is configured, require it.
-        if (!settings.helloassoFormSlug || String(settings.helloassoFormSlug) === String(formSlug)) {
+        // If a specific shop slug is configured, require it when the payload provides it.
+        // Some webhook payloads (notably Payment) may omit the formSlug.
+        if (!settings.helloassoFormSlug || !formSlug || String(settings.helloassoFormSlug) === String(formSlug)) {
           resolvedRid = await tryMatchShopOrderToReservation(payload);
         }
       }

package/package.json

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