@fire-spark/core 0.1.2 → 0.2.0

package/dist/index.d.ts

@@ -331,7 +331,12 @@ type ApplyRedeemInput = {
   discount_rate?: number;
   /** > 0, per unit; caps the rate discount when both are set. */
   discount_amount?: number;
-  /** Root line to discount; omit to discount the whole order. */
+  /**
+   * Default `true`: discounts the pre-tax value and recomputes taxes on it.
+   * `false` discounts the value with taxes and leaves taxes unchanged.
+   */
+  before_taxes?: boolean;
+  /** Root line to discount; omit to discount the whole order (prorated). */
   line_uid?: string;
   /** ISO datetime with offset; validation fails once it has passed. */
   expires_at?: string;
@@ -568,15 +573,21 @@ declare class OrderValidationError extends Error {
 declare const isOrderValidationError: (error: unknown) => error is OrderValidationError;
 //#endregion
 //#region src/order/redemptions.d.ts
-/** Steps + totals for a set of lines and redeems, keeping step order. */
+/**
+ * Root group money rebuilt from the line itself plus its children, i.e. the
+ * menu price before any redemption. Child lines are never discounted.
+ */
+declare const stripRedemptionLines: (lines: OrderLine[]) => OrderLine[];
+/** Discounted lines, steps and totals, keeping step order. */
 declare const recomputeRedemptions: (input: {
   lines: OrderLine[];
   redeem: OrderRedeem[];
   redemption_steps: OrderRedemptionStep[];
   currency: string;
 }) => {
+  lines: OrderLine[];
   redemption_steps: OrderRedemptionStep[];
-  totals: OrderTotals;
+  totals: import("@fire-spark/types").OrderTotals;
 };
 //#endregion
 //#region src/order/totals.d.ts
@@ -1101,4 +1112,4 @@ declare const validateCardholderName: (value: string) => CardholderNameError | n
  */
 declare const cardPreviewGroups: (value: string) => CardPreviewSlot[][];
 //#endregion
-export { type ApplyRedeemInput, type AuthConfigureOptions, CARD_BRANDS, type CardBrand, type CardBrandSpec, type CardCvcError, type CardExpiry, type CardExpiryError, type CardNumberError, type CardPreviewSlot, type CardholderNameError, type CreateOrderOptions, type CreateSessionOptions, type CustomizationPath, type CustomizationSession, DEFAULT_RECOMMENDATION_TYPES, type ExchangeOptions, type FlatMenuCategory, type GroupDisplayType, type IdBuilder, type ListMenusStreamOptions, type Menu, type MenuCategoryNode, type MenuLookup, type MilestoneSteps, type MilestoneTrackItem, type ModifierControlType, type ModifierCtx, type ModifierGroupCtx, type NestedMenuCategory, Order, type OrderCustomerSource, type OrderDraft, type OrderIssue, type OrderIssueCode, type OrderLineDiff, type OrderLineIssue, type OrderLineIssueCode, type OrderScope, OrderSyncPendingError, OrderValidationError, type OrderValidationResult, type PayOptions, type PaymentCardBrand, type PaymentRunOptions, type PaymentSessionOptions, type PricingModifier, type Product, type ProductCtx, type QuantitiesByPath, type RecommendationType, RecurringDateCron, type RemoveRedeemInput, type ReorderOrderOptions, type ResetOptions, type ReversalOutcome, RulesEngine, type ScheduleWindow, type SelectionStatus, type SelectionsByPath, type SerializedError, type ServiceHttpOptions, type Snapshot, type StorefrontAccessToken, StorefrontHttpError, type TrackWorkflow, type ValidateOptions, type ValidateOrderAgainstMenuInput, type Variant, type VariantGroup, type VariantGroupCtx, type VariantOptionCtx, type VariantSelection, type VerifyWebhookSignatureInput, type VisitedState, addLines, auth, buildCustomerSnapshot, cardBrandSpec, cardDigits, cardNumberGaps, cardNumberMaxLength, cardPreviewGroups, caretAfterDigits, collectOrderLineDiffs, computeStartingPrice, countCartProducts, coveredAmount, createSession, currentNodes, cvcMaxLength, defaultConditionError, detectCardBrand, flattenMenuCategories, flushLogs, formatCardNumber, formatCvc, formatExpiry, fromOrderLines, genId, genOrderId, getLogContext, getScheduleWindow, indexMenu, isCardNumberComplete, isCardNumberDefinitelyInvalid, isCheckoutFieldFilled, isCvcComplete, isDeviceNotLinked, isExpiryComplete, isKioskUnauthorized, isMilestoneStepDone, isOnSchedule, isOrderValidationError, isPosDeviceNotLinked, isPosUnauthorized, isStorefrontNotFound, isVariantBase, listMenusStream, localizePosError, log, logError, luhnCheck, matchAbsoluteDateOperator, matchBooleanOperator, matchCurrencyOperator, matchEnumOperator, matchNumberOperator, matchRecurringDateOperator, matchRelativeDateOperator, matchStringOperator, milestoneSteps, milestoneTrack, nestMenuCategories, normalizeCardholderName, parseExpiry, paymentMatchesClientConditions, recomputeRedemptions, recomputeTotals, remainingAmount, removeLine, replaceLine, resolveCheckout, reversePayment, runPaymentAttempt, serializeError, services, setLineQuantity, storefrontJson, toOrderLines, toPaymentCardBrand, validateCardNumber, validateCardholderName, validateCvc, validateExpiry, validateOrderAgainstMenu, verifyWebhookSignature, visitedStates };
+export { type ApplyRedeemInput, type AuthConfigureOptions, CARD_BRANDS, type CardBrand, type CardBrandSpec, type CardCvcError, type CardExpiry, type CardExpiryError, type CardNumberError, type CardPreviewSlot, type CardholderNameError, type CreateOrderOptions, type CreateSessionOptions, type CustomizationPath, type CustomizationSession, DEFAULT_RECOMMENDATION_TYPES, type ExchangeOptions, type FlatMenuCategory, type GroupDisplayType, type IdBuilder, type ListMenusStreamOptions, type Menu, type MenuCategoryNode, type MenuLookup, type MilestoneSteps, type MilestoneTrackItem, type ModifierControlType, type ModifierCtx, type ModifierGroupCtx, type NestedMenuCategory, Order, type OrderCustomerSource, type OrderDraft, type OrderIssue, type OrderIssueCode, type OrderLineDiff, type OrderLineIssue, type OrderLineIssueCode, type OrderScope, OrderSyncPendingError, OrderValidationError, type OrderValidationResult, type PayOptions, type PaymentCardBrand, type PaymentRunOptions, type PaymentSessionOptions, type PricingModifier, type Product, type ProductCtx, type QuantitiesByPath, type RecommendationType, RecurringDateCron, type RemoveRedeemInput, type ReorderOrderOptions, type ResetOptions, type ReversalOutcome, RulesEngine, type ScheduleWindow, type SelectionStatus, type SelectionsByPath, type SerializedError, type ServiceHttpOptions, type Snapshot, type StorefrontAccessToken, StorefrontHttpError, type TrackWorkflow, type ValidateOptions, type ValidateOrderAgainstMenuInput, type Variant, type VariantGroup, type VariantGroupCtx, type VariantOptionCtx, type VariantSelection, type VerifyWebhookSignatureInput, type VisitedState, addLines, auth, buildCustomerSnapshot, cardBrandSpec, cardDigits, cardNumberGaps, cardNumberMaxLength, cardPreviewGroups, caretAfterDigits, collectOrderLineDiffs, computeStartingPrice, countCartProducts, coveredAmount, createSession, currentNodes, cvcMaxLength, defaultConditionError, detectCardBrand, flattenMenuCategories, flushLogs, formatCardNumber, formatCvc, formatExpiry, fromOrderLines, genId, genOrderId, getLogContext, getScheduleWindow, indexMenu, isCardNumberComplete, isCardNumberDefinitelyInvalid, isCheckoutFieldFilled, isCvcComplete, isDeviceNotLinked, isExpiryComplete, isKioskUnauthorized, isMilestoneStepDone, isOnSchedule, isOrderValidationError, isPosDeviceNotLinked, isPosUnauthorized, isStorefrontNotFound, isVariantBase, listMenusStream, localizePosError, log, logError, luhnCheck, matchAbsoluteDateOperator, matchBooleanOperator, matchCurrencyOperator, matchEnumOperator, matchNumberOperator, matchRecurringDateOperator, matchRelativeDateOperator, matchStringOperator, milestoneSteps, milestoneTrack, nestMenuCategories, normalizeCardholderName, parseExpiry, paymentMatchesClientConditions, recomputeRedemptions, recomputeTotals, remainingAmount, removeLine, replaceLine, resolveCheckout, reversePayment, runPaymentAttempt, serializeError, services, setLineQuantity, storefrontJson, stripRedemptionLines, toOrderLines, toPaymentCardBrand, validateCardNumber, validateCardholderName, validateCvc, validateExpiry, validateOrderAgainstMenu, verifyWebhookSignature, visitedStates };

package/dist/index.js

@@ -4355,7 +4355,7 @@ const ORDER_KEY = "ORDER";
 /** Same rules as `vOrders.redeem()`; throws on invalid input. */
 const buildRedeem = (input) => {
 	const { reward_id, quantity, discount_rate, discount_amount } = input;
-	const { expires_at } = input;
+	const { before_taxes, expires_at } = input;
 	if (!reward_id.trim()) throw new Error("Redeem requires reward_id");
 	if (!Number.isInteger(quantity) || quantity < 1) throw new Error("Redeem quantity must be an integer ≥ 1");
 	if (discount_rate === void 0 && discount_amount === void 0) throw new Error("Redeem requires discount_rate or discount_amount");
@@ -4369,6 +4369,7 @@ const buildRedeem = (input) => {
 	};
 	if (discount_rate !== void 0) redeem.discount_rate = discount_rate;
 	if (discount_amount !== void 0) redeem.discount_amount = discount_amount;
+	if (before_taxes !== void 0) redeem.before_taxes = before_taxes;
 	if (expires_at !== void 0) redeem.expires_at = expires_at;
 	return redeem;
 };
@@ -4447,26 +4448,71 @@ const sequenceRedeems = (lines, redeem, steps) => {
 const minBig = (a, b) => {
 	return a.lt(b) ? a : b;
 };
-const left = (run) => {
-	return run.base.minus(run.discount);
-};
 const rateOf = (discount, base) => {
 	if (base.lte(0)) return 0;
 	return minBig(discount.div(base), new Big(1)).toNumber();
 };
-const snapshot = (run) => {
+const snapshot = (roots, quantity) => {
+	let subtotal = new Big(0);
+	let total = new Big(0);
+	let discount = new Big(0);
+	for (const root of roots) {
+		subtotal = subtotal.plus(root.subtotal);
+		total = total.plus(root.total);
+		discount = discount.plus(root.discount);
+	}
 	const b1 = {
-		value: left(run).toNumber(),
-		quantity: run.quantity
+		value: total.toNumber(),
+		quantity
 	};
-	const b2 = { discount_amount: run.discount.toNumber() };
-	const b3 = { discount_rate: rateOf(run.discount, run.base) };
+	const b2 = { discount_amount: discount.toNumber() };
+	const b3 = { discount_rate: rateOf(discount, subtotal) };
 	return {
 		...b1,
 		...b2,
 		...b3
 	};
 };
+const netOf = (root) => {
+	const net = root.total.minus(root.tax);
+	return net.gt(0) ? net : new Big(0);
+};
+/** What a redeem can still discount on a root: pre-tax or with taxes. */
+const baseOf = (root, beforeTaxes) => {
+	return beforeTaxes ? netOf(root) : root.total;
+};
+/** Before taxes, taxes shrink with the pre-tax value they were charged on. */
+const discountRoot = (root, amount, beforeTaxes) => {
+	if (amount.lte(0)) return;
+	root.discount = root.discount.plus(amount);
+	if (!beforeTaxes) {
+		root.total = root.total.minus(amount);
+		return;
+	}
+	const net = netOf(root);
+	const nextNet = net.minus(amount);
+	root.tax = root.tax.times(nextNet).div(net);
+	root.total = nextNet.plus(root.tax);
+};
+/** Splits an order discount across roots by what each can still discount. */
+const discountOrder = (roots, amount, beforeTaxes) => {
+	const bases = roots.map((root) => baseOf(root, beforeTaxes));
+	const sum = bases.reduce((acc, base) => acc.plus(base), new Big(0));
+	if (sum.lte(0) || amount.lte(0)) return;
+	let last = -1;
+	bases.forEach((base, index) => {
+		if (base.gt(0)) last = index;
+	});
+	let rest = amount;
+	roots.forEach((root, index) => {
+		const base = bases[index];
+		if (base.lte(0)) return;
+		const share = amount.times(base).div(sum);
+		const part = minBig(index === last ? rest : share, base);
+		rest = rest.minus(part);
+		discountRoot(root, part, beforeTaxes);
+	});
+};
 /**
 * Rate compounds once per reward unit over the remaining value; amount is
 * per unit. With both, the rate discount is capped at `amount × quantity`.
@@ -4480,38 +4526,117 @@ const redeemDiscount = (redeem, remaining) => {
 	const byRate = remaining.times(new Big(1).minus(kept));
 	return cap ? minBig(byRate, cap) : byRate;
 };
-const runningFor = (base, quantity) => {
+/**
+* Root group money rebuilt from the line itself plus its children, i.e. the
+* menu price before any redemption. Child lines are never discounted.
+*/
+const stripRedemptionLines = (lines) => {
+	const children = /* @__PURE__ */ new Map();
+	for (const line of lines) {
+		if (line.parent_uid == null) continue;
+		const list = children.get(line.parent_uid) ?? [];
+		list.push(line);
+		children.set(line.parent_uid, list);
+	}
+	return lines.map((line) => {
+		if (line.parent_uid != null) return line;
+		const qty = new Big(line.quantity);
+		let sub = new Big(0);
+		let disc = new Big(0);
+		let tax = new Big(0);
+		let tot = new Big(0);
+		for (const child of children.get(line.uid) ?? []) {
+			sub = sub.plus(child.group_subtotal);
+			disc = disc.plus(child.group_discount);
+			tax = tax.plus(child.group_tax_total);
+			tot = tot.plus(child.group_total);
+		}
+		const gSub = new Big(line.subtotal).plus(sub.times(qty));
+		const gDisc = new Big(line.discount_total).plus(disc.times(qty));
+		const gTax = new Big(line.tax_total).plus(tax.times(qty));
+		const gTot = new Big(line.total).plus(tot.times(qty));
+		const u1 = { unit_group_subtotal: gSub.div(qty).toNumber() };
+		const u2 = { unit_group_discount: gDisc.div(qty).toNumber() };
+		const u3 = { unit_group_tax_total: gTax.div(qty).toNumber() };
+		const u4 = { unit_group_total: gTot.div(qty).toNumber() };
+		const g1 = { group_subtotal: gSub.toNumber() };
+		const g2 = { group_discount: gDisc.toNumber() };
+		const g3 = { group_tax_total: gTax.toNumber() };
+		const g4 = { group_total: gTot.toNumber() };
+		const p1 = {
+			...u1,
+			...u2,
+			...u3,
+			...u4
+		};
+		return {
+			...line,
+			...p1,
+			...g1,
+			...g2,
+			...g3,
+			...g4
+		};
+	});
+};
+const withRootMoney = (line, money) => {
+	const qty = new Big(line.quantity);
+	const discount = new Big(line.group_discount).plus(money.discount);
+	const u1 = { unit_group_discount: discount.div(qty).toNumber() };
+	const u2 = { unit_group_tax_total: money.tax.div(qty).toNumber() };
+	const u3 = { unit_group_total: money.total.div(qty).toNumber() };
+	const g1 = { group_discount: discount.toNumber() };
+	const g2 = { group_tax_total: money.tax.toNumber() };
+	const g3 = { group_total: money.total.toNumber() };
 	return {
-		base: new Big(base),
-		discount: new Big(0),
-		quantity
+		...line,
+		...u1,
+		...u2,
+		...u3,
+		...g1,
+		...g2,
+		...g3
 	};
 };
 /**
 * Replays every redeem in persisted step order over the root lines' group
-* totals. A discount never exceeds what is left on its target or the order.
+* money. Line redeems discount their root; order redeems are prorated over
+* every root. A discount never exceeds what is left on its target.
 */
-const computeRedemptionSteps = (lines, redeem, steps) => {
-	const sequence = sequenceRedeems(lines, redeem, steps);
-	if (sequence.length === 0) return [];
-	const roots = lines.filter((line) => line.parent_uid == null);
-	let orderBase = new Big(0);
-	const lineRuns = /* @__PURE__ */ new Map();
-	for (const root of roots) {
-		orderBase = orderBase.plus(root.group_total);
-		lineRuns.set(root.uid, runningFor(root.group_total, root.quantity));
-	}
-	const order = runningFor(orderBase, 1);
-	return sequence.map((item) => {
-		const line = item.target_id ? lineRuns.get(item.target_id) : void 0;
-		const before = snapshot(order);
-		const targetBefore = line ? snapshot(line) : void 0;
-		const orderLeft = left(order);
-		const targetLeft = line ? left(line) : orderLeft;
-		const raw = redeemDiscount(item.redeem, targetLeft);
-		const discount = minBig(minBig(raw, targetLeft), orderLeft);
-		order.discount = order.discount.plus(discount);
-		if (line) line.discount = line.discount.plus(discount);
+const replayRedemptions = (lines, redeem, steps) => {
+	const base = stripRedemptionLines(lines);
+	const sequence = sequenceRedeems(base, redeem, steps);
+	const moneyByUid = /* @__PURE__ */ new Map();
+	for (const line of base) {
+		if (line.parent_uid != null) continue;
+		const b1 = { quantity: line.quantity };
+		const b2 = { subtotal: new Big(line.group_subtotal) };
+		const b3 = { tax: new Big(line.group_tax_total) };
+		const b4 = {
+			total: new Big(line.group_total),
+			discount: new Big(0)
+		};
+		moneyByUid.set(line.uid, {
+			...b1,
+			...b2,
+			...b3,
+			...b4
+		});
+	}
+	const roots = [...moneyByUid.values()];
+	const redemption_steps = sequence.map((item) => {
+		const id = item.target_id;
+		const root = id ? moneyByUid.get(id) : void 0;
+		const beforeTaxes = item.redeem.before_taxes ?? true;
+		const before = snapshot(roots, 1);
+		const targetBefore = root ? snapshot([root], root.quantity) : void 0;
+		let left = new Big(0);
+		if (root) left = baseOf(root, beforeTaxes);
+		else for (const r of roots) left = left.plus(baseOf(r, beforeTaxes));
+		const raw = redeemDiscount(item.redeem, left);
+		const discount = minBig(raw, left);
+		if (root) discountRoot(root, discount, beforeTaxes);
+		else discountOrder(roots, discount, beforeTaxes);
 		const action = discount.gt(0) ? "UPDATE" : "READ";
 		const { reward_id, quantity } = item.redeem;
 		const b1 = {
@@ -4519,19 +4644,19 @@ const computeRedemptionSteps = (lines, redeem, steps) => {
 			reward_quantity: quantity,
 			target: item.target
 		};
-		const b2 = item.target_id ? { target_id: item.target_id } : {};
+		const b2 = id ? { target_id: id } : {};
 		const b3 = {
 			action,
 			discount_amount: discount.toNumber()
 		};
 		const b4 = {
 			before,
-			after: snapshot(order)
+			after: snapshot(roots, 1)
 		};
 		let b5 = {};
-		if (line) b5 = {
+		if (root) b5 = {
 			target_before: targetBefore,
-			target_after: snapshot(line)
+			target_after: snapshot([root], root.quantity)
 		};
 		return {
 			...b1,
@@ -4541,33 +4666,24 @@ const computeRedemptionSteps = (lines, redeem, steps) => {
 			...b5
 		};
 	});
-};
-/** Subtract redemption discounts from line-based order totals. */
-const applyRedemptionTotals = (totals, steps) => {
-	if (steps.length === 0) return totals;
-	let redeemed = new Big(0);
-	for (const step of steps) redeemed = redeemed.plus(step.discount_amount);
-	const discountTotal = new Big(totals.discount_total).plus(redeemed);
-	const subtotal = new Big(totals.subtotal);
-	const discount_rate = rateOf(discountTotal, subtotal);
-	const discount_total = discountTotal.toNumber();
-	const total = new Big(totals.total).minus(redeemed).toNumber();
 	return {
-		...totals,
-		discount_rate,
-		discount_total,
-		total
+		lines: base.map((line) => {
+			const money = moneyByUid.get(line.uid);
+			if (!money || money.discount.eq(0)) return line;
+			return withRootMoney(line, money);
+		}),
+		redemption_steps
 	};
 };
-/** Steps + totals for a set of lines and redeems, keeping step order. */
+/** Discounted lines, steps and totals, keeping step order. */
 const recomputeRedemptions = (input) => {
-	const { lines, redeem, currency } = input;
+	const { redeem, currency } = input;
 	const steps = input.redemption_steps;
-	const redemption_steps = computeRedemptionSteps(lines, redeem, steps);
-	const lineTotals = recomputeTotals(lines, currency);
+	const { lines, redemption_steps } = replayRedemptions(input.lines, redeem, steps);
 	return {
+		lines,
 		redemption_steps,
-		totals: applyRedemptionTotals(lineTotals, redemption_steps)
+		totals: recomputeTotals(lines, currency)
 	};
 };
 //#endregion
@@ -4633,11 +4749,11 @@ const buildInsertFromSource = (options, source) => {
 	if (options.scope?.brand_id !== void 0) brand_id = optionalBrandId(options.scope.brand_id);
 	let customer = source.customer;
 	if (options.customer) customer = buildCustomerSnapshot(options.customer);
-	const lines = structuredClone(source.lines);
+	const sourceLines = structuredClone(source.lines);
 	const is_anonymous = options.isAnonymous ?? source.is_anonymous;
 	const redeem = structuredClone(source.redeem ?? []);
-	const { redemption_steps, totals } = recomputeRedemptions({
-		lines,
+	const { lines, redemption_steps, totals } = recomputeRedemptions({
+		lines: sourceLines,
 		redeem,
 		redemption_steps: source.redemption_steps ?? [],
 		currency: source.totals.currency
@@ -5213,10 +5329,10 @@ var Order = class Order {
 	}
 	/** Applies lines/redeem, replaying redemption steps and totals. */
 	commitLines(patch) {
-		const lines = patch.lines ?? this.draft.lines;
+		const patched = patch.lines ?? this.draft.lines;
 		const redeem = patch.redeem ?? this.draft.redeem ?? [];
-		const { redemption_steps, totals } = recomputeRedemptions({
-			lines,
+		const { lines, redemption_steps, totals } = recomputeRedemptions({
+			lines: patched,
 			redeem,
 			redemption_steps: this.draft.redemption_steps ?? [],
 			currency: this.draft.totals.currency
@@ -5903,9 +6019,38 @@ const validateRedemptions = (input, issues, lineIssues) => {
 		for (const issue of expired) pushLineIssue(lineIssues, line.uid, issue);
 	}
 	checkRedemptionTargets(input.lines, redeem, steps, issues, lineIssues);
-	const expected = computeRedemptionSteps(input.lines, redeem, steps);
-	compareRedemptionSteps(steps, expected, issues);
-	return expected;
+	const replayed = replayRedemptions(input.lines, redeem, steps);
+	compareRedemptionSteps(steps, replayed.redemption_steps, issues);
+	return replayed.lines;
+};
+const REDEEMED_GROUP_FIELDS = [
+	["group_discount", "DISCOUNT_MISMATCH"],
+	["unit_group_discount", "DISCOUNT_MISMATCH"],
+	["group_tax_total", "TAX_MISMATCH"],
+	["unit_group_tax_total", "TAX_MISMATCH"],
+	["group_total", "PRICE_MISMATCH"],
+	["unit_group_total", "PRICE_MISMATCH"]
+];
+/** Root group money must carry exactly the replayed redemption discounts. */
+const compareRedeemedRoots = (submitted, expected, out) => {
+	const byUid = new Map(expected.map((line) => [line.uid, line]));
+	for (const line of submitted) {
+		if (line.parent_uid != null) continue;
+		const wanted = byUid.get(line.uid);
+		if (!wanted) continue;
+		for (const [field, code] of REDEEMED_GROUP_FIELDS) {
+			if (bigEq(line[field], wanted[field])) continue;
+			const b1 = {
+				code,
+				field,
+				expected: bigStr(wanted[field])
+			};
+			pushLineIssue(out, line.uid, {
+				...b1,
+				actual: bigStr(line[field])
+			});
+		}
+	}
 };
 /** Compare cart lines/totals against a fresh menu (exact Big.js equality). */
 const validateOrderAgainstMenu = (input) => {
@@ -5918,7 +6063,8 @@ const validateOrderAgainstMenu = (input) => {
 		lines: {}
 	};
 	if (!input.menuActive) issues.push({ code: "MENU_CLOSED" });
-	const roots = input.lines.filter((line) => line.parent_uid == null);
+	const menuLines = stripRedemptionLines(input.lines);
+	const roots = menuLines.filter((line) => line.parent_uid == null);
 	if (roots.length === 0) {
 		issues.push({ code: "EMPTY_ORDER" });
 		return {
@@ -5933,12 +6079,13 @@ const validateOrderAgainstMenu = (input) => {
 			checkFeeSelfConsistency(root, lineIssues);
 			continue;
 		}
-		validateProductRoot(root, input.lines, lookup, locale, lineIssues);
+		validateProductRoot(root, menuLines, lookup, locale, lineIssues);
 	}
 	checkRootProductQuantities(roots, lookup, lineIssues);
 	if (input.expectedFeeLines) compareExpectedFeeLines(input.lines, input.expectedFeeLines, lineIssues);
-	const expectedSteps = validateRedemptions(input, issues, lineIssues);
-	const expectedTotals = applyRedemptionTotals(recomputeTotals(input.lines, input.totals.currency), expectedSteps);
+	const redeemed = validateRedemptions(input, issues, lineIssues);
+	compareRedeemedRoots(input.lines, redeemed, lineIssues);
+	const expectedTotals = recomputeTotals(redeemed, input.totals.currency);
 	for (const field of TOTALS_FIELDS) {
 		if (bigEq(input.totals[field], expectedTotals[field])) continue;
 		issues.push({
@@ -7857,4 +8004,4 @@ const cardPreviewGroups = (value) => {
 	return groups;
 };
 //#endregion
-export { CARD_BRANDS, DEFAULT_RECOMMENDATION_TYPES, Order, OrderSyncPendingError, OrderValidationError, RecurringDateCron, RulesEngine, StorefrontHttpError, addLines, auth, buildCustomerSnapshot, cardBrandSpec, cardDigits, cardNumberGaps, cardNumberMaxLength, cardPreviewGroups, caretAfterDigits, collectOrderLineDiffs, computeStartingPrice, countCartProducts, coveredAmount, createSession, currentNodes, cvcMaxLength, defaultConditionError, detectCardBrand, flattenMenuCategories, flushLogs, formatCardNumber, formatCvc, formatExpiry, fromOrderLines, genId, genOrderId, getLogContext, getScheduleWindow, indexMenu, isCardNumberComplete, isCardNumberDefinitelyInvalid, isCheckoutFieldFilled, isCvcComplete, isDeviceNotLinked, isExpiryComplete, isKioskUnauthorized, isMilestoneStepDone, isOnSchedule, isOrderValidationError, isPosDeviceNotLinked, isPosUnauthorized, isStorefrontNotFound, isVariantBase, listMenusStream, localizePosError, log, logError, luhnCheck, matchAbsoluteDateOperator, matchBooleanOperator, matchCurrencyOperator, matchEnumOperator, matchNumberOperator, matchRecurringDateOperator, matchRelativeDateOperator, matchStringOperator, milestoneSteps, milestoneTrack, nestMenuCategories, normalizeCardholderName, parseExpiry, paymentMatchesClientConditions, recomputeRedemptions, recomputeTotals, remainingAmount, removeLine, replaceLine, resolveCheckout, reversePayment, runPaymentAttempt, serializeError, services, setLineQuantity, storefrontJson, toOrderLines, toPaymentCardBrand, validateCardNumber, validateCardholderName, validateCvc, validateExpiry, validateOrderAgainstMenu, verifyWebhookSignature, visitedStates };
+export { CARD_BRANDS, DEFAULT_RECOMMENDATION_TYPES, Order, OrderSyncPendingError, OrderValidationError, RecurringDateCron, RulesEngine, StorefrontHttpError, addLines, auth, buildCustomerSnapshot, cardBrandSpec, cardDigits, cardNumberGaps, cardNumberMaxLength, cardPreviewGroups, caretAfterDigits, collectOrderLineDiffs, computeStartingPrice, countCartProducts, coveredAmount, createSession, currentNodes, cvcMaxLength, defaultConditionError, detectCardBrand, flattenMenuCategories, flushLogs, formatCardNumber, formatCvc, formatExpiry, fromOrderLines, genId, genOrderId, getLogContext, getScheduleWindow, indexMenu, isCardNumberComplete, isCardNumberDefinitelyInvalid, isCheckoutFieldFilled, isCvcComplete, isDeviceNotLinked, isExpiryComplete, isKioskUnauthorized, isMilestoneStepDone, isOnSchedule, isOrderValidationError, isPosDeviceNotLinked, isPosUnauthorized, isStorefrontNotFound, isVariantBase, listMenusStream, localizePosError, log, logError, luhnCheck, matchAbsoluteDateOperator, matchBooleanOperator, matchCurrencyOperator, matchEnumOperator, matchNumberOperator, matchRecurringDateOperator, matchRelativeDateOperator, matchStringOperator, milestoneSteps, milestoneTrack, nestMenuCategories, normalizeCardholderName, parseExpiry, paymentMatchesClientConditions, recomputeRedemptions, recomputeTotals, remainingAmount, removeLine, replaceLine, resolveCheckout, reversePayment, runPaymentAttempt, serializeError, services, setLineQuantity, storefrontJson, stripRedemptionLines, toOrderLines, toPaymentCardBrand, validateCardNumber, validateCardholderName, validateCvc, validateExpiry, validateOrderAgainstMenu, verifyWebhookSignature, visitedStates };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fire-spark/core",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "description": "Fire Spark headless SDK",
   "type": "module",
   "sideEffects": false,
@@ -20,8 +20,8 @@
     "big.js": "6.2.1",
     "dayjs": "1.11.9",
     "@types/big.js": "6.2.2",
-    "@fire-spark/payments": "^0.1.2",
-    "@fire-spark/types": "^0.1.2"
+    "@fire-spark/payments": "^0.2.0",
+    "@fire-spark/types": "^0.2.0"
   },
   "devDependencies": {
     "tsdown": "^0.22.14",