@infuro/cms-core 1.0.60 → 1.0.62

package/dist/{chunk-BSLNXKV2.cjs → chunk-QA5C477U.cjs}

@@ -1,12 +1,15 @@
 'use strict';
 
+var chunkWFMVD567_cjs = require('./chunk-WFMVD567.cjs');
 var chunkXQ3QUHWR_cjs = require('./chunk-XQ3QUHWR.cjs');
 var chunkHY3AXLOI_cjs = require('./chunk-HY3AXLOI.cjs');
-var chunkYSYX4GUD_cjs = require('./chunk-YSYX4GUD.cjs');
+var chunkTWTISTZB_cjs = require('./chunk-TWTISTZB.cjs');
+var chunkH3IVLIPR_cjs = require('./chunk-H3IVLIPR.cjs');
 var chunk7NMT3GBR_cjs = require('./chunk-7NMT3GBR.cjs');
-var chunkV25RDUOU_cjs = require('./chunk-V25RDUOU.cjs');
-var chunkBXYZDMTZ_cjs = require('./chunk-BXYZDMTZ.cjs');
+var chunkLRD4CGOG_cjs = require('./chunk-LRD4CGOG.cjs');
+var chunkAXMP2U43_cjs = require('./chunk-AXMP2U43.cjs');
 var chunkUPLVMVRX_cjs = require('./chunk-UPLVMVRX.cjs');
+var chunkCTIEAHQL_cjs = require('./chunk-CTIEAHQL.cjs');
 var chunk3DZRIZOD_cjs = require('./chunk-3DZRIZOD.cjs');
 var chunkTJ2MIQUT_cjs = require('./chunk-TJ2MIQUT.cjs');
 var chunk4U6DATGZ_cjs = require('./chunk-4U6DATGZ.cjs');
@@ -1526,9 +1529,15 @@ async function autoExpireOrderIfPaymentTimeExceeded(dataSource, entityMap, order
   if (status !== "pending") return order;
   const meta = typeof order.metadata === "object" && order.metadata ? order.metadata : {};
   const expiresAtStr = meta.paymentExpiresAt ? String(meta.paymentExpiresAt) : null;
-  if (!expiresAtStr) return order;
-  const expiresMs = new Date(expiresAtStr).getTime();
-  if (Number.isNaN(expiresMs) || Date.now() <= expiresMs) return order;
+  let isExpired = false;
+  if (expiresAtStr) {
+    const expiresMs = new Date(expiresAtStr).getTime();
+    if (!Number.isNaN(expiresMs) && Date.now() > expiresMs) isExpired = true;
+  } else if (order.createdAt) {
+    const createdMs = new Date(order.createdAt).getTime();
+    if (!Number.isNaN(createdMs) && Date.now() - createdMs > 10 * 60 * 1e3) isExpired = true;
+  }
+  if (!isExpired) return order;
   try {
     const orderId = Number(order.id);
     if (orderId && entityMap.orders) {
@@ -3557,7 +3566,7 @@ function createCrudHandler(dataSource, entityMap, options) {
             });
           }
         }
-        const qb = repo2.createQueryBuilder("order").leftJoinAndSelect("order.contact", "contact").leftJoinAndSelect("order.items", "items").leftJoinAndSelect("items.product", "product").leftJoinAndSelect("product.collection", "collection").leftJoinAndSelect("order.payments", "payments").andWhere("order.deleted = :orderDel", {
+        const qb = repo2.createQueryBuilder("order").leftJoinAndSelect("order.contact", "contact").leftJoinAndSelect("order.items", "items").leftJoinAndSelect("items.product", "product").leftJoinAndSelect("product.collection", "collection").leftJoinAndSelect("order.payments", "payments").leftJoinAndSelect("order.assignedUser", "assignedUser").andWhere("order.deleted = :orderDel", {
           orderDel: false
         }).orderBy(`order.${sortField2}`, sortOrderOrders).skip(skip).take(limit);
         applyVendorScopeToQueryBuilder(qb, "order", scope);
@@ -3615,7 +3624,9 @@ function createCrudHandler(dataSource, entityMap, options) {
         }
         const [rows, total2] = await qb.getManyAndCount();
         const data2 = await Promise.all(rows.map(async (order) => {
+          await autoExpireOrderIfPaymentTimeExceeded(dataSource, entityMap, order);
           const contact = order.contact;
+          const assignedUserObj = order.assignedUser;
           const items = order.items ?? [];
           const orderPayments = order.payments ?? [];
           const parts = [];
@@ -3663,6 +3674,11 @@ function createCrudHandler(dataSource, entityMap, options) {
               email: contact.email,
               phone: contact.phone
             } : null,
+            assignedUser: assignedUserObj ? {
+              id: assignedUserObj.id,
+              name: assignedUserObj.name || assignedUserObj.email,
+              email: assignedUserObj.email
+            } : null,
             itemsSummary,
             paymentStatus: paymentStatus2
           };
@@ -3856,14 +3872,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));
           }
         }
@@ -4140,6 +4156,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);
@@ -5181,18 +5215,99 @@ function createCrudHandler(dataSource, entityMap, options) {
             }
             await recordDiscountUsage2(dataSource, entityMap, created.id, orderDiscountId, persistBody.contactId, discount);
           }
+          if (entityMap["payments"]) {
+            try {
+              const paymentRepo = dataSource.getRepository(entityMap["payments"]);
+              const initialPayStatus2 = String(persistBody.paymentStatus ?? body.paymentStatus ?? "unpaid").toLowerCase();
+              const isPaid = initialPayStatus2 === "paid" || initialPayStatus2 === "captured";
+              const vId = Number(orderVendorId ?? created?.vendorId ?? 1);
+              const cId = persistBody.contactId ? Number(persistBody.contactId) : null;
+              await paymentRepo.save(paymentRepo.create({
+                vendorId: vId,
+                contactId: cId,
+                orderId: created.id,
+                status: initialPayStatus2,
+                amount: Number(total ?? persistBody.total ?? 0),
+                currency: orderCurrency ?? persistBody.currency ?? "INR",
+                paidAt: isPaid ? /* @__PURE__ */ new Date() : null,
+                method: String(body.paymentMethod ?? "manual")
+              }));
+            } catch (payErr) {
+              console.error("[crud] failed to create initial payment for order", payErr);
+            }
+          }
           const orderIdForNotify = created.id;
-          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, {
+          const finalCreatedStatus = String(created.status ?? createdStatus ?? "pending").toLowerCase();
+          const initialPayStatus = String(persistBody.paymentStatus ?? body.paymentStatus ?? "unpaid").toLowerCase();
+          void import('./emit-order-notification-trigger-K7URAZHJ.cjs').then(({ fireOrderNotificationTrigger }) => {
+            if (finalCreatedStatus === "pending") {
+              if (initialPayStatus === "failed") {
+                fireOrderNotificationTrigger("payment_failed", orderIdForNotify, {
+                  dataSource,
+                  entityMap
+                });
+              } else {
+                fireOrderNotificationTrigger("order_pending", orderIdForNotify, {
+                  dataSource,
+                  entityMap
+                });
+              }
+            } else if (finalCreatedStatus === "confirmed") {
+              fireOrderNotificationTrigger("order_placed", orderIdForNotify, {
+                dataSource,
+                entityMap
+              });
+              if (initialPayStatus === "paid" || initialPayStatus === "captured") {
+                fireOrderNotificationTrigger("payment_success", orderIdForNotify, {
+                  dataSource,
+                  entityMap
+                });
+              } else if (initialPayStatus === "failed") {
+                fireOrderNotificationTrigger("payment_failed", orderIdForNotify, {
+                  dataSource,
+                  entityMap
+                });
+              }
+            } else if (finalCreatedStatus === "processing") {
+              fireOrderNotificationTrigger("order_processing", orderIdForNotify, {
                 dataSource,
                 entityMap
               });
+              if (initialPayStatus === "failed") {
+                fireOrderNotificationTrigger("payment_failed", orderIdForNotify, {
+                  dataSource,
+                  entityMap
+                });
+              }
+            } else if (finalCreatedStatus === "completed") {
+              fireOrderNotificationTrigger("order_completed", orderIdForNotify, {
+                dataSource,
+                entityMap
+              });
+              if (initialPayStatus === "failed") {
+                fireOrderNotificationTrigger("payment_failed", orderIdForNotify, {
+                  dataSource,
+                  entityMap
+                });
+              }
+            } else if (finalCreatedStatus === "cancelled") {
+              if (initialPayStatus === "failed") {
+                fireOrderNotificationTrigger("payment_failed", orderIdForNotify, {
+                  dataSource,
+                  entityMap
+                });
+              } else {
+                fireOrderNotificationTrigger("order_cancelled", orderIdForNotify, {
+                  dataSource,
+                  entityMap
+                });
+                if (initialPayStatus === "paid" || initialPayStatus === "refunded") {
+                  fireOrderNotificationTrigger("payment_refund_initiated", orderIdForNotify, {
+                    dataSource,
+                    entityMap
+                  });
+                }
+              }
             }
           });
         }
