@pisell/private-materials 6.12.370 → 6.12.371

package/es/components/vendingMachine/README.md

@@ -124,6 +124,8 @@ Home 的 Redeem Socks 入口打开独立 `RedeemPage`，展示扫码指引、扫
 
 Sale 与 Redeem 共用同一购物车和实时券列表，券不按来源预留，也不注册 `productVoucherGroups` 或向商品附加 `productVoucherGroupKey`。兑换分组仅用于展示，已选和剩余数量按商品行实际 `good_pass` 抵扣记录统计；Apply、Unapply、登录资产变化后重新计算。Unapply 本身保留普通购物车行为；若用户随后在兑换页明确新增商品，可通过同一 `setDiscount` 操作重新启用对应券。兑换页的 Also buy something? 入口暂时隐藏；主按钮直接结算同一订单。
 
+零售兑换页按券的 `product_id` 合并展示，同一商品 ID 的数字和字符串形式归入同组，不按持有人、扩展字段或适用规则拆组；缺少商品 ID 的券按实例单独展示。组内可兑商品取各券适用范围的并集，每个商品的新增数量按尚未实际抵扣且适用于该商品的券数限制；本机无适用商品且无关联已选商品的券不计入额度。加购不预填持有人，实际抵扣仍保留各张券的实例 ID 和原有规则。此分组逻辑仅用于 vendingMachine，不改变普通销售、优惠钱包或底层抵扣规则。
+
 零价商品可在兑换页按普通免费商品加入购物车并正常结算、出货，不要求分配商品券。页面从实际零价且无折扣记录的订单行读取数量，支持加减和键盘修改；免费数量计入已选商品，不占用券额度，继续受实时库存限制。存在免费选择时，汇总分别展示已选商品数和剩余商品券数；多个券组匹配同一免费商品时共享数量，汇总只计一次。有价商品仍按实际 `good_pass` 分配统计，`pisell_os` 的抵扣规则保持原样。
 
 售货机购物车通过 `saleDetailModuleConfig.cartItems.renderProductLineItemStatus` 在 A12 右侧展示兑换印章：仅商品行实际分配了 `good_pass` 时替代价格、编辑和数量区域，保留原删除按钮及确认流程；Unapply 后恢复正常展示。印章由内联 SVG 绘制圆框、勾选和多语言文字，颜色跟随卡片主题色 `--pc-a12-accent`，保留倾斜样式，不依赖图片文件；以透明背景、不降低不透明度的水印形式相对右侧区域居中绝对定位，不撑高卡片、不拦截点击，删除按钮保持在上层。文字跟随页面语言，未提供的语言回退英文。此配置仅由 VendingSale 启用，普通 Kiosk、H5、POS 及 A12 的其它调用方保持原样；不改变订单金额或券分配逻辑。

package/es/components/vendingMachine/VoucherCollectPage.js

@@ -4,7 +4,7 @@ import { useSalesInventory } from "../../plus/salesSdk/inventory/context.js";
 import { resolveLocalizedText } from "../../plus/salesSdk/utils/resolveLocalizedText.js";
 import { pickIdentity } from "../../plus/salesSdk/utils/identity.js";
 import { resolveEffectiveSaleDetailAmountDue } from "../../plus/saleDetail/utils.js";
-import { resolveVoucherInitialHolderIds, sanitizeVoucherAddProduct } from "../../plus/saleDetail/components/PromotionWalletPanels/voucherProductAdd.js";
+import { sanitizeVoucherAddProduct } from "../../plus/saleDetail/components/PromotionWalletPanels/voucherProductAdd.js";
 import { useVendingLocale } from "./locales.js";
 import { Brand, CustomerViewport, Icon as Icon$1 } from "./CustomerScreens.js";
 import { VendingActionBar } from "./VendingBottomBar.js";
@@ -12,7 +12,7 @@ import { buildVendingCatalog, buildVendingSkuProduct } from "./catalogModel.js";
 import VoucherSkuList from "./VoucherSkuList.js";
 import useVendingCartInteraction from "./useVendingCartInteraction.js";
 import { buildVoucherSkuChoices, isFreeVoucherProduct, isSimpleVoucherProduct, usesInlineVoucherSkus } from "./voucherSkuSelection.js";
-import { appliedProductVoucherIds, buildRedemptionGroups, isFreeRedemptionItem, redemptionRows } from "./voucherRedemption.js";
+import { buildRedemptionGroups, getRemainingProductVouchers, isFreeRedemptionItem, redemptionRows } from "./voucherRedemption.js";
 import React, { useEffect, useRef } from "react";
 import { useToast } from "@pisell/materials";
 import { useMemoizedFn } from "ahooks";
@@ -55,14 +55,14 @@ function VoucherCollectPage({ brand, context, products, loading, isActive, inven
 		var _ticket$getDiscountLi, _ticket$getTempOrder3, _context$cart$tempOrd;
 		return buildRedemptionGroups((ticket === null || ticket === void 0 || (_ticket$getDiscountLi = ticket.getDiscountList) === null || _ticket$getDiscountLi === void 0 ? void 0 : _ticket$getDiscountLi.call(ticket)) || context.cart.discountList, products, (ticket === null || ticket === void 0 || (_ticket$getTempOrder3 = ticket.getTempOrder) === null || _ticket$getTempOrder3 === void 0 || (_ticket$getTempOrder3 = _ticket$getTempOrder3.call(ticket)) === null || _ticket$getTempOrder3 === void 0 ? void 0 : _ticket$getTempOrder3.products) || ((_context$cart$tempOrd = context.cart.tempOrder) === null || _context$cart$tempOrd === void 0 ? void 0 : _context$cart$tempOrd.products) || []);
 	});
