@infuro/cms-core 1.0.59 → 1.0.61

package/dist/{chunk-MCCA7WLQ.cjs → chunk-CNAHVRRU.cjs}

@@ -2,16 +2,16 @@
 
 var chunkXQ3QUHWR_cjs = require('./chunk-XQ3QUHWR.cjs');
 var chunkHY3AXLOI_cjs = require('./chunk-HY3AXLOI.cjs');
-var chunkHXLC56ZK_cjs = require('./chunk-HXLC56ZK.cjs');
+var chunkYSYX4GUD_cjs = require('./chunk-YSYX4GUD.cjs');
 var chunk7NMT3GBR_cjs = require('./chunk-7NMT3GBR.cjs');
 var chunkV25RDUOU_cjs = require('./chunk-V25RDUOU.cjs');
 var chunkBXYZDMTZ_cjs = require('./chunk-BXYZDMTZ.cjs');
 var chunkUPLVMVRX_cjs = require('./chunk-UPLVMVRX.cjs');
 var chunk3DZRIZOD_cjs = require('./chunk-3DZRIZOD.cjs');
 var chunkTJ2MIQUT_cjs = require('./chunk-TJ2MIQUT.cjs');
-var chunk3EOM4V2M_cjs = require('./chunk-3EOM4V2M.cjs');
+var chunk4U6DATGZ_cjs = require('./chunk-4U6DATGZ.cjs');
 var chunkOY2YTBMP_cjs = require('./chunk-OY2YTBMP.cjs');
-var chunk77NUXO6A_cjs = require('./chunk-77NUXO6A.cjs');
+var chunkJ7FMZK66_cjs = require('./chunk-J7FMZK66.cjs');
 var chunkD5FBNKQM_cjs = require('./chunk-D5FBNKQM.cjs');
 var chunkUSNT2KNT_cjs = require('./chunk-USNT2KNT.cjs');
 var typeorm = require('typeorm');
