@infuro/cms-core 1.0.59 → 1.0.61

package/dist/{chunk-BTUEUA5H.js → chunk-UHT4INVW.js}

@@ -1,15 +1,15 @@
 import { JOB_RUNNER_QUEUE } from './chunk-GO7PPYNU.js';
 import { validateInventoryForConfirmedOrderLines, orderStatusHoldsStock, reconcileOrderInventoryBetweenSnapshots, orderInventorySnapshotFromRow, validateInventoryForOrderBecomingConfirmed } from './chunk-3K5AIEIZ.js';
-import { resolveChatEmailToolSettings, CHAT_EMAIL_LOG, detectChatLeadIntent, parseIntentRecipientEmails, sendChatLeadEmail, buildTranscriptForLeadEmail, buildChatbotSystemPromptWithEmailTool, validateFcmCredentials, sendFcmPushNotification, parseEmailRecipientsFromConfig, isWhatsAppPluginEnabled, mergeWhatsAppConfigLayers, whatsAppConfigured, WhatsAppService, registerWhatsAppQueueProcessor, emailPlugin, initWhatsappTriggerDispatcher } from './chunk-HYW3MUXT.js';
+import { resolveChatEmailToolSettings, CHAT_EMAIL_LOG, detectChatLeadIntent, parseIntentRecipientEmails, sendChatLeadEmail, buildTranscriptForLeadEmail, buildChatbotSystemPromptWithEmailTool, validateFcmCredentials, sendFcmPushNotification, parseEmailRecipientsFromConfig, isWhatsAppPluginEnabled, mergeWhatsAppConfigLayers, whatsAppConfigured, WhatsAppService, registerWhatsAppQueueProcessor, emailPlugin, initWhatsappTriggerDispatcher } from './chunk-URN7GS23.js';
 import { inviteStatusForActivation } from './chunk-JXF23MPG.js';
 import { queueEmail, queueVendorOnboardEmails, registerEmailQueueProcessor } from './chunk-L3525VXI.js';
 import { mergeEmailLayoutCompanyDetails, unwrapErpReadData, mapErpPayloadToFulfillment, extractChildOrderRefsFromSalePayload, mapErpPayloadToInvoiceNumber, streamOrderInvoicePdf } from './chunk-2KUCQVAQ.js';
 import { isErpIntegrationEnabled } from './chunk-JC6DLWTE.js';
 import { getSmsTemplateDefault, SMS_MESSAGE_TEMPLATE_DEFAULTS } from './chunk-MQBT33IV.js';
 import { EVENT_ORDER_MESSAGE_TEMPLATE_DEFAULTS, EVENT_ORDER_TEMPLATE_KEY, EVENT_ORDER_TEMPLATE_VARIABLES } from './chunk-AYERBA7I.js';
-import { ensureCustomerRecord, linkUnclaimedContactToUser, ensureCustomerForUser, canManageRoles, sessionHasEntityAccess } from './chunk-RK5ETF2I.js';
+import { ensureCustomerRecord, linkUnclaimedContactToUser, ensureCustomerForUser, canManageRoles, sessionHasEntityAccess } from './chunk-NR44CK5E.js';
 import { retireSoftDeletedUniqueValue, activeUniqueValueExists } from './chunk-DBPSJYLZ.js';