-	const remaining = useMemoizedFn((key) => {
-		var _getLiveGroups$find;
-		return ((_getLiveGroups$find = getLiveGroups().find((group) => group.key === key)) === null || _getLiveGroups$find === void 0 ? void 0 : _getLiveGroups$find.remaining) || 0;
+	const remaining = useMemoizedFn((key, product) => {
+		const group = getLiveGroups().find((entry) => entry.key === key);
+		return group ? getRemainingProductVouchers(group, product).length : 0;
 	});
 	const restoreUnappliedVouchers = useMemoizedFn(function() {
-		var _ref = _asyncToGenerator(function* (key, targetSelected, isCurrent) {
+		var _ref = _asyncToGenerator(function* (key, product, targetSelected, isCurrent) {
 			let group = getLiveGroups().find((item) => item.key === key);
-			const manuallyUnapplied = (group === null || group === void 0 ? void 0 : group.vouchers.filter((voucher) => voucher.source.isManualSelect)) || [];
+			const manuallyUnapplied = group ? getRemainingProductVouchers(group, product).filter((voucher) => voucher.source.isManualSelect) : [];
 			for (const voucher of manuallyUnapplied) {
 				if (!isCurrent() || !group || group.selected >= targetSelected) return;
 				yield context.cart.setDiscount({
@@ -72,7 +72,7 @@ function VoucherCollectPage({ brand, context, products, loading, isActive, inven
 				group = getLiveGroups().find((item) => item.key === key);
 			}
 		});
-		return function(_x, _x2, _x3) {
+		return function(_x, _x2, _x3, _x4) {
 			return _ref.apply(this, arguments);
 		};
 	}());
@@ -85,7 +85,7 @@ function VoucherCollectPage({ brand, context, products, loading, isActive, inven
 			var _variant$id;
 			const id = (_variant$id = variant.id) !== null && _variant$id !== void 0 ? _variant$id : variant.product_variant_id;
 			const stock = inventory.selectionAvailability(product, id, items);
-			const limit = freeSelection || isFreeVoucherProduct(product, id) ? Infinity : remaining(group.key);
+			const limit = freeSelection || isFreeVoucherProduct(product, id) ? Infinity : remaining(group.key, product);
 			return stock.availability.status === "ready" ? Math.min(stock.availableQuantity, limit) : 0;
 		}));
 	});
@@ -99,17 +99,17 @@ function VoucherCollectPage({ brand, context, products, loading, isActive, inven
 				quantity,
 				debounceMs: 0,
 				notShowToast: true,
-				getQuantityLimit: free ? void 0 : () => remaining(group.key),
-				initialHolderIds: group.vouchers[0] ? resolveVoucherInitialHolderIds(group.vouchers[0]) : []
+				getQuantityLimit: free ? void 0 : () => remaining(group.key, product),
+				initialHolderIds: []
 			});
 			if (result.status === "added" && isCurrent() && !free) {
 				const after = getLiveGroups().find((item) => item.key === group.key);
 				const freeAdded = Math.max(0, ((after === null || after === void 0 ? void 0 : after.freeQuantity) || 0) - ((before === null || before === void 0 ? void 0 : before.freeQuantity) || 0));
-				yield restoreUnappliedVouchers(group.key, ((before === null || before === void 0 ? void 0 : before.selected) || 0) + Math.max(0, quantity - freeAdded), isCurrent);
+				yield restoreUnappliedVouchers(group.key, product, ((before === null || before === void 0 ? void 0 : before.selected) || 0) + Math.max(0, quantity - freeAdded), isCurrent);
 			}
 			return result;
 		});
-		return function(_x4, _x5, _x6, _x7) {
+		return function(_x5, _x6, _x7, _x8) {
 			return _ref3.apply(this, arguments);
 		};
 	}());
@@ -118,7 +118,7 @@ function VoucherCollectPage({ brand, context, products, loading, isActive, inven
 			if (increaseLimit(group, product) < 1) throw new Error(t("collectLimit"));
 			return addVoucherProduct(group, product, 1, isCurrent);
 		});
-		return function(_x8) {
+		return function(_x9) {
 			return _ref4.apply(this, arguments);
 		};
 	}());
@@ -152,16 +152,14 @@ function VoucherCollectPage({ brand, context, products, loading, isActive, inven
 				const row = (_buildVendingCatalog$2 = buildVendingCatalog([product], [], localized)[0]) === null || _buildVendingCatalog$2 === void 0 ? void 0 : _buildVendingCatalog$2.rows[0];
 				const currentItems = ((_ref5 = (_ticket$getTempOrder6 = ticket === null || ticket === void 0 || (_ticket$getTempOrder7 = ticket.getTempOrder) === null || _ticket$getTempOrder7 === void 0 ? void 0 : _ticket$getTempOrder7.call(ticket)) !== null && _ticket$getTempOrder6 !== void 0 ? _ticket$getTempOrder6 : context.cart.tempOrder) === null || _ref5 === void 0 ? void 0 : _ref5.products) || [];
 				if (!(row === null || row === void 0 ? void 0 : row.enabled) || inventoryFailed || inventoryRefreshing || (inventory === null || inventory === void 0 ? void 0 : inventory.selectionAvailability(product, 0, currentItems).availability.status) !== "ready") return;
-				const fresh = group.vouchers.filter((voucher) => freshIds.has(String(voucher.id)));
-				const allocated = new Set(group.items.flatMap(appliedProductVoucherIds));
-				const unused = fresh.filter((voucher) => !voucher.source.isManualSelect && !allocated.has(String(voucher.id)));
+				const unused = getRemainingProductVouchers(group, product).filter((voucher) => freshIds.has(String(voucher.id)) && !voucher.source.isManualSelect);
 				const quantity = Math.min(unused.length, increaseLimit(group, product, 0), isFreeVoucherProduct(product, 0) ? Math.max(0, group.quota - group.freeQuantity) : Infinity);
 				if (quantity > 0) {
 					const result = yield addVoucherProduct(group, buildVendingSkuProduct(row), quantity, isCurrent);
 					if (isCurrent() && result.status !== "added" && result.status !== "cancelled") throw new Error(t("catalogUpdateFailed"));
 				}
 			});
-			return function(_x9) {
+			return function(_x10) {
 				return _ref6.apply(this, arguments);
 			};
 		}());
@@ -213,10 +211,10 @@ function VoucherCollectPage({ brand, context, products, loading, isActive, inven
 						const result = yield addVoucherProduct(liveGroup, buildVendingSkuProduct(liveRow), delta, isCurrent);
 						if (isCurrent() && result.status !== "added" && result.status !== "cancelled") throw new Error(t("catalogUpdateFailed"));
 					} else {
-						var _getLiveGroups$find2;
-						const selectedBefore = ((_getLiveGroups$find2 = getLiveGroups().find((entry) => entry.key === group.key)) === null || _getLiveGroups$find2 === void 0 ? void 0 : _getLiveGroups$find2.selected) || 0;
+						var _getLiveGroups$find;
+						const selectedBefore = ((_getLiveGroups$find = getLiveGroups().find((entry) => entry.key === group.key)) === null || _getLiveGroups$find === void 0 ? void 0 : _getLiveGroups$find.selected) || 0;
 						yield context.cart.updateItemQuantity(item, Number(item.num) + delta);
-						if (isCurrent() && !free) yield restoreUnappliedVouchers(group.key, selectedBefore + delta, isCurrent);
+						if (isCurrent() && !free) yield restoreUnappliedVouchers(group.key, product, selectedBefore + delta, isCurrent);
 					}
 					return;
 				}
@@ -233,7 +231,7 @@ function VoucherCollectPage({ brand, context, products, loading, isActive, inven
 					yield context.cart.waitForCartConsistency();
 				}
 			});
