@fire-spark/payments 0.4.1 → 0.6.0

package/dist/index.d.ts

@@ -57,7 +57,9 @@ declare const prorateMinor: (amount: number, quantity: number, parts: readonly {
  * split exactly (last part is the remainder), fees to their tender, tip /
  * delivery and any order-level difference to the primary, then REDEMPTION
  * deducted from the primary first and by `sequence`, never below a tender's
- * tip + delivery (D18). Amounts are not rounded.
+ * tip + delivery (D18). A tender publishes only what it pays
+ * (`amount.total`); `allocation.amounts` is the money of the lines it
+ * covers, before REDEMPTION. Amounts are not rounded.
  */
 declare const allocateTenders: (input: AllocateTendersInput) => AllocateTendersResult;
 /**
@@ -97,8 +99,8 @@ declare const validateTendersAgainstRules: (input: {
 //#region src/money.d.ts
 /** One monetary amount. Arithmetic stays on Big until a caller serializes. */
 type Money = Big;
-declare const money: (value: number | string | Money) => import("big.js").Big;
-declare const moneyZero: () => import("big.js").Big;
+declare const money: (value: number | string | Money) => Money;
+declare const moneyZero: () => Money;
 declare const moneySum: (values: readonly Money[]) => Big;
 declare const moneyMax: (left: Money, right: Money) => Big;
 declare const moneyMin: (left: Money, right: Money) => Big;
@@ -455,8 +457,6 @@ declare const toChargeAmount: (input: {
   chargeCurrency?: string | null;
   rate?: number | null;
 }) => ChargeConversion;
-/** Tolerance used when comparing amounts in a currency. */
-declare const amountTolerance: (currency: string) => number;
 //#endregion
 //#region src/device.d.ts
 /** Required, visible device fields that are still empty on this device. */
@@ -495,16 +495,17 @@ type RedemptionDetails = Extract<TenderDetails, {
 /** One reward inside a grouped REDEMPTION tender (entry totals). */
 type RedemptionReward = RedemptionDetails["rewards"][number];
 /**
- * Payment redeem as stored in `orders.redeem`. `amount` is the total of
- * the entry (every unit); `quantity` is informational.
+ * Redeem as stored in `orders.redeem` or a root line's `redeem`. `amount`
+ * is the total of the entry (every unit); `quantity` is informational.
  */
-type PaymentRedeemLike = {
+type RedeemLike = {
   reward_id: string;
   quantity?: number;
   payment_id?: string | null;
   amount?: number;
+  before_taxes?: boolean;
 };
-/** Payment redeems of one `payment_id`, ready to seed its tender. */
+/** Redeems of one `payment_id`, ready to seed its tender. */
 type RedemptionGroup = {
   payment_id: string;
   /** Tender value: Σ `amount` of the grouped redeems. */
@@ -512,18 +513,14 @@ type RedemptionGroup = {
   details: RedemptionDetails;
 };
 /**
- * Reward (voucher, balance…) paid with a REDEMPTION tender, not a discount (D16):
- * it never discounts lines nor has a `redemption_steps` entry.
+ * Every redeem has a `payment_id` whose REDEMPTION tender covers it.
+ * Legacy rows stored without one are ignored.
  */
-declare const isPaymentRedeem: (redeem: {
+declare const hasRedeemPayment: (redeem: {
   payment_id?: string | null;
 }) => boolean;
-/** Discount redeems: the ones replayed into `redemption_steps`. */
-declare const discountRedeems: <T extends {
-  payment_id?: string | null;
-}>(redeem: readonly T[]) => T[];
-/** Order fields payment redeems live in: the order and its root lines. */
-type PaymentRedeemSource<T extends PaymentRedeemLike> = {
+/** Order fields redeems live in: the order and its root lines. */
+type RedeemSource<T extends RedeemLike> = {
   redeem?: readonly T[] | null;
   lines?: readonly {
     parent_uid?: string | null;
@@ -531,24 +528,24 @@ type PaymentRedeemSource<T extends PaymentRedeemLike> = {
   }[];
 };
 /**
- * Every payment redeem of the order: order-level ones first, then the ones
- * kept on a root line (a voucher stored with the product it pays for).
- * Both are paid by REDEMPTION tenders; child-line redeems never apply.
+ * Every redeem of the order: order-level ones first, then the ones kept
+ * on a root line (a voucher stored with the product it pays for). Each is
+ * covered by a REDEMPTION tender; child-line redeems never apply.
  */
-declare const orderPaymentRedeems: <T extends PaymentRedeemLike>(order: PaymentRedeemSource<T>) => T[];
+declare const orderRedeems: <T extends RedeemLike>(order: RedeemSource<T>) => T[];
 /**
- * Payment redeems pay the whole order, so no real tender is needed: the
- * intent is only REDEMPTION tenders and the order advances on its own.
+ * Redeems pay the whole order, so no other tender is needed: the intent
+ * is only REDEMPTION tenders and the order advances on its own.
  */
-declare const paymentRedeemsCoverTotal: (redeem: readonly PaymentRedeemLike[], totals: {
+declare const redeemsCoverTotal: (redeem: readonly RedeemLike[], totals: {
   total: number;
   currency: string;
 }) => boolean;
 /**
- * Groups payment redeems (`payment_id` set) into one entry per
- * `payment_id`, in first-appearance order. Discount redeems are skipped.
+ * Groups redeems into one entry per `payment_id`, in first-appearance
+ * order. Legacy entries without `payment_id` are skipped.
  */
-declare const groupPaymentRedeems: (redeem: readonly PaymentRedeemLike[]) => RedemptionGroup[];
+declare const groupRedeems: (redeem: readonly RedeemLike[]) => RedemptionGroup[];
 /**
  * REDEMPTION `details` in the current shape, or null for other methods.
  * Details persisted earlier (one `reward_id`, or money as `points_value`)
@@ -723,4 +720,4 @@ declare const scopedPaymentStorage: (storage: PaymentStorage, paymentId: string)
 /** For tests and web previews; apps provide AsyncStorage or localStorage. */
 declare const memoryPaymentStorage: () => PaymentStorage;
 //#endregion
-export { ACTIVE_INTENT_STATUSES, AllocateTenderInput, AllocateTendersInput, AllocateTendersResult, AllocatedTender, AllocationError, CURRENCY_DECIMALS, ChargeConversion, DEFAULT_PAYMENT_POLICY, DELIVERY_FEE_BASED_ON, DIGITAL_COLLECT_AT, type DeviceField, MergePaymentTenderOutcome, MergePaymentTenderResult, Money, NEXT_STATUSES, PARTIAL_APPROVAL_ERROR, PAYMENT_ERROR_CODES, PAYMENT_ERROR_DEFAULTS, type PaymentAction, type PaymentAdapter, type PaymentAdapterCapabilities, type PaymentAmount, type PaymentCardType, type PaymentCollectAt, type PaymentContext, type PaymentCustomer, type PaymentEntryMode, type PaymentEnvironment, PaymentError, PaymentErrorCode, PaymentErrorDictionary, PaymentErrorEntry, PaymentErrorReason, type PaymentIntentStatus, type PaymentMetadata, type PaymentMetadataPayment, type PaymentOperation, type PaymentPolicy, PaymentRedeemLike, PaymentRedeemSource, type PaymentResult, type PaymentReversal, type PaymentServer, type PaymentStorage, PaymentTenderUpdate, type PaymentUI, REDEMPTION_METHOD, RawPaymentError, RedemptionDetails, RedemptionGroup, RedemptionReward, RulesTender, StandardPaymentError, TERMINAL_TENDER_STATUSES, TIP_FEE_BASED_ON, type TaxBreakdown, TaxLine, type TerminalContext, type TerminalOperation, type TerminalOperations, type TerminalResult, ValidateTendersResult, activeIntent, allocateTenders, amountTolerance, batchCloseDay, countTenderItems, createAttemptReference, createPaymentError, currencyDecimals, currentIntent, defaultReversalFor, definePaymentErrors, derivePaymentStatus, discountRedeems, formatPaymentError, groupPaymentRedeems, isBatchCloseDue, isDeliveryFee, isIntentCovered, isMixedTenders, isPaymentError, isPaymentRedeem, isRealPaymentMethod, isRedemptionReserved, isScopePaid, isTenderSettled, isTerminalLocked, isTipFee, liveRealTenders, liveTenders, memoryPaymentStorage, mergePaymentTender, missingDeviceFields, money, moneyMax, moneyMin, moneyNumber, moneyNumbers, moneySum, moneyZero, nextIntentStatus, orderPaymentRedeems, paymentRedeemsCoverTotal, primaryTender, primaryTenderOf, prorateMinor, realTenders, redemptionDetailsOf, redemptionRewardsOf, resolvePaymentPolicy, resolveProviderEnvironment, roundTo, scopedPaymentStorage, splitMoney, taxBreakdown, tendersCoverage, tendersInScope, toChargeAmount, toPaymentAmount, toPaymentError, validateTendersAgainstRules, withTerminalLock };
+export { ACTIVE_INTENT_STATUSES, AllocateTenderInput, AllocateTendersInput, AllocateTendersResult, AllocatedTender, AllocationError, CURRENCY_DECIMALS, ChargeConversion, DEFAULT_PAYMENT_POLICY, DELIVERY_FEE_BASED_ON, DIGITAL_COLLECT_AT, type DeviceField, MergePaymentTenderOutcome, MergePaymentTenderResult, Money, NEXT_STATUSES, PARTIAL_APPROVAL_ERROR, PAYMENT_ERROR_CODES, PAYMENT_ERROR_DEFAULTS, type PaymentAction, type PaymentAdapter, type PaymentAdapterCapabilities, type PaymentAmount, type PaymentCardType, type PaymentCollectAt, type PaymentContext, type PaymentCustomer, type PaymentEntryMode, type PaymentEnvironment, PaymentError, PaymentErrorCode, PaymentErrorDictionary, PaymentErrorEntry, PaymentErrorReason, type PaymentIntentStatus, type PaymentMetadata, type PaymentMetadataPayment, type PaymentOperation, type PaymentPolicy, type PaymentResult, type PaymentReversal, type PaymentServer, type PaymentStorage, PaymentTenderUpdate, type PaymentUI, REDEMPTION_METHOD, RawPaymentError, RedeemLike, RedeemSource, RedemptionDetails, RedemptionGroup, RedemptionReward, RulesTender, StandardPaymentError, TERMINAL_TENDER_STATUSES, TIP_FEE_BASED_ON, type TaxBreakdown, TaxLine, type TerminalContext, type TerminalOperation, type TerminalOperations, type TerminalResult, ValidateTendersResult, activeIntent, allocateTenders, batchCloseDay, countTenderItems, createAttemptReference, createPaymentError, currencyDecimals, currentIntent, defaultReversalFor, definePaymentErrors, derivePaymentStatus, formatPaymentError, groupRedeems, hasRedeemPayment, isBatchCloseDue, isDeliveryFee, isIntentCovered, isMixedTenders, isPaymentError, isRealPaymentMethod, isRedemptionReserved, isScopePaid, isTenderSettled, isTerminalLocked, isTipFee, liveRealTenders, liveTenders, memoryPaymentStorage, mergePaymentTender, missingDeviceFields, money, moneyMax, moneyMin, moneyNumber, moneyNumbers, moneySum, moneyZero, nextIntentStatus, orderRedeems, primaryTender, primaryTenderOf, prorateMinor, realTenders, redeemsCoverTotal, redemptionDetailsOf, redemptionRewardsOf, resolvePaymentPolicy, resolveProviderEnvironment, roundTo, scopedPaymentStorage, splitMoney, taxBreakdown, tendersCoverage, tendersInScope, toChargeAmount, toPaymentAmount, toPaymentError, validateTendersAgainstRules, withTerminalLock };

package/dist/index.js

@@ -42,65 +42,6 @@ const moneyNumbers = (whole, parts) => {
 	return [...head, whole.minus(used).toNumber()];
 };
 //#endregion
-//#region src/amount.ts
-/** ISO 4217 minor units; anything not listed uses 2. */
-const CURRENCY_DECIMALS = {
-	CLP: 0,
-	PYG: 0,
-	JPY: 0,
-	COP: 2,
-	USD: 2,
-	BRL: 2,
-	PEN: 2,
-	ARS: 2,
-	VES: 2,
-	MXN: 2,
-	EUR: 2
-};
-const currencyDecimals = (currency) => {
-	return CURRENCY_DECIMALS[currency.toUpperCase()] ?? 2;
-};
-/** Full precision. `decimals` is ignored so amounts are never truncated. */
-const roundTo = (value, _decimals) => {
-	return moneyNumber(money(value));
-};
-const toPaymentAmount = (value, currency) => {
-	const code = currency.toUpperCase();
-	const decimals = currencyDecimals(code);
-	const exact = money(value);
-	const scale = money(10).pow(decimals);
-	const minor = moneyNumber(exact.times(scale));
-	return {
-		value: moneyNumber(exact),
-		minor,
-		currency: code,
-		decimals
-	};
-};
-/** Converts an order-currency value to the charge currency at a fixed rate. */
-const toChargeAmount = (input) => {
-	const orderCurrency = input.orderCurrency.toUpperCase();
-	const chargeCurrency = (input.chargeCurrency ?? orderCurrency).toUpperCase();
-	const same = chargeCurrency === orderCurrency;
-	if (!same && !(input.rate && input.rate > 0)) {
-		const message = `Missing exchange rate ${orderCurrency}->${chargeCurrency}`;
-		throw new Error(message);
-	}
-	const rate = same ? 1 : input.rate;
-	const charged = money(input.value).times(rate);
-	const amount = toPaymentAmount(moneyNumber(charged), chargeCurrency);
-	return {
-		amount,
-		charged_amount: amount.value,
-		charged_currency: chargeCurrency,
-		exchange_rate: rate
-	};
-};
-/** Tolerance used when comparing amounts in a currency. */
-const amountTolerance = (currency) => {
-	return 10 ** -currencyDecimals(currency) / 2;
-};
-//#endregion
 //#region src/tenders.ts
 const REDEMPTION_METHOD = "REDEMPTION";
 /** Methods that charge money (everything but `REDEMPTION`, D17). */
@@ -199,17 +140,20 @@ const coveringTenders = (tenders) => {
 		return tender.status !== "FAILED" && tender.status !== "CANCELLED";
 	});
 };
+const coverageOf = (tenders) => {
+	return coveringTenders(tenders).reduce((sum, tender) => {
+		return sum.plus(tender.amount.total);
+	}, moneyZero());
+};
 /** Σ `amount.total` of live, not failed/cancelled tenders. */
 const tendersCoverage = (tenders) => {
-	return coveringTenders(tenders).reduce((sum, tender) => {
-		return sum + tender.amount.total;
-	}, 0);
+	return moneyNumber(coverageOf(tenders));
 };
 /** Live tenders that are not failed/cancelled cover the order total. */
 const isIntentCovered = (intent, orderTotal) => {
 	if (!intent) return false;
 	const total = orderTotal ?? intent.totals.total;
-	return tendersCoverage(liveTenders(intent)) + amountTolerance(intent.totals.currency) >= total;
+	return coverageOf(liveTenders(intent)).gte(money(total));
 };
 /**
 * Order `payment_status` from the live tenders of the current intent
@@ -266,8 +210,7 @@ const RESOLVED_STATUSES = [
 const isPartialApproval = (tender, update) => {
 	if (update.status !== "PAID") return false;
 	if (update.approved_amount === void 0) return false;
-	const tolerance = amountTolerance(tender.amount.currency);
-	return update.approved_amount + tolerance < tender.amount.total;
+	return money(update.approved_amount).lt(tender.amount.total);
 };
 const withAttempt = (tender, reference) => {
 	if (tender.attempt_reference === reference) return tender;
@@ -635,32 +578,14 @@ const balanceAmounts = (amounts, gross) => {
 	const used = head.reduce((sum, row) => sum.plus(row.total), moneyZero());
 	const lastTotal = gross.minus(used);
 	const last = amounts[amounts.length - 1];
-	const drift = lastTotal.minus(last.total);
-	const subtotal = money(last.subtotal).plus(drift);
-	const total = moneyNumber(lastTotal);
-	const next = {
+	return [...head, {
 		...last,
-		subtotal: moneyNumber(subtotal),
-		total
-	};
-	return [...head, next];
+		total: moneyNumber(lastTotal)
+	}];
 };
 const emptyAmount = (currency, total) => {
-	const b1 = {
-		currency,
-		subtotal: total,
-		discount_total: 0,
-		tax_total: 0
-	};
-	const b2 = {
-		fees: 0,
-		tip: 0,
-		delivery: 0,
-		redemptions_applied: 0
-	};
 	return {
-		...b1,
-		...b2,
+		currency,
 		total
 	};
 };
@@ -669,7 +594,9 @@ const emptyAmount = (currency, total) => {
 * split exactly (last part is the remainder), fees to their tender, tip /
 * delivery and any order-level difference to the primary, then REDEMPTION
 * deducted from the primary first and by `sequence`, never below a tender's
-* tip + delivery (D18). Amounts are not rounded.
+* tip + delivery (D18). A tender publishes only what it pays
+* (`amount.total`); `allocation.amounts` is the money of the lines it
+* covers, before REDEMPTION. Amounts are not rounded.
 */
 const allocateTenders = (input) => {
 	const currency = input.totals.currency;
@@ -754,19 +681,10 @@ const allocateTenders = (input) => {
 		};
 	});
 	const toAmount = (uid, value, units) => {
-		const subtotal = moneyNumber(value.subtotal);
-		const discount = moneyNumber(value.discount);
-		const total = moneyNumber(value.total);
-		const b1 = {
-			tax: moneyNumber(money(total).minus(subtotal).plus(discount)),
-			total
-		};
 		return {
 			line_uid: uid,
 			...units === void 0 ? {} : { units },
-			subtotal,
-			discount,
-			...b1
+			total: moneyNumber(value.total)
 		};
 	};
 	for (const root of roots) {
@@ -882,45 +800,26 @@ const allocateTenders = (input) => {
 			message: "Redemptions exceed what real tenders can absorb"
 		}
 	};
+	const appliedById = /* @__PURE__ */ new Map();
 	const tenders = [...real.map((tender, index) => {
 		const build = builds[index];
-		const subtotal = moneyNumber(build.products.subtotal);
-		const discount = moneyNumber(build.products.discount);
-		const tax = moneyNumber(build.products.tax);
-		const fees = moneyNumber(build.fees);
-		const tip = moneyNumber(build.tip);
-		const delivery = moneyNumber(build.delivery);
-		const redemptions = moneyNumber(applied[index] ?? moneyZero());
-		const published = money(subtotal).minus(discount).plus(tax).plus(fees).plus(tip).plus(delivery).minus(redemptions);
-		const b1 = {
-			currency,
-			subtotal,
-			discount_total: discount,
-			tax_total: tax
-		};
-		const b2 = {
-			fees,
-			tip,
-			delivery,
-			redemptions_applied: redemptions
-		};
+		const gross = totals[index] ?? moneyZero();
+		const redemptions = applied[index] ?? moneyZero();
+		appliedById.set(tender.id, redemptions);
+		const published = gross.minus(redemptions);
 		const amount = {
-			...b1,
-			...b2,
+			currency,
 			total: moneyNumber(published)
 		};
 		const open = tender.allocation === null;
 		const lines = open ? [] : tender.allocation?.lines ?? [];
 		const feesLines = open ? [] : tender.allocation?.fees ?? [];
 		let allocation = null;
-		if (real.length > 1 || !open) {
-			const gross = money(amount.total).plus(amount.redemptions_applied);
-			allocation = {
-				lines,
-				fees: feesLines,
-				amounts: balanceAmounts(build.amounts, gross)
-			};
-		}
+		if (real.length > 1 || !open) allocation = {
+			lines,
+			fees: feesLines,
+			amounts: balanceAmounts(build.amounts, gross)
+		};
 		return {
 			...base(tender),
 			allocation,
@@ -938,12 +837,9 @@ const allocateTenders = (input) => {
 		ok: true,
 		tenders: tenders.map((tender) => {
 			if (tender.id !== primaryId) return tender;
-			const drift = primaryTotal.minus(tender.amount.total);
-			if (drift.eq(0)) return tender;
-			const subtotal = money(tender.amount.subtotal).plus(drift);
+			if (primaryTotal.eq(tender.amount.total)) return tender;
 			const amount = {
 				...tender.amount,
-				subtotal: moneyNumber(subtotal),
 				total: moneyNumber(primaryTotal)
 			};
 			const allocation = tender.allocation;
@@ -951,7 +847,8 @@ const allocateTenders = (input) => {
 				...tender,
 				amount
 			};
-			const gross = money(amount.total).plus(amount.redemptions_applied);
+			const redemptions = appliedById.get(tender.id) ?? moneyZero();
+			const gross = primaryTotal.plus(redemptions);
 			const amounts = balanceAmounts(allocation.amounts, gross);
 			return {
 				...tender,
@@ -1021,8 +918,7 @@ const validateTendersAgainstRules = (input) => {
 			}
 		};
 		const maxAmount = caps?.max_amount ?? effect.max_amount_per_method;
-		const tolerance = amountTolerance(tender.amount.currency);
-		if (maxAmount !== null && tender.amount.total > maxAmount + tolerance) return {
+		if (maxAmount !== null && money(tender.amount.total).gt(maxAmount)) return {
 			ok: false,
 			error: {
 				code: "PAYMENT_AMOUNT_EXCEEDED",
@@ -1037,6 +933,61 @@ const validateTendersAgainstRules = (input) => {
 	};
 };
 //#endregion
+//#region src/amount.ts
+/** ISO 4217 minor units; anything not listed uses 2. */
+const CURRENCY_DECIMALS = {
+	CLP: 0,
+	PYG: 0,
+	JPY: 0,
+	COP: 2,
+	USD: 2,
+	BRL: 2,
+	PEN: 2,
+	ARS: 2,
+	VES: 2,
+	MXN: 2,
+	EUR: 2
+};
+const currencyDecimals = (currency) => {
+	return CURRENCY_DECIMALS[currency.toUpperCase()] ?? 2;
+};
+/** Full precision. `decimals` is ignored so amounts are never truncated. */
+const roundTo = (value, _decimals) => {
+	return moneyNumber(money(value));
+};
+const toPaymentAmount = (value, currency) => {
+	const code = currency.toUpperCase();
+	const decimals = currencyDecimals(code);
+	const exact = money(value);
+	const scale = money(10).pow(decimals);
+	const minor = moneyNumber(exact.times(scale));
+	return {
+		value: moneyNumber(exact),
+		minor,
+		currency: code,
+		decimals
+	};
+};
+/** Converts an order-currency value to the charge currency at a fixed rate. */
+const toChargeAmount = (input) => {
+	const orderCurrency = input.orderCurrency.toUpperCase();
+	const chargeCurrency = (input.chargeCurrency ?? orderCurrency).toUpperCase();
+	const same = chargeCurrency === orderCurrency;
+	if (!same && !(input.rate && input.rate > 0)) {
+		const message = `Missing exchange rate ${orderCurrency}->${chargeCurrency}`;
+		throw new Error(message);
+	}
+	const rate = same ? 1 : input.rate;
+	const charged = money(input.value).times(rate);
+	const amount = toPaymentAmount(moneyNumber(charged), chargeCurrency);
+	return {
+		amount,
+		charged_amount: amount.value,
+		charged_currency: chargeCurrency,
+		exchange_rate: rate
+	};
+};
+//#endregion
 //#region src/device.ts
 const isEmpty = (value) => {
 	return value == null || typeof value === "string" && value.trim() === "";
@@ -1274,32 +1225,28 @@ const add = (left, right) => {
 	return moneyNumber(money(left).plus(right));
 };
 /**
-* Reward (voucher, balance…) paid with a REDEMPTION tender, not a discount (D16):
-* it never discounts lines nor has a `redemption_steps` entry.
+* Every redeem has a `payment_id` whose REDEMPTION tender covers it.
+* Legacy rows stored without one are ignored.
 */
-const isPaymentRedeem = (redeem) => {
+const hasRedeemPayment = (redeem) => {
 	return Boolean(redeem.payment_id);
 };
-/** Discount redeems: the ones replayed into `redemption_steps`. */
-const discountRedeems = (redeem) => {
-	return redeem.filter((item) => !isPaymentRedeem(item));
-};
 /**
-* Every payment redeem of the order: order-level ones first, then the ones
-* kept on a root line (a voucher stored with the product it pays for).
-* Both are paid by REDEMPTION tenders; child-line redeems never apply.
+* Every redeem of the order: order-level ones first, then the ones kept
+* on a root line (a voucher stored with the product it pays for). Each is
+* covered by a REDEMPTION tender; child-line redeems never apply.
 */
-const orderPaymentRedeems = (order) => {
+const orderRedeems = (order) => {
 	const onLines = (order.lines ?? []).filter((line) => line.parent_uid == null).flatMap((line) => line.redeem ?? []);
-	return [...order.redeem ?? [], ...onLines].filter(isPaymentRedeem);
+	return [...order.redeem ?? [], ...onLines].filter(hasRedeemPayment);
 };
 /**
-* Payment redeems pay the whole order, so no real tender is needed: the
-* intent is only REDEMPTION tenders and the order advances on its own.
+* Redeems pay the whole order, so no other tender is needed: the intent
+* is only REDEMPTION tenders and the order advances on its own.
 */
-const paymentRedeemsCoverTotal = (redeem, totals) => {
+const redeemsCoverTotal = (redeem, totals) => {
 	const paid = redeem.reduce((sum, item) => {
-		if (!isPaymentRedeem(item)) return sum;
+		if (!hasRedeemPayment(item)) return sum;
 		return sum.plus(item.amount ?? 0);
 	}, moneyZero());
 	if (paid.lte(0)) return false;
@@ -1325,13 +1272,13 @@ const detailsOf = (rewards, loyalty_transaction_id) => {
 	};
 };
 /**
-* Groups payment redeems (`payment_id` set) into one entry per
-* `payment_id`, in first-appearance order. Discount redeems are skipped.
+* Groups redeems into one entry per `payment_id`, in first-appearance
+* order. Legacy entries without `payment_id` are skipped.
 */
-const groupPaymentRedeems = (redeem) => {
+const groupRedeems = (redeem) => {
 	const groups = /* @__PURE__ */ new Map();
 	for (const item of redeem) {
-		if (!isPaymentRedeem(item)) continue;
+		if (!hasRedeemPayment(item)) continue;
 		const payment_id = item.payment_id;
 		const list = groups.get(payment_id) ?? [];
 		list.push(item);
@@ -1487,4 +1434,4 @@ const memoryPaymentStorage = () => {
 	};
 };
 //#endregion
-export { ACTIVE_INTENT_STATUSES, CURRENCY_DECIMALS, DEFAULT_PAYMENT_POLICY, DELIVERY_FEE_BASED_ON, DIGITAL_COLLECT_AT, NEXT_STATUSES, PARTIAL_APPROVAL_ERROR, PAYMENT_ERROR_CODES, PAYMENT_ERROR_DEFAULTS, PaymentError, REDEMPTION_METHOD, TERMINAL_TENDER_STATUSES, TIP_FEE_BASED_ON, activeIntent, allocateTenders, amountTolerance, batchCloseDay, countTenderItems, createAttemptReference, createPaymentError, currencyDecimals, currentIntent, defaultReversalFor, definePaymentErrors, derivePaymentStatus, discountRedeems, formatPaymentError, groupPaymentRedeems, isBatchCloseDue, isDeliveryFee, isIntentCovered, isMixedTenders, isPaymentError, isPaymentRedeem, isRealPaymentMethod, isRedemptionReserved, isScopePaid, isTenderSettled, isTerminalLocked, isTipFee, liveRealTenders, liveTenders, memoryPaymentStorage, mergePaymentTender, missingDeviceFields, money, moneyMax, moneyMin, moneyNumber, moneyNumbers, moneySum, moneyZero, nextIntentStatus, orderPaymentRedeems, paymentRedeemsCoverTotal, primaryTender, primaryTenderOf, prorateMinor, realTenders, redemptionDetailsOf, redemptionRewardsOf, resolvePaymentPolicy, resolveProviderEnvironment, roundTo, scopedPaymentStorage, splitMoney, taxBreakdown, tendersCoverage, tendersInScope, toChargeAmount, toPaymentAmount, toPaymentError, validateTendersAgainstRules, withTerminalLock };
+export { ACTIVE_INTENT_STATUSES, CURRENCY_DECIMALS, DEFAULT_PAYMENT_POLICY, DELIVERY_FEE_BASED_ON, DIGITAL_COLLECT_AT, NEXT_STATUSES, PARTIAL_APPROVAL_ERROR, PAYMENT_ERROR_CODES, PAYMENT_ERROR_DEFAULTS, PaymentError, REDEMPTION_METHOD, TERMINAL_TENDER_STATUSES, TIP_FEE_BASED_ON, activeIntent, allocateTenders, batchCloseDay, countTenderItems, createAttemptReference, createPaymentError, currencyDecimals, currentIntent, defaultReversalFor, definePaymentErrors, derivePaymentStatus, formatPaymentError, groupRedeems, hasRedeemPayment, isBatchCloseDue, isDeliveryFee, isIntentCovered, isMixedTenders, isPaymentError, isRealPaymentMethod, isRedemptionReserved, isScopePaid, isTenderSettled, isTerminalLocked, isTipFee, liveRealTenders, liveTenders, memoryPaymentStorage, mergePaymentTender, missingDeviceFields, money, moneyMax, moneyMin, moneyNumber, moneyNumbers, moneySum, moneyZero, nextIntentStatus, orderRedeems, primaryTender, primaryTenderOf, prorateMinor, realTenders, redeemsCoverTotal, redemptionDetailsOf, redemptionRewardsOf, resolvePaymentPolicy, resolveProviderEnvironment, roundTo, scopedPaymentStorage, splitMoney, taxBreakdown, tendersCoverage, tendersInScope, toChargeAmount, toPaymentAmount, toPaymentError, validateTendersAgainstRules, withTerminalLock };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fire-spark/payments",
-  "version": "0.4.1",
+  "version": "0.6.0",
   "description": "Fire Spark payments contract: adapters, errors, amounts and policy",
   "type": "module",
   "sideEffects": false,
@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "big.js": "6.2.1",
-    "@fire-spark/types": "^0.4.1"
+    "@fire-spark/types": "^0.6.0"
   },
   "devDependencies": {
     "@types/big.js": "6.2.2",