@nextcommerce/campaigns-os 1.50.0 → 1.53.0

package/src/commercial-journey.mjs

@@ -104,11 +104,72 @@ function selectedShipping(page) {
 }
 
 // One predicate for "this checkout row is an order bump": the spec marks a
-// bump with `is_upsell: true` on a non-upsell page. Every consumer that must
+// bump with `is_order_bump: true` (the schema's and authoring guide's flag) or
+// `is_upsell: true` on a non-upsell page. Every consumer that must
 // tell a bump from a main selector row (parity scenarios, bump deltas, the QA
-// selector-tier planner) reads this, so a marker change lands in one place.
+// selector-tier planner, `next`'s order-bump QA command) reads this, so a
+// marker change lands in one place.
 export function isBumpRow(row) {
-  return Boolean(row?.is_upsell);
+  return Boolean(row?.is_order_bump || row?.is_upsell);
+}
+
+// A checkout package row's ref, with the doctor's specPackageRecords
+// tolerance (ref_id, then package_id, then id).
+function checkoutRowRef(pkg) {
+  return [pkg.ref_id, pkg.package_id, pkg.id]
+    .map((value) => (value == null ? "" : String(value).trim()))
+    .find(Boolean);
+}
+
+// Order bumps declared on a checkout page (isBumpRow rows), as refs in
+// declaration order. They are add-ons to a selected tier, not tiers, so the
+// QA tier planner reports and skips them and `next` names the --cart run that
+// toggles them.
+export function declaredOrderBumps(checkoutPage) {
+  const refs = [];
+  for (const pkg of array(checkoutPage?.packages)) {
+    if (!pkg || typeof pkg !== "object" || !isBumpRow(pkg)) continue;
+    const ref = checkoutRowRef(pkg);
+    if (ref && !refs.includes(ref)) refs.push(ref);
+  }
+  return refs;
+}
+
+// Selector tiers are the packages a spec declares on a checkout page, in
+// declaration order. Order-bump rows are add-ons offered alongside the
+// selected tier, not tiers of their own: they never become a tier.
+export function declaredSelectorTiers(checkoutPage) {
+  const records = [];
+  const quantitiesByRef = new Map();
+  for (const pkg of array(checkoutPage?.packages)) {
+    if (!pkg || typeof pkg !== "object" || isBumpRow(pkg)) continue;
+    const ref = checkoutRowRef(pkg);
+    const declaredQuantity = Number(pkg.qty ?? pkg.quantity ?? 1);
+    if (!ref || !Number.isInteger(declaredQuantity) || declaredQuantity < 1) continue;
+    records.push({ pkg, ref, declaredQuantity });
+    if (!quantitiesByRef.has(ref)) quantitiesByRef.set(ref, new Set());
+    quantitiesByRef.get(ref).add(declaredQuantity);
+  }
+
+  const tiers = [];
+  const seen = new Set();
+  for (const { pkg, ref, declaredQuantity } of records) {
+    // A unique ref is a catalog package bought once, even when that package's
+    // own composition is 3x. Only repeated declarations of the SAME ref at
+    // different quantities express shopper purchase multipliers (e.g. a 1x
+    // and a 2x package).
+    const quantity = quantitiesByRef.get(ref).size > 1 ? declaredQuantity : 1;
+    const identity = `${ref}:${quantity}`;
+    if (seen.has(identity)) continue;
+    seen.add(identity);
+    const label = [pkg.name, pkg.title].find((value) => typeof value === "string" && value.trim());
+    tiers.push({
+      ref,
+      quantity,
+      declared_by: label ? label.trim() : undefined,
+    });
+  }
+  return tiers;
 }
 
 function lineForRow(row) {
@@ -932,7 +993,7 @@ function makePage(scenarios, catalog) {
       row_index: row.row_index,
       package_id: row.package_id,
       quantity: row.quantity,
-      ...(row.is_upsell ? { is_upsell: true } : {}),
+      ...(isBumpRow(row) ? { is_upsell: true } : {}),
       name: row.name,
       state: PricingState.Unresolved,
       reason: pageReason,

package/src/commercial-parity.mjs

@@ -607,7 +607,12 @@ function partitionCaptures(capturesValue, { countsOnly = false } = {}) {
 
 function priceComparisonClaims(capture, page) {
   const claims = array(capture?.price_claims);
-  if (!exactMoneyFact(page?.representative_total)) {
+  // A voucher on the page that the plan cannot price (no calculated pair for
+  // its code) can move the shown price away from the planned total, so a
+  // difference there says nothing about the page. Its price claims stay
+  // unresolved, which already keeps coverage incomplete, rather than being
+  // reported as mismatches against the list-price total.
+  if (!exactMoneyFact(page?.representative_total) || voucherComparisonClaims(capture, page).unresolved > 0) {
     return { compared: [], unresolved: claims.length };
   }
   const bindings = [...new Set(claims.map((claim) => String(claim.binding)))];