@@ -5543,8 +5658,7 @@ function createCrudByIdHandler(dataSource, entityMap, options) {
         const scope2 = await resolveScopeById();
         const order = await repo.findOne({
           where: {
-            id: Number(id),
-            deleted: false
+            id: Number(id)
           },
           relations: [
             "contact",
@@ -5553,7 +5667,8 @@ function createCrudByIdHandler(dataSource, entityMap, options) {
             "items",
             "items.product",
             "items.product.collection",
-            "payments"
+            "payments",
+            "assignedUser"
           ]
         });
         if (order) {
@@ -5563,8 +5678,7 @@ function createCrudByIdHandler(dataSource, entityMap, options) {
         if (orderDenied) return orderDenied;
         const relatedOrders = await repo.find({
           where: {
-            parentOrderId: Number(id),
-            deleted: false
+            parentOrderId: Number(id)
           },
           order: {
             id: "ASC"
@@ -5943,6 +6057,36 @@ function createCrudByIdHandler(dataSource, entityMap, options) {
             lines: []
           } : await calculateOrderTotalsFromLines(dataSource, entityMap, orderLinesNorm, effectiveCurrency, putDiscountId, Number.isFinite(putOrderVendorId) ? putOrderVendorId : null);
           const scalarUpdate = pickColumnUpdates(repo, rawBody);
+          if (rawBody && typeof rawBody === "object" && "assignedUserId" in rawBody && rawBody.assignedUserId !== void 0) {
+            const aId = Number(rawBody.assignedUserId);
+            if (Number.isFinite(aId) && aId > 0) {
+              scalarUpdate.assignedUserId = aId;
+              scalarUpdate.assignedAt = /* @__PURE__ */ new Date();
+              if (!scalarUpdate.status && (orderInvPrev?.status === "confirmed" || orderInvPrev?.status === "pending")) {
+                scalarUpdate.status = "processing";
+              }
+            } else {
+              scalarUpdate.assignedUserId = null;
+              scalarUpdate.assignedAt = null;
+            }
+          }
+          if (scalarUpdate.status === "processing") {
+            const effectiveAssignee = scalarUpdate.assignedUserId !== void 0 ? scalarUpdate.assignedUserId : orderInvPrev?.assignedUserId;
+            if (!effectiveAssignee) {
+              return json({
+                error: "Cannot start processing without assigning a teammate. Please assign a teammate first."
+              }, {
+                status: 400
+              });
+            }
+          }
+          if (scalarUpdate.status === "completed" && orderInvPrev?.status !== "completed" && !rawBody?.__internalBypassOtp) {
+            return json({
+              error: "Direct completion is disabled. Please complete the order via the customer OTP verification flow."
+            }, {
+              status: 400
+            });
+          }
           const nextStatus = typeof scalarUpdate.status === "string" && scalarUpdate.status ? String(scalarUpdate.status) : orderInvPrev?.status ?? "pending";
           if (chunkHY3AXLOI_cjs.orderStatusHoldsStock(nextStatus) && lines.length > 0) {
             const verr = await chunkHY3AXLOI_cjs.validateInventoryForOrderBecomingConfirmed(dataSource, entityMap, orderInvPrev, lines.filter((l) => l.found && l.productId != null).map((l) => ({
@@ -6130,6 +6274,128 @@ function createCrudByIdHandler(dataSource, entityMap, options) {
               }
             }
           }
+          if (rawBody && entityMap["payments"]) {
+            try {
+              const bodyPayStatusRaw = rawBody.paymentStatus;
+              if (bodyPayStatusRaw != null && typeof bodyPayStatusRaw === "string") {
+                const payStatus = bodyPayStatusRaw.trim().toLowerCase();
+                const paymentRepo = dataSource.getRepository(entityMap["payments"]);
+                const existingPay = await paymentRepo.findOne({
+                  where: {
+                    orderId: numericId
+                  },
+                  order: {
+                    id: "DESC"
+                  }
+                });
+                const isPaid = payStatus === "paid" || payStatus === "captured";
+                if (existingPay) {
+                  await paymentRepo.update(existingPay.id, {
+                    status: payStatus,
+                    paidAt: isPaid && !existingPay.paidAt ? /* @__PURE__ */ new Date() : existingPay.paidAt
+                  });
+                } else {
+                  const orderRow = updatedOrder;
+                  const orderTotal = Number(orderRow?.total ?? 0);
+                  const orderCurrency = String(orderRow?.currency ?? "INR");
+                  const vId = Number(orderRow?.vendorId ?? 1);
+                  const cId = orderRow?.contactId ? Number(orderRow.contactId) : null;
+                  await paymentRepo.save(paymentRepo.create({
+                    vendorId: vId,
+                    contactId: cId,
+                    orderId: numericId,
+                    status: payStatus,
+                    amount: orderTotal,
+                    currency: orderCurrency,
+                    paidAt: isPaid ? /* @__PURE__ */ new Date() : null,
+                    method: "manual"
+                  }));
+                }
+              }
+            } catch (payErr) {
+              console.error("[crud] failed to update/create payment on order update", payErr);
+            }
+          }
+          const statusUpdated = Boolean(scalarUpdate.status || rawBody.status);
+          const paymentUpdated = Boolean(rawBody && typeof rawBody === "object" && rawBody.paymentStatus != null);
+          if (statusUpdated || paymentUpdated) {
+            const newStatus = scalarUpdate.status ? String(scalarUpdate.status).toLowerCase() : rawBody.status ? String(rawBody.status).toLowerCase() : String(updatedOrder.status || "pending").toLowerCase();
+            const payments = Array.isArray(updatedOrder.payments) ? updatedOrder.payments : [];
+            const bodyPayStatus = rawBody && typeof rawBody === "object" && rawBody.paymentStatus != null ? String(rawBody.paymentStatus).toLowerCase() : null;
+            const curPayStatus = bodyPayStatus || String(payments[0]?.status || "unpaid").toLowerCase();
+            void import('./emit-order-notification-trigger-K7URAZHJ.cjs').then(({ fireOrderNotificationTrigger }) => {
+              if (newStatus === "pending") {
+                if (curPayStatus === "failed") {
+                  fireOrderNotificationTrigger("payment_failed", updatedOrder.id, {
+                    dataSource,
+                    entityMap
+                  });
+                } else {
+                  fireOrderNotificationTrigger("order_pending", updatedOrder.id, {
+                    dataSource,
+                    entityMap
+                  });
+                }
+              } else if (newStatus === "confirmed") {
+                fireOrderNotificationTrigger("order_placed", updatedOrder.id, {
+                  dataSource,
+                  entityMap
+                });
+                if (curPayStatus === "paid" || curPayStatus === "captured") {
+                  fireOrderNotificationTrigger("payment_success", updatedOrder.id, {
+                    dataSource,
+                    entityMap
+                  });
+                } else if (curPayStatus === "failed") {
+                  fireOrderNotificationTrigger("payment_failed", updatedOrder.id, {
+                    dataSource,
+                    entityMap
+                  });
+                }
+              } else if (newStatus === "processing") {
+                fireOrderNotificationTrigger("order_processing", updatedOrder.id, {
+                  dataSource,
+                  entityMap
+                });
+                if (curPayStatus === "failed") {
+                  fireOrderNotificationTrigger("payment_failed", updatedOrder.id, {
+                    dataSource,
+                    entityMap
+                  });
+                }
+              } else if (newStatus === "completed") {
+                fireOrderNotificationTrigger("order_completed", updatedOrder.id, {
+                  dataSource,
+                  entityMap
+                });
+                if (curPayStatus === "failed") {
+                  fireOrderNotificationTrigger("payment_failed", updatedOrder.id, {
+                    dataSource,
+                    entityMap
+                  });
+                }
+              } else if (newStatus === "cancelled") {
+                if (curPayStatus === "failed") {
+                  fireOrderNotificationTrigger("payment_failed", updatedOrder.id, {
+                    dataSource,
+                    entityMap
+                  });
+                } else {
+                  fireOrderNotificationTrigger("order_cancelled", updatedOrder.id, {
+                    dataSource,
+                    entityMap
+                  });
+                  if (curPayStatus === "paid" || curPayStatus === "refunded") {
+                    fireOrderNotificationTrigger("payment_refund_initiated", updatedOrder.id, {
+                      dataSource,
+                      entityMap
+                    });
+                  }
+                }
+              }
+            }).catch(() => {
+            });
+          }
           return json(updatedOrder);
         }
       }
@@ -6606,7 +6872,37 @@ function createCrudByIdHandler(dataSource, entityMap, options) {
           if (k in merged) updatePayload[k] = merged[k];
         }
       }
-      if (resource === "orders" && orderInvPrev) {
+      if (resource === "orders" && orderInvPrev && rawBody && typeof rawBody === "object") {
+        if ("assignedUserId" in rawBody && rawBody.assignedUserId !== void 0) {
+          const aId = Number(rawBody.assignedUserId);
+          if (Number.isFinite(aId) && aId > 0) {
+            updatePayload.assignedUserId = aId;
+            updatePayload.assignedAt = /* @__PURE__ */ new Date();
+            if (!updatePayload.status && (orderInvPrev.status === "confirmed" || orderInvPrev.status === "pending")) {
+              updatePayload.status = "processing";
+            }
+          } else {
+            updatePayload.assignedUserId = null;
+            updatePayload.assignedAt = null;
+          }
+        }
+        if (updatePayload.status === "processing") {
+          const effectiveAssignee = updatePayload.assignedUserId !== void 0 ? updatePayload.assignedUserId : orderInvPrev?.assignedUserId;
+          if (!effectiveAssignee) {
+            return json({
+              error: "Cannot start processing without assigning a teammate. Please assign a teammate first."
+            }, {
+              status: 400
+            });
+          }
+        }
+        if (updatePayload.status === "completed" && orderInvPrev.status !== "completed" && !rawBody.__internalBypassOtp) {
+          return json({
+            error: "Direct completion is disabled. Please complete the order via the customer OTP verification flow."
+          }, {
+            status: 400
+          });
+        }
         const nextSt = typeof updatePayload.status === "string" && updatePayload.status ? String(updatePayload.status) : orderInvPrev.status;
         if (chunkHY3AXLOI_cjs.orderStatusHoldsStock(nextSt) && orderInvPrev.lines.length > 0) {
           const verr = await chunkHY3AXLOI_cjs.validateInventoryForOrderBecomingConfirmed(dataSource, entityMap, orderInvPrev, orderInvPrev.lines);
@@ -6671,24 +6967,43 @@ function createCrudByIdHandler(dataSource, entityMap, options) {
             if (pOrder && Number.isFinite(pOrder)) {
               if (newPayStatus === "paid" || newPayStatus === "captured") {
                 if (entityMap.orders) {
-                  await dataSource.getRepository(entityMap.orders).update(pOrder, {
-                    status: "confirmed"
+                  const ordRepo = dataSource.getRepository(entityMap.orders);
+                  const currentOrd = await ordRepo.findOne({
+                    where: {
+                      id: pOrder
+                    }
                   });
+                  const ordStatus = String(currentOrd?.status || "pending").toLowerCase();
+                  if (ordStatus === "pending") {
+                    await ordRepo.update(pOrder, {
+                      status: "confirmed"
+                    });
+                  }
+                  if (ordStatus === "pending" || ordStatus === "confirmed") {
+                    void import('./emit-order-notification-trigger-K7URAZHJ.cjs').then(({ fireOrderNotificationTrigger }) => {
+                      fireOrderNotificationTrigger("order_placed", pOrder, {
+                        dataSource,
+                        entityMap
+                      });
+                      fireOrderNotificationTrigger("payment_success", pOrder, {
+                        dataSource,
+                        entityMap
+                      });
+                    }).catch(() => {
+                    });
+                  }
                 }
-                void import('./emit-order-notification-trigger-TNEZOYEE.cjs').then(({ fireOrderNotificationTrigger }) => {
-                  fireOrderNotificationTrigger("order_placed", pOrder, {
-                    dataSource,
-                    entityMap
-                  });
-                  fireOrderNotificationTrigger("payment_success", pOrder, {
+              } else if (newPayStatus === "failed") {
+                void import('./emit-order-notification-trigger-K7URAZHJ.cjs').then(({ fireOrderNotificationTrigger }) => {
+                  fireOrderNotificationTrigger("payment_failed", pOrder, {
                     dataSource,
                     entityMap
                   });
                 }).catch(() => {
                 });
-              } else if (newPayStatus === "failed") {
-                void import('./emit-order-notification-trigger-TNEZOYEE.cjs').then(({ fireOrderNotificationTrigger }) => {
-                  fireOrderNotificationTrigger("payment_failed", pOrder, {
+              } else if (newPayStatus === "refunded") {
+                void import('./emit-order-notification-trigger-K7URAZHJ.cjs').then(({ fireOrderNotificationTrigger }) => {
+                  fireOrderNotificationTrigger("payment_refund_initiated", pOrder, {
                     dataSource,
                     entityMap
                   });
@@ -6708,6 +7023,52 @@ function createCrudByIdHandler(dataSource, entityMap, options) {
           throw err;
         }
       }
+      if (resource === "orders" && rawBody && entityMap["payments"]) {
+        try {
+          const bodyPayStatusRaw = rawBody.paymentStatus;
+          if (bodyPayStatusRaw != null && typeof bodyPayStatusRaw === "string") {
+            const payStatus = bodyPayStatusRaw.trim().toLowerCase();
+            const paymentRepo = dataSource.getRepository(entityMap["payments"]);
+            const existingPay = await paymentRepo.findOne({
+              where: {
+                orderId: numericId
+              },
+              order: {
+                id: "DESC"
+              }
+            });
+            const isPaid = payStatus === "paid" || payStatus === "captured";
+            if (existingPay) {
+              await paymentRepo.update(existingPay.id, {
+                status: payStatus,
+                paidAt: isPaid && !existingPay.paidAt ? /* @__PURE__ */ new Date() : existingPay.paidAt
+              });
+            } else {
+              const orderRow = await repo.findOne({
+                where: {
+                  id: numericId
+                }
+              });
+              const orderTotal = Number(orderRow?.total ?? 0);
+              const orderCurrency = String(orderRow?.currency ?? "INR");
+              const vId = Number(orderRow?.vendorId ?? 1);
+              const cId = orderRow?.contactId ? Number(orderRow.contactId) : null;
+              await paymentRepo.save(paymentRepo.create({
+                vendorId: vId,
+                contactId: cId,
+                orderId: numericId,
+                status: payStatus,
+                amount: orderTotal,
+                currency: orderCurrency,
+                paidAt: isPaid ? /* @__PURE__ */ new Date() : null,
+                method: "manual"
+              }));
+            }
+          }
+        } catch (payErr) {
+          console.error("[crud] failed to update/create payment on order update", payErr);
+        }
+      }
       if (resource === "orders" && rawBody && entityMap["order_addresses"]) {
         const addressRawScalar = String(rawBody["contact.address"] ?? "").trim();
         if (addressRawScalar) {
@@ -6746,17 +7107,105 @@ function createCrudByIdHandler(dataSource, entityMap, options) {
       }
       let updated = resource === "orders" ? await repo.findOne({
         where: {
-          id: numericId,
-          deleted: false
+          id: numericId
         },
         relations: [
-          "items"
+          "contact",
+          "billingAddress",
+          "shippingAddress",
+          "items",
+          "items.product",
+          "items.product.collection",
+          "payments"
         ]
       }) : await repo.findOne({
         where: {
           id: numericId
         }
       });
+      if (resource === "orders" && updated) {
+        const ord = updated;
+        const statusUpdated = Boolean(updatePayload.status);
+        const paymentUpdated = Boolean(rawBody && typeof rawBody === "object" && rawBody.paymentStatus != null);
+        if (statusUpdated || paymentUpdated) {
+          const newStatus = updatePayload.status ? String(updatePayload.status).toLowerCase() : String(ord.status || "pending").toLowerCase();
+          const payments = Array.isArray(ord.payments) ? ord.payments : [];
+          const bodyPayStatus = rawBody && typeof rawBody === "object" && rawBody.paymentStatus != null ? String(rawBody.paymentStatus).toLowerCase() : null;
+          const curPayStatus = bodyPayStatus || String(payments[0]?.status || "unpaid").toLowerCase();
+          void import('./emit-order-notification-trigger-K7URAZHJ.cjs').then(({ fireOrderNotificationTrigger }) => {
+            if (newStatus === "pending") {
+              if (curPayStatus === "failed") {
+                fireOrderNotificationTrigger("payment_failed", ord.id, {
+                  dataSource,
+                  entityMap
+                });
+              } else {
+                fireOrderNotificationTrigger("order_pending", ord.id, {
+                  dataSource,
+                  entityMap
+                });
+              }
+            } else if (newStatus === "confirmed") {
+              fireOrderNotificationTrigger("order_placed", ord.id, {
+                dataSource,
+                entityMap
+              });
+              if (curPayStatus === "paid" || curPayStatus === "captured") {
+                fireOrderNotificationTrigger("payment_success", ord.id, {
+                  dataSource,
+                  entityMap
+                });
+              } else if (curPayStatus === "failed") {
+                fireOrderNotificationTrigger("payment_failed", ord.id, {
+                  dataSource,
+                  entityMap
+                });
+              }
+            } else if (newStatus === "processing") {
+              fireOrderNotificationTrigger("order_processing", ord.id, {
+                dataSource,
+                entityMap
+              });
+              if (curPayStatus === "failed") {
+                fireOrderNotificationTrigger("payment_failed", ord.id, {
+                  dataSource,
+                  entityMap
+                });
+              }
+            } else if (newStatus === "completed") {
+              fireOrderNotificationTrigger("order_completed", ord.id, {
+                dataSource,
+                entityMap
+              });
+              if (curPayStatus === "failed") {
+                fireOrderNotificationTrigger("payment_failed", ord.id, {
+                  dataSource,
+                  entityMap
+                });
+              }
+            } else if (newStatus === "cancelled") {
+              if (curPayStatus === "failed") {
+                fireOrderNotificationTrigger("payment_failed", ord.id, {
+                  dataSource,
+                  entityMap
+                });
+              } else {
+                fireOrderNotificationTrigger("order_cancelled", ord.id, {
+                  dataSource,
+                  entityMap
+                });
+                if (curPayStatus === "paid" || curPayStatus === "refunded") {
+                  fireOrderNotificationTrigger("payment_refund_initiated", ord.id, {
+                    dataSource,
+                    entityMap
+                  });
+                }
+              }
+            }
+          }).catch(() => {
+          });
+        }
+      }
       if (resource === "orders" && orderInvPrev && updated) {
         const invErr = await chunkHY3AXLOI_cjs.reconcileOrderInventoryBetweenSnapshots(dataSource, entityMap, orderInvPrev, chunkHY3AXLOI_cjs.orderInventorySnapshotFromRow(updated));
         if (invErr) return json({
@@ -8820,25 +9269,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;
@@ -8846,25 +9349,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"
           }, {
@@ -8878,6 +9407,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"
           }, {
@@ -8885,25 +9420,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,
@@ -8911,8 +9511,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');
@@ -8923,6 +9525,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
@@ -8931,11 +9539,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({
@@ -9272,13 +9882,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: {
@@ -9432,7 +10072,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,
@@ -9611,7 +10251,7 @@ function createFormSubmissionHandler(config) {
                 label: f.label && String(f.label).trim() || `Field ${f.id}`,
                 value: formatSubmissionFieldValue(data[String(f.id)])
               }));
-              await chunkV25RDUOU_cjs.queueEmail(cms, {
+              await chunkLRD4CGOG_cjs.queueEmail(cms, {
                 to,
                 templateName: "formSubmission",
                 ctx: {
@@ -9665,7 +10305,7 @@ function createUsersApiHandlers(config) {
     try {
       const cms = await getCms();
       const companyDetails = getCompanyDetails ? await getCompanyDetails() : {};
-      await chunkV25RDUOU_cjs.queueEmail(cms, {
+      await chunkLRD4CGOG_cjs.queueEmail(cms, {
         to: toEmail,
         templateName: "invite",
         ctx: {
@@ -10938,7 +11578,7 @@ function createChatHandlers(config) {
         const notifyEmailAgent = await findLlmAgentByScope(dataSource, entityMap, LLM_AGENT_SCOPE_EMAIL_INTENT_CHATBOT, {
           enabledOnly: false
         });
-        const emailTool = chunkYSYX4GUD_cjs.resolveChatEmailToolSettings(llmSettings, {
+        const emailTool = chunkTWTISTZB_cjs.resolveChatEmailToolSettings(llmSettings, {
           chatbotValidationRules: agentRow?.validationRules ?? null,
           notifyAgent: notifyEmailAgent ? {
             systemInstruction: notifyEmailAgent.systemInstruction,
@@ -10948,7 +11588,7 @@ function createChatHandlers(config) {
         const emailPlugin2 = cms.getPlugin("email");
         const convLeadSent = conv.leadEmailSentAt;
         const chatAgentFn = llm.chatAgent?.bind(llm);
-        console.info(chunkYSYX4GUD_cjs.CHAT_EMAIL_LOG, "pipeline check", {
+        console.info(chunkTWTISTZB_cjs.CHAT_EMAIL_LOG, "pipeline check", {
           conversationId,
           enabled: emailTool.enabled,
           intentCount: emailTool.intents.length,
@@ -10962,27 +11602,27 @@ function createChatHandlers(config) {
           mergedPromptIncludesNotify: Boolean(notifyEmailAgent?.systemInstruction?.trim())
         });
         if (!emailTool.enabled) {
-          console.info(chunkYSYX4GUD_cjs.CHAT_EMAIL_LOG, "pipeline skipped", {
+          console.info(chunkTWTISTZB_cjs.CHAT_EMAIL_LOG, "pipeline skipped", {
             conversationId,
             reason: "email_tool_disabled"
           });
         } else if (emailTool.intents.length === 0) {
-          console.info(chunkYSYX4GUD_cjs.CHAT_EMAIL_LOG, "pipeline skipped", {
+          console.info(chunkTWTISTZB_cjs.CHAT_EMAIL_LOG, "pipeline skipped", {
             conversationId,
             reason: "no_intents_configured"
           });
         } else if (!emailPlugin2) {
-          console.info(chunkYSYX4GUD_cjs.CHAT_EMAIL_LOG, "pipeline skipped", {
+          console.info(chunkTWTISTZB_cjs.CHAT_EMAIL_LOG, "pipeline skipped", {
             conversationId,
             reason: "email_plugin_missing"
           });
         } else if (!chatAgentFn) {
-          console.info(chunkYSYX4GUD_cjs.CHAT_EMAIL_LOG, "pipeline skipped", {
+          console.info(chunkTWTISTZB_cjs.CHAT_EMAIL_LOG, "pipeline skipped", {
             conversationId,
             reason: "llm_chat_agent_unavailable"
           });
         } else if (convLeadSent) {
-          console.info(chunkYSYX4GUD_cjs.CHAT_EMAIL_LOG, "pipeline skipped", {
+          console.info(chunkTWTISTZB_cjs.CHAT_EMAIL_LOG, "pipeline skipped", {
             conversationId,
             reason: "lead_email_already_sent",
             leadEmailSentAt: convLeadSent
@@ -10995,7 +11635,7 @@ function createChatHandlers(config) {
             }
           });
           if (!contactRow) {
-            console.warn(chunkYSYX4GUD_cjs.CHAT_EMAIL_LOG, "pipeline skipped", {
+            console.warn(chunkTWTISTZB_cjs.CHAT_EMAIL_LOG, "pipeline skipped", {
               conversationId,
               reason: "contact_not_found",
               contactId
@@ -11003,7 +11643,7 @@ function createChatHandlers(config) {
           } else {
             const c = contactRow;
             try {
-              const intent = await chunkYSYX4GUD_cjs.detectChatLeadIntent({
+              const intent = await chunkTWTISTZB_cjs.detectChatLeadIntent({
                 chatAgent: chatAgentFn
               }, {
                 settings: emailTool,
@@ -11017,15 +11657,15 @@ function createChatHandlers(config) {
                 model: agentRow?.model?.trim() || notifyEmailAgent?.model?.trim() || void 0
               });
               if (!intent.intent || !intent.emailTo) {
-                console.info(chunkYSYX4GUD_cjs.CHAT_EMAIL_LOG, "no email sent", {
+                console.info(chunkTWTISTZB_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 = chunkYSYX4GUD_cjs.parseIntentRecipientEmails(intent.emailTo);
-                console.info(chunkYSYX4GUD_cjs.CHAT_EMAIL_LOG, "intent matched \u2014 sending", {
+                const intentRecipients = chunkTWTISTZB_cjs.parseIntentRecipientEmails(intent.emailTo);
+                console.info(chunkTWTISTZB_cjs.CHAT_EMAIL_LOG, "intent matched \u2014 sending", {
                   conversationId,
                   intent: intent.intent,
                   emailTo: intent.emailTo,
@@ -11034,8 +11674,8 @@ 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 chunkYSYX4GUD_cjs.sendChatLeadEmail(cms, emailSettings, brandingSettings, {
+                const companyDetails = chunkCTIEAHQL_cjs.mergeEmailLayoutCompanyDetails(brandingSettings, emailSettings);
+                const leadResult = await chunkTWTISTZB_cjs.sendChatLeadEmail(cms, emailSettings, brandingSettings, {
                   contactName: String(c.name ?? "").trim() || "Visitor",
                   contactEmail: String(c.email ?? "").trim(),
                   contactPhone: c.phone ?? null,
@@ -11043,7 +11683,7 @@ function createChatHandlers(config) {
                   latestMessage: message,
                   intentCode: intent.intent,
                   intentReason: intent.intentLabel || intent.reason,
-                  transcript: chunkYSYX4GUD_cjs.buildTranscriptForLeadEmail(history, message),
+                  transcript: chunkTWTISTZB_cjs.buildTranscriptForLeadEmail(history, message),
                   companyDetails,
                   recipients: intentRecipients.length > 0 ? intentRecipients : void 0
                 });
@@ -11051,13 +11691,13 @@ function createChatHandlers(config) {
                   await convRepo().update(conversationId, {
                     leadEmailSentAt: /* @__PURE__ */ new Date()
                   });
-                  console.info(chunkYSYX4GUD_cjs.CHAT_EMAIL_LOG, "lead email recorded", {
+                  console.info(chunkTWTISTZB_cjs.CHAT_EMAIL_LOG, "lead email recorded", {
                     conversationId,
                     sent: true,
                     recipients: leadResult.recipients
                   });
                 } else {
-                  console.warn(chunkYSYX4GUD_cjs.CHAT_EMAIL_LOG, "lead email not sent", {
+                  console.warn(chunkTWTISTZB_cjs.CHAT_EMAIL_LOG, "lead email not sent", {
                     conversationId,
                     sent: false,
                     error: leadResult.error ?? "unknown",
@@ -11066,7 +11706,7 @@ function createChatHandlers(config) {
                 }
               }
             } catch (intentErr) {
-              console.warn(chunkYSYX4GUD_cjs.CHAT_EMAIL_LOG, "pipeline error", {
+              console.warn(chunkTWTISTZB_cjs.CHAT_EMAIL_LOG, "pipeline error", {
                 conversationId,
                 error: intentErr instanceof Error ? intentErr.message : String(intentErr)
               });
@@ -11083,7 +11723,7 @@ function createChatHandlers(config) {
         });
         if (agentRow && llm.chatAgent) {
           const fromAgent = llmAgentToChatAgentOptions(agentRow);
-          const systemPrompt = chunkYSYX4GUD_cjs.buildChatbotSystemPromptWithEmailTool(fromAgent.systemPrompt, parsedValidation.guardrailsForPrompt, emailTool);
+          const systemPrompt = chunkTWTISTZB_cjs.buildChatbotSystemPromptWithEmailTool(fromAgent.systemPrompt, parsedValidation.guardrailsForPrompt, emailTool);
           const res = await llm.chatAgent({
             ...fromAgent,
             systemPrompt: systemPrompt || void 0,
@@ -11104,7 +11744,7 @@ ${contextParts.join("\n\n")}` : "";
               agentRow.systemInstruction?.trim(),
               ragSystem
             ].filter(Boolean).join("\n\n");
-            systemContent = chunkYSYX4GUD_cjs.buildChatbotSystemPromptWithEmailTool(mergedBase || defaultSystem, parsedValidation.guardrailsForPrompt, emailTool) || defaultSystem;
+            systemContent = chunkTWTISTZB_cjs.buildChatbotSystemPromptWithEmailTool(mergedBase || defaultSystem, parsedValidation.guardrailsForPrompt, emailTool) || defaultSystem;
           } else {
             systemContent = ragSystem || defaultSystem;
           }
@@ -12359,7 +12999,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 chunkYSYX4GUD_cjs.validateFcmCredentials(dataSource, entityMap);
+          const valRes = await chunkTWTISTZB_cjs.validateFcmCredentials(dataSource, entityMap);
           if (!valRes.success) {
             return json({
               success: false,
@@ -12376,7 +13016,7 @@ function createDeviceTokensHandlers(config) {
             clientEmail: valRes.clientEmail
           });
         }
-        const res = await chunkYSYX4GUD_cjs.sendFcmPushNotification(dataSource, entityMap, {
+        const res = await chunkTWTISTZB_cjs.sendFcmPushNotification(dataSource, entityMap, {
           token,
           title,
           body: msgBody,
@@ -13370,8 +14010,8 @@ async function sendVendorOnboardEmails(input, deps) {
       getSuperAdminEmails(deps),
       getVendorEmails(deps)
     ]);
-    const companyDetails = chunkBXYZDMTZ_cjs.mergeEmailLayoutCompanyDetails(branding, emailSettings);
-    const configuredNotify = chunkYSYX4GUD_cjs.parseEmailRecipientsFromConfig(emailSettings.salesTeamEmails ?? emailSettings.salesTeamEmail);
+    const companyDetails = chunkCTIEAHQL_cjs.mergeEmailLayoutCompanyDetails(branding, emailSettings);
+    const configuredNotify = chunkTWTISTZB_cjs.parseEmailRecipientsFromConfig(emailSettings.salesTeamEmails ?? emailSettings.salesTeamEmail);
     const ownerEmail = input.ownerEmail?.trim() || "";
     const ownerEmailLower = ownerEmail.toLowerCase();
     const sendToOwner = input.sendToOwner !== false;
@@ -13381,7 +14021,7 @@ async function sendVendorOnboardEmails(input, deps) {
     ];
     const notifyEmails = Array.from(new Set(combined.map((e) => e.trim().toLowerCase()).filter((e) => e && e !== ownerEmailLower && !vendorEmailSet.has(e))));
     const cms = await deps.getCms();
-    await chunkV25RDUOU_cjs.queueVendorOnboardEmails(cms, {
+    await chunkLRD4CGOG_cjs.queueVendorOnboardEmails(cms, {
       vendorName: input.vendorName,
       vendorSlug: input.vendorSlug,
       ownerName: input.ownerName,
@@ -18047,6 +18687,9 @@ exports.Order = class Order {
   customerContact;
   billingAddress;
   shippingAddress;
+  assignedUserId;
+  assignedAt;
+  assignedUser;
   items;
   payments;
 };
@@ -18259,6 +18902,29 @@ _ts_decorate21([
   }),
   _ts_metadata21("design:type", Object)
 ], exports.Order.prototype, "shippingAddress", void 0);
+_ts_decorate21([
+  typeorm.Column("int", {
+    nullable: true
+  }),
+  _ts_metadata21("design:type", Object)
+], exports.Order.prototype, "assignedUserId", void 0);
+_ts_decorate21([
+  typeorm.Column({
+    type: "timestamp",
+    nullable: true
+  }),
+  _ts_metadata21("design:type", Object)
+], exports.Order.prototype, "assignedAt", void 0);
+_ts_decorate21([
+  typeorm.ManyToOne(() => exports.User, {
+    nullable: true,
+    onDelete: "SET NULL"
+  }),
+  typeorm.JoinColumn({
+    name: "assignedUserId"
+  }),
+  _ts_metadata21("design:type", Object)
+], exports.Order.prototype, "assignedUser", void 0);
 _ts_decorate21([
   typeorm.OneToMany("OrderItem", "order"),
   _ts_metadata21("design:type", Array)
@@ -24290,6 +24956,7 @@ var NotificationChannel = /* @__PURE__ */ (function(NotificationChannel2) {
   NotificationChannel2["WHATSAPP"] = "whatsapp";
   NotificationChannel2["EMAIL"] = "email";
   NotificationChannel2["MOBILE"] = "mobile";
+  NotificationChannel2["SMS"] = "sms";
   return NotificationChannel2;
 })({});
 var NotificationAudienceType = /* @__PURE__ */ (function(NotificationAudienceType2) {
@@ -27944,21 +28611,37 @@ function whatsappPlugin(config = {}) {
     async init(context) {
       const env = context.config;
       const { getWhatsAppSettings, getMessageTemplateRow, ...staticRest } = config;
+      let settingsLoader = getWhatsAppSettings;
+      if (!settingsLoader && context.dataSource) {
+        settingsLoader = /* @__PURE__ */ chunkUSNT2KNT_cjs.__name(async () => {
+          try {
+            const ds = context.dataSource;
+            const repo = ds.getRepository("configs");
+            const rows = await repo.find({
+              where: {
+                settings: "whatsapp",
+                deleted: false
+              }
+            });
+            return Object.fromEntries(rows.map((r) => [
+              r.key,
+              r.value
+            ]));
+          } catch {
+            return {};
+          }
+        }, "settingsLoader");
+      }
       let db = {};
       try {
-        db = await getWhatsAppSettings?.() ?? {};
+        db = await settingsLoader?.() ?? {};
       } catch {
       }
-      if (!chunkYSYX4GUD_cjs.isWhatsAppPluginEnabled(db)) {
+      if (!chunkTWTISTZB_cjs.isWhatsAppPluginEnabled(db)) {
         context.logger.warn("WhatsApp plugin skipped: disabled in Plugins \u2192 WhatsApp");
         return null;
       }
-      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 chunkYSYX4GUD_cjs.WhatsAppService(env, staticRest, getWhatsAppSettings, getMessageTemplateRow);
+      const svc = new chunkTWTISTZB_cjs.WhatsAppService(env, staticRest, settingsLoader, getMessageTemplateRow);
       return {
         send: /* @__PURE__ */ chunkUSNT2KNT_cjs.__name((opts) => svc.send(opts), "send")
       };
@@ -28031,11 +28714,11 @@ function createMessageTemplateRowLoader(dataSource, entityMap) {
 }
 chunkUSNT2KNT_cjs.__name(createMessageTemplateRowLoader, "createMessageTemplateRowLoader");
 function registerMessagingQueueProcessors(cms, entityMap) {
-  chunkV25RDUOU_cjs.registerEmailQueueProcessor(cms, {
+  chunkLRD4CGOG_cjs.registerEmailQueueProcessor(cms, {
     getDataSource: /* @__PURE__ */ chunkUSNT2KNT_cjs.__name(async () => cms.dataSource, "getDataSource"),
     entityMap
   });
-  chunkYSYX4GUD_cjs.registerWhatsAppQueueProcessor(cms);
+  chunkH3IVLIPR_cjs.registerWhatsAppQueueProcessor(cms);
 }
 chunkUSNT2KNT_cjs.__name(registerMessagingQueueProcessors, "registerMessagingQueueProcessors");
 async function ensureMessagingPluginsOnCms(base, options) {
@@ -28064,7 +28747,7 @@ async function ensureMessagingPluginsOnCms(base, options) {
   }
   if (!cms.getPlugin("email")) {
     try {
-      const instance = await chunkYSYX4GUD_cjs.emailPlugin({
+      const instance = await chunkTWTISTZB_cjs.emailPlugin({
         type: "SMTP",
         from: config.SMTP_FROM ?? "no-reply@localhost",
         to: config.SMTP_TO ?? ""
@@ -28105,7 +28788,7 @@ function messagingPlugins(options) {
   const config = options.config ?? (typeof process !== "undefined" ? process.env : {});
   return [
     queuePlugin(),
-    chunkYSYX4GUD_cjs.emailPlugin({
+    chunkTWTISTZB_cjs.emailPlugin({
       type: "SMTP",
       from: config.SMTP_FROM ?? "no-reply@localhost",
       to: config.SMTP_TO ?? ""
@@ -28239,7 +28922,7 @@ function createCmsApiHandler(config) {
   } : void 0;
   const entityMap = withLlmKnowledgeEntityFallbacks(rawEntityMap);
   if (getCms) {
-    chunkYSYX4GUD_cjs.initWhatsappTriggerDispatcher({
+    chunkTWTISTZB_cjs.initWhatsappTriggerDispatcher({
       dataSource,
       entityMap,
       getCms
@@ -28332,7 +29015,7 @@ function createCmsApiHandler(config) {
         companyDetails
       };
       if (queue) {
-        const { queueEmail: queueEmail2 } = await import('./email-queue-6NJY6HNM.cjs');
+        const { queueEmail: queueEmail2 } = await import('./email-queue-J7DXYNCE.cjs');
         await queueEmail2(cms, {
           to: opts.to,
           templateName: "passwordReset",
@@ -29632,7 +30315,7 @@ function createCmsApiHandler(config) {
         const pe = await requireEntityPermissionEffective(req, "orders", "read");
         if (pe) return pe;
         const cms = await getCms();
-        const { streamOrderInvoicePdf: streamOrderInvoicePdf2 } = await import('./erp-order-invoice-EYYNR526.cjs');
+        const { streamOrderInvoicePdf: streamOrderInvoicePdf2 } = await import('./erp-order-invoice-C5GZCOBM.cjs');
         const oid = Number(path2[1]);
         if (!Number.isFinite(oid)) return config.json({
           error: "Invalid id"
@@ -29781,6 +30464,11 @@ function createCmsApiHandler(config) {
           });
         }
       }
+      if (path2[0] === "sms-notification-templates" && path2.length === 1 && m === "GET") {
+        const { createSmsNotificationTemplatesHandlers } = await import('./sms-notification-templates-handlers-YSB3L2PK.cjs');
+        const handlers = createSmsNotificationTemplatesHandlers(dataSource, entityMap);
+        return handlers.GET(req);
+      }
       if (path2[0] === "orders" && path2[1] === "calculate" && path2.length === 2 && m === "POST") {
         const a = await config.requireAuth(req);
         if (a) return a;
@@ -30009,7 +30697,7 @@ function createCmsApiHandler(config) {
             status: 400
           });
         }
-        const { resendOrderNotification } = await import('./order-notification-dispatcher-KJVGLK5E.cjs');
+        const { resendOrderNotification } = await import('./order-notification-dispatcher-X2XM5VUY.cjs');
         const result = await resendOrderNotification(triggerKey, orderId, {
           dataSource,
           entityMap,
@@ -30108,25 +30796,20 @@ function createCmsApiHandler(config) {
           status: "cancelled"
         });
         const fireOrderCancelledNotification = /* @__PURE__ */ chunkUSNT2KNT_cjs.__name((refundAmount) => {
-          void import('./emit-order-notification-trigger-TNEZOYEE.cjs').then(({ fireOrderNotificationTrigger }) => {
+          void import('./emit-order-notification-trigger-K7URAZHJ.cjs').then(({ fireOrderNotificationTrigger }) => {
             fireOrderNotificationTrigger("order_cancelled", orderId, {
               dataSource,
               entityMap
             }, refundAmount != null && refundAmount > 0 ? {
               refundAmount
             } : void 0);
-            if (paymentStatus === "paid" || paymentStatus === "captured") {
+            if (paymentStatus === "paid" || paymentStatus === "captured" || paymentStatus === "refunded") {
               fireOrderNotificationTrigger("payment_refund_initiated", orderId, {
                 dataSource,
                 entityMap
               }, refundAmount != null && refundAmount > 0 ? {
                 refundAmount
               } : void 0);
-            } else {
-              fireOrderNotificationTrigger("payment_failed", orderId, {
-                dataSource,
-                entityMap
-              });
             }
           });
         }, "fireOrderCancelledNotification");
@@ -30347,6 +31030,66 @@ function createCmsApiHandler(config) {
           finalRefund: 0
         });
       }
+      if (path2[0] === "orders" && path2.length === 4 && path2[2] === "completion-otp" && path2[3] === "channels" && m === "GET" && getCms) {
+        const a = await config.requireAuth(req);
+        if (a) return a;
+        const pe = await requireEntityPermissionEffective(req, "orders", "read");
+        if (pe) return pe;
+        const orderId = Number(path2[1]);
+        if (!Number.isFinite(orderId)) return config.json({
+          error: "Invalid order ID"
+        }, {
+          status: 400
+        });
+        const { createOrderCompletionOtpHandlers } = await import('./order-completion-otp-handlers-4EOLYLAP.cjs');
+        const handlers = createOrderCompletionOtpHandlers(dataSource, entityMap, getCms);
+        return handlers.getChannels(req, orderId);
+      }
+      if (path2[0] === "orders" && path2.length === 4 && path2[2] === "completion-otp" && path2[3] === "send" && m === "POST" && getCms) {
+        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 order ID"
+        }, {
+          status: 400
+        });
+        const { createOrderCompletionOtpHandlers } = await import('./order-completion-otp-handlers-4EOLYLAP.cjs');
+        const handlers = createOrderCompletionOtpHandlers(dataSource, entityMap, getCms);
+        return handlers.sendOtp(req, orderId);
+      }
+      if (path2[0] === "orders" && path2.length === 4 && path2[2] === "completion-otp" && path2[3] === "verify" && m === "POST" && getCms) {
+        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 order ID"
+        }, {
+          status: 400
+        });
+        const { createOrderCompletionOtpHandlers } = await import('./order-completion-otp-handlers-4EOLYLAP.cjs');
+        const handlers = createOrderCompletionOtpHandlers(dataSource, entityMap, getCms);
+        return handlers.verifyOtp(req, orderId);
+      }
+      if (path2[0] === "orders" && path2.length === 3 && path2[2] === "eligible-assignees" && m === "GET") {
+        const a = await config.requireAuth(req);
+        if (a) return a;
+        const pe = await requireEntityPermissionEffective(req, "orders", "read");
+        if (pe) return pe;
+        const orderId = Number(path2[1]);
+        if (!Number.isFinite(orderId)) return config.json({
+          error: "Invalid order ID"
+        }, {
+          status: 400
+        });
+        const { createOrderAssigneesHandlers } = await import('./order-assignees-handlers-NPKD64P6.cjs');
+        const handlers = createOrderAssigneesHandlers(dataSource, entityMap, getHydratedSessionUser);
+        return handlers.listEligibleAssignees(req, orderId);
+      }
       if (path2[0] === "refund-policies") {
         if (path2.length === 1) {
           if (m === "GET") {
@@ -30776,12 +31519,12 @@ async function refreshOrderFromErp(cms, dataSource, entityMap, submission, order
     const r1 = await submission.postErpReadAction("get-order-status", {
       platformOrderId: refId
     });
-    const d1 = r1.ok ? chunkBXYZDMTZ_cjs.unwrapErpReadData(r1.json) : null;
+    const d1 = r1.ok ? chunkAXMP2U43_cjs.unwrapErpReadData(r1.json) : null;
     if (d1) {
       const mapped = mapErpSaleStatusToOrderStatus(typeof d1.status === "string" ? d1.status : typeof d1.orderStatus === "string" ? d1.orderStatus : typeof d1.state === "string" ? d1.state : void 0);
       if (mapped) newStatus = mapped;
-      fulfillment = chunkBXYZDMTZ_cjs.mapErpPayloadToFulfillment(d1);
-      const refs = chunkBXYZDMTZ_cjs.extractChildOrderRefsFromSalePayload(d1);
+      fulfillment = chunkAXMP2U43_cjs.mapErpPayloadToFulfillment(d1);
+      const refs = chunkAXMP2U43_cjs.extractChildOrderRefsFromSalePayload(d1);
       if (refs.length) {
         await ensureChildOrdersFromRefs(orderRepo, order, refs, order.contactId, String(order.currency || "INR"));
       }
@@ -30789,16 +31532,16 @@ async function refreshOrderFromErp(cms, dataSource, entityMap, submission, order
     const r2 = await submission.postErpReadAction("get-fulfillment-status", {
       platformOrderId: refId
     });
-    const d2 = r2.ok ? chunkBXYZDMTZ_cjs.unwrapErpReadData(r2.json) : null;
+    const d2 = r2.ok ? chunkAXMP2U43_cjs.unwrapErpReadData(r2.json) : null;
     if (d2) {
-      fulfillment = deepMergeFulfillment(fulfillment, chunkBXYZDMTZ_cjs.mapErpPayloadToFulfillment(d2));
+      fulfillment = deepMergeFulfillment(fulfillment, chunkAXMP2U43_cjs.mapErpPayloadToFulfillment(d2));
     }
     const r3 = await submission.postErpReadAction("get-invoice", {
       platformOrderId: refId
     });
-    const d3 = r3.ok ? chunkBXYZDMTZ_cjs.unwrapErpReadData(r3.json) : null;
+    const d3 = r3.ok ? chunkAXMP2U43_cjs.unwrapErpReadData(r3.json) : null;
     if (d3) {
-      invoiceNumber = chunkBXYZDMTZ_cjs.mapErpPayloadToInvoiceNumber(d3);
+      invoiceNumber = chunkAXMP2U43_cjs.mapErpPayloadToInvoiceNumber(d3);
       invoiceId = pickInvoiceId(d3);
     }
     const oid = order.id;
@@ -30834,10 +31577,10 @@ async function refreshOrderFromErp(cms, dataSource, entityMap, submission, order
     const r = await submission.postErpReadAction("get-return-status", {
       platformReturnId
     });
-    const d = r.ok ? chunkBXYZDMTZ_cjs.unwrapErpReadData(r.json) : null;
+    const d = r.ok ? chunkAXMP2U43_cjs.unwrapErpReadData(r.json) : null;
     if (!d) return;
     const mapped = mapErpSaleStatusToOrderStatus(typeof d.status === "string" ? d.status : typeof d.returnStatus === "string" ? d.returnStatus : void 0);
-    const fulfillment = chunkBXYZDMTZ_cjs.mapErpPayloadToFulfillment(d);
+    const fulfillment = chunkAXMP2U43_cjs.mapErpPayloadToFulfillment(d);
     const patch = {};
     if (fulfillment !== void 0) patch.fulfillment = fulfillment;
     const nextMeta = Object.keys(patch).length ? mergeOrderMetadataPatch(meta, patch) : meta;
@@ -30863,63 +31606,6 @@ async function tryRefreshOrderFromErpForStorefront(cms, dataSource, entityMap, o
 }
 chunkUSNT2KNT_cjs.__name(tryRefreshOrderFromErpForStorefront, "tryRefreshOrderFromErpForStorefront");
 
-// src/plugins/sms/sms-queue.ts
-var SMS_QUEUE_NAME = "sms";
-function registerSmsQueueProcessor(cms) {
-  const queue = cms.getPlugin("queue");
-  const sms = cms.getPlugin("sms");
-  if (!queue || !sms || typeof sms.send !== "function") return;
-  queue.registerProcessor(SMS_QUEUE_NAME, async (data) => {
-    const payload = data;
-    if (!payload.to) return;
-    if (payload.templateKey?.trim()) {
-      await sms.send({
-        to: payload.to,
-        templateKey: payload.templateKey.trim(),
-        variables: payload.variables,
-        otpCode: payload.otpCode
-      });
-      return;
-    }
-    if (!payload.body?.trim()) return;
-    await sms.send({
-      to: payload.to,
-      body: payload.body,
-      otpCode: payload.otpCode,
-      variables: payload.variables
-    });
-  });
-}
-chunkUSNT2KNT_cjs.__name(registerSmsQueueProcessor, "registerSmsQueueProcessor");
-async function queueSms(cms, payload) {
-  const queue = cms.getPlugin("queue");
-  const sms = cms.getPlugin("sms");
-  if (queue) {
-    await queue.add(SMS_QUEUE_NAME, payload);
-    return;
-  }
-  if (sms && typeof sms.send === "function") {
-    if (payload.templateKey?.trim()) {
-      await sms.send({
-        to: payload.to,
-        templateKey: payload.templateKey.trim(),
-        variables: payload.variables,
-        otpCode: payload.otpCode
-      });
-      return;
-    }
-    if (payload.body?.trim()) {
-      await sms.send({
-        to: payload.to,
-        body: payload.body,
-        otpCode: payload.otpCode,
-        variables: payload.variables
-      });
-    }
-  }
-}
-chunkUSNT2KNT_cjs.__name(queueSms, "queueSms");
-
 // src/lib/storefront-product-pricing.ts
 function eventPricingFromRow(row) {
   const defaultCurrency = normalizeCurrencyCode(String(row?.defaultCurrency ?? "INR")) || "INR";
@@ -30988,143 +31674,6 @@ async function buildPricesForSupportedCurrencies(dataSource, entityMap, basePric
   return rows;
 }
 chunkUSNT2KNT_cjs.__name(buildPricesForSupportedCurrencies, "buildPricesForSupportedCurrencies");
-var OTP_TTL_MS = 10 * 60 * 1e3;
-var MAX_SENDS_PER_HOUR = 5;
-var MAX_VERIFY_ATTEMPTS = 8;
-function getPepper(explicit) {
-  return (explicit || process.env.OTP_PEPPER || process.env.NEXTAUTH_SECRET || "dev-otp-pepper").trim();
-}
-chunkUSNT2KNT_cjs.__name(getPepper, "getPepper");
-function hashOtpCode(code, purpose, identifier, pepper) {
-  return crypto2.createHmac("sha256", getPepper(pepper)).update(`${purpose}|${identifier}|${code}`).digest("hex");
-}
-chunkUSNT2KNT_cjs.__name(hashOtpCode, "hashOtpCode");
-function verifyOtpCodeHash(code, storedHash, purpose, identifier, pepper) {
-  const h = hashOtpCode(code, purpose, identifier, pepper);
-  try {
-    return crypto2.timingSafeEqual(Buffer.from(h, "utf8"), Buffer.from(storedHash, "utf8"));
-  } catch {
-    return false;
-  }
-}
-chunkUSNT2KNT_cjs.__name(verifyOtpCodeHash, "verifyOtpCodeHash");
-function generateNumericOtp(length = 6) {
-  const max = 10 ** length;
-  return crypto2.randomInt(0, max).toString().padStart(length, "0");
-}
-chunkUSNT2KNT_cjs.__name(generateNumericOtp, "generateNumericOtp");
-function normalizePhoneE164(raw, defaultCountryCode) {
-  const t = raw.trim();
-  const digitsOnly = t.replace(/\D/g, "");
-  if (digitsOnly.length < 10) return null;
-  if (t.startsWith("+")) return `+${digitsOnly}`;
-  const cc = (defaultCountryCode || process.env.DEFAULT_PHONE_COUNTRY_CODE || "91").replace(/\D/g, "");
-  if (digitsOnly.length > 10) return `+${digitsOnly}`;
-  return `+${cc}${digitsOnly}`;
-}
-chunkUSNT2KNT_cjs.__name(normalizePhoneE164, "normalizePhoneE164");
-async function countRecentOtpSends(dataSource, entityMap, purpose, identifier, since) {
-  const repo = dataSource.getRepository(entityMap.otp_challenges);
-  return repo.count({
-    where: {
-      purpose,
-      identifier,
-      createdAt: typeorm.MoreThan(since)
-    }
-  });
-}
-chunkUSNT2KNT_cjs.__name(countRecentOtpSends, "countRecentOtpSends");
-async function createOtpChallenge(dataSource, entityMap, input) {
-  const { purpose, channel, identifier, code, pepper } = input;
-  const since = new Date(Date.now() - 60 * 60 * 1e3);
-  const recent = await countRecentOtpSends(dataSource, entityMap, purpose, identifier, since);
-  if (recent >= MAX_SENDS_PER_HOUR) {
-    return {
-      ok: false,
-      error: "Too many codes sent. Try again later.",
-      status: 429
-    };
-  }
-  const repo = dataSource.getRepository(entityMap.otp_challenges);
-  await repo.delete({
-    purpose,
-    identifier,
-    consumedAt: typeorm.IsNull()
-  });
-  const expiresAt = new Date(Date.now() + OTP_TTL_MS);
-  const codeHash = hashOtpCode(code, purpose, identifier, pepper);
-  await repo.save(repo.create({
-    purpose,
-    channel,
-    identifier,
-    codeHash,
-    expiresAt,
-    attempts: 0,
-    consumedAt: null
-  }));
-  return {
-    ok: true
-  };
-}
-chunkUSNT2KNT_cjs.__name(createOtpChallenge, "createOtpChallenge");
-async function verifyAndConsumeOtpChallenge(dataSource, entityMap, input) {
-  const { purpose, identifier, code, pepper } = input;
-  const repo = dataSource.getRepository(entityMap.otp_challenges);
-  const row = await repo.findOne({
-    where: {
-      purpose,
-      identifier,
-      consumedAt: typeorm.IsNull()
-    },
-    order: {
-      id: "DESC"
-    }
-  });
-  if (!row) {
-    return {
-      ok: false,
-      error: "Invalid or expired code",
-      status: 400
-    };
-  }
-  const r = row;
-  if (new Date(r.expiresAt) < /* @__PURE__ */ new Date()) {
-    await repo.delete(row.id);
-    return {
-      ok: false,
-      error: "Invalid or expired code",
-      status: 400
-    };
-  }
-  const attempts = r.attempts || 0;
-  if (attempts >= MAX_VERIFY_ATTEMPTS) {
-    await repo.delete(row.id);
-    return {
-      ok: false,
-      error: "Too many attempts",
-      status: 400
-    };
-  }
-  const valid = verifyOtpCodeHash(code, r.codeHash, purpose, identifier, pepper);
-  if (!valid) {
-    await repo.update(row.id, {
-      attempts: attempts + 1
-    });
-    return {
-      ok: false,
-      error: "Invalid or expired code",
-      status: 400
-    };
-  }
-  await repo.update(row.id, {
-    consumedAt: /* @__PURE__ */ new Date(),
-    attempts: attempts + 1
-  });
-  return {
-    ok: true
-  };
-}
-chunkUSNT2KNT_cjs.__name(verifyAndConsumeOtpChallenge, "verifyAndConsumeOtpChallenge");
 
 // src/api/storefront-handlers.ts
 var GUEST_COOKIE = "guest_id";
@@ -31154,7 +31703,7 @@ function createStorefrontApiHandler(config) {
   const otpPepper = config.otpPepper;
   const defaultPhoneCc = config.defaultPhoneCountryCode;
   function fireOrderPlacedNotification(orderId, isPaid) {
-    void import('./emit-order-notification-trigger-TNEZOYEE.cjs').then(({ fireOrderNotificationTrigger }) => {
+    void import('./emit-order-notification-trigger-K7URAZHJ.cjs').then(({ fireOrderNotificationTrigger }) => {
       fireOrderNotificationTrigger("order_placed", orderId, {
         dataSource,
         entityMap
@@ -31204,7 +31753,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;
     }
@@ -31225,9 +31774,21 @@ function createStorefrontApiHandler(config) {
         },
         select: [
           "id",
-          "vendorId"
+          "vendorId",
+          "eventId"
         ]
       });
+      const comboEventId = Number(combo?.eventId);
+      if (Number.isInteger(comboEventId) && comboEventId > 0 && entityMap.events) {
+        const evRows = await dataSource.query(`SELECT "vendorId" FROM events WHERE id = $1 AND deleted = false LIMIT 1`, [
+          comboEventId
+        ]);
+        const evVid = Number(evRows[0]?.vendorId);
+        if (Number.isInteger(evVid) && evVid > 0) {
+          comboVendorCache.set(comboId, evVid);
+          return evVid;
+        }
+      }
       const vid = Number(combo?.vendorId);
       if (Number.isInteger(vid) && vid > 0) {
         comboVendorCache.set(comboId, vid);
@@ -31247,9 +31808,30 @@ function createStorefrontApiHandler(config) {
       }
       const p = it.product;
       if (!p || p.deleted || p.status !== "available") continue;
-      const vid = Number(p.vendorId);
+      let vid = Number(p.vendorId);
+      if (!Number.isInteger(vid) || vid <= 0) {
+        const prodId = Number(p.id);
+        if (Number.isInteger(prodId) && prodId > 0 && entityMap.event_products) {
+          const epRows = await dataSource.query(`SELECT e."vendorId" FROM event_products ep
+             JOIN events e ON e.id = ep."eventId"
+             WHERE ep."productId" = $1 AND e.deleted = false LIMIT 1`, [
+            prodId
+          ]);
+          const evVid = Number(epRows[0]?.vendorId);
+          if (Number.isInteger(evVid) && evVid > 0) vid = evVid;
+        }
+      }
       if (Number.isInteger(vid) && vid > 0) vendorIds.add(vid);
     }
+    if (vendorIds.size > 1) {
+      const nonDefault = [
+        ...vendorIds
+      ].filter((id) => id !== 1);
+      if (nonDefault.length === 1) {
+        vendorIds.clear();
+        vendorIds.add(nonDefault[0]);
+      }
+    }
     if (vendorIds.size === 0) return {
       error: "Cart has no valid products",
       status: 400
@@ -32710,7 +33292,7 @@ function createStorefrontApiHandler(config) {
                   status: 403
                 });
               }
-              const p = normalizePhoneE164(phoneIn, defaultPhoneCc);
+              const p = chunkWFMVD567_cjs.normalizePhoneE164(phoneIn, defaultPhoneCc);
               if (!p) return json({
                 error: "Invalid phone"
               }, {
@@ -32763,7 +33345,7 @@ function createStorefrontApiHandler(config) {
             }, {
               status: 401
             });
-            const p = normalizePhoneE164(phoneIn, defaultPhoneCc);
+            const p = chunkWFMVD567_cjs.normalizePhoneE164(phoneIn, defaultPhoneCc);
             if (!p) return json({
               error: "Valid phone required"
             }, {
@@ -32787,8 +33369,8 @@ function createStorefrontApiHandler(config) {
               });
             }
           }
-          const code = generateNumericOtp(6);
-          const created = await createOtpChallenge(dataSource, entityMap, {
+          const code = chunkWFMVD567_cjs.generateNumericOtp(6);
+          const created = await chunkWFMVD567_cjs.createOtpChallenge(dataSource, entityMap, {
             purpose,
             channel,
             identifier,
@@ -32814,7 +33396,7 @@ function createStorefrontApiHandler(config) {
                 status: 503
               });
               const companyDetails = getCompanyDetails ? await getCompanyDetails() : {};
-              await chunkV25RDUOU_cjs.queueEmail(cms, {
+              await chunkLRD4CGOG_cjs.queueEmail(cms, {
                 to: identifier,
                 templateName: "otp",
                 ctx: {
@@ -32829,7 +33411,7 @@ function createStorefrontApiHandler(config) {
                 status: 503
               });
               const templateKey = purpose === "verify_phone" ? "auth.otp_verify_phone" : "auth.otp_login";
-              await queueSms(cms, {
+              await chunkWFMVD567_cjs.queueSms(cms, {
                 to: identifier,
                 templateKey,
                 variables: {
@@ -32862,7 +33444,7 @@ function createStorefrontApiHandler(config) {
           }, {
             status: 400
           });
-          const v = await verifyAndConsumeOtpChallenge(dataSource, entityMap, {
+          const v = await chunkWFMVD567_cjs.verifyAndConsumeOtpChallenge(dataSource, entityMap, {
             purpose: "verify_email",
             identifier: email,
             code,
@@ -32912,13 +33494,13 @@ function createStorefrontApiHandler(config) {
           const b = await req.json().catch(() => ({}));
           const phoneRaw = typeof b.phone === "string" ? b.phone.trim() : "";
           const code = typeof b.code === "string" ? b.code.trim() : "";
-          const phone = normalizePhoneE164(phoneRaw, defaultPhoneCc);
+          const phone = chunkWFMVD567_cjs.normalizePhoneE164(phoneRaw, defaultPhoneCc);
           if (!phone || !code) return json({
             error: "phone and code required"
           }, {
             status: 400
           });
-          const v = await verifyAndConsumeOtpChallenge(dataSource, entityMap, {
+          const v = await chunkWFMVD567_cjs.verifyAndConsumeOtpChallenge(dataSource, entityMap, {
             purpose: "verify_phone",
             identifier: phone,
             code,
@@ -33039,7 +33621,7 @@ function createStorefrontApiHandler(config) {
               const companyDetails = getCompanyDetails ? await getCompanyDetails() : {};
               const base = (publicSiteUrl || "").replace(/\/$/, "").trim() || "http://localhost:3000";
               const verifyEmailUrl = `${base}/verify-email?token=${encodeURIComponent(rawToken)}`;
-              await chunkV25RDUOU_cjs.queueEmail(cms, {
+              await chunkLRD4CGOG_cjs.queueEmail(cms, {
                 to: email,
                 templateName: "signup",
                 ctx: {
@@ -33333,7 +33915,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({
@@ -33848,7 +34433,7 @@ function createStorefrontApiHandler(config) {
             status: 400
           });
           const cms = await getCms();
-          return chunkBXYZDMTZ_cjs.streamOrderInvoicePdf(cms, dataSource, entityMap, orderId, {
+          return chunkAXMP2U43_cjs.streamOrderInvoicePdf(cms, dataSource, entityMap, orderId, {
             ownerContactId: contact.id
           });
         }
@@ -34055,7 +34640,7 @@ function createStorefrontApiHandler(config) {
             } catch {
             }
             try {
-              void import('./emit-order-notification-trigger-TNEZOYEE.cjs').then(({ fireOrderNotificationTrigger }) => {
+              void import('./emit-order-notification-trigger-K7URAZHJ.cjs').then(({ fireOrderNotificationTrigger }) => {
                 fireOrderNotificationTrigger("order_cancelled", orderId, {
                   dataSource,
                   entityMap
@@ -34129,7 +34714,6 @@ exports.completeUserInviteAccept = completeUserInviteAccept;
 exports.consumeAppliedDiscountUsages = consumeAppliedDiscountUsages;
 exports.contactIsVendorCustomer = contactIsVendorCustomer;
 exports.countDiscountOrdersForContact = countDiscountOrdersForContact;
-exports.countRecentOtpSends = countRecentOtpSends;
 exports.createAnalyticsHandlers = createAnalyticsHandlers;
 exports.createBlogBySlugHandler = createBlogBySlugHandler;
 exports.createChangePasswordHandler = createChangePasswordHandler;
@@ -34148,7 +34732,6 @@ exports.createJobScheduleHandlers = createJobScheduleHandlers;
 exports.createLlmAgentKnowledgeHandlers = createLlmAgentKnowledgeHandlers;
 exports.createMediaZipExtractHandler = createMediaZipExtractHandler;
 exports.createMessageTemplateRowLoader = createMessageTemplateRowLoader;
-exports.createOtpChallenge = createOtpChallenge;
 exports.createSetPasswordHandler = createSetPasswordHandler;
 exports.createSettingsApiHandlers = createSettingsApiHandlers;
 exports.createSocialMediaHandlers = createSocialMediaHandlers;
@@ -34171,13 +34754,11 @@ exports.findActiveRefundPolicyForVendor = findActiveRefundPolicyForVendor;
 exports.findUserByInviteToken = findUserByInviteToken;
 exports.findVendorByInviteToken = findVendorByInviteToken;
 exports.formatTierRange = formatTierRange;
-exports.generateNumericOtp = generateNumericOtp;
 exports.getPublicSettingsGroup = getPublicSettingsGroup;
 exports.getRequireEventApproval = getRequireEventApproval;
 exports.getRequireProductApproval = getRequireProductApproval;
 exports.getRssArticleSummaryFromItem = getRssArticleSummaryFromItem;
 exports.getVendorCatalogCreateFlags = getVendorCatalogCreateFlags;
-exports.hashOtpCode = hashOtpCode;
 exports.hydrateVendorSessionUser = hydrateVendorSessionUser;
 exports.invalidateEventsCache = invalidateEventsCache;
 exports.invalidateMultiVendorCache = invalidateMultiVendorCache;
@@ -34198,7 +34779,6 @@ exports.metaPostPageFeed = metaPostPageFeed;
 exports.metaPostPagePhoto = metaPostPagePhoto;
 exports.metaResolvePageAccessToken = metaResolvePageAccessToken;
 exports.newUserInviteToken = newUserInviteToken;
-exports.normalizePhoneE164 = normalizePhoneE164;
 exports.normalizeRefundTiers = normalizeRefundTiers;
 exports.overlayCmsPlugins = overlayCmsPlugins;
 exports.parseBlogGeneratorAgentContent = parseBlogGeneratorAgentContent;
@@ -34209,11 +34789,9 @@ exports.pgBossScheduleNameForId = pgBossScheduleNameForId;
 exports.queueErpCreateContactIfEnabled = queueErpCreateContactIfEnabled;
 exports.queueJobScheduleNow = queueJobScheduleNow;
 exports.queuePlugin = queuePlugin;
-exports.queueSms = queueSms;
 exports.recordDiscountUsage = recordDiscountUsage;
 exports.registerJobRunnerWorker = registerJobRunnerWorker;
 exports.registerMessagingQueueProcessors = registerMessagingQueueProcessors;
-exports.registerSmsQueueProcessor = registerSmsQueueProcessor;
 exports.relativePathFromMediaParentId = relativePathFromMediaParentId;
 exports.resolveBlogCategoryIdByName = resolveBlogCategoryIdByName;
 exports.resolveSettingsEncryptionKey = resolveSettingsEncryptionKey;
@@ -34228,7 +34806,5 @@ exports.validateRefundTiers = validateRefundTiers;
 exports.validateScheduleInput = validateScheduleInput;
 exports.validateUserMessageAgainstAgentRules = validateUserMessageAgainstAgentRules;
 exports.validateUserMessageAgainstStructuredRules = validateUserMessageAgainstStructuredRules;
-exports.verifyAndConsumeOtpChallenge = verifyAndConsumeOtpChallenge;
-exports.verifyOtpCodeHash = verifyOtpCodeHash;
 exports.whatsappPlugin = whatsappPlugin;
 exports.wrapGetCmsWithMessaging = wrapGetCmsWithMessaging;