@@ -120,7 +120,7 @@ async function loadUserVendorContext(dataSource, userId, preferredVendorId) {
         `, [
         primary.vendorRoleId
       ]);
-      vendorEntityPerms = chunk77NUXO6A_cjs.permissionRowsToRecord(permRows);
+      vendorEntityPerms = chunkJ7FMZK66_cjs.permissionRowsToRecord(permRows);
     } catch (err) {
       if (!isMissingVendorRoleSchemaError(err)) throw err;
     }
@@ -227,7 +227,7 @@ async function hydrateVendorSessionUser(dataSource, user) {
     ]);
     const resolvedId = Number(byEmailRows[0]?.id);
     if (!Number.isFinite(resolvedId)) {
-      chunk77NUXO6A_cjs.logRbac("hydrateVendorSessionUser: unable to resolve numeric user id", {
+      chunkJ7FMZK66_cjs.logRbac("hydrateVendorSessionUser: unable to resolve numeric user id", {
         email: user.email,
         rawSessionId: user.id ?? null
       });
@@ -247,7 +247,7 @@ async function hydrateVendorSessionUser(dataSource, user) {
   const groupName = rows[0]?.groupName ?? user.groupName ?? null;
   const groupId = rows[0]?.groupId ?? user.groupId ?? void 0;
   const adminAccess = rows[0]?.adminAccess ?? user.adminAccess;
-  const isRBACAdmin = user.isRBACAdmin ?? chunk77NUXO6A_cjs.isSuperAdmin({
+  const isRBACAdmin = user.isRBACAdmin ?? chunkJ7FMZK66_cjs.isSuperAdmin({
     groupId,
     groupName,
     isRBACAdmin: user.isRBACAdmin
@@ -260,7 +260,7 @@ async function hydrateVendorSessionUser(dataSource, user) {
   };
   if (multiVendorEnabled) {
     ctx = await loadUserVendorContext(dataSource, id, user.activeVendorId);
-    flags = chunk77NUXO6A_cjs.vendorPortalFlagsFromUser({
+    flags = chunkJ7FMZK66_cjs.vendorPortalFlagsFromUser({
       email: user.email,
       isRBACAdmin,
       groupName,
@@ -295,7 +295,7 @@ async function hydrateVendorSessionUser(dataSource, user) {
     isVendorPortal: flags.isVendorPortal,
     isVendorOwner: flags.isVendorOwner
   };
-  chunk77NUXO6A_cjs.logRbac("hydrateVendorSessionUser", {
+  chunkJ7FMZK66_cjs.logRbac("hydrateVendorSessionUser", {
     email: user.email,
     userId: id,
     groupName,
@@ -908,7 +908,7 @@ function repoHasVendorIdColumn(repo) {
 }
 chunkUSNT2KNT_cjs.__name(repoHasVendorIdColumn, "repoHasVendorIdColumn");
 function resourceUsesVendorScope(resource) {
-  return resource === "vendors" || chunk77NUXO6A_cjs.VENDOR_SCOPED_STORE_ENTITIES.has(resource);
+  return resource === "vendors" || chunkJ7FMZK66_cjs.VENDOR_SCOPED_STORE_ENTITIES.has(resource);
 }
 chunkUSNT2KNT_cjs.__name(resourceUsesVendorScope, "resourceUsesVendorScope");
 function mergeWhereClause(where, extra) {
@@ -1398,7 +1398,7 @@ async function ensureVendorCustomersForOrder(dataSource, entityMap, vendorIds, c
   }
   let customerId = null;
   if (entityMap.customer) {
-    const ensured = await chunk3EOM4V2M_cjs.ensureCustomerRecord(dataSource, entityMap.customer, {
+    const ensured = await chunk4U6DATGZ_cjs.ensureCustomerRecord(dataSource, entityMap.customer, {
       name,
       email,
       phone,
@@ -2454,13 +2454,46 @@ function discountCompare(cartValue, op, ruleValue) {
   }
 }
 chunkUSNT2KNT_cjs.__name(discountCompare, "discountCompare");
-function discountEvaluateRule(rule, cartLines, cartTotal) {
-  if (rule.conditionType === "group") return discountEvaluateGroup(rule, cartLines, cartTotal);
+async function getExchangeRate(dataSource, entityMap, fromCurrency, toCurrency) {
+  const from = (fromCurrency || "INR").trim().toUpperCase();
+  const to = (toCurrency || "INR").trim().toUpperCase();
+  if (from === to) return 1;
+  if (entityMap["currency_exchange"]) {
+    try {
+      const exchangeRepo = dataSource.getRepository(entityMap["currency_exchange"]);
+      const direct = await exchangeRepo.findOne({
+        where: {
+          fromCurrency: from,
+          toCurrency: to
+        }
+      });
+      if (direct && Number(direct.rate) > 0) {
+        return Number(direct.rate);
+      }
+      const inverse = await exchangeRepo.findOne({
+        where: {
+          fromCurrency: to,
+          toCurrency: from
+        }
+      });
+      if (inverse && Number(inverse.rate) > 0) {
+        return 1 / Number(inverse.rate);
+      }
+    } catch {
+    }
+  }
+  return 1;
+}
+chunkUSNT2KNT_cjs.__name(getExchangeRate, "getExchangeRate");
+function discountEvaluateRule(rule, cartLines, cartTotal, exchangeRate = 1) {
+  if (rule.conditionType === "group") return discountEvaluateGroup(rule, cartLines, cartTotal, exchangeRate);
   if (rule.type === "reward") return true;
-  const ruleValue = discountExtractValue(rule.value);
+  const rawRuleValue = discountExtractValue(rule.value);
   switch (rule.type) {
-    case "minAmount":
-      return discountCompare(cartTotal, rule.comparisonOperator, ruleValue);
+    case "minAmount": {
+      const convertedValue = typeof rawRuleValue === "number" ? rawRuleValue * exchangeRate : !isNaN(Number(rawRuleValue)) ? Number(rawRuleValue) * exchangeRate : rawRuleValue;
+      return discountCompare(cartTotal, rule.comparisonOperator, convertedValue);
+    }
     case "quantity": {
       if (rule.subType === "productId" && rule.value?.productId) {
         const targetProductId = Number(rule.value.productId);
@@ -2469,11 +2502,11 @@ function discountEvaluateRule(rule, cartLines, cartTotal) {
         return discountCompare(productQty, rule.comparisonOperator, requiredQty);
       }
       const totalQty = cartLines.reduce((s, l) => s + l.quantity, 0);
-      return discountCompare(totalQty, rule.comparisonOperator, ruleValue);
+      return discountCompare(totalQty, rule.comparisonOperator, rawRuleValue);
     }
     case "product":
       if (rule.subType === "productId") {
-        return cartLines.some((l) => discountCompare(l.productId, rule.comparisonOperator, ruleValue));
+        return cartLines.some((l) => discountCompare(l.productId, rule.comparisonOperator, rawRuleValue));
       }
       return false;
     // These require external context (user session, payment method, time) —
@@ -2497,11 +2530,11 @@ function discountEvaluateRule(rule, cartLines, cartTotal) {
   }
 }
 chunkUSNT2KNT_cjs.__name(discountEvaluateRule, "discountEvaluateRule");
-function discountEvaluateGroup(group, cartLines, cartTotal) {
+function discountEvaluateGroup(group, cartLines, cartTotal, exchangeRate = 1) {
   if (!group.children?.length) return true;
   const op = (group.conditionOperator ?? "and").toLowerCase();
-  if (op === "and") return group.children.every((child) => discountEvaluateRule(child, cartLines, cartTotal));
-  if (op === "or") return group.children.some((child) => discountEvaluateRule(child, cartLines, cartTotal));
+  if (op === "and") return group.children.every((child) => discountEvaluateRule(child, cartLines, cartTotal, exchangeRate));
+  if (op === "or") return group.children.some((child) => discountEvaluateRule(child, cartLines, cartTotal, exchangeRate));
   return true;
 }
 chunkUSNT2KNT_cjs.__name(discountEvaluateGroup, "discountEvaluateGroup");
@@ -2548,19 +2581,19 @@ function discountExtractBuyProductId(nodes) {
   return null;
 }
 chunkUSNT2KNT_cjs.__name(discountExtractBuyProductId, "discountExtractBuyProductId");
-function discountBuildUniversalResult(discount, cartLines) {
+function discountBuildUniversalResult(discount, cartLines, effectiveValue) {
   return {
     rewardLines: cartLines.map((l) => ({
       productId: l.productId,
       quantity: l.quantity,
-      discountRate: Number(discount.value),
+      discountRate: effectiveValue,
       discountType: discount.discountType
     })),
     conditionsMet: true
   };
 }
 chunkUSNT2KNT_cjs.__name(discountBuildUniversalResult, "discountBuildUniversalResult");
-function evaluateDiscount(discount, cartLines) {
+function evaluateDiscount(discount, cartLines, exchangeRate = 1) {
   const empty = {
     rewardLines: [],
     conditionsMet: false
@@ -2584,16 +2617,17 @@ function evaluateDiscount(discount, cartLines) {
       reason: "discount usage limit reached"
     };
   }
+  const effectiveValue = discount.discountType === "FLAT" ? Number(discount.value) * exchangeRate : Number(discount.value);
   const cartTotal = cartLines.reduce((s, l) => s + l.subtotal, 0);
   const tree = discountBuildTree(discount.rules ?? []);
-  if (tree.length === 0) return discountBuildUniversalResult(discount, cartLines);
-  const conditionsMet = tree.every((node) => discountEvaluateRule(node, cartLines, cartTotal));
+  if (tree.length === 0) return discountBuildUniversalResult(discount, cartLines, effectiveValue);
+  const conditionsMet = tree.every((node) => discountEvaluateRule(node, cartLines, cartTotal, exchangeRate));
   if (!conditionsMet) return {
     ...empty,
     reason: "conditions not met"
   };
   const rewardRules = discountCollectRewardRules(tree);
-  if (rewardRules.length === 0) return discountBuildUniversalResult(discount, cartLines);
+  if (rewardRules.length === 0) return discountBuildUniversalResult(discount, cartLines, effectiveValue);
   const requiredBuyQty = discountExtractRequiredBuyQty(tree);
   const buyProductId = discountExtractBuyProductId(tree);
   let dealMultiplier = 1;
@@ -2611,7 +2645,7 @@ function evaluateDiscount(discount, cartLines) {
       rewardLines.push({
         productId: rewardProductId,
         quantity: dealMultiplier,
-        discountRate: Number(discount.value),
+        discountRate: effectiveValue,
         discountType: discount.discountType
       });
     } else {
@@ -2620,7 +2654,7 @@ function evaluateDiscount(discount, cartLines) {
       rewardLines.push({
         productId: rewardProductId,
         quantity: rewardQty,
-        discountRate: Number(discount.value),
+        discountRate: effectiveValue,
         discountType: discount.discountType
       });
     }
@@ -2631,8 +2665,9 @@ function evaluateDiscount(discount, cartLines) {
   };
 }
 chunkUSNT2KNT_cjs.__name(evaluateDiscount, "evaluateDiscount");
-function applyDiscountToOrderLines(lines, evalResult, maxDiscountAmount) {
+function applyDiscountToOrderLines(lines, evalResult, maxDiscountAmount, exchangeRate = 1) {
   if (!evalResult.conditionsMet || evalResult.rewardLines.length === 0) return 0;
+  const effectiveMaxDiscountAmount = maxDiscountAmount != null ? Number(maxDiscountAmount) * exchangeRate : null;
   let totalDiscountApplied = 0;
   for (const reward of evalResult.rewardLines) {
     const line = lines.find((l) => l.productId === reward.productId);
@@ -2649,8 +2684,8 @@ function applyDiscountToOrderLines(lines, evalResult, maxDiscountAmount) {
     line.subtotal = line.unitPrice * line.quantity;
     line.total = Math.max(0, line.subtotal - (line.discount ?? 0));
   }
-  if (maxDiscountAmount != null && totalDiscountApplied > maxDiscountAmount) {
-    const excess = totalDiscountApplied - maxDiscountAmount;
+  if (effectiveMaxDiscountAmount != null && totalDiscountApplied > effectiveMaxDiscountAmount) {
+    const excess = totalDiscountApplied - effectiveMaxDiscountAmount;
     for (let i = evalResult.rewardLines.length - 1; i >= 0; i--) {
       const reward = evalResult.rewardLines[i];
       const line = lines.find((l) => l.productId === reward.productId);
@@ -2660,7 +2695,7 @@ function applyDiscountToOrderLines(lines, evalResult, maxDiscountAmount) {
       line.total = Math.max(0, line.total + rollback);
       if (rollback > 0) break;
     }
-    totalDiscountApplied = maxDiscountAmount;
+    totalDiscountApplied = effectiveMaxDiscountAmount;
   }
   return totalDiscountApplied;
 }
@@ -2766,7 +2801,9 @@ async function validateCoupon(dataSource, entityMap, couponCode, orderLines, cur
     unitPrice: l.unitPrice,
     subtotal: l.subtotal
   }));
-  const evalResult = evaluateDiscount(discountForEval, cartLines);
+  const dCurrency = d.currency || "INR";
+  const exchangeRate = await getExchangeRate(dataSource, entityMap, dCurrency, currency);
+  const evalResult = evaluateDiscount(discountForEval, cartLines, exchangeRate);
   if (!evalResult.conditionsMet) {
     return {
       valid: false,
@@ -2776,7 +2813,7 @@ async function validateCoupon(dataSource, entityMap, couponCode, orderLines, cur
   const clonedLines = lines.map((l) => ({
     ...l
   }));
-  const calculatedDiscount = applyDiscountToOrderLines(clonedLines, evalResult, d.maxDiscountAmount);
+  const calculatedDiscount = applyDiscountToOrderLines(clonedLines, evalResult, d.maxDiscountAmount, exchangeRate);
   const rewardProductIds = evalResult.rewardLines.map((r) => r.productId);
   return {
     valid: true,
@@ -3061,9 +3098,11 @@ async function calculateOrderTotalsFromLines(dataSource, entityMap, lineInputs,
             unitPrice: l.unitPrice,
             subtotal: l.subtotal
           }));
-          const evalResult = evaluateDiscount(discountForEval, cartLines);
+          const dCurrency = discountRow.currency || "INR";
+          const exchangeRate2 = await getExchangeRate(dataSource, entityMap, dCurrency, currency);
+          const evalResult = evaluateDiscount(discountForEval, cartLines, exchangeRate2);
           if (evalResult.conditionsMet) {
-            const totalDiscountApplied = applyDiscountToOrderLines(lines, evalResult, discountRow.maxDiscountAmount);
+            const totalDiscountApplied = applyDiscountToOrderLines(lines, evalResult, discountRow.maxDiscountAmount, exchangeRate2);
             orderDiscount += totalDiscountApplied;
           }
         }
@@ -3176,9 +3215,25 @@ async function calculateOrderTotals(dataSource, entityMap, itemsSummary, discoun
           unitPrice: l.unitPrice,
           subtotal: l.subtotal
         }));
-        const evalResult = evaluateDiscount(discountForEval, cartLines);
+        const dCurrency = discountRow.currency || "INR";
+        let storeCurrency = "INR";
+        if (entityMap["configs"]) {
+          try {
+            const configRepo = dataSource.getRepository(entityMap["configs"]);
+            const curr = await configRepo.findOne({
+              where: {
+                settings: "store",
+                key: "currency"
+              }
+            });
+            storeCurrency = curr?.value?.toUpperCase() ?? "INR";
+          } catch {
+          }
+        }
+        const exchangeRate = await getExchangeRate(dataSource, entityMap, dCurrency, storeCurrency);
+        const evalResult = evaluateDiscount(discountForEval, cartLines, exchangeRate);
         if (evalResult.conditionsMet) {
-          const totalDiscountApplied = applyDiscountToOrderLines(lines, evalResult, discountRow.maxDiscountAmount);
+          const totalDiscountApplied = applyDiscountToOrderLines(lines, evalResult, discountRow.maxDiscountAmount, exchangeRate);
           for (const line of lines) {
             if (!line.found || line.taxRate === 0) continue;
             const discountedAmount = line.subtotal - (line.discount ?? 0);
@@ -3801,14 +3856,14 @@ function createCrudHandler(dataSource, entityMap, options) {
             if (Number.isFinite(n)) productWhere[key] = n;
           }
         }
-        const idsParam = searchParams.get("ids")?.trim();
-        if (idsParam) {
-          const ids = idsParam.split(",").map((s) => Number(s.trim())).filter((n) => Number.isFinite(n) && n > 0);
+        const idsParam2 = searchParams.get("ids")?.trim();
+        if (idsParam2) {
+          const ids = idsParam2.split(",").map((s) => Number(s.trim())).filter((n) => Number.isFinite(n) && n > 0);
           productWhere.id = ids.length > 0 ? typeorm.In(ids) : -1;
         } else {
-          const excludeIdsParam = searchParams.get("excludeIds")?.trim();
-          if (excludeIdsParam) {
-            const excludeIds = excludeIdsParam.split(",").map((s) => Number(s.trim())).filter((n) => Number.isFinite(n) && n > 0);
+          const excludeIdsParam2 = searchParams.get("excludeIds")?.trim();
+          if (excludeIdsParam2) {
+            const excludeIds = excludeIdsParam2.split(",").map((s) => Number(s.trim())).filter((n) => Number.isFinite(n) && n > 0);
             if (excludeIds.length > 0) productWhere.id = typeorm.Not(typeorm.In(excludeIds));
           }
         }
@@ -4085,6 +4140,24 @@ function createCrudHandler(dataSource, entityMap, options) {
         }
       }
       where = mergeDeletedFalseWhere(repo, where);
+      const idsParam = searchParams.get("ids")?.trim();
+      if (idsParam && columnNames.has("id")) {
+        const idList = idsParam.split(",").map((s) => Number(s.trim())).filter((n) => Number.isFinite(n) && n > 0);
+        if (idList.length > 0) {
+          where = mergeListWhereAnd(where, {
+            id: typeorm.In(idList)
+          });
+        }
+      }
+      const excludeIdsParam = searchParams.get("excludeIds")?.trim();
+      if (excludeIdsParam && columnNames.has("id")) {
+        const excludeIdList = excludeIdsParam.split(",").map((s) => Number(s.trim())).filter((n) => Number.isFinite(n) && n > 0);
+        if (excludeIdList.length > 0) {
+          where = mergeListWhereAnd(where, {
+            id: typeorm.Not(typeorm.In(excludeIdList))
+          });
+        }
+      }
       if (resourceUsesVendorScope(resource)) {
         const scope = await resolveScope();
         const catalogFlags = await getVendorCatalogCreateFlags(dataSource);
@@ -4348,7 +4421,7 @@ function createCrudHandler(dataSource, entityMap, options) {
             });
           }
         }
-        const savedCustomer = await chunk3EOM4V2M_cjs.ensureCustomerRecord(dataSource, entityMap["customer"], {
+        const savedCustomer = await chunk4U6DATGZ_cjs.ensureCustomerRecord(dataSource, entityMap["customer"], {
           name,
           email,
           phone,
@@ -5127,11 +5200,18 @@ function createCrudHandler(dataSource, entityMap, options) {
             await recordDiscountUsage2(dataSource, entityMap, created.id, orderDiscountId, persistBody.contactId, discount);
           }
           const orderIdForNotify = created.id;
-          void import('./emit-order-notification-trigger-NR3VN6C6.cjs').then(({ fireOrderNotificationTrigger }) => {
+          const initialPayStatus = String(persistBody.paymentStatus ?? "unpaid").toLowerCase();
+          void import('./emit-order-notification-trigger-TNEZOYEE.cjs').then(({ fireOrderNotificationTrigger }) => {
             fireOrderNotificationTrigger("order_placed", orderIdForNotify, {
               dataSource,
               entityMap
             });
+            if (initialPayStatus === "paid" || initialPayStatus === "captured") {
+              fireOrderNotificationTrigger("payment_success", orderIdForNotify, {
+                dataSource,
+                entityMap
+              });
+            }
           });
         }
       } catch (err) {
@@ -6598,6 +6678,43 @@ function createCrudByIdHandler(dataSource, entityMap, options) {
         await retireSoftDeletedUniquesFromBody(repo, updatePayload);
         try {
           await repo.update(numericId, updatePayload);
+          if (resource === "payments" && updatePayload.status) {
+            const updatedPay = await repo.findOne({
+              where: {
+                id: numericId
+              }
+            });
+            const pOrder = updatedPay?.orderId;
+            const newPayStatus = String(updatePayload.status).toLowerCase();
+            if (pOrder && Number.isFinite(pOrder)) {
+              if (newPayStatus === "paid" || newPayStatus === "captured") {
+                if (entityMap.orders) {
+                  await dataSource.getRepository(entityMap.orders).update(pOrder, {
+                    status: "confirmed"
+                  });
+                }
+                void import('./emit-order-notification-trigger-TNEZOYEE.cjs').then(({ fireOrderNotificationTrigger }) => {
+                  fireOrderNotificationTrigger("order_placed", pOrder, {
+                    dataSource,
+                    entityMap
+                  });
+                  fireOrderNotificationTrigger("payment_success", pOrder, {
+                    dataSource,
+                    entityMap
+                  });
+                }).catch(() => {
+                });
+              } else if (newPayStatus === "failed") {
+                void import('./emit-order-notification-trigger-TNEZOYEE.cjs').then(({ fireOrderNotificationTrigger }) => {
+                  fireOrderNotificationTrigger("payment_failed", pOrder, {
+                    dataSource,
+                    entityMap
+                  });
+                }).catch(() => {
+                });
+              }
+            }
+          }
         } catch (err) {
           if (resource === "events" && isSlugUniqueViolation(err)) {
             return json({
@@ -7281,7 +7398,7 @@ function createInviteAcceptHandler(config) {
       }
       const { userId, email, vendorId } = validation.target;
       if (entityMap.contacts) {
-        await chunk3EOM4V2M_cjs.linkUnclaimedContactToUser(dataSource, entityMap.contacts, userId, email);
+        await chunk4U6DATGZ_cjs.linkUnclaimedContactToUser(dataSource, entityMap.contacts, userId, email);
       }
       if (beforeActivate) await beforeActivate(email, userId);
       const hashedPassword = await hashPassword(password);
@@ -8374,7 +8491,7 @@ function createVendorDashboardHandler(config) {
       if (pe) return pe;
     }
     const user = await getSessionUser();
-    if (!user || !chunk77NUXO6A_cjs.isVendorPortalUser(user)) {
+    if (!user || !chunkJ7FMZK66_cjs.isVendorPortalUser(user)) {
       return json({
         error: "Forbidden"
       }, {
@@ -8721,25 +8838,79 @@ function createUploadHandler(config) {
     "application/x-zip-compressed"
   ];
   return /* @__PURE__ */ chunkUSNT2KNT_cjs.__name(async function POST(req) {
+    const reqId = `req-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+    console.info("[upload] POST /api/upload start", {
+      reqId,
+      method: req.method,
+      contentType: req.headers.get("content-type"),
+      contentLength: req.headers.get("content-length"),
+      hasStorageConfig: storage != null
+    });
     const authErr = await requireAuth(req);
-    if (authErr) return authErr;
+    if (authErr) {
+      console.error("[upload] auth failed", {
+        reqId,
+        status: authErr.status
+      });
+      return authErr;
+    }
+    console.info("[upload] auth ok", {
+      reqId
+    });
     if (requireEntityPermission) {
       const pe = await requireEntityPermission(req, "upload", "create");
-      if (pe) return pe;
+      if (pe) {
+        console.error("[upload] permission denied", {
+          reqId,
+          status: pe.status
+        });
+        return pe;
+      }
+      console.info("[upload] permission ok", {
+        reqId,
+        entity: "upload",
+        action: "create"
+      });
     }
     try {
+      console.info("[upload] parsing formData", {
+        reqId
+      });
       const formData = await req.formData();
       const file = formData.get("file");
-      if (!file) return json({
-        error: "No file uploaded"
-      }, {
-        status: 400
-      });
-      if (!allowed.includes(file.type)) return json({
-        error: "File type not allowed"
-      }, {
-        status: 400
+      console.info("[upload] formData parsed", {
+        reqId,
+        hasFile: Boolean(file),
+        fileName: file?.name ?? null,
+        fileType: file?.type ?? null,
+        fileSize: file?.size ?? null,
+        formKeys: [
+          ...formData.keys()
+        ]
       });
+      if (!file) {
+        console.error("[upload] no file in formData", {
+          reqId
+        });
+        return json({
+          error: "No file uploaded"
+        }, {
+          status: 400
+        });
+      }
+      if (!allowed.includes(file.type)) {
+        console.error("[upload] file type not allowed", {
+          reqId,
+          fileType: file.type,
+          fileName: file.name,
+          allowed
+        });
+        return json({
+          error: "File type not allowed"
+        }, {
+          status: 400
+        });
+      }
       const defaultMax = 10 * 1024 * 1024;
       const maxZipBytes = 80 * 1024 * 1024;
       const maxVideoBytes = 100 * 1024 * 1024;
@@ -8747,25 +8918,51 @@ function createUploadHandler(config) {
       const isZip = file.type === "application/zip" || file.type === "application/x-zip-compressed";
       const isVideo = file.type === "video/mp4" || file.type === "video/webm" || file.type === "video/quicktime";
       const effectiveMax = isZip ? Math.max(baseMax, maxZipBytes) : isVideo ? Math.max(baseMax, maxVideoBytes) : baseMax;
-      if (file.size > effectiveMax) return json({
-        error: "File size exceeds limit"
-      }, {
-        status: 400
+      console.info("[upload] size check", {
+        reqId,
+        fileSize: file.size,
+        effectiveMax,
+        isZip,
+        isVideo,
+        isImage: file.type.startsWith("image/")
       });
+      if (file.size > effectiveMax) {
+        console.error("[upload] file too large", {
+          reqId,
+          fileSize: file.size,
+          effectiveMax,
+          fileName: file.name
+        });
+        return json({
+          error: "File size exceeds limit"
+        }, {
+          status: 400
+        });
+      }
       const parentRaw = formData.get("parentId");
       let parentId = null;
       if (parentRaw != null && String(parentRaw).trim() !== "") {
         const n = Number(parentRaw);
-        if (!Number.isFinite(n)) return json({
-          error: "Invalid parentId"
-        }, {
-          status: 400
-        });
+        if (!Number.isFinite(n)) {
+          console.error("[upload] invalid parentId", {
+            reqId,
+            parentRaw
+          });
+          return json({
+            error: "Invalid parentId"
+          }, {
+            status: 400
+          });
+        }
         parentId = n;
       }
       let folder = "";
       if (parentId != null) {
         if (!dataSource || !entityMap?.media) {
+          console.error("[upload] missing dataSource/entityMap for folder upload", {
+            reqId,
+            parentId
+          });
           return json({
             error: "Upload handler needs dataSource and entityMap for folder uploads"
           }, {
@@ -8779,6 +8976,12 @@ function createUploadHandler(config) {
           }
         });
         if (!p || p.kind !== "folder") {
+          console.error("[upload] parent is not a folder", {
+            reqId,
+            parentId,
+            found: Boolean(p),
+            kind: p ? p.kind : null
+          });
           return json({
             error: "parent must be a folder"
           }, {
@@ -8786,25 +8989,90 @@ function createUploadHandler(config) {
           });
         }
         folder = await relativePathFromMediaParentId(dataSource, entityMap, parentId);
+        console.info("[upload] resolved folder from parentId", {
+          reqId,
+          parentId,
+          folder
+        });
       } else {
         const folderRawLegacy = formData.get("folder") ?? formData.get("folderPath");
         if (folderRawLegacy && typeof folderRawLegacy === "string" && folderRawLegacy.trim()) {
           folder = sanitizeMediaFolderPath(folderRawLegacy);
+          console.info("[upload] resolved folder from legacy field", {
+            reqId,
+            folder
+          });
         }
       }
+      console.info("[upload] reading file into buffer", {
+        reqId,
+        fileName: file.name,
+        fileType: file.type,
+        fileSize: file.size
+      });
       const buffer = Buffer.from(await file.arrayBuffer());
       const fileName = `${Date.now()}-${file.name}`;
       const contentType = file.type || "application/octet-stream";
       const relativeUnderUploads = folder ? `${folder}/${fileName}` : fileName;
+      const storageKey = `uploads/${relativeUnderUploads}`;
+      console.info("[upload] S3/storage key prepared", {
+        reqId,
+        originalFileName: file.name,
+        stampedFileName: fileName,
+        folder: folder || "(root)",
+        relativeUnderUploads,
+        storageKey,
+        contentType,
+        bytes: buffer.length
+      });
       const raw = typeof storage === "function" ? storage() : storage;
+      console.info("[upload] resolving storage service", {
+        reqId,
+        storageKey,
+        storageIsFunction: typeof storage === "function",
+        rawIsPromise: raw instanceof Promise,
+        rawIsNullish: raw == null
+      });
       const storageService = raw instanceof Promise ? await raw : raw;
+      console.info("[upload] storage service resolved", {
+        reqId,
+        storageKey,
+        hasStorageService: Boolean(storageService)
+      });
       if (storageService) {
-        const fileUrl = await storageService.upload(buffer, `uploads/${relativeUnderUploads}`, contentType);
+        console.info("[upload] calling storage.upload", {
+          reqId,
+          storageKey,
+          contentType,
+          bytes: buffer.length
+        });
+        const uploadStarted = Date.now();
+        let fileUrl;
+        try {
+          fileUrl = await storageService.upload(buffer, storageKey, contentType);
+        } catch (storageErr) {
+          console.error("[upload] storage.upload threw", {
+            reqId,
+            storageKey,
+            contentType,
+            bytes: buffer.length,
+            ms: Date.now() - uploadStarted,
+            error: storageErr instanceof Error ? storageErr.message : String(storageErr),
+            name: storageErr instanceof Error ? storageErr.name : void 0,
+            stack: storageErr instanceof Error ? storageErr.stack : void 0,
+            code: storageErr && typeof storageErr === "object" && ("Code" in storageErr || "code" in storageErr) ? storageErr.Code ?? storageErr.code : void 0,
+            metadata: storageErr && typeof storageErr === "object" && "$metadata" in storageErr ? storageErr.$metadata : void 0
+          });
+          throw storageErr;
+        }
         console.info("[upload] stored via storage plugin", {
-          key: `uploads/${relativeUnderUploads}`,
+          reqId,
+          key: storageKey,
+          fullS3KeyHint: storageKey,
           contentType,
           bytes: buffer.length,
-          fileUrl
+          fileUrl,
+          ms: Date.now() - uploadStarted
         });
         return json({
           filePath: fileUrl,
@@ -8812,8 +9080,10 @@ function createUploadHandler(config) {
         });
       }
       console.warn("[upload] no storage plugin \u2014 writing local disk (broken on most deploys)", {
+        reqId,
         localUploadDir,
-        key: relativeUnderUploads
+        key: relativeUnderUploads,
+        storageKey
       });
       const fs2 = await import('fs/promises');
       const path2 = await import('path');
@@ -8824,6 +9094,12 @@ function createUploadHandler(config) {
       });
       await fs2.writeFile(filePath, buffer);
       const urlRel = `${localUploadDir.replace(/^\/+/, "").replace(/\\/g, "/")}/${relativeUnderUploads.replace(/\\/g, "/")}`;
+      console.info("[upload] local write ok", {
+        reqId,
+        diskPath: filePath,
+        filePath: `/${urlRel}`,
+        key: relativeUnderUploads
+      });
       return json({
         filePath: `/${urlRel}`,
         parentId
@@ -8832,11 +9108,13 @@ function createUploadHandler(config) {
       const message = err instanceof Error ? err.message : String(err);
       const awsMeta = err && typeof err === "object" && "$metadata" in err ? err.$metadata : void 0;
       console.error("[upload] File upload failed", {
+        reqId,
         error: message,
         stack: err instanceof Error ? err.stack : void 0,
         name: err instanceof Error ? err.name : void 0,
         code: err && typeof err === "object" && ("Code" in err || "code" in err) ? err.Code ?? err.code : void 0,
-        metadata: awsMeta
+        metadata: awsMeta,
+        raw: err instanceof Error ? void 0 : String(err)
       });
       if (/Failed to parse body as FormData/i.test(message)) {
         return json({
@@ -9152,7 +9430,9 @@ function createFormSaveHandlers(config) {
           "description",
           "campaign",
           "slug",
-          "published"
+          "published",
+          "enableTurnstile",
+          "enable_turnstile"
         ]) {
           if (body[key] !== void 0) formRow[key] = body[key];
         }
@@ -9171,13 +9451,43 @@ function createFormSaveHandlers(config) {
           }
         }
         if (Object.keys(formRow).length > 0) await formRepo().update(formId, formRow);
-        await fieldRepo().delete({
-          formId
-        });
+        const incomingFieldIds = /* @__PURE__ */ new Set();
         for (let i = 0; i < fields.length; i++) {
-          const row = normalizeFieldRow(fields[i], formId);
+          const f = fields[i];
+          const fieldId = f.id != null && Number.isFinite(Number(f.id)) && Number(f.id) > 0 ? Number(f.id) : null;
+          const row = normalizeFieldRow(f, formId);
           row.order = i + 1;
-          await fieldRepo().save(fieldRepo().create(row));
+          if (fieldId) {
+            const existingField = await fieldRepo().findOne({
+              where: {
+                id: fieldId,
+                formId
+              }
+            });
+            if (existingField) {
+              incomingFieldIds.add(fieldId);
+              await fieldRepo().update({
+                id: fieldId,
+                formId
+              }, row);
+              continue;
+            }
+          }
+          const created = await fieldRepo().save(fieldRepo().create(row));
+          if (created?.id) incomingFieldIds.add(created.id);
+        }
+        const allCurrentFields = await fieldRepo().find({
+          where: {
+            formId
+          }
+        });
+        for (const existingField of allCurrentFields) {
+          if (!incomingFieldIds.has(existingField.id)) {
+            await fieldRepo().delete({
+              id: existingField.id,
+              formId
+            });
+          }
         }
         const saved = await formRepo().findOne({
           where: {
@@ -9331,7 +9641,7 @@ function createFormSubmissionListHandler(config) {
       const limit = Math.min(100, Number(searchParams.get("limit")) || 10);
       const skip = (page - 1) * limit;
       const sortField = searchParams.get("sortField") || "createdAt";
-      const sortOrder = searchParams.get("sortOrder") === "desc" ? "DESC" : "ASC";
+      const sortOrder = searchParams.get("sortOrder") === "asc" ? "ASC" : "DESC";
       const [data, total] = await repo.findAndCount({
         skip,
         take: limit,
@@ -9743,11 +10053,11 @@ function createUsersApiHandlers(config) {
           adminAccess
         }));
         if (entityMap.contacts) {
-          await chunk3EOM4V2M_cjs.linkUnclaimedContactToUser(dataSource, entityMap.contacts, newUser.id, newUser.email);
+          await chunk4U6DATGZ_cjs.linkUnclaimedContactToUser(dataSource, entityMap.contacts, newUser.id, newUser.email);
         }
         if (entityMap.customer) {
           const phone = typeof body.phone === "string" && body.phone.trim() ? body.phone.trim() : null;
-          await chunk3EOM4V2M_cjs.ensureCustomerForUser(dataSource, entityMap.customer, {
+          await chunk4U6DATGZ_cjs.ensureCustomerForUser(dataSource, entityMap.customer, {
             id: newUser.id,
             name: String(newUser.name ?? body.name),
             email: String(newUser.email),
@@ -10837,7 +11147,7 @@ function createChatHandlers(config) {
         const notifyEmailAgent = await findLlmAgentByScope(dataSource, entityMap, LLM_AGENT_SCOPE_EMAIL_INTENT_CHATBOT, {
           enabledOnly: false
         });
-        const emailTool = chunkHXLC56ZK_cjs.resolveChatEmailToolSettings(llmSettings, {
+        const emailTool = chunkYSYX4GUD_cjs.resolveChatEmailToolSettings(llmSettings, {
           chatbotValidationRules: agentRow?.validationRules ?? null,
           notifyAgent: notifyEmailAgent ? {
             systemInstruction: notifyEmailAgent.systemInstruction,
@@ -10847,7 +11157,7 @@ function createChatHandlers(config) {
         const emailPlugin2 = cms.getPlugin("email");
         const convLeadSent = conv.leadEmailSentAt;
         const chatAgentFn = llm.chatAgent?.bind(llm);
-        console.info(chunkHXLC56ZK_cjs.CHAT_EMAIL_LOG, "pipeline check", {
+        console.info(chunkYSYX4GUD_cjs.CHAT_EMAIL_LOG, "pipeline check", {
           conversationId,
           enabled: emailTool.enabled,
           intentCount: emailTool.intents.length,
@@ -10861,27 +11171,27 @@ function createChatHandlers(config) {
           mergedPromptIncludesNotify: Boolean(notifyEmailAgent?.systemInstruction?.trim())
         });
         if (!emailTool.enabled) {
-          console.info(chunkHXLC56ZK_cjs.CHAT_EMAIL_LOG, "pipeline skipped", {
+          console.info(chunkYSYX4GUD_cjs.CHAT_EMAIL_LOG, "pipeline skipped", {
             conversationId,
             reason: "email_tool_disabled"
           });
         } else if (emailTool.intents.length === 0) {
-          console.info(chunkHXLC56ZK_cjs.CHAT_EMAIL_LOG, "pipeline skipped", {
+          console.info(chunkYSYX4GUD_cjs.CHAT_EMAIL_LOG, "pipeline skipped", {
             conversationId,
             reason: "no_intents_configured"
           });
         } else if (!emailPlugin2) {
-          console.info(chunkHXLC56ZK_cjs.CHAT_EMAIL_LOG, "pipeline skipped", {
+          console.info(chunkYSYX4GUD_cjs.CHAT_EMAIL_LOG, "pipeline skipped", {
             conversationId,
             reason: "email_plugin_missing"
           });
         } else if (!chatAgentFn) {
-          console.info(chunkHXLC56ZK_cjs.CHAT_EMAIL_LOG, "pipeline skipped", {
+          console.info(chunkYSYX4GUD_cjs.CHAT_EMAIL_LOG, "pipeline skipped", {
             conversationId,
             reason: "llm_chat_agent_unavailable"
           });
         } else if (convLeadSent) {
-          console.info(chunkHXLC56ZK_cjs.CHAT_EMAIL_LOG, "pipeline skipped", {
+          console.info(chunkYSYX4GUD_cjs.CHAT_EMAIL_LOG, "pipeline skipped", {
             conversationId,
             reason: "lead_email_already_sent",
             leadEmailSentAt: convLeadSent
@@ -10894,7 +11204,7 @@ function createChatHandlers(config) {
             }
           });
           if (!contactRow) {
-            console.warn(chunkHXLC56ZK_cjs.CHAT_EMAIL_LOG, "pipeline skipped", {
+            console.warn(chunkYSYX4GUD_cjs.CHAT_EMAIL_LOG, "pipeline skipped", {
               conversationId,
               reason: "contact_not_found",
               contactId
@@ -10902,7 +11212,7 @@ function createChatHandlers(config) {
           } else {
             const c = contactRow;
             try {
-              const intent = await chunkHXLC56ZK_cjs.detectChatLeadIntent({
+              const intent = await chunkYSYX4GUD_cjs.detectChatLeadIntent({
                 chatAgent: chatAgentFn
               }, {
                 settings: emailTool,
@@ -10916,15 +11226,15 @@ function createChatHandlers(config) {
                 model: agentRow?.model?.trim() || notifyEmailAgent?.model?.trim() || void 0
               });
               if (!intent.intent || !intent.emailTo) {
-                console.info(chunkHXLC56ZK_cjs.CHAT_EMAIL_LOG, "no email sent", {
+                console.info(chunkYSYX4GUD_cjs.CHAT_EMAIL_LOG, "no email sent", {
                   conversationId,
                   reason: intent.intent ? "missing_email_to" : "no_intent_match",
                   intentLabel: intent.intentLabel,
                   classifierReason: intent.reason
                 });
               } else {
-                const intentRecipients = chunkHXLC56ZK_cjs.parseIntentRecipientEmails(intent.emailTo);
-                console.info(chunkHXLC56ZK_cjs.CHAT_EMAIL_LOG, "intent matched \u2014 sending", {
+                const intentRecipients = chunkYSYX4GUD_cjs.parseIntentRecipientEmails(intent.emailTo);
+                console.info(chunkYSYX4GUD_cjs.CHAT_EMAIL_LOG, "intent matched \u2014 sending", {
                   conversationId,
                   intent: intent.intent,
                   emailTo: intent.emailTo,
@@ -10934,7 +11244,7 @@ function createChatHandlers(config) {
                 const emailSettings = await loadSettingsGroupMap(dataSource, entityMap, "email");
                 const brandingSettings = await loadSettingsGroupMap(dataSource, entityMap, "branding");
                 const companyDetails = chunkBXYZDMTZ_cjs.mergeEmailLayoutCompanyDetails(brandingSettings, emailSettings);
-                const leadResult = await chunkHXLC56ZK_cjs.sendChatLeadEmail(cms, emailSettings, brandingSettings, {
+                const leadResult = await chunkYSYX4GUD_cjs.sendChatLeadEmail(cms, emailSettings, brandingSettings, {
                   contactName: String(c.name ?? "").trim() || "Visitor",
                   contactEmail: String(c.email ?? "").trim(),
                   contactPhone: c.phone ?? null,
@@ -10942,7 +11252,7 @@ function createChatHandlers(config) {
                   latestMessage: message,
                   intentCode: intent.intent,
                   intentReason: intent.intentLabel || intent.reason,
-                  transcript: chunkHXLC56ZK_cjs.buildTranscriptForLeadEmail(history, message),
+                  transcript: chunkYSYX4GUD_cjs.buildTranscriptForLeadEmail(history, message),
                   companyDetails,
                   recipients: intentRecipients.length > 0 ? intentRecipients : void 0
                 });
@@ -10950,13 +11260,13 @@ function createChatHandlers(config) {
                   await convRepo().update(conversationId, {
                     leadEmailSentAt: /* @__PURE__ */ new Date()
                   });
-                  console.info(chunkHXLC56ZK_cjs.CHAT_EMAIL_LOG, "lead email recorded", {
+                  console.info(chunkYSYX4GUD_cjs.CHAT_EMAIL_LOG, "lead email recorded", {
                     conversationId,
                     sent: true,
                     recipients: leadResult.recipients
                   });
                 } else {
-                  console.warn(chunkHXLC56ZK_cjs.CHAT_EMAIL_LOG, "lead email not sent", {
+                  console.warn(chunkYSYX4GUD_cjs.CHAT_EMAIL_LOG, "lead email not sent", {
                     conversationId,
                     sent: false,
                     error: leadResult.error ?? "unknown",
@@ -10965,7 +11275,7 @@ function createChatHandlers(config) {
                 }
               }
             } catch (intentErr) {
-              console.warn(chunkHXLC56ZK_cjs.CHAT_EMAIL_LOG, "pipeline error", {
+              console.warn(chunkYSYX4GUD_cjs.CHAT_EMAIL_LOG, "pipeline error", {
                 conversationId,
                 error: intentErr instanceof Error ? intentErr.message : String(intentErr)
               });
@@ -10982,7 +11292,7 @@ function createChatHandlers(config) {
         });
         if (agentRow && llm.chatAgent) {
           const fromAgent = llmAgentToChatAgentOptions(agentRow);
-          const systemPrompt = chunkHXLC56ZK_cjs.buildChatbotSystemPromptWithEmailTool(fromAgent.systemPrompt, parsedValidation.guardrailsForPrompt, emailTool);
+          const systemPrompt = chunkYSYX4GUD_cjs.buildChatbotSystemPromptWithEmailTool(fromAgent.systemPrompt, parsedValidation.guardrailsForPrompt, emailTool);
           const res = await llm.chatAgent({
             ...fromAgent,
             systemPrompt: systemPrompt || void 0,
@@ -11003,7 +11313,7 @@ ${contextParts.join("\n\n")}` : "";
               agentRow.systemInstruction?.trim(),
               ragSystem
             ].filter(Boolean).join("\n\n");
-            systemContent = chunkHXLC56ZK_cjs.buildChatbotSystemPromptWithEmailTool(mergedBase || defaultSystem, parsedValidation.guardrailsForPrompt, emailTool) || defaultSystem;
+            systemContent = chunkYSYX4GUD_cjs.buildChatbotSystemPromptWithEmailTool(mergedBase || defaultSystem, parsedValidation.guardrailsForPrompt, emailTool) || defaultSystem;
           } else {
             systemContent = ragSystem || defaultSystem;
           }
@@ -12258,7 +12568,7 @@ function createDeviceTokensHandlers(config) {
         const title = body.title?.trim() || "Test Push Notification";
         const msgBody = body.body?.trim() || "Firebase Push Notification setup is working!";
         if (!token || token === "validate" || token === "validate_only") {
-          const valRes = await chunkHXLC56ZK_cjs.validateFcmCredentials(dataSource, entityMap);
+          const valRes = await chunkYSYX4GUD_cjs.validateFcmCredentials(dataSource, entityMap);
           if (!valRes.success) {
             return json({
               success: false,
@@ -12275,7 +12585,7 @@ function createDeviceTokensHandlers(config) {
             clientEmail: valRes.clientEmail
           });
         }
-        const res = await chunkHXLC56ZK_cjs.sendFcmPushNotification(dataSource, entityMap, {
+        const res = await chunkYSYX4GUD_cjs.sendFcmPushNotification(dataSource, entityMap, {
           token,
           title,
           body: msgBody,
@@ -12829,7 +13139,7 @@ chunkUSNT2KNT_cjs.__name(findActiveRefundPolicyForVendor, "findActiveRefundPolic
 // src/api/admin-roles-handlers.ts
 function createAdminRolesHandlers(config) {
   const { dataSource, entityMap, json, getSessionUser } = config;
-  const baseEntities = chunk77NUXO6A_cjs.getPermissionableEntityKeys(entityMap);
+  const baseEntities = chunkJ7FMZK66_cjs.getPermissionableEntityKeys(entityMap);
   const allowEntities = /* @__PURE__ */ new Set([
     ...baseEntities,
     "users"
@@ -12844,7 +13154,7 @@ function createAdminRolesHandlers(config) {
     }, {
       status: 401
     });
-    if (!chunk3EOM4V2M_cjs.canManageRoles(u) && !chunk77NUXO6A_cjs.canManageVendorRoles(u)) {
+    if (!chunk4U6DATGZ_cjs.canManageRoles(u) && !chunkJ7FMZK66_cjs.canManageVendorRoles(u)) {
       return json({
         error: "Forbidden"
       }, {
@@ -12855,11 +13165,11 @@ function createAdminRolesHandlers(config) {
   }
   chunkUSNT2KNT_cjs.__name(gate, "gate");
   function isVendorRolesOnly(u) {
-    return chunk77NUXO6A_cjs.canManageVendorRoles(u) && !chunk3EOM4V2M_cjs.canManageRoles(u);
+    return chunkJ7FMZK66_cjs.canManageVendorRoles(u) && !chunk4U6DATGZ_cjs.canManageRoles(u);
   }
   chunkUSNT2KNT_cjs.__name(isVendorRolesOnly, "isVendorRolesOnly");
   const vendorRoleEntities = [
-    ...chunk77NUXO6A_cjs.VENDOR_STORE_RBAC_ENTITIES,
+    ...chunkJ7FMZK66_cjs.VENDOR_STORE_RBAC_ENTITIES,
     "dashboard",
     "settings"
   ].sort();
@@ -13016,7 +13326,7 @@ function createAdminRolesHandlers(config) {
         }, {
           status: 404
         });
-        if (chunk77NUXO6A_cjs.isSuperAdminGroupName(g.name) && !chunk77NUXO6A_cjs.isSuperAdminGroupName(name)) {
+        if (chunkJ7FMZK66_cjs.isSuperAdminGroupName(g.name) && !chunkJ7FMZK66_cjs.isSuperAdminGroupName(name)) {
           return json({
             error: "Cannot rename the administrator group"
           }, {
@@ -13073,7 +13383,7 @@ function createAdminRolesHandlers(config) {
       }, {
         status: 404
       });
-      if (chunk77NUXO6A_cjs.isSuperAdminGroupName(g.name)) return json({
+      if (chunkJ7FMZK66_cjs.isSuperAdminGroupName(g.name)) return json({
         error: "Cannot delete the administrator group"
       }, {
         status: 400
@@ -13270,7 +13580,7 @@ async function sendVendorOnboardEmails(input, deps) {
       getVendorEmails(deps)
     ]);
     const companyDetails = chunkBXYZDMTZ_cjs.mergeEmailLayoutCompanyDetails(branding, emailSettings);
-    const configuredNotify = chunkHXLC56ZK_cjs.parseEmailRecipientsFromConfig(emailSettings.salesTeamEmails ?? emailSettings.salesTeamEmail);
+    const configuredNotify = chunkYSYX4GUD_cjs.parseEmailRecipientsFromConfig(emailSettings.salesTeamEmails ?? emailSettings.salesTeamEmail);
     const ownerEmail = input.ownerEmail?.trim() || "";
     const ownerEmailLower = ownerEmail.toLowerCase();
     const sendToOwner = input.sendToOwner !== false;
@@ -13304,7 +13614,7 @@ chunkUSNT2KNT_cjs.__name(sendVendorOnboardEmails, "sendVendorOnboardEmails");
 
 // src/lib/seed-vendor-roles.ts
 async function insertRolePermissions(exec, vendorRoleId, permissions) {
-  for (const entity of chunk77NUXO6A_cjs.VENDOR_RBAC_ENTITIES) {
+  for (const entity of chunkJ7FMZK66_cjs.VENDOR_RBAC_ENTITIES) {
     const flags = permissions[entity];
     if (!flags) continue;
     await exec.query(`
@@ -13335,7 +13645,7 @@ async function seedVendorDefaultRoles(em, vendorId) {
     for (const r of existing) {
       roleIdsByName2[r.name] = Number(r.id);
       if (r.isOwnerRole) ownerRoleId2 = Number(r.id);
-      if (r.name === chunk77NUXO6A_cjs.VENDOR_VIEWER_ROLE_NAME) viewerRoleId2 = Number(r.id);
+      if (r.name === chunkJ7FMZK66_cjs.VENDOR_VIEWER_ROLE_NAME) viewerRoleId2 = Number(r.id);
     }
     return {
       roleIdsByName: roleIdsByName2,
@@ -13346,7 +13656,7 @@ async function seedVendorDefaultRoles(em, vendorId) {
   const roleIdsByName = {};
   let ownerRoleId = 0;
   let viewerRoleId = 0;
-  for (const def of chunk77NUXO6A_cjs.DEFAULT_VENDOR_ROLE_DEFS) {
+  for (const def of chunkJ7FMZK66_cjs.DEFAULT_VENDOR_ROLE_DEFS) {
     const inserted = await exec.query(`
       INSERT INTO "vendor_roles"
         ("vendorId", "name", "description", "isSystem", "isOwnerRole")
@@ -13363,7 +13673,7 @@ async function seedVendorDefaultRoles(em, vendorId) {
     if (!roleId) continue;
     roleIdsByName[def.name] = roleId;
     if (def.isOwnerRole) ownerRoleId = roleId;
-    if (def.name === chunk77NUXO6A_cjs.VENDOR_VIEWER_ROLE_NAME) viewerRoleId = roleId;
+    if (def.name === chunkJ7FMZK66_cjs.VENDOR_VIEWER_ROLE_NAME) viewerRoleId = roleId;
     await insertRolePermissions(exec, roleId, def.permissions);
   }
   return {
@@ -13393,7 +13703,7 @@ async function backfillVendorUserRoleIds(em, vendorId, seeded) {
       vendorId
     ]);
   }
-  const viewerId = seeded.viewerRoleId || seeded.roleIdsByName[chunk77NUXO6A_cjs.VENDOR_VIEWER_ROLE_NAME];
+  const viewerId = seeded.viewerRoleId || seeded.roleIdsByName[chunkJ7FMZK66_cjs.VENDOR_VIEWER_ROLE_NAME];
   if (viewerId) {
     await em.query(`
       UPDATE "vendor_users"
@@ -13419,7 +13729,7 @@ async function getDefaultStaffRoleIdForVendor(em, vendorId) {
     LIMIT 1
     `, [
     vendorId,
-    chunk77NUXO6A_cjs.VENDOR_VIEWER_ROLE_NAME
+    chunkJ7FMZK66_cjs.VENDOR_VIEWER_ROLE_NAME
   ]);
   const id = rows[0]?.id;
   return id != null ? Number(id) : null;
@@ -13780,7 +14090,7 @@ function createVendorOnboardHandlers(config) {
     }, {
       status: 401
     });
-    if (!chunk77NUXO6A_cjs.isPlatformAdministrator(u)) return json({
+    if (!chunkJ7FMZK66_cjs.isPlatformAdministrator(u)) return json({
       error: "Forbidden",
       reason: "admin_only"
     }, {
@@ -13790,7 +14100,7 @@ function createVendorOnboardHandlers(config) {
   }
   chunkUSNT2KNT_cjs.__name(gateAdmin, "gateAdmin");
   async function resolveActiveVendorId(u) {
-    const scope = chunk77NUXO6A_cjs.resolveVendorScopeFromSessionUser(u);
+    const scope = chunkJ7FMZK66_cjs.resolveVendorScopeFromSessionUser(u);
     const candidates = [];
     if (scope.type === "vendor") candidates.push(scope.vendorId);
     if (scope.type === "all" || scope.type === "vendor") {
@@ -13844,7 +14154,7 @@ function createVendorOnboardHandlers(config) {
     }, {
       status: 401
     });
-    if (!chunk77NUXO6A_cjs.isVendorPortalUser(u) && !chunk77NUXO6A_cjs.isPlatformAdministrator(u)) {
+    if (!chunkJ7FMZK66_cjs.isVendorPortalUser(u) && !chunkJ7FMZK66_cjs.isPlatformAdministrator(u)) {
       return json({
         error: "Forbidden"
       }, {
@@ -13872,7 +14182,7 @@ function createVendorOnboardHandlers(config) {
     }, {
       status: 401
     });
-    if (!chunk77NUXO6A_cjs.canManageVendorTeam(u)) return json({
+    if (!chunkJ7FMZK66_cjs.canManageVendorTeam(u)) return json({
       error: "Forbidden"
     }, {
       status: 403
@@ -14090,7 +14400,7 @@ function createVendorOnboardHandlers(config) {
           await chunkOY2YTBMP_cjs.retireSoftDeletedUniqueValue(vendorRepo, "slug", slug);
           let ownerGroup = await groupRepo.findOne({
             where: {
-              name: chunk77NUXO6A_cjs.VENDOR_GROUP_NAME,
+              name: chunkJ7FMZK66_cjs.VENDOR_GROUP_NAME,
               deleted: false
             }
           });
@@ -14105,12 +14415,12 @@ function createVendorOnboardHandlers(config) {
           if (!ownerGroup) {
             try {
               await groupRepo.save(groupRepo.create({
-                name: chunk77NUXO6A_cjs.VENDOR_GROUP_NAME,
+                name: chunkJ7FMZK66_cjs.VENDOR_GROUP_NAME,
                 deleted: false
               }));
               ownerGroup = await groupRepo.findOne({
                 where: {
-                  name: chunk77NUXO6A_cjs.VENDOR_GROUP_NAME,
+                  name: chunkJ7FMZK66_cjs.VENDOR_GROUP_NAME,
                   deleted: false
                 }
               });
@@ -14227,7 +14537,7 @@ function createVendorOnboardHandlers(config) {
           }
           if (entityMap.customer) {
             try {
-              await chunk3EOM4V2M_cjs.ensureCustomerForUser(em, entityMap.customer, {
+              await chunk4U6DATGZ_cjs.ensureCustomerForUser(em, entityMap.customer, {
                 id: newUser.id,
                 name: userName,
                 email: userEmail,
@@ -14727,7 +15037,7 @@ function createVendorOnboardHandlers(config) {
           if (!groupId) {
             const g = await groupRepo.findOne({
               where: {
-                name: chunk77NUXO6A_cjs.VENDOR_GROUP_NAME,
+                name: chunkJ7FMZK66_cjs.VENDOR_GROUP_NAME,
                 deleted: false
               }
             }) ?? await groupRepo.findOne({
@@ -14827,7 +15137,7 @@ function createVendorOnboardHandlers(config) {
           }
           if (entityMap.customer) {
             try {
-              await chunk3EOM4V2M_cjs.ensureCustomerForUser(em, entityMap.customer, {
+              await chunk4U6DATGZ_cjs.ensureCustomerForUser(em, entityMap.customer, {
                 id: newUser.id,
                 name: userName,
                 email: userEmail,
@@ -15364,10 +15674,10 @@ chunkUSNT2KNT_cjs.__name(createVendorOnboardHandlers, "createVendorOnboardHandle
 function createVendorRolesHandlers(config) {
   const { dataSource, entityMap, json, getSessionUser } = config;
   const vendorRoleEntities = [
-    ...chunk77NUXO6A_cjs.VENDOR_RBAC_ENTITIES
+    ...chunkJ7FMZK66_cjs.VENDOR_RBAC_ENTITIES
   ].sort();
   async function resolveActiveVendorId(u) {
-    const scope = chunk77NUXO6A_cjs.resolveVendorScopeFromSessionUser(u);
+    const scope = chunkJ7FMZK66_cjs.resolveVendorScopeFromSessionUser(u);
     if (scope.type === "vendor") return scope.vendorId;
     if (scope.type === "all") {
       const id = u.activeVendorId ?? u.vendorIds?.[0];
@@ -15383,7 +15693,7 @@ function createVendorRolesHandlers(config) {
     }, {
       status: 401
     });
-    if (!chunk77NUXO6A_cjs.canManageVendorRoles(u)) return json({
+    if (!chunkJ7FMZK66_cjs.canManageVendorRoles(u)) return json({
       error: "Forbidden"
     }, {
       status: 403
@@ -17048,6 +17358,7 @@ exports.Form = class Form {
   campaign;
   slug;
   published;
+  enableTurnstile;
   createdAt;
   updatedAt;
   deletedAt;
@@ -17090,6 +17401,14 @@ _ts_decorate14([
   }),
   _ts_metadata14("design:type", Boolean)
 ], exports.Form.prototype, "published", void 0);
+_ts_decorate14([
+  typeorm.Column("boolean", {
+    default: false,
+    name: "enable_turnstile",
+    nullable: true
+  }),
+  _ts_metadata14("design:type", Boolean)
+], exports.Form.prototype, "enableTurnstile", void 0);
 _ts_decorate14([
   typeorm.Column({
     type: "timestamp",
@@ -27839,16 +28158,16 @@ function whatsappPlugin(config = {}) {
         db = await getWhatsAppSettings?.() ?? {};
       } catch {
       }
-      if (!chunkHXLC56ZK_cjs.isWhatsAppPluginEnabled(db)) {
+      if (!chunkYSYX4GUD_cjs.isWhatsAppPluginEnabled(db)) {
         context.logger.warn("WhatsApp plugin skipped: disabled in Plugins \u2192 WhatsApp");
         return null;
       }
-      const merged = chunkHXLC56ZK_cjs.mergeWhatsAppConfigLayers(env, db, staticRest);
-      if (!getWhatsAppSettings && !chunkHXLC56ZK_cjs.whatsAppConfigured(merged)) {
+      const merged = chunkYSYX4GUD_cjs.mergeWhatsAppConfigLayers(env, db, staticRest);
+      if (!getWhatsAppSettings && !chunkYSYX4GUD_cjs.whatsAppConfigured(merged)) {
         context.logger.warn("WhatsApp plugin skipped: set WHATSAPP_ACCESS_TOKEN and WHATSAPP_PHONE_NUMBER_ID, or pass getWhatsAppSettings");
         return null;
       }
-      const svc = new chunkHXLC56ZK_cjs.WhatsAppService(env, staticRest, getWhatsAppSettings, getMessageTemplateRow);
+      const svc = new chunkYSYX4GUD_cjs.WhatsAppService(env, staticRest, getWhatsAppSettings, getMessageTemplateRow);
       return {
         send: /* @__PURE__ */ chunkUSNT2KNT_cjs.__name((opts) => svc.send(opts), "send")
       };
@@ -27925,7 +28244,7 @@ function registerMessagingQueueProcessors(cms, entityMap) {
     getDataSource: /* @__PURE__ */ chunkUSNT2KNT_cjs.__name(async () => cms.dataSource, "getDataSource"),
     entityMap
   });
-  chunkHXLC56ZK_cjs.registerWhatsAppQueueProcessor(cms);
+  chunkYSYX4GUD_cjs.registerWhatsAppQueueProcessor(cms);
 }
 chunkUSNT2KNT_cjs.__name(registerMessagingQueueProcessors, "registerMessagingQueueProcessors");
 async function ensureMessagingPluginsOnCms(base, options) {
@@ -27954,7 +28273,7 @@ async function ensureMessagingPluginsOnCms(base, options) {
   }
   if (!cms.getPlugin("email")) {
     try {
-      const instance = await chunkHXLC56ZK_cjs.emailPlugin({
+      const instance = await chunkYSYX4GUD_cjs.emailPlugin({
         type: "SMTP",
         from: config.SMTP_FROM ?? "no-reply@localhost",
         to: config.SMTP_TO ?? ""
@@ -27995,7 +28314,7 @@ function messagingPlugins(options) {
   const config = options.config ?? (typeof process !== "undefined" ? process.env : {});
   return [
     queuePlugin(),
-    chunkHXLC56ZK_cjs.emailPlugin({
+    chunkYSYX4GUD_cjs.emailPlugin({
       type: "SMTP",
       from: config.SMTP_FROM ?? "no-reply@localhost",
       to: config.SMTP_TO ?? ""
@@ -28129,7 +28448,7 @@ function createCmsApiHandler(config) {
   } : void 0;
   const entityMap = withLlmKnowledgeEntityFallbacks(rawEntityMap);
   if (getCms) {
-    chunkHXLC56ZK_cjs.initWhatsappTriggerDispatcher({
+    chunkYSYX4GUD_cjs.initWhatsappTriggerDispatcher({
       dataSource,
       entityMap,
       getCms
@@ -28142,7 +28461,7 @@ function createCmsApiHandler(config) {
   ] : baseCrudResources;
   const requireEntityPermissionEffective = /* @__PURE__ */ chunkUSNT2KNT_cjs.__name(async (_req, entity, action) => {
     if (!resolveSessionUser) {
-      chunk77NUXO6A_cjs.logRbac("requireEntityPermission: getSessionUser not passed \u2014 vendor store APIs may 403", {
+      chunkJ7FMZK66_cjs.logRbac("requireEntityPermission: getSessionUser not passed \u2014 vendor store APIs may 403", {
         entity,
         action,
         hint: "Pass getSessionUser: auth.getAuthenticatedUser from createCmsAuthBundle()"
@@ -28152,7 +28471,7 @@ function createCmsApiHandler(config) {
       const raw = await resolveSessionUser();
       const u = await hydrateVendorSessionUser(dataSource, raw);
       if (!u?.email) {
-        chunk77NUXO6A_cjs.logRbac("requireEntityPermission: no session user", {
+        chunkJ7FMZK66_cjs.logRbac("requireEntityPermission: no session user", {
           entity,
           action
         });
@@ -28162,13 +28481,13 @@ function createCmsApiHandler(config) {
           status: 401
         });
       }
-      const allowed = chunk3EOM4V2M_cjs.sessionHasEntityAccess(u, entity, action);
-      await chunk77NUXO6A_cjs.logEntityAccessDecision(dataSource, "cmsApi.requireEntityPermission", u, entity, action, {
+      const allowed = chunk4U6DATGZ_cjs.sessionHasEntityAccess(u, entity, action);
+      await chunkJ7FMZK66_cjs.logEntityAccessDecision(dataSource, "cmsApi.requireEntityPermission", u, entity, action, {
         allowed,
         resolvePath: "hydrated_session"
       });
       if (allowed) return null;
-      const { reason } = chunk77NUXO6A_cjs.explainSessionEntityAccess(u, entity, action);
+      const { reason } = chunkJ7FMZK66_cjs.explainSessionEntityAccess(u, entity, action);
       return config.json({
         error: "Forbidden",
         entity,
@@ -28179,7 +28498,7 @@ function createCmsApiHandler(config) {
       });
     }
     if (userRequireEntityPermission) {
-      chunk77NUXO6A_cjs.logRbac("requireEntityPermission: using app callback only (no getSessionUser)", {
+      chunkJ7FMZK66_cjs.logRbac("requireEntityPermission: using app callback only (no getSessionUser)", {
         entity,
         action
       });
@@ -28266,10 +28585,10 @@ function createCmsApiHandler(config) {
       getVendorScope: /* @__PURE__ */ chunkUSNT2KNT_cjs.__name(async () => {
         const multiVendorEnabled = await checkMultiVendorEnabled(dataSource);
         if (!multiVendorEnabled) {
-          return chunk77NUXO6A_cjs.resolveDisabledMultiVendorScope(dataSource);
+          return chunkJ7FMZK66_cjs.resolveDisabledMultiVendorScope(dataSource);
         }
         const u = await hydrateVendorSessionUser(dataSource, await resolveSessionUser());
-        return chunk77NUXO6A_cjs.resolveVendorScopeFromSessionUser(u ?? null);
+        return chunkJ7FMZK66_cjs.resolveVendorScopeFromSessionUser(u ?? null);
       }, "getVendorScope"),
       getHydratedSessionUser: /* @__PURE__ */ chunkUSNT2KNT_cjs.__name(async () => {
         const u = await hydrateVendorSessionUser(dataSource, await resolveSessionUser());
@@ -29227,7 +29546,7 @@ function createCmsApiHandler(config) {
       }
       if (path2[0] === "settings" && path2.length === 2 && settingsHandlers) {
         const group = path2[1];
-        const isPublic = group === "multi_vendor" || settingsConfig?.publicGetGroups?.includes(group);
+        const isPublic = group === "multi_vendor" || group === "turnstile" || group === "auth_providers" || settingsConfig?.publicGetGroups?.includes(group);
         if (m === "GET") {
           if (!isPublic) {
             const a = await config.requireAuth(req);
@@ -29603,7 +29922,7 @@ function createCmsApiHandler(config) {
           let vendorId = null;
           if (resolveSessionUser) {
             const u = await hydrateVendorSessionUser(dataSource, await resolveSessionUser());
-            const scope = chunk77NUXO6A_cjs.resolveVendorScopeFromSessionUser(u ?? null);
+            const scope = chunkJ7FMZK66_cjs.resolveVendorScopeFromSessionUser(u ?? null);
             if (scope.type === "vendor") vendorId = scope.vendorId;
           }
           const result = await validateCoupon(dataSource, entityMap, couponCode, orderLinesNorm, currency, contactId, isAutomatic, discountId ?? void 0, vendorId);
@@ -29686,7 +30005,7 @@ function createCmsApiHandler(config) {
           let vendorId = null;
           if (resolveSessionUser) {
             const u = await hydrateVendorSessionUser(dataSource, await resolveSessionUser());
-            const scope = chunk77NUXO6A_cjs.resolveVendorScopeFromSessionUser(u ?? null);
+            const scope = chunkJ7FMZK66_cjs.resolveVendorScopeFromSessionUser(u ?? null);
             if (scope.type === "vendor") vendorId = scope.vendorId;
           }
           const orderLinesNorm = normalizeOrderLinesInput(body?.orderLines);
@@ -29885,14 +30204,21 @@ function createCmsApiHandler(config) {
           body = {};
         }
         const triggerKey = String(body.triggerKey ?? "order_placed").trim() || "order_placed";
-        if (triggerKey !== "order_placed" && triggerKey !== "order_cancelled") {
+        const validTriggers = [
+          "order_placed",
+          "order_cancelled",
+          "payment_success",
+          "payment_failed",
+          "payment_refund_initiated"
+        ];
+        if (!validTriggers.includes(triggerKey)) {
           return config.json({
-            error: "Invalid triggerKey; use order_placed or order_cancelled"
+            error: `Invalid triggerKey; use one of: ${validTriggers.join(", ")}`
           }, {
             status: 400
           });
         }
-        const { resendOrderNotification } = await import('./order-notification-dispatcher-2FCZFZUD.cjs');
+        const { resendOrderNotification } = await import('./order-notification-dispatcher-KJVGLK5E.cjs');
         const result = await resendOrderNotification(triggerKey, orderId, {
           dataSource,
           entityMap,
@@ -29914,11 +30240,9 @@ function createCmsApiHandler(config) {
       if (path2[0] === "orders" && path2.length === 3 && path2[2] === "cancel" && m === "POST") {
         const a = await config.requireAuth(req);
         if (a) return a;
-        const pe = await requireEntityPermissionEffective(req, "orders", "update");
-        if (pe) return pe;
-        const orderId = Number(path2[1]);
-        if (!Number.isFinite(orderId)) return config.json({
-          error: "Invalid id"
+        const orderId = parseInt(path2[1], 10);
+        if (Number.isNaN(orderId)) return config.json({
+          error: "Invalid order ID"
         }, {
           status: 400
         });
@@ -29935,9 +30259,10 @@ function createCmsApiHandler(config) {
           status: 404
         });
         const o = order;
-        if (o.status !== "confirmed" && o.status !== "completed") {
+        const currentStatus = (o.status || "").toLowerCase();
+        if (currentStatus === "cancelled") {
           return config.json({
-            error: "Only confirmed or completed orders can be cancelled"
+            error: "Order is already cancelled"
           }, {
             status: 400
           });
@@ -29960,7 +30285,7 @@ function createCmsApiHandler(config) {
             }
           });
           if (payment) {
-            paymentStatus = String(payment.status ?? "unpaid");
+            paymentStatus = String(payment.status ?? "unpaid").toLowerCase();
             paymentId = Number(payment.id);
           }
         }
@@ -29992,13 +30317,26 @@ function createCmsApiHandler(config) {
           status: "cancelled"
         });
         const fireOrderCancelledNotification = /* @__PURE__ */ chunkUSNT2KNT_cjs.__name((refundAmount) => {
-          void import('./emit-order-notification-trigger-NR3VN6C6.cjs').then(({ fireOrderNotificationTrigger }) => {
+          void import('./emit-order-notification-trigger-TNEZOYEE.cjs').then(({ fireOrderNotificationTrigger }) => {
             fireOrderNotificationTrigger("order_cancelled", orderId, {
               dataSource,
               entityMap
             }, refundAmount != null && refundAmount > 0 ? {
               refundAmount
             } : void 0);
+            if (paymentStatus === "paid" || paymentStatus === "captured") {
+              fireOrderNotificationTrigger("payment_refund_initiated", orderId, {
+                dataSource,
+                entityMap
+              }, refundAmount != null && refundAmount > 0 ? {
+                refundAmount
+              } : void 0);
+            } else {
+              fireOrderNotificationTrigger("payment_failed", orderId, {
+                dataSource,
+                entityMap
+              });
+            }
           });
         }, "fireOrderCancelledNotification");
         if (paymentStatus === "paid" && entityMap.payments && paymentId) {
@@ -30324,7 +30662,7 @@ function createCmsApiHandler(config) {
           if (resolveSessionUser) {
             const raw = await resolveSessionUser();
             const u = await hydrateVendorSessionUser(dataSource, raw);
-            const scope = chunk77NUXO6A_cjs.resolveVendorScopeFromSessionUser(u ?? null);
+            const scope = chunkJ7FMZK66_cjs.resolveVendorScopeFromSessionUser(u ?? null);
             if (scope.type === "vendor") {
               scopedVendorIds = scope.vendorIds;
             }
@@ -31024,12 +31362,23 @@ function createStorefrontApiHandler(config) {
   const otpFlags = config.otpFlags;
   const otpPepper = config.otpPepper;
   const defaultPhoneCc = config.defaultPhoneCountryCode;
-  function fireOrderPlacedNotification(orderId) {
-    void import('./emit-order-notification-trigger-NR3VN6C6.cjs').then(({ fireOrderNotificationTrigger }) => {
+  function fireOrderPlacedNotification(orderId, isPaid) {
+    void import('./emit-order-notification-trigger-TNEZOYEE.cjs').then(({ fireOrderNotificationTrigger }) => {
       fireOrderNotificationTrigger("order_placed", orderId, {
         dataSource,
         entityMap
       });
+      if (isPaid) {
+        fireOrderNotificationTrigger("payment_success", orderId, {
+          dataSource,
+          entityMap
+        });
+      } else {
+        fireOrderNotificationTrigger("payment_failed", orderId, {
+          dataSource,
+          entityMap
+        });
+      }
     }).catch((err) => console.error("[notification-triggers] import failed", err));
   }
   chunkUSNT2KNT_cjs.__name(fireOrderPlacedNotification, "fireOrderPlacedNotification");
@@ -31064,7 +31413,7 @@ function createStorefrontApiHandler(config) {
     const meta = it.metadata && typeof it.metadata === "object" && !Array.isArray(it.metadata) ? it.metadata : {};
     const fromMeta = Number(meta.comboId ?? meta.combo_id);
     if (Number.isInteger(fromMeta) && fromMeta > 0) return fromMeta;
-    if (meta.isCombo === true || meta.type === "combo" || meta.lineType === "combo") {
+    if (meta.isCombo === true || meta.type === "combo" || meta.lineType === "combo" || meta.lineKind === "combo" || meta.itemType === "combo") {
       const pid = Number(it.productId);
       if (Number.isInteger(pid) && pid > 0) return pid;
     }
@@ -32872,10 +33221,10 @@ function createStorefrontApiHandler(config) {
             adminAccess: false
           }));
           const userId = newUser.id;
-          await chunk3EOM4V2M_cjs.linkUnclaimedContactToUser(dataSource, entityMap.contacts, userId, email);
+          await chunk4U6DATGZ_cjs.linkUnclaimedContactToUser(dataSource, entityMap.contacts, userId, email);
           if (entityMap.customer) {
             const phone = typeof b.phone === "string" && b.phone.trim() ? String(b.phone).trim() : null;
-            await chunk3EOM4V2M_cjs.ensureCustomerForUser(dataSource, entityMap.customer, {
+            await chunk4U6DATGZ_cjs.ensureCustomerForUser(dataSource, entityMap.customer, {
               id: userId,
               name,
               email,
@@ -33193,7 +33542,10 @@ function createStorefrontApiHandler(config) {
             });
             if (existing) {
               await cartItemRepo().update(existing.id, {
-                quantity: existing.quantity + gi.quantity
+                quantity: gi.quantity,
+                ...gi.metadata ? {
+                  metadata: gi.metadata
+                } : {}
               });
             } else {
               await cartItemRepo().save(cartItemRepo().create({
@@ -33914,6 +34266,20 @@ function createStorefrontApiHandler(config) {
               }
             } catch {
             }
+            try {
+              void import('./emit-order-notification-trigger-TNEZOYEE.cjs').then(({ fireOrderNotificationTrigger }) => {
+                fireOrderNotificationTrigger("order_cancelled", orderId, {
+                  dataSource,
+                  entityMap
+                });
+                fireOrderNotificationTrigger("payment_failed", orderId, {
+                  dataSource,
+                  entityMap
+                });
+              }).catch(() => {
+              });
+            } catch {
+            }
           }
           return json({
             ok: true,