-import { permissionRowsToRecord, logRbac, isSuperAdmin, vendorPortalFlagsFromUser, VENDOR_SCOPED_STORE_ENTITIES, isVendorPortalUser, getPermissionableEntityKeys, VENDOR_STORE_RBAC_ENTITIES, isSuperAdminGroupName, VENDOR_RBAC_ENTITIES, VENDOR_VIEWER_ROLE_NAME, DEFAULT_VENDOR_ROLE_DEFS, VENDOR_GROUP_NAME, resolveVendorScopeFromSessionUser, canManageVendorRoles, isPlatformAdministrator, canManageVendorTeam, resolveDisabledMultiVendorScope, logEntityAccessDecision, explainSessionEntityAccess } from './chunk-JIWUVQ6B.js';
+import { permissionRowsToRecord, logRbac, isSuperAdmin, vendorPortalFlagsFromUser, VENDOR_SCOPED_STORE_ENTITIES, isVendorPortalUser, getPermissionableEntityKeys, VENDOR_STORE_RBAC_ENTITIES, isSuperAdminGroupName, VENDOR_RBAC_ENTITIES, VENDOR_VIEWER_ROLE_NAME, DEFAULT_VENDOR_ROLE_DEFS, VENDOR_GROUP_NAME, resolveVendorScopeFromSessionUser, canManageVendorRoles, isPlatformAdministrator, canManageVendorTeam, resolveDisabledMultiVendorScope, logEntityAccessDecision, explainSessionEntityAccess } from './chunk-MVHDC3XF.js';
 import { queueErp } from './chunk-SYBOCAWB.js';
 import { __name } from './chunk-SHUYVCID.js';
 import { PrimaryGeneratedColumn, Column, Entity, ManyToOne, JoinColumn, CreateDateColumn, UpdateDateColumn, Unique, OneToMany, Index, ManyToMany, JoinTable, In, ILike, Between, MoreThanOrEqual, LessThanOrEqual, Not, MoreThan, IsNull } from 'typeorm';
@@ -2444,13 +2444,46 @@ function discountCompare(cartValue, op, ruleValue) {
   }
 }
 __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;
+}
+__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);
@@ -2459,11 +2492,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) —
@@ -2487,11 +2520,11 @@ function discountEvaluateRule(rule, cartLines, cartTotal) {
   }
 }
 __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;
 }
 __name(discountEvaluateGroup, "discountEvaluateGroup");
@@ -2538,19 +2571,19 @@ function discountExtractBuyProductId(nodes) {
   return null;
 }
 __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
   };
 }
 __name(discountBuildUniversalResult, "discountBuildUniversalResult");
-function evaluateDiscount(discount, cartLines) {
+function evaluateDiscount(discount, cartLines, exchangeRate = 1) {
   const empty = {
     rewardLines: [],
     conditionsMet: false
@@ -2574,16 +2607,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;
@@ -2601,7 +2635,7 @@ function evaluateDiscount(discount, cartLines) {
       rewardLines.push({
         productId: rewardProductId,
         quantity: dealMultiplier,
-        discountRate: Number(discount.value),
+        discountRate: effectiveValue,
         discountType: discount.discountType
       });
     } else {
@@ -2610,7 +2644,7 @@ function evaluateDiscount(discount, cartLines) {
       rewardLines.push({
         productId: rewardProductId,
         quantity: rewardQty,
-        discountRate: Number(discount.value),
+        discountRate: effectiveValue,
         discountType: discount.discountType
       });
     }
@@ -2621,8 +2655,9 @@ function evaluateDiscount(discount, cartLines) {
   };
 }
 __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);
@@ -2639,8 +2674,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);
@@ -2650,7 +2685,7 @@ function applyDiscountToOrderLines(lines, evalResult, maxDiscountAmount) {
       line.total = Math.max(0, line.total + rollback);
       if (rollback > 0) break;
     }
-    totalDiscountApplied = maxDiscountAmount;
+    totalDiscountApplied = effectiveMaxDiscountAmount;
   }
   return totalDiscountApplied;
 }
@@ -2756,7 +2791,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,
@@ -2766,7 +2803,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,
@@ -3051,9 +3088,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;
           }
         }
@@ -3166,9 +3205,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);
@@ -3791,14 +3846,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 ? 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 = Not(In(excludeIds));
           }
         }
