@infuro/cms-core 1.0.43 → 1.0.44

package/dist/{chunk-SCPKMZG5.cjs → chunk-P2IWWBJV.cjs}

@@ -462,6 +462,41 @@ function applyApprovalStatusSideEffects(updatePayload, opts) {
   }
 }
 chunkUSNT2KNT_cjs.__name(applyApprovalStatusSideEffects, "applyApprovalStatusSideEffects");
+async function syncProductVariantsStatusWithProduct(dataSource, entityMap, productId, productStatus) {
+  if (!entityMap.product_variants || !Number.isFinite(productId) || productId < 1) return;
+  const status = String(productStatus || "draft");
+  const repo = dataSource.getRepository(entityMap.product_variants);
+  if (status === "available") {
+    await repo.createQueryBuilder().update().set({
+      status: "available"
+    }).where('"productId" = :productId', {
+      productId
+    }).andWhere("status = :from", {
+      from: "draft"
+    }).execute();
+    return;
+  }
+  if (status === "draft") {
+    await repo.createQueryBuilder().update().set({
+      status: "draft"
+    }).where('"productId" = :productId', {
+      productId
+    }).andWhere("status = :from", {
+      from: "available"
+    }).execute();
+  }
+}
+chunkUSNT2KNT_cjs.__name(syncProductVariantsStatusWithProduct, "syncProductVariantsStatusWithProduct");
+function coerceVariantStatusForProduct(variantStatus, productStatus, opts) {
+  const next = String(variantStatus ?? "draft").trim() || "draft";
+  const productLive = String(productStatus ?? "draft") === "available";
+  const approvalOk = !opts?.requireApproval || String(opts?.approvalStatus ?? "") === "approved";
+  if (!productLive || !approvalOk) {
+    return "draft";
+  }
+  return next;
+}
+chunkUSNT2KNT_cjs.__name(coerceVariantStatusForProduct, "coerceVariantStatusForProduct");
 
 // src/lib/event-approval.ts
 var EVENT_APPROVAL_STATUSES = [
@@ -4604,6 +4639,26 @@ function createCrudHandler(dataSource, entityMap, options) {
           }
         }
       }
+      if (resource === "product_variants" && entityMap.products) {
+        const productIdRaw = persistBody.productId;
+        const productId = typeof productIdRaw === "number" ? productIdRaw : typeof productIdRaw === "string" && /^\d+$/.test(productIdRaw) ? parseInt(productIdRaw, 10) : NaN;
+        if (Number.isFinite(productId)) {
+          const parent = await dataSource.getRepository(entityMap.products).findOne({
+            where: {
+              id: productId
+            }
+          });
+          const parentStatus = parent?.status;
+          const parentApproval = parent?.approvalStatus;
+          const requireApproval = await getRequireProductApproval(dataSource);
+          persistBody.status = coerceVariantStatusForProduct(persistBody.status, parentStatus, {
+            approvalStatus: parentApproval,
+            requireApproval
+          });
+        } else if (!("status" in persistBody)) {
+          persistBody.status = "draft";
+        }
+      }
       if (resource === "products") {
         const scopeForProduct = await resolveScope();
         const productFlags = await getVendorCatalogCreateFlags(dataSource);
@@ -6243,6 +6298,34 @@ function createCrudByIdHandler(dataSource, entityMap, options) {
           delete u.parentId;
         }
       }