-			return function(_x10) {
+			return function(_x11) {
 				return _ref9.apply(this, arguments);
 			};
 		}());
@@ -340,7 +338,7 @@ function VoucherCollectPage({ brand, context, products, loading, isActive, inven
 					product,
 					items: (order === null || order === void 0 ? void 0 : order.products) || [],
 					selectedItems: group.items,
-					remaining: group.remaining,
+					remaining: getRemainingProductVouchers(group, product).length,
 					inventory,
 					localize: localized
 				}),

package/es/components/vendingMachine/voucherRedemption.js

@@ -2,33 +2,15 @@ import { resolveLocalizedText } from "../../plus/salesSdk/utils/resolveLocalized
 import { enrichCartItem } from "../../plus/salesSdk/utils/enrich.js";
 import { buildVoucherViews } from "../../plus/saleDetail/components/PromotionWalletPanels/adapters.js";
 //#region src/components/vendingMachine/voucherRedemption.ts
-/** Stable rule identity; array ordering in the response is not a different voucher type. */
+/** Normalize selection details without depending on response ordering. */
 function canonical(value) {
 	if (Array.isArray(value)) return value.map(canonical).sort((a, b) => JSON.stringify(a).localeCompare(JSON.stringify(b)));
 	if (value && typeof value === "object") return Object.fromEntries(Object.keys(value).sort().map((key) => [key, canonical(value[key])]));
 	return value;
 }
 function voucherGroupKey(voucher) {
-	var _voucher$metadata, _voucher$holder;
-	const source = voucher.limited_relation_product_data || {};
-	const relation = {
-		type: source.type,
-		filter: source.filter,
-		product_ids: source.product_ids,
-		exclude_product_ids: source.exclude_product_ids,
-		product_collection_id: source.product_collection_id,
-		package_sub_item_usage_rules: source.package_sub_item_usage_rules
-	};
-	return JSON.stringify(canonical({
-		productId: voucher.product_id,
-		relation,
-		holder: (_voucher$metadata = voucher.metadata) === null || _voucher$metadata === void 0 ? void 0 : _voucher$metadata.holder,
-		holderId: (_voucher$holder = voucher.holder) === null || _voucher$holder === void 0 ? void 0 : _voucher$holder.holder_id,
-		rules: (voucher.extension_data || []).map((field) => ({
-			key: field.field_key,
-			value: field.value
-		}))
-	}));
+	const productId = voucher.product_id;
+	return JSON.stringify(productId == null || String(productId) === "" ? ["voucher", String(voucher.id)] : ["product", String(productId)]);
 }
 function isRedeemableVoucher(voucher) {
 	var _source$config;
@@ -64,13 +46,21 @@ function isFreeRedemptionItem(item) {
 	const price = item.selling_price;
 	return price != null && String(price).trim() !== "" && Number(price) === 0 && !((_item$discount_list = item.discount_list) === null || _item$discount_list === void 0 ? void 0 : _item$discount_list.length);
 }
+/** A merged group can contain instances with different eligible products. */
+function getRemainingProductVouchers(group, product) {
+	const used = new Set(group.items.flatMap(appliedProductVoucherIds));
+	return group.vouchers.filter((voucher) => !used.has(String(voucher.id)) && voucherAppliesToProduct(voucher.source, product));
+}
 function buildRedemptionGroups(current, products, items = []) {
 	const groups = /* @__PURE__ */ new Map();
 	const seen = /* @__PURE__ */ new Set();
+	const allocatedIds = new Set(items.flatMap(appliedProductVoucherIds));
+	const freeItems = items.filter(isFreeRedemptionItem);
 	for (const voucher of buildVoucherViews(current).filter(isRedeemableVoucher)) {
 		if (seen.has(String(voucher.id))) continue;
 		seen.add(String(voucher.id));
 		const source = voucher.source;
+		if (!products.some((product) => voucherAppliesToProduct(source, product)) && !allocatedIds.has(String(voucher.id)) && !freeItems.some((item) => voucherAppliesToProduct(source, { id: item.product_id }))) continue;
 		const key = voucherGroupKey(source);
 		let group = groups.get(key);
 		if (!group) {
@@ -84,7 +74,7 @@ function buildRedemptionGroups(current, products, items = []) {
 				freeQuantity: 0,
 				remaining: 0,
 				items: [],
-				products: products.filter((product) => voucherAppliesToProduct(source, product))
+				products: []
 			};
 			groups.set(key, group);
 		}
@@ -92,14 +82,15 @@ function buildRedemptionGroups(current, products, items = []) {
 		group.vouchers.push(voucher);
 		group.quota += 1;
 	}
-	const freeItems = new Set(items.filter(isFreeRedemptionItem));
+	const freeItemSet = new Set(freeItems);
 	for (const group of groups.values()) {
+		group.products = products.filter((product) => group.vouchers.some((voucher) => voucherAppliesToProduct(voucher.source, product)));
 		const ids = new Set(group.discountIds.map(String));
 		const used = /* @__PURE__ */ new Set();
 		group.items = items.filter((item) => {
 			const allocated = appliedProductVoucherIds(item).filter((id) => ids.has(id));
 			allocated.forEach((id) => used.add(id));
-			if (freeItems.has(item) && group.vouchers.some((voucher) => voucherAppliesToProduct(voucher.source, { id: item.product_id }))) {
+			if (freeItemSet.has(item) && group.vouchers.some((voucher) => voucherAppliesToProduct(voucher.source, { id: item.product_id }))) {
 				group.freeQuantity += Number(item.num || 0);
 				return true;
 			}
@@ -134,4 +125,4 @@ function redemptionRows(items, displayContext) {
 	return [...rows.values()];
 }
 //#endregion
-export { appliedProductVoucherIds, buildRedemptionGroups, isFreeRedemptionItem, mergeRedemptionVouchers, redemptionRows };
+export { appliedProductVoucherIds, buildRedemptionGroups, getRemainingProductVouchers, isFreeRedemptionItem, mergeRedemptionVouchers, redemptionRows };

package/es/pro/skuDetailModal/flow/registry.d.ts

@@ -37,7 +37,7 @@ declare const flowModuleRegistry: {
     Component: _$react.FC<FlowModuleProps<string>>;
     initializeWhileInactive: true;
     hardRequires: ("productData" | "booking.selectedCandidate")[];
-    refreshOn: ("quantity" | "productData" | "skuValue" | "booking.customerId" | "booking.duration" | "booking.selectedCandidate")[];
+    refreshOn: ("productData" | "skuValue" | "quantity" | "booking.customerId" | "booking.duration" | "booking.selectedCandidate")[];
     isApplicable: (context: _$_pisell_materials_src0.SelectionFlowContextValue<SelectionFlowDraft, SelectionFlowDraftUpdate, SelectionDraftField, string, SelectionFlowServices, unknown>) => boolean;
     canInitialize: (context: _$_pisell_materials_src0.SelectionFlowContextValue<SelectionFlowDraft, SelectionFlowDraftUpdate, SelectionDraftField, string, SelectionFlowServices, unknown>) => boolean;
     refresh: (context: SelectionFlowContextValue<string>, module: CompiledSelectionFlowModuleConfig<string>) => Promise<void>;
@@ -55,7 +55,7 @@ declare const flowModuleRegistry: {
     isSkippable: (context: _$_pisell_materials_src0.SelectionFlowContextValue<SelectionFlowDraft, SelectionFlowDraftUpdate, SelectionDraftField, string, SelectionFlowServices, unknown>) => any;
     provides: "booking.capacity"[];
     hardRequires: "productData"[];
-    refreshOn: ("quantity" | "productData" | "skuValue")[];
+    refreshOn: ("productData" | "skuValue" | "quantity")[];
     isApplicable: (context: _$_pisell_materials_src0.SelectionFlowContextValue<SelectionFlowDraft, SelectionFlowDraftUpdate, SelectionDraftField, string, SelectionFlowServices, unknown>) => boolean;
     canInitialize: () => true;
     refresh: (context: _$_pisell_materials_src0.SelectionFlowContextValue<SelectionFlowDraft, SelectionFlowDraftUpdate, SelectionDraftField, string, SelectionFlowServices, unknown>, module: _$_pisell_materials_src0.CompiledSelectionFlowModuleConfig<string>) => void;

package/lib/components/vendingMachine/README.md

@@ -124,6 +124,8 @@ Home 的 Redeem Socks 入口打开独立 `RedeemPage`，展示扫码指引、扫
 
 Sale 与 Redeem 共用同一购物车和实时券列表，券不按来源预留，也不注册 `productVoucherGroups` 或向商品附加 `productVoucherGroupKey`。兑换分组仅用于展示，已选和剩余数量按商品行实际 `good_pass` 抵扣记录统计；Apply、Unapply、登录资产变化后重新计算。Unapply 本身保留普通购物车行为；若用户随后在兑换页明确新增商品，可通过同一 `setDiscount` 操作重新启用对应券。兑换页的 Also buy something? 入口暂时隐藏；主按钮直接结算同一订单。
 
+零售兑换页按券的 `product_id` 合并展示，同一商品 ID 的数字和字符串形式归入同组，不按持有人、扩展字段或适用规则拆组；缺少商品 ID 的券按实例单独展示。组内可兑商品取各券适用范围的并集，每个商品的新增数量按尚未实际抵扣且适用于该商品的券数限制；本机无适用商品且无关联已选商品的券不计入额度。加购不预填持有人，实际抵扣仍保留各张券的实例 ID 和原有规则。此分组逻辑仅用于 vendingMachine，不改变普通销售、优惠钱包或底层抵扣规则。
+
 零价商品可在兑换页按普通免费商品加入购物车并正常结算、出货，不要求分配商品券。页面从实际零价且无折扣记录的订单行读取数量，支持加减和键盘修改；免费数量计入已选商品，不占用券额度，继续受实时库存限制。存在免费选择时，汇总分别展示已选商品数和剩余商品券数；多个券组匹配同一免费商品时共享数量，汇总只计一次。有价商品仍按实际 `good_pass` 分配统计，`pisell_os` 的抵扣规则保持原样。
 
 售货机购物车通过 `saleDetailModuleConfig.cartItems.renderProductLineItemStatus` 在 A12 右侧展示兑换印章：仅商品行实际分配了 `good_pass` 时替代价格、编辑和数量区域，保留原删除按钮及确认流程；Unapply 后恢复正常展示。印章由内联 SVG 绘制圆框、勾选和多语言文字，颜色跟随卡片主题色 `--pc-a12-accent`，保留倾斜样式，不依赖图片文件；以透明背景、不降低不透明度的水印形式相对右侧区域居中绝对定位，不撑高卡片、不拦截点击，删除按钮保持在上层。文字跟随页面语言，未提供的语言回退英文。此配置仅由 VendingSale 启用，普通 Kiosk、H5、POS 及 A12 的其它调用方保持原样；不改变订单金额或券分配逻辑。

package/lib/components/vendingMachine/VoucherCollectPage.js

@@ -57,14 +57,14 @@ function VoucherCollectPage({ brand, context, products, loading, isActive, inven
 		var _ticket$getDiscountLi, _ticket$getTempOrder3, _context$cart$tempOrd;
 		return require_voucherRedemption.buildRedemptionGroups((ticket === null || ticket === void 0 || (_ticket$getDiscountLi = ticket.getDiscountList) === null || _ticket$getDiscountLi === void 0 ? void 0 : _ticket$getDiscountLi.call(ticket)) || context.cart.discountList, products, (ticket === null || ticket === void 0 || (_ticket$getTempOrder3 = ticket.getTempOrder) === null || _ticket$getTempOrder3 === void 0 || (_ticket$getTempOrder3 = _ticket$getTempOrder3.call(ticket)) === null || _ticket$getTempOrder3 === void 0 ? void 0 : _ticket$getTempOrder3.products) || ((_context$cart$tempOrd = context.cart.tempOrder) === null || _context$cart$tempOrd === void 0 ? void 0 : _context$cart$tempOrd.products) || []);
 	});
-	const remaining = (0, ahooks.useMemoizedFn)((key) => {
-		var _getLiveGroups$find;
-		return ((_getLiveGroups$find = getLiveGroups().find((group) => group.key === key)) === null || _getLiveGroups$find === void 0 ? void 0 : _getLiveGroups$find.remaining) || 0;
+	const remaining = (0, ahooks.useMemoizedFn)((key, product) => {
+		const group = getLiveGroups().find((entry) => entry.key === key);
+		return group ? require_voucherRedemption.getRemainingProductVouchers(group, product).length : 0;
 	});
 	const restoreUnappliedVouchers = (0, ahooks.useMemoizedFn)(function() {
-		var _ref = require_asyncToGenerator._asyncToGenerator(function* (key, targetSelected, isCurrent) {
+		var _ref = require_asyncToGenerator._asyncToGenerator(function* (key, product, targetSelected, isCurrent) {
 			let group = getLiveGroups().find((item) => item.key === key);
-			const manuallyUnapplied = (group === null || group === void 0 ? void 0 : group.vouchers.filter((voucher) => voucher.source.isManualSelect)) || [];
+			const manuallyUnapplied = group ? require_voucherRedemption.getRemainingProductVouchers(group, product).filter((voucher) => voucher.source.isManualSelect) : [];
 			for (const voucher of manuallyUnapplied) {
 				if (!isCurrent() || !group || group.selected >= targetSelected) return;
 				yield context.cart.setDiscount({
@@ -74,7 +74,7 @@ function VoucherCollectPage({ brand, context, products, loading, isActive, inven
 				group = getLiveGroups().find((item) => item.key === key);
 			}
 		});
-		return function(_x, _x2, _x3) {
+		return function(_x, _x2, _x3, _x4) {
 			return _ref.apply(this, arguments);
 		};
 	}());
@@ -87,7 +87,7 @@ function VoucherCollectPage({ brand, context, products, loading, isActive, inven
 			var _variant$id;
 			const id = (_variant$id = variant.id) !== null && _variant$id !== void 0 ? _variant$id : variant.product_variant_id;
 			const stock = inventory.selectionAvailability(product, id, items);
-			const limit = freeSelection || require_voucherSkuSelection.isFreeVoucherProduct(product, id) ? Infinity : remaining(group.key);
+			const limit = freeSelection || require_voucherSkuSelection.isFreeVoucherProduct(product, id) ? Infinity : remaining(group.key, product);
 			return stock.availability.status === "ready" ? Math.min(stock.availableQuantity, limit) : 0;
 		}));
 	});
@@ -101,17 +101,17 @@ function VoucherCollectPage({ brand, context, products, loading, isActive, inven
 				quantity,
 				debounceMs: 0,
 				notShowToast: true,
-				getQuantityLimit: free ? void 0 : () => remaining(group.key),
-				initialHolderIds: group.vouchers[0] ? require_voucherProductAdd.resolveVoucherInitialHolderIds(group.vouchers[0]) : []
+				getQuantityLimit: free ? void 0 : () => remaining(group.key, product),
+				initialHolderIds: []
 			});
 			if (result.status === "added" && isCurrent() && !free) {
 				const after = getLiveGroups().find((item) => item.key === group.key);
 				const freeAdded = Math.max(0, ((after === null || after === void 0 ? void 0 : after.freeQuantity) || 0) - ((before === null || before === void 0 ? void 0 : before.freeQuantity) || 0));
-				yield restoreUnappliedVouchers(group.key, ((before === null || before === void 0 ? void 0 : before.selected) || 0) + Math.max(0, quantity - freeAdded), isCurrent);
+				yield restoreUnappliedVouchers(group.key, product, ((before === null || before === void 0 ? void 0 : before.selected) || 0) + Math.max(0, quantity - freeAdded), isCurrent);
 			}
 			return result;
 		});
-		return function(_x4, _x5, _x6, _x7) {
+		return function(_x5, _x6, _x7, _x8) {
 			return _ref3.apply(this, arguments);
 		};
 	}());
@@ -120,7 +120,7 @@ function VoucherCollectPage({ brand, context, products, loading, isActive, inven
 			if (increaseLimit(group, product) < 1) throw new Error(t("collectLimit"));
 			return addVoucherProduct(group, product, 1, isCurrent);
 		});
-		return function(_x8) {
+		return function(_x9) {
 			return _ref4.apply(this, arguments);
 		};
 	}());
@@ -154,16 +154,14 @@ function VoucherCollectPage({ brand, context, products, loading, isActive, inven
 				const row = (_buildVendingCatalog$2 = require_catalogModel.buildVendingCatalog([product], [], localized)[0]) === null || _buildVendingCatalog$2 === void 0 ? void 0 : _buildVendingCatalog$2.rows[0];
 				const currentItems = ((_ref5 = (_ticket$getTempOrder6 = ticket === null || ticket === void 0 || (_ticket$getTempOrder7 = ticket.getTempOrder) === null || _ticket$getTempOrder7 === void 0 ? void 0 : _ticket$getTempOrder7.call(ticket)) !== null && _ticket$getTempOrder6 !== void 0 ? _ticket$getTempOrder6 : context.cart.tempOrder) === null || _ref5 === void 0 ? void 0 : _ref5.products) || [];
 				if (!(row === null || row === void 0 ? void 0 : row.enabled) || inventoryFailed || inventoryRefreshing || (inventory === null || inventory === void 0 ? void 0 : inventory.selectionAvailability(product, 0, currentItems).availability.status) !== "ready") return;
-				const fresh = group.vouchers.filter((voucher) => freshIds.has(String(voucher.id)));
-				const allocated = new Set(group.items.flatMap(require_voucherRedemption.appliedProductVoucherIds));
-				const unused = fresh.filter((voucher) => !voucher.source.isManualSelect && !allocated.has(String(voucher.id)));
+				const unused = require_voucherRedemption.getRemainingProductVouchers(group, product).filter((voucher) => freshIds.has(String(voucher.id)) && !voucher.source.isManualSelect);
 				const quantity = Math.min(unused.length, increaseLimit(group, product, 0), require_voucherSkuSelection.isFreeVoucherProduct(product, 0) ? Math.max(0, group.quota - group.freeQuantity) : Infinity);
 				if (quantity > 0) {
 					const result = yield addVoucherProduct(group, require_catalogModel.buildVendingSkuProduct(row), quantity, isCurrent);
 					if (isCurrent() && result.status !== "added" && result.status !== "cancelled") throw new Error(t("catalogUpdateFailed"));
 				}
 			});
-			return function(_x9) {
+			return function(_x10) {
 				return _ref6.apply(this, arguments);
 			};
 		}());
@@ -215,10 +213,10 @@ function VoucherCollectPage({ brand, context, products, loading, isActive, inven
 						const result = yield addVoucherProduct(liveGroup, require_catalogModel.buildVendingSkuProduct(liveRow), delta, isCurrent);
 						if (isCurrent() && result.status !== "added" && result.status !== "cancelled") throw new Error(t("catalogUpdateFailed"));
 					} else {
-						var _getLiveGroups$find2;
-						const selectedBefore = ((_getLiveGroups$find2 = getLiveGroups().find((entry) => entry.key === group.key)) === null || _getLiveGroups$find2 === void 0 ? void 0 : _getLiveGroups$find2.selected) || 0;
+						var _getLiveGroups$find;
+						const selectedBefore = ((_getLiveGroups$find = getLiveGroups().find((entry) => entry.key === group.key)) === null || _getLiveGroups$find === void 0 ? void 0 : _getLiveGroups$find.selected) || 0;
 						yield context.cart.updateItemQuantity(item, Number(item.num) + delta);
-						if (isCurrent() && !free) yield restoreUnappliedVouchers(group.key, selectedBefore + delta, isCurrent);
+						if (isCurrent() && !free) yield restoreUnappliedVouchers(group.key, product, selectedBefore + delta, isCurrent);
 					}
 					return;
 				}
@@ -235,7 +233,7 @@ function VoucherCollectPage({ brand, context, products, loading, isActive, inven
 					yield context.cart.waitForCartConsistency();
 				}
 			});
-			return function(_x10) {
+			return function(_x11) {
 				return _ref9.apply(this, arguments);
 			};
 		}());
@@ -342,7 +340,7 @@ function VoucherCollectPage({ brand, context, products, loading, isActive, inven
 					product,
 					items: (order === null || order === void 0 ? void 0 : order.products) || [],
 					selectedItems: group.items,
-					remaining: group.remaining,
+					remaining: require_voucherRedemption.getRemainingProductVouchers(group, product).length,
 					inventory,
 					localize: localized
 				}),

package/lib/components/vendingMachine/voucherRedemption.js

@@ -2,33 +2,15 @@ const require_resolveLocalizedText = require("../../plus/salesSdk/utils/resolveL
 const require_enrich = require("../../plus/salesSdk/utils/enrich.js");
 const require_adapters = require("../../plus/saleDetail/components/PromotionWalletPanels/adapters.js");
 //#region src/components/vendingMachine/voucherRedemption.ts
-/** Stable rule identity; array ordering in the response is not a different voucher type. */
+/** Normalize selection details without depending on response ordering. */
 function canonical(value) {
 	if (Array.isArray(value)) return value.map(canonical).sort((a, b) => JSON.stringify(a).localeCompare(JSON.stringify(b)));
 	if (value && typeof value === "object") return Object.fromEntries(Object.keys(value).sort().map((key) => [key, canonical(value[key])]));
 	return value;
 }
 function voucherGroupKey(voucher) {
-	var _voucher$metadata, _voucher$holder;
-	const source = voucher.limited_relation_product_data || {};
-	const relation = {
-		type: source.type,
-		filter: source.filter,
-		product_ids: source.product_ids,
-		exclude_product_ids: source.exclude_product_ids,
-		product_collection_id: source.product_collection_id,
-		package_sub_item_usage_rules: source.package_sub_item_usage_rules
-	};
-	return JSON.stringify(canonical({
-		productId: voucher.product_id,
-		relation,
-		holder: (_voucher$metadata = voucher.metadata) === null || _voucher$metadata === void 0 ? void 0 : _voucher$metadata.holder,
-		holderId: (_voucher$holder = voucher.holder) === null || _voucher$holder === void 0 ? void 0 : _voucher$holder.holder_id,
-		rules: (voucher.extension_data || []).map((field) => ({
-			key: field.field_key,
-			value: field.value
-		}))
-	}));
+	const productId = voucher.product_id;
+	return JSON.stringify(productId == null || String(productId) === "" ? ["voucher", String(voucher.id)] : ["product", String(productId)]);
 }
 function isRedeemableVoucher(voucher) {
 	var _source$config;
@@ -64,13 +46,21 @@ function isFreeRedemptionItem(item) {
 	const price = item.selling_price;
 	return price != null && String(price).trim() !== "" && Number(price) === 0 && !((_item$discount_list = item.discount_list) === null || _item$discount_list === void 0 ? void 0 : _item$discount_list.length);
 }
+/** A merged group can contain instances with different eligible products. */
+function getRemainingProductVouchers(group, product) {
+	const used = new Set(group.items.flatMap(appliedProductVoucherIds));
+	return group.vouchers.filter((voucher) => !used.has(String(voucher.id)) && voucherAppliesToProduct(voucher.source, product));
+}
 function buildRedemptionGroups(current, products, items = []) {
 	const groups = /* @__PURE__ */ new Map();
 	const seen = /* @__PURE__ */ new Set();
+	const allocatedIds = new Set(items.flatMap(appliedProductVoucherIds));
+	const freeItems = items.filter(isFreeRedemptionItem);
 	for (const voucher of require_adapters.buildVoucherViews(current).filter(isRedeemableVoucher)) {
 		if (seen.has(String(voucher.id))) continue;
 		seen.add(String(voucher.id));
 		const source = voucher.source;
+		if (!products.some((product) => voucherAppliesToProduct(source, product)) && !allocatedIds.has(String(voucher.id)) && !freeItems.some((item) => voucherAppliesToProduct(source, { id: item.product_id }))) continue;
 		const key = voucherGroupKey(source);
 		let group = groups.get(key);
 		if (!group) {
@@ -84,7 +74,7 @@ function buildRedemptionGroups(current, products, items = []) {
 				freeQuantity: 0,
 				remaining: 0,
 				items: [],
-				products: products.filter((product) => voucherAppliesToProduct(source, product))
+				products: []
 			};
 			groups.set(key, group);
 		}
@@ -92,14 +82,15 @@ function buildRedemptionGroups(current, products, items = []) {
 		group.vouchers.push(voucher);
 		group.quota += 1;
 	}
-	const freeItems = new Set(items.filter(isFreeRedemptionItem));
+	const freeItemSet = new Set(freeItems);
 	for (const group of groups.values()) {
+		group.products = products.filter((product) => group.vouchers.some((voucher) => voucherAppliesToProduct(voucher.source, product)));
 		const ids = new Set(group.discountIds.map(String));
 		const used = /* @__PURE__ */ new Set();
 		group.items = items.filter((item) => {
 			const allocated = appliedProductVoucherIds(item).filter((id) => ids.has(id));
 			allocated.forEach((id) => used.add(id));
-			if (freeItems.has(item) && group.vouchers.some((voucher) => voucherAppliesToProduct(voucher.source, { id: item.product_id }))) {
+			if (freeItemSet.has(item) && group.vouchers.some((voucher) => voucherAppliesToProduct(voucher.source, { id: item.product_id }))) {
 				group.freeQuantity += Number(item.num || 0);
 				return true;
 			}
@@ -136,6 +127,7 @@ function redemptionRows(items, displayContext) {
 //#endregion
 exports.appliedProductVoucherIds = appliedProductVoucherIds;
 exports.buildRedemptionGroups = buildRedemptionGroups;
+exports.getRemainingProductVouchers = getRemainingProductVouchers;
 exports.isFreeRedemptionItem = isFreeRedemptionItem;
 exports.mergeRedemptionVouchers = mergeRedemptionVouchers;
 exports.redemptionRows = redemptionRows;

package/lib/pro/skuDetailModal/flow/registry.d.ts

@@ -37,7 +37,7 @@ declare const flowModuleRegistry: {
     Component: _$react.FC<FlowModuleProps<string>>;
     initializeWhileInactive: true;
     hardRequires: ("productData" | "booking.selectedCandidate")[];
-    refreshOn: ("quantity" | "productData" | "skuValue" | "booking.customerId" | "booking.duration" | "booking.selectedCandidate")[];
+    refreshOn: ("productData" | "skuValue" | "quantity" | "booking.customerId" | "booking.duration" | "booking.selectedCandidate")[];
     isApplicable: (context: _$_pisell_materials_src0.SelectionFlowContextValue<SelectionFlowDraft, SelectionFlowDraftUpdate, SelectionDraftField, string, SelectionFlowServices, unknown>) => boolean;
     canInitialize: (context: _$_pisell_materials_src0.SelectionFlowContextValue<SelectionFlowDraft, SelectionFlowDraftUpdate, SelectionDraftField, string, SelectionFlowServices, unknown>) => boolean;
     refresh: (context: SelectionFlowContextValue<string>, module: CompiledSelectionFlowModuleConfig<string>) => Promise<void>;
@@ -55,7 +55,7 @@ declare const flowModuleRegistry: {
     isSkippable: (context: _$_pisell_materials_src0.SelectionFlowContextValue<SelectionFlowDraft, SelectionFlowDraftUpdate, SelectionDraftField, string, SelectionFlowServices, unknown>) => any;
     provides: "booking.capacity"[];
     hardRequires: "productData"[];
-    refreshOn: ("quantity" | "productData" | "skuValue")[];
+    refreshOn: ("productData" | "skuValue" | "quantity")[];
     isApplicable: (context: _$_pisell_materials_src0.SelectionFlowContextValue<SelectionFlowDraft, SelectionFlowDraftUpdate, SelectionDraftField, string, SelectionFlowServices, unknown>) => boolean;
     canInitialize: () => true;
     refresh: (context: _$_pisell_materials_src0.SelectionFlowContextValue<SelectionFlowDraft, SelectionFlowDraftUpdate, SelectionDraftField, string, SelectionFlowServices, unknown>, module: _$_pisell_materials_src0.CompiledSelectionFlowModuleConfig<string>) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.12.370",
+  "version": "6.12.371",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -74,10 +74,10 @@
     "styled-components": "^6.0.0-rc.3",
     "use-sync-external-store": "^1.6.0",
     "@pisell/pi-payment-sdk": "0.0.4",
-    "@pisell/date-picker": "3.0.12",
+    "@pisell/utils": "3.0.7",
     "@pisell/materials": "6.12.88",
     "@pisell/icon": "0.0.11",
-    "@pisell/utils": "3.0.7"
+    "@pisell/date-picker": "3.0.12"
   },
   "peerDependencies": {
     "react": "^18.0.0",