@@ -4075,6 +4130,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: 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: Not(In(excludeIdList))
+          });
+        }
+      }
       if (resourceUsesVendorScope(resource)) {
         const scope = await resolveScope();
         const catalogFlags = await getVendorCatalogCreateFlags(dataSource);
@@ -5117,11 +5190,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-HZQPPSFB.js').then(({ fireOrderNotificationTrigger }) => {
+          const initialPayStatus = String(persistBody.paymentStatus ?? "unpaid").toLowerCase();
+          void import('./emit-order-notification-trigger-CZU3V2WE.js').then(({ fireOrderNotificationTrigger }) => {
             fireOrderNotificationTrigger("order_placed", orderIdForNotify, {
               dataSource,
               entityMap
             });
+            if (initialPayStatus === "paid" || initialPayStatus === "captured") {
+              fireOrderNotificationTrigger("payment_success", orderIdForNotify, {
+                dataSource,
+                entityMap
+              });
+            }
           });
         }
       } catch (err) {
@@ -6588,6 +6668,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-CZU3V2WE.js').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-CZU3V2WE.js').then(({ fireOrderNotificationTrigger }) => {
+                  fireOrderNotificationTrigger("payment_failed", pOrder, {
+                    dataSource,
+                    entityMap
+                  });
+                }).catch(() => {
+                });
+              }
+            }
+          }
         } catch (err) {
           if (resource === "events" && isSlugUniqueViolation(err)) {
             return json({
@@ -8711,25 +8828,79 @@ function createUploadHandler(config) {
     "application/x-zip-compressed"
   ];
   return /* @__PURE__ */ __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;
@@ -8737,25 +8908,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"
           }, {
@@ -8769,6 +8966,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"
           }, {
@@ -8776,25 +8979,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,
@@ -8802,8 +9070,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');
@@ -8814,6 +9084,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
@@ -8822,11 +9098,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({
@@ -9142,7 +9420,9 @@ function createFormSaveHandlers(config) {
           "description",
           "campaign",
           "slug",
-          "published"
+          "published",
+          "enableTurnstile",
+          "enable_turnstile"
         ]) {
           if (body[key] !== void 0) formRow[key] = body[key];
         }
@@ -9161,13 +9441,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: {
@@ -9321,7 +9631,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,
@@ -17038,6 +17348,7 @@ var Form = class {
   campaign;
   slug;
   published;
+  enableTurnstile;
   createdAt;
   updatedAt;
   deletedAt;
@@ -17080,6 +17391,14 @@ _ts_decorate14([
   }),
   _ts_metadata14("design:type", Boolean)
 ], Form.prototype, "published", void 0);
+_ts_decorate14([
+  Column("boolean", {
+    default: false,
+    name: "enable_turnstile",
+    nullable: true
+  }),
+  _ts_metadata14("design:type", Boolean)
+], Form.prototype, "enableTurnstile", void 0);
 _ts_decorate14([
   Column({
     type: "timestamp",
@@ -29217,7 +29536,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);
@@ -29875,14 +30194,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-64WDCHHG.js');
+        const { resendOrderNotification } = await import('./order-notification-dispatcher-ZSFKEYMP.js');
         const result = await resendOrderNotification(triggerKey, orderId, {
           dataSource,
           entityMap,
@@ -29904,11 +30230,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
         });
@@ -29925,9 +30249,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
           });
@@ -29950,7 +30275,7 @@ function createCmsApiHandler(config) {
             }
           });
           if (payment) {
-            paymentStatus = String(payment.status ?? "unpaid");
+            paymentStatus = String(payment.status ?? "unpaid").toLowerCase();
             paymentId = Number(payment.id);
           }
         }
@@ -29982,13 +30307,26 @@ function createCmsApiHandler(config) {
           status: "cancelled"
         });
         const fireOrderCancelledNotification = /* @__PURE__ */ __name((refundAmount) => {
-          void import('./emit-order-notification-trigger-HZQPPSFB.js').then(({ fireOrderNotificationTrigger }) => {
+          void import('./emit-order-notification-trigger-CZU3V2WE.js').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) {
@@ -31014,12 +31352,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-HZQPPSFB.js').then(({ fireOrderNotificationTrigger }) => {
+  function fireOrderPlacedNotification(orderId, isPaid) {
+    void import('./emit-order-notification-trigger-CZU3V2WE.js').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));
   }
   __name(fireOrderPlacedNotification, "fireOrderPlacedNotification");
@@ -31054,7 +31403,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;
     }
@@ -33183,7 +33532,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({
@@ -33904,6 +34256,20 @@ function createStorefrontApiHandler(config) {
               }
             } catch {
             }
+            try {
+              void import('./emit-order-notification-trigger-CZU3V2WE.js').then(({ fireOrderNotificationTrigger }) => {
+                fireOrderNotificationTrigger("order_cancelled", orderId, {
+                  dataSource,
+                  entityMap
+                });
+                fireOrderNotificationTrigger("payment_failed", orderId, {
+                  dataSource,
+                  entityMap
+                });
+              }).catch(() => {
+              });
+            } catch {
+            }
           }
           return json({
             ok: true,