+      if (resource === "product_variants" && entityMap.products) {
+        const currentVariant = await repo.findOne({
+          where: {
+            id: numericId
+          }
+        });
+        if (!currentVariant) return json({
+          message: "Not found"
+        }, {
+          status: 404
+        });
+        const productId = "productId" in updatePayload && updatePayload.productId != null ? Number(updatePayload.productId) : Number(currentVariant.productId);
+        if (Number.isFinite(productId)) {
+          const parent = await dataSource.getRepository(entityMap.products).findOne({
+            where: {
+              id: productId
+            }
+          });
+          const parentStatus = parent?.status;
+          const parentApproval = parent?.approvalStatus;
+          const requireApproval = await getRequireProductApproval(dataSource);
+          const nextStatus = "status" in updatePayload ? updatePayload.status : currentVariant.status;
+          updatePayload.status = coerceVariantStatusForProduct(nextStatus, parentStatus, {
+            approvalStatus: parentApproval,
+            requireApproval
+          });
+        }
+      }
       if (resource === "products") {
         const currentRow = await repo.findOne({
           where: {
@@ -6598,6 +6681,10 @@ function createCrudByIdHandler(dataSource, entityMap, options) {
           if (reloaded) updated = reloaded;
         }
         updated = hydrateProductDisplayName(updated);
+        const productStatus = String(updated.status ?? "draft");
+        if (Number.isFinite(updatedId) && updatedId > 0) {
+          await syncProductVariantsStatusWithProduct(dataSource, entityMap, updatedId, productStatus);
+        }
         if (getCms) {
           const cms = await getCms();
           await queueErpProductUpsertIfEnabled(cms, dataSource, entityMap, updated);
@@ -29815,7 +29902,8 @@ function createStorefrontApiHandler(config) {
     const repo = dataSource.getRepository(entityMap.product_variants);
     const rows = await repo.find({
       where: {
-        productId
+        productId,
+        status: "available"
       },
       order: {
         id: "ASC"
@@ -29848,6 +29936,52 @@ function createStorefrontApiHandler(config) {
     return result;
   }
   chunkUSNT2KNT_cjs.__name(loadProductVariantsWithPricing, "loadProductVariantsWithPricing");
+  async function loadApplicableVendorPolicies(productId, vendorId) {
+    if (!entityMap.refund_policies) return [];
+    const policyRepo = dataSource.getRepository(entityMap.refund_policies);
+    const format = /* @__PURE__ */ chunkUSNT2KNT_cjs.__name((row) => ({
+      id: Number(row.id),
+      name: String(row.name ?? "").trim(),
+      desc: row.desc != null ? String(row.desc) : null,
+      refundWindowDays: Number(row.refundWindowDays) || 0,
+      type: String(row.type ?? "percentage"),
+      value: Number(row.value) || 0
+    }), "format");
+    const linkedIds = /* @__PURE__ */ new Set();
+    if (entityMap.product_config) {
+      const configs = await dataSource.getRepository(entityMap.product_config).find({
+        where: {
+          productId
+        }
+      });
+      for (const c of configs) {
+        const id = Number(c.refundPolicyId);
+        if (Number.isFinite(id) && id > 0) linkedIds.add(id);
+      }
+    }
+    if (linkedIds.size > 0) {
+      const rows = await policyRepo.find({
+        where: {
+          id: typeorm.In([
+            ...linkedIds
+          ])
+        }
+      });
+      return rows.map((r) => format(r)).filter((p) => p.name).sort((a, b) => a.id - b.id);
+    }
+    if (vendorId == null || !Number.isFinite(Number(vendorId))) return [];
+    const vendorRows = await policyRepo.find({
+      where: {
+        vendorId: Number(vendorId),
+        status: "active"
+      },
+      order: {
+        id: "ASC"
+      }
+    });
+    return vendorRows.map((r) => format(r)).filter((p) => p.name);
+  }
+  chunkUSNT2KNT_cjs.__name(loadApplicableVendorPolicies, "loadApplicableVendorPolicies");
   return {
     async handle(method, path2, req) {
       try {
@@ -29915,13 +30049,11 @@ function createStorefrontApiHandler(config) {
           const url = new URL(req.url || "", "http://localhost");
           const collectionSlug = url.searchParams.get("collection")?.trim();
           const collectionId = url.searchParams.get("collectionId");
+          const q = url.searchParams.get("q")?.trim() ?? "";
           const limit = Math.min(100, Math.max(1, parseInt(url.searchParams.get("limit") || "20", 10)));
           const offset = Math.max(0, parseInt(url.searchParams.get("offset") || "0", 10));
-          const where = {
-            status: "available",
-            deleted: false
-          };
           let collectionFilter = null;
+          let collectionIdFilter = null;
           if (collectionSlug) {
             let col = null;
             if (/^\d+$/.test(collectionSlug)) {
@@ -29948,30 +30080,59 @@ function createStorefrontApiHandler(config) {
                 collection: null
               });
             }
-            where.collectionId = col.id;
+            collectionIdFilter = Number(col.id);
             collectionFilter = {
               name: col.name,
               slug: col.slug
             };
           } else if (collectionId) {
             const cid = parseInt(collectionId, 10);
-            if (Number.isFinite(cid)) where.collectionId = cid;
+            if (Number.isFinite(cid)) collectionIdFilter = cid;
+          }
+          let items = [];
+          let total = 0;
+          if (q) {
+            const like = `%${q.replace(/[%_]/g, "\\$&")}%`;
+            const qb = productRepo().createQueryBuilder("p").where("p.status = :status", {
+              status: "available"
+            }).andWhere("p.deleted = :del", {
+              del: false
+            }).andWhere(`(p.name ILIKE :like OR p.slug ILIKE :like OR COALESCE(p.sku, '') ILIKE :like OR COALESCE(p.title, '') ILIKE :like OR COALESCE(p.metadata->>'description', '') ILIKE :like)`, {
+              like
+            }).orderBy("p.id", "ASC").take(limit).skip(offset);
+            if (collectionIdFilter != null) {
+              qb.andWhere("p.collectionId = :cid", {
+                cid: collectionIdFilter
+              });
+            }
+            [items, total] = await qb.getManyAndCount();
+          } else {
+            const where = {
+              status: "available",
+              deleted: false
+            };
+            if (collectionIdFilter != null) where.collectionId = collectionIdFilter;
+            const result = await productRepo().findAndCount({
+              where,
+              order: {
+                id: "ASC"
+              },
+              take: limit,
+              skip: offset
+            });
+            items = result[0];
+            total = result[1];
           }
-          const [items, total] = await productRepo().findAndCount({
-            where,
-            order: {
-              id: "ASC"
-            },
-            take: limit,
-            skip: offset
-          });
           const products = await Promise.all(items.map((item) => enrichProductPricing(item)));
           return json({
             products,
             total,
             ...collectionFilter && {
               collection: collectionFilter
-            }
+            },
+            ...q ? {
+              q
+            } : {}
           });
         }
         if (path2[0] === "products" && path2.length === 2 && method === "GET") {
@@ -30007,12 +30168,14 @@ function createStorefrontApiHandler(config) {
           const pricing = await resolveProductEventPricing(Number(p.id));
           const enriched = await enrichProductPricing(p, pricing);
           const variants = await loadProductVariantsWithPricing(Number(p.id), pricing);
+          const policies = await loadApplicableVendorPolicies(Number(p.id), p.vendorId != null ? Number(p.vendorId) : null);
           return json({
             ...enriched,
             attributes: attributeTags,
             ...variants.length ? {
               variants
-            } : {}
+            } : {},
+            policies
           });
         }
         if (path2[0] === "collections" && path2.length === 1 && method === "GET") {
@@ -30824,24 +30987,61 @@ function createStorefrontApiHandler(config) {
           }, {
             status: 404
           });
+          const rawVariantId = body.variantId ?? body.variant_id;
+          const variantIdNum = rawVariantId != null && String(rawVariantId).trim() !== "" ? Number(rawVariantId) : NaN;
+          const hasVariantId = Number.isFinite(variantIdNum) && variantIdNum > 0;
+          const bodyMeta = body.metadata && typeof body.metadata === "object" && !Array.isArray(body.metadata) ? body.metadata : {};
+          const optionsRaw = body.options && typeof body.options === "object" && !Array.isArray(body.options) ? body.options : bodyMeta.options && typeof bodyMeta.options === "object" && !Array.isArray(bodyMeta.options) ? bodyMeta.options : null;
+          const options = optionsRaw && Object.fromEntries(Object.entries(optionsRaw).map(([k, v]) => [
+            String(k),
+            String(v ?? "").trim()
+          ]).filter(([, v]) => v.length > 0));
+          const lineMetadata = {
+            ...bodyMeta,
+            ...hasVariantId ? {
+              variantId: variantIdNum
+            } : {},
+            ...options && Object.keys(options).length ? {
+              options
+            } : {}
+          };
+          if (typeof bodyMeta.imageUrl === "string" && bodyMeta.imageUrl.trim()) {
+            lineMetadata.imageUrl = bodyMeta.imageUrl.trim();
+          }
+          if (typeof bodyMeta.title === "string" && bodyMeta.title.trim()) {
+            lineMetadata.title = bodyMeta.title.trim();
+          }
+          const metadataPayload = Object.keys(lineMetadata).length ? lineMetadata : null;
           const { cart, setCookie, err } = await getOrCreateCart(req);
           if (err) return err;
           const cartId = cart.id;
-          const existing = await cartItemRepo().findOne({
+          const sameProductLines = await cartItemRepo().find({
             where: {
               cartId,
               productId
             }
           });
+          const existing = sameProductLines.find((row) => {
+            const m = row.metadata;
+            const existingVid = m?.variantId ?? m?.variant_id;
+            if (hasVariantId) {
+              return Number(existingVid) === variantIdNum;
+            }
+            return existingVid == null || existingVid === "";
+          });
           if (existing) {
             await cartItemRepo().update(existing.id, {
-              quantity: existing.quantity + quantity
+              quantity: existing.quantity + quantity,
+              ...metadataPayload ? {
+                metadata: metadataPayload
+              } : {}
             });
           } else {
             await cartItemRepo().save(cartItemRepo().create({
               cartId,
               productId,
-              quantity
+              quantity,
+              metadata: metadataPayload
             }));
           }
           await cartRepo().update(cartId, {

package/dist/{chunk-IX7X4ILO.js → chunk-SQGBHYJF.js}

@@ -452,6 +452,41 @@ function applyApprovalStatusSideEffects(updatePayload, opts) {
   }
 }
 __name(applyApprovalStatusSideEffects, "applyApprovalStatusSideEffects");
+async function syncProductVariantsStatusWithProduct(dataSource, entityMap, productId, productStatus) {
+  if (!entityMap.product_variants || !Number.isFinite(productId) || productId < 1) return;
+  const status = String(productStatus || "draft");
+  const repo = dataSource.getRepository(entityMap.product_variants);
+  if (status === "available") {
+    await repo.createQueryBuilder().update().set({
+      status: "available"
+    }).where('"productId" = :productId', {
+      productId
+    }).andWhere("status = :from", {
+      from: "draft"
+    }).execute();
+    return;
+  }
+  if (status === "draft") {
+    await repo.createQueryBuilder().update().set({
+      status: "draft"
+    }).where('"productId" = :productId', {
+      productId
+    }).andWhere("status = :from", {
+      from: "available"
+    }).execute();
+  }
+}
+__name(syncProductVariantsStatusWithProduct, "syncProductVariantsStatusWithProduct");
+function coerceVariantStatusForProduct(variantStatus, productStatus, opts) {
+  const next = String(variantStatus ?? "draft").trim() || "draft";
+  const productLive = String(productStatus ?? "draft") === "available";
+  const approvalOk = !opts?.requireApproval || String(opts?.approvalStatus ?? "") === "approved";
+  if (!productLive || !approvalOk) {
+    return "draft";
+  }
+  return next;
+}
+__name(coerceVariantStatusForProduct, "coerceVariantStatusForProduct");
 
 // src/lib/event-approval.ts
 var EVENT_APPROVAL_STATUSES = [
@@ -4594,6 +4629,26 @@ function createCrudHandler(dataSource, entityMap, options) {
           }
         }
       }
+      if (resource === "product_variants" && entityMap.products) {
+        const productIdRaw = persistBody.productId;
+        const productId = typeof productIdRaw === "number" ? productIdRaw : typeof productIdRaw === "string" && /^\d+$/.test(productIdRaw) ? parseInt(productIdRaw, 10) : NaN;
+        if (Number.isFinite(productId)) {
+          const parent = await dataSource.getRepository(entityMap.products).findOne({
+            where: {
+              id: productId
+            }
+          });
+          const parentStatus = parent?.status;
+          const parentApproval = parent?.approvalStatus;
+          const requireApproval = await getRequireProductApproval(dataSource);
+          persistBody.status = coerceVariantStatusForProduct(persistBody.status, parentStatus, {
+            approvalStatus: parentApproval,
+            requireApproval
+          });
+        } else if (!("status" in persistBody)) {
+          persistBody.status = "draft";
+        }
+      }
       if (resource === "products") {
         const scopeForProduct = await resolveScope();
         const productFlags = await getVendorCatalogCreateFlags(dataSource);
@@ -6233,6 +6288,34 @@ function createCrudByIdHandler(dataSource, entityMap, options) {
           delete u.parentId;
         }
       }
+      if (resource === "product_variants" && entityMap.products) {
+        const currentVariant = await repo.findOne({
+          where: {
+            id: numericId
+          }
+        });
+        if (!currentVariant) return json({
+          message: "Not found"
+        }, {
+          status: 404
+        });
+        const productId = "productId" in updatePayload && updatePayload.productId != null ? Number(updatePayload.productId) : Number(currentVariant.productId);
+        if (Number.isFinite(productId)) {
+          const parent = await dataSource.getRepository(entityMap.products).findOne({
+            where: {
+              id: productId
+            }
+          });
+          const parentStatus = parent?.status;
+          const parentApproval = parent?.approvalStatus;
+          const requireApproval = await getRequireProductApproval(dataSource);
+          const nextStatus = "status" in updatePayload ? updatePayload.status : currentVariant.status;
+          updatePayload.status = coerceVariantStatusForProduct(nextStatus, parentStatus, {
+            approvalStatus: parentApproval,
+            requireApproval
+          });
+        }
+      }
       if (resource === "products") {
         const currentRow = await repo.findOne({
           where: {
@@ -6588,6 +6671,10 @@ function createCrudByIdHandler(dataSource, entityMap, options) {
           if (reloaded) updated = reloaded;
         }
         updated = hydrateProductDisplayName(updated);
+        const productStatus = String(updated.status ?? "draft");
+        if (Number.isFinite(updatedId) && updatedId > 0) {
+          await syncProductVariantsStatusWithProduct(dataSource, entityMap, updatedId, productStatus);
+        }
         if (getCms) {
           const cms = await getCms();
           await queueErpProductUpsertIfEnabled(cms, dataSource, entityMap, updated);
@@ -29805,7 +29892,8 @@ function createStorefrontApiHandler(config) {
     const repo = dataSource.getRepository(entityMap.product_variants);
     const rows = await repo.find({
       where: {
-        productId
+        productId,
+        status: "available"
       },
       order: {
         id: "ASC"
@@ -29838,6 +29926,52 @@ function createStorefrontApiHandler(config) {
     return result;
   }
   __name(loadProductVariantsWithPricing, "loadProductVariantsWithPricing");
+  async function loadApplicableVendorPolicies(productId, vendorId) {
+    if (!entityMap.refund_policies) return [];
+    const policyRepo = dataSource.getRepository(entityMap.refund_policies);
+    const format = /* @__PURE__ */ __name((row) => ({
+      id: Number(row.id),
+      name: String(row.name ?? "").trim(),
+      desc: row.desc != null ? String(row.desc) : null,
+      refundWindowDays: Number(row.refundWindowDays) || 0,
+      type: String(row.type ?? "percentage"),
+      value: Number(row.value) || 0
+    }), "format");
+    const linkedIds = /* @__PURE__ */ new Set();
+    if (entityMap.product_config) {
+      const configs = await dataSource.getRepository(entityMap.product_config).find({
+        where: {
+          productId
+        }
+      });
+      for (const c of configs) {
+        const id = Number(c.refundPolicyId);
+        if (Number.isFinite(id) && id > 0) linkedIds.add(id);
+      }
+    }
+    if (linkedIds.size > 0) {
+      const rows = await policyRepo.find({
+        where: {
+          id: In([
+            ...linkedIds
+          ])
+        }
+      });
+      return rows.map((r) => format(r)).filter((p) => p.name).sort((a, b) => a.id - b.id);
+    }
+    if (vendorId == null || !Number.isFinite(Number(vendorId))) return [];
+    const vendorRows = await policyRepo.find({
+      where: {
+        vendorId: Number(vendorId),
+        status: "active"
+      },
+      order: {
+        id: "ASC"
+      }
+    });
+    return vendorRows.map((r) => format(r)).filter((p) => p.name);
+  }
+  __name(loadApplicableVendorPolicies, "loadApplicableVendorPolicies");
   return {
     async handle(method, path2, req) {
       try {
@@ -29905,13 +30039,11 @@ function createStorefrontApiHandler(config) {
           const url = new URL(req.url || "", "http://localhost");
           const collectionSlug = url.searchParams.get("collection")?.trim();
           const collectionId = url.searchParams.get("collectionId");
+          const q = url.searchParams.get("q")?.trim() ?? "";
           const limit = Math.min(100, Math.max(1, parseInt(url.searchParams.get("limit") || "20", 10)));
           const offset = Math.max(0, parseInt(url.searchParams.get("offset") || "0", 10));
-          const where = {
-            status: "available",
-            deleted: false
-          };
           let collectionFilter = null;
+          let collectionIdFilter = null;
           if (collectionSlug) {
             let col = null;
             if (/^\d+$/.test(collectionSlug)) {
@@ -29938,30 +30070,59 @@ function createStorefrontApiHandler(config) {
                 collection: null
               });
             }
-            where.collectionId = col.id;
+            collectionIdFilter = Number(col.id);
             collectionFilter = {
               name: col.name,
               slug: col.slug
             };
           } else if (collectionId) {
             const cid = parseInt(collectionId, 10);
-            if (Number.isFinite(cid)) where.collectionId = cid;
+            if (Number.isFinite(cid)) collectionIdFilter = cid;
+          }
+          let items = [];
+          let total = 0;
+          if (q) {
+            const like = `%${q.replace(/[%_]/g, "\\$&")}%`;
+            const qb = productRepo().createQueryBuilder("p").where("p.status = :status", {
+              status: "available"
+            }).andWhere("p.deleted = :del", {
+              del: false
+            }).andWhere(`(p.name ILIKE :like OR p.slug ILIKE :like OR COALESCE(p.sku, '') ILIKE :like OR COALESCE(p.title, '') ILIKE :like OR COALESCE(p.metadata->>'description', '') ILIKE :like)`, {
+              like
+            }).orderBy("p.id", "ASC").take(limit).skip(offset);
+            if (collectionIdFilter != null) {
+              qb.andWhere("p.collectionId = :cid", {
+                cid: collectionIdFilter
+              });
+            }
+            [items, total] = await qb.getManyAndCount();
+          } else {
+            const where = {
+              status: "available",
+              deleted: false
+            };
+            if (collectionIdFilter != null) where.collectionId = collectionIdFilter;
+            const result = await productRepo().findAndCount({
+              where,
+              order: {
+                id: "ASC"
+              },
+              take: limit,
+              skip: offset
+            });
+            items = result[0];
+            total = result[1];
           }
-          const [items, total] = await productRepo().findAndCount({
-            where,
-            order: {
-              id: "ASC"
-            },
-            take: limit,
-            skip: offset
-          });
           const products = await Promise.all(items.map((item) => enrichProductPricing(item)));
           return json({
             products,
             total,
             ...collectionFilter && {
               collection: collectionFilter
-            }
+            },
+            ...q ? {
+              q
+            } : {}
           });
         }
         if (path2[0] === "products" && path2.length === 2 && method === "GET") {
@@ -29997,12 +30158,14 @@ function createStorefrontApiHandler(config) {
           const pricing = await resolveProductEventPricing(Number(p.id));
           const enriched = await enrichProductPricing(p, pricing);
           const variants = await loadProductVariantsWithPricing(Number(p.id), pricing);
+          const policies = await loadApplicableVendorPolicies(Number(p.id), p.vendorId != null ? Number(p.vendorId) : null);
           return json({
             ...enriched,
             attributes: attributeTags,
             ...variants.length ? {
               variants
-            } : {}
+            } : {},
+            policies
           });
         }
         if (path2[0] === "collections" && path2.length === 1 && method === "GET") {
@@ -30814,24 +30977,61 @@ function createStorefrontApiHandler(config) {
           }, {
             status: 404
           });
+          const rawVariantId = body.variantId ?? body.variant_id;
+          const variantIdNum = rawVariantId != null && String(rawVariantId).trim() !== "" ? Number(rawVariantId) : NaN;
+          const hasVariantId = Number.isFinite(variantIdNum) && variantIdNum > 0;
+          const bodyMeta = body.metadata && typeof body.metadata === "object" && !Array.isArray(body.metadata) ? body.metadata : {};
+          const optionsRaw = body.options && typeof body.options === "object" && !Array.isArray(body.options) ? body.options : bodyMeta.options && typeof bodyMeta.options === "object" && !Array.isArray(bodyMeta.options) ? bodyMeta.options : null;
+          const options = optionsRaw && Object.fromEntries(Object.entries(optionsRaw).map(([k, v]) => [
+            String(k),
+            String(v ?? "").trim()
+          ]).filter(([, v]) => v.length > 0));
+          const lineMetadata = {
+            ...bodyMeta,
+            ...hasVariantId ? {
+              variantId: variantIdNum
+            } : {},
+            ...options && Object.keys(options).length ? {
+              options
+            } : {}
+          };
+          if (typeof bodyMeta.imageUrl === "string" && bodyMeta.imageUrl.trim()) {
+            lineMetadata.imageUrl = bodyMeta.imageUrl.trim();
+          }
+          if (typeof bodyMeta.title === "string" && bodyMeta.title.trim()) {
+            lineMetadata.title = bodyMeta.title.trim();
+          }
+          const metadataPayload = Object.keys(lineMetadata).length ? lineMetadata : null;
           const { cart, setCookie, err } = await getOrCreateCart(req);
           if (err) return err;
           const cartId = cart.id;
-          const existing = await cartItemRepo().findOne({
+          const sameProductLines = await cartItemRepo().find({
             where: {
               cartId,
               productId
             }
           });
+          const existing = sameProductLines.find((row) => {
+            const m = row.metadata;
+            const existingVid = m?.variantId ?? m?.variant_id;
+            if (hasVariantId) {
+              return Number(existingVid) === variantIdNum;
+            }
+            return existingVid == null || existingVid === "";
+          });
           if (existing) {
             await cartItemRepo().update(existing.id, {
-              quantity: existing.quantity + quantity
+              quantity: existing.quantity + quantity,
+              ...metadataPayload ? {
+                metadata: metadataPayload
+              } : {}
             });
           } else {
             await cartItemRepo().save(cartItemRepo().create({
               cartId,
               productId,
-              quantity
+              quantity,
+              metadata: metadataPayload
             }));
           }
           await cartRepo().update(cartId, {