@pisell/private-materials 6.12.374 → 6.12.375

package/lib/components/vendingMachine/README.md

@@ -32,7 +32,7 @@ Home 右上角参照 `webpos/beta` 的 HDLKiosk 提供地球图标与语言下
 
 购买列表和兑换列表的主按钮直接进入现有结账流程，不再先进入购物车确认页；购买列表的购物车按钮和金额入口可主动打开完整购物车，兑换列表底栏仅保留已选数量/额度摘要，不显示购物车按钮。支付返回到发起结账时的列表或购物车，保留本单选择。普通 Kiosk 同样支持列表直接结账，H5/PC 保留各自既有结账入口。共享 Kiosk 模板在所有平台移除结账前的“Do you have a coupon or card?”询问弹窗，手动打开优惠面板、扫码和输入优惠码的入口仍保留；登录、库存预检、零元确认与出货继续沿用原逻辑。
 
-购买列表与兑换列表通过内部 `useVendingCartInteraction` 共用防重复操作、扫码／支付锁检查、购物车同步等待、会话失效校验及忙碌状态上报。页面分别保留购买 SKU 库存判断和兑换券额度规则；自动选中与平铺规格选择同样不能绕过扫码、支付或订单切换锁。购买卡片的延迟进度提示保持不变。此 hook 仅由两个售货机列表使用，不接入普通 Kiosk、H5 或 POS。
+购买列表与兑换列表通过内部 `useVendingCartInteraction` 共用防重复操作、扫码／支付锁检查、购物车同步等待、会话失效校验及忙碌状态上报。页面分别保留购买 SKU 库存判断和兑换券额度规则；自动选中与平铺规格选择同样不能绕过扫码、支付或订单切换锁。购买卡片调整数量期间保留原数量文案，不显示延迟 Loading 提示；处理锁和无障碍忙碌状态仍保留。此 hook 仅由两个售货机列表使用，不接入普通 Kiosk、H5 或 POS。
 
 兑换页的自动选中、详情加购与平铺 SKU 选择共用内部 `addVoucherProduct`，统一商品数据清理、动态券额度、持有人参数和加购后的券恢复。平铺数量直接读取购物车，各次操作即时提交；失败或取消保留此前已成功的选择。入口扫码只向已有销售实例交接请求，初始化由首页准备流程负责。
 
@@ -44,7 +44,7 @@ Home 右上角参照 `webpos/beta` 的 HDLKiosk 提供地球图标与语言下
 
 购买卡片和兑换平铺选项均支持点击整块区域加一，包含独立的键盘可访问按钮；加减控件及数量区域不冒泡触发卡片加购。点击沿用加号的库存、可用状态和处理锁，兑换还受剩余券额度约束；兑换选择即时同步购物车，不再需要额外的确认或取消步骤。
 
-不可用 SKU 使用浅白色整卡遮罩，灰色邮戳式状态印章按整张卡片绝对居中，不因数量控件偏移；印章以矢量双圆环、倾斜字牌和波纹构成，文字随语言切换。仅库存状态 ready 且原始可售数量为 0 时显示 Sold Out，其它不可用情况显示 Unavailable。购物车已占满库存、券额度已用完分别提示 Limit reached、No redemptions left，均不显示遮罩；读取库存时显示 Loading。已选数量仍可减少或清零。
+不可用 SKU 使用浅白色整卡遮罩，灰色邮戳式状态印章按整张卡片绝对居中，不因数量控件偏移；印章以矢量双圆环、倾斜字牌和波纹构成，文字随语言切换。仅库存状态 ready 且原始可售数量为 0 时显示 Sold Out，其它不可用情况显示 Unavailable。购物车已占满库存时提示 Limit reached；券额度已用完时不显示 No redemptions left，仍禁止继续增加，且不显示遮罩。读取库存时显示 Loading。已选数量仍可减少或清零。
 
 宿主销售模块的 `otherParams.platform` 与 `otherParams.channel` 使用 `vending`，页面仍复用 `template="kiosk"`。共享自助场景判断支持 kiosk/vending，保留商品布局、客户验证、预约选择及零元订单完成方式；实际商品、定价与订单渠道保持 `vending`。需配套使用支持 vending 云端结账的 PisellOS；非零元使用独立支付页，售货机始终排除现金支付。
 
@@ -65,6 +65,8 @@ Home 的 Redeem Socks 入口打开独立 `RedeemPage`，展示扫码指引、扫
 
 宿主应提供稳定的服务回调引用。租户、业务、门店或设备变化会重置组件会话并取消旧队列订阅；单纯切换语言保留当前页面状态。出货全部成功后 30 秒返回 Idle，失败由用户主动返回；出货和结果页底部始终显示联系工作人员文案。
 
+出货交接时随订单快照保存本单是否来自兑换列表。兑换流程的出货失败或部分出货结果只提示工作人员协助，不显示 Your order is paid 或顶部的 Your payment is complete；普通购买仍保留付款完成文案。对应提示覆盖全部五种界面语言。
+
 单件结果可附带 `message`、`code` 和 `uncertain`。宿主无法确认物理出货结果时返回 `success: false, uncertain: true`；队列仍以 `failed` 标识已处理的非成功项，展示时单独标记为“需要核对”，不计入明确未出货数量、不启动成功倒计时。`message` 展示宿主提供的本地化原因。硬件调用、结果分类与是否重试由宿主管理，物料不调用原生插件。
 
 队列快照可附带 `inventorySync`（`syncing / synced / review`），独立于物理出货结果。宿主汇总扣库存后可更新此状态；待核对时结果页提示工作人员处理，但不会改变成功件数或重新启动 30 秒倒计时。物料不发起扣库存或自动补偿。

package/lib/components/vendingMachine/VendingCatalog.js

@@ -37,13 +37,6 @@ function VendingCatalog({ brand, context, products, loading, isActive, inventory
 		onBusyChange,
 		errorMessage: t("catalogUpdateFailed")
 	});
-	const [showMutationProgress, setShowMutationProgress] = (0, react.useState)(false);
-	(0, react.useEffect)(() => {
-		setShowMutationProgress(false);
-		if (!mutatingRowKey) return;
-		const timer = setTimeout(() => setShowMutationProgress(true), 200);
-		return () => clearTimeout(timer);
-	}, [mutatingRowKey]);
 	const ticket = context.sales.bookingTicket;
 	const productsRef = (0, react.useRef)(products);
 	productsRef.current = products;
@@ -199,7 +192,7 @@ function VendingCatalog({ brand, context, products, loading, isActive, inventory
 			}), /* @__PURE__ */ react.default.createElement("div", { className: "vm-catalog-card-heading" }, /* @__PURE__ */ react.default.createElement(Heading, null, label), /* @__PURE__ */ react.default.createElement("strong", null, require_index$1.formatTempOrderSettlementAmount(order, row.price))), showStatusOverlay && /* @__PURE__ */ react.default.createElement(require_SkuStatusOverlay.default, { label: t(soldOut ? "catalogSoldOut" : "catalogUnavailableLabel") }), checkingStock && /* @__PURE__ */ react.default.createElement("span", {
 				className: "vm-catalog-stock-loading",
 				role: "status"
-			}, t("loading")), (!unavailable || row.quantity > 0) && /* @__PURE__ */ react.default.createElement("div", { className: "vm-catalog-quantity" }, /* @__PURE__ */ react.default.createElement("span", null, showMutationProgress && mutatingRowKey === row.key ? t("loading") : limitReached ? t("catalogLimitReached") : t(row.quantity > 0 ? "catalogAdded" : "catalogQuantity")), /* @__PURE__ */ react.default.createElement("div", {
+			}, t("loading")), (!unavailable || row.quantity > 0) && /* @__PURE__ */ react.default.createElement("div", { className: "vm-catalog-quantity" }, /* @__PURE__ */ react.default.createElement("span", null, limitReached ? t("catalogLimitReached") : t(row.quantity > 0 ? "catalogAdded" : "catalogQuantity")), /* @__PURE__ */ react.default.createElement("div", {
 				role: "group",
 				"aria-label": name,
 				"aria-disabled": busy,

package/lib/components/vendingMachine/VendingSale.js

@@ -25,7 +25,7 @@ const RESULT_RETURN_SECONDS = 30;
 const DEFAULT_HOME_IDLE_TIMEOUT_MS = 3e4;
 const SALE_DETAIL_MODULE_CONFIG = { cartItems: { renderProductLineItemStatus: require_VoucherRedemptionStamp.renderVendingCartItemStatus } };
 function VendingSale({ context, sales, fulfillment, blockNavigation, scanSource, scanEnabled = true, isActive = true, isVisible = true, idleRequest = 0, homeIdleTimeoutMs = DEFAULT_HOME_IDLE_TIMEOUT_MS, onHomePageActiveChange, onLocaleChange, brand, subtitle, machine, onRequestSettings, onRequestStaff, onPrerenderComplete, className, style }) {
-	var _scan$pending2;
+	var _scan$pending2, _sale$snapshot, _sale$isRedemption;
 	const { text: t } = require_locales.useVendingLocale();
 	const themeStyle = require_useVendingTheme.default();
 	const toast = (0, _pisell_materials.useToast)();
@@ -329,6 +329,10 @@ function VendingSale({ context, sales, fulfillment, blockNavigation, scanSource,
 	}, [onPrerenderComplete]);
 	const onPaidCheckout = (0, react.useCallback)((payload) => {
 		const snapshot = (0, lodash.cloneDeep)(payload);
+		const completedSale = {
+			snapshot,
+			isRedemption: catalogView === "vouchers"
+		};
 		const saleContext = require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, context), {}, { businessCode: payload.businessCode || context.businessCode });
 		const isCurrentScope = () => mounted.current && active.current && isCurrentContext(context);
 		return require_asyncToGenerator._asyncToGenerator(function* () {
@@ -337,7 +341,7 @@ function VendingSale({ context, sales, fulfillment, blockNavigation, scanSource,
 				var _unsubscribeJob$curre3;
 				if (!(yield shouldDispenseAfterSale(saleContext))) return false;
 				if (!isCurrentScope()) return true;
-				setSale(snapshot);
+				setSale(completedSale);
 				setProgress(null);
 				setDispenseError(false);
 				setStage("dispense");
@@ -360,7 +364,7 @@ function VendingSale({ context, sales, fulfillment, blockNavigation, scanSource,
 				update(nextJob.getSnapshot());
 			} catch (_unused) {
 				if (isCurrentScope()) {
-					setSale(snapshot);
+					setSale(completedSale);
 					setDispenseError(true);
 					setStage("result");
 				}
@@ -368,6 +372,7 @@ function VendingSale({ context, sales, fulfillment, blockNavigation, scanSource,
 			return true;
 		})();
 	}, [
+		catalogView,
 		context,
 		isCurrentContext,
 		setIdlePaused,
@@ -588,7 +593,8 @@ function VendingSale({ context, sales, fulfillment, blockNavigation, scanSource,
 		}
 	})), isFulfillment && /* @__PURE__ */ react.default.createElement(require_CustomerScreens.CustomerViewport, null, /* @__PURE__ */ react.default.createElement(require_DispensePage.default, {
 		brand,
-		sale,
+		sale: (_sale$snapshot = sale === null || sale === void 0 ? void 0 : sale.snapshot) !== null && _sale$snapshot !== void 0 ? _sale$snapshot : null,
+		isRedemption: (_sale$isRedemption = sale === null || sale === void 0 ? void 0 : sale.isRedemption) !== null && _sale$isRedemption !== void 0 ? _sale$isRedemption : false,
 		progress,
 		error: dispenseError,
 		stage,

package/lib/components/vendingMachine/VoucherSkuList.js

@@ -24,6 +24,7 @@ function VoucherSkuList({ choices, busy, disabled, blocked, inventoryRefreshing,
 		}, group.label && /* @__PURE__ */ react.default.createElement("legend", { className: "vm-voucher-sku-group-title" }, group.dimensionName && /* @__PURE__ */ react.default.createElement("span", { className: "vm-sku-group-dimension" }, group.dimensionName), /* @__PURE__ */ react.default.createElement("h3", null, group.label)), /* @__PURE__ */ react.default.createElement("div", { className: "vm-voucher-sku-options" }, group.rows.map(({ row, label }) => {
 			const { quantity, maxQuantity, available, soldOut, loading, limitReason } = choicesByKey.get(row.key);
 			const checkingStock = inventoryRefreshing || loading;
+			const statusText = checkingStock ? t("loading") : limitReason === "stock" ? t("catalogLimitReached") : null;
 			const showStatusOverlay = (!available || soldOut) && !checkingStock;
 			const canIncrease = !disabled && !blocked && !checkingStock && available && !soldOut && quantity < maxQuantity;
 			const Heading = group.label ? "h4" : "h3";
@@ -50,9 +51,9 @@ function VoucherSkuList({ choices, busy, disabled, blocked, inventoryRefreshing,
 				"aria-hidden": "true"
 			}), /* @__PURE__ */ react.default.createElement("div", { className: "vm-voucher-sku-label" }, /* @__PURE__ */ react.default.createElement(Heading, null, label), !group.label && row.specification && label !== row.specification && /* @__PURE__ */ react.default.createElement("p", null, row.specification), /* @__PURE__ */ react.default.createElement("p", {
 				className: "vm-voucher-sku-status",
-				role: checkingStock || limitReason ? "status" : void 0,
-				"aria-hidden": !checkingStock && !limitReason
-			}, checkingStock ? t("loading") : limitReason ? t(limitReason === "voucher" ? "collectQuotaReached" : "catalogLimitReached") : null)), showStatusOverlay && /* @__PURE__ */ react.default.createElement(require_SkuStatusOverlay.default, { label: t(soldOut ? "catalogSoldOut" : "catalogUnavailableLabel") }), /* @__PURE__ */ react.default.createElement("div", {
+				role: statusText ? "status" : void 0,
+				"aria-hidden": !statusText
+			}, statusText)), showStatusOverlay && /* @__PURE__ */ react.default.createElement(require_SkuStatusOverlay.default, { label: t(soldOut ? "catalogSoldOut" : "catalogUnavailableLabel") }), /* @__PURE__ */ react.default.createElement("div", {
 				className: `vm-voucher-sku-quantity${showStatusOverlay && quantity === 0 ? " is-hidden" : ""}`,
 				role: "group",
 				"aria-label": row.label,

package/lib/components/vendingMachine/locales.d.ts

@@ -215,6 +215,8 @@ declare const en: {
   partial: string;
   partialDescription: string;
   postPaymentError: string;
+  redemptionPartialDescription: string;
+  redemptionCollectionError: string;
   summary: string;
   returning: string;
   itemNumber: string;

package/lib/components/vendingMachine/locales.js

@@ -113,7 +113,7 @@ const en = {
 	scanPreparingHint: "Please wait. The shopping page will open automatically.",
 	scanPrepareFailed: "Unable to open the shopping page",
 	scanPrepareFailedHint: "Please try again, or go back to start over.",
-	scanResolveFailed: "the code is invalid",
+	scanResolveFailed: "The code is invalid",
 	scanProcessing: "Processing…",
 	scanNoVouchers: "No valid product vouchers were found.",
 	scanVoucherNotStarted: "Your product vouchers are not valid yet.",
@@ -216,6 +216,8 @@ const en = {
 	partial: "Some items need attention",
 	partialDescription: "Your payment is complete. A staff member can help with the remaining items.",
 	postPaymentError: "Your order is paid. Please contact a staff member to complete collection.",
+	redemptionPartialDescription: "A staff member can help with the remaining items.",
+	redemptionCollectionError: "Please contact a staff member to complete collection.",
 	summary: "{success} dispensed · {failed} not dispensed",
 	returning: "Back to start in {seconds}s",
 	itemNumber: "Item {number}",
@@ -443,6 +445,8 @@ const translations = {
 		partial: "部分商品需要工作人员协助",
 		partialDescription: "订单已支付，请联系工作人员处理未出货的商品。",
 		postPaymentError: "订单已支付，请联系工作人员协助取货。",
+		redemptionPartialDescription: "请联系工作人员处理未出货的商品。",
+		redemptionCollectionError: "请联系工作人员协助取货。",
 		summary: "成功 {success} 件 · 未出货 {failed} 件",
 		returning: "{seconds} 秒后返回首页",
 		itemNumber: "第 {number} 件",
@@ -668,6 +672,8 @@ const translations = {
 		partial: "部分商品需要工作人員協助",
 		partialDescription: "訂單已付款，請聯絡工作人員處理未出貨的商品。",
 		postPaymentError: "訂單已付款，請聯絡工作人員協助取貨。",
+		redemptionPartialDescription: "請聯絡工作人員處理未出貨的商品。",
+		redemptionCollectionError: "請聯絡工作人員協助取貨。",
 		summary: "成功 {success} 件 · 未出貨 {failed} 件",
 		returning: "{seconds} 秒後返回首頁",
 		itemNumber: "第 {number} 件",
@@ -893,6 +899,8 @@ const translations = {
 		partial: "スタッフの確認が必要です",
 		partialDescription: "お支払いは完了しています。未排出の商品についてスタッフにお問い合わせください。",
 		postPaymentError: "お支払いは完了しています。スタッフにお問い合わせください。",
+		redemptionPartialDescription: "未排出の商品についてスタッフにお問い合わせください。",
+		redemptionCollectionError: "スタッフにお問い合わせください。",
 		summary: "排出済み {success} 点 · 未排出 {failed} 点",
 		returning: "{seconds} 秒後にホームに戻ります",
 		itemNumber: "商品 {number}",
@@ -1118,6 +1126,8 @@ const translations = {
 		partial: "Alguns produtos precisam de atenção",
 		partialDescription: "O pagamento foi concluído. Procure um funcionário para os produtos restantes.",
 		postPaymentError: "Seu pedido está pago. Procure um funcionário para concluir a retirada.",
+		redemptionPartialDescription: "Procure um funcionário para os produtos restantes.",
+		redemptionCollectionError: "Procure um funcionário para concluir a retirada.",
 		summary: "{success} entregues · {failed} não entregues",
 		returning: "Voltando ao início em {seconds}s",
 		itemNumber: "Item {number}",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.12.374",
+  "version": "6.12.375",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -76,8 +76,8 @@
     "@pisell/pi-payment-sdk": "0.0.4",
     "@pisell/utils": "3.0.7",
     "@pisell/materials": "6.12.88",
-    "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "3.0.12"
+    "@pisell/date-picker": "3.0.12",
+    "@pisell/icon": "0.0.11"
   },
   "peerDependencies": {
     "react": "^18.0.0",

package/es/plus/pisellReservation/index.js

@@ -1,17 +0,0 @@
-import "./serve/formResourcePage.js";
-import "./floorRoomCard/mapRowToFloorRoomCardData.js";
-import "./floorRoomCard/ReservationFloorRoomCard.js";
-import "./floorMap/reservationMock.js";
-import "./floorMap/floorPlanApi.js";
-import "./reservationConstants.js";
-import "./data/bookingToReservationTables.js";
-import "./data/formResourceToReservationTables.js";
-import "./data/salesEmbeddedResourceToTableRows.js";
-import "./floorMap/reservationCards.js";
-import "./PisellReservation.js";
-import "./PisellReservationBookingPage.js";
-import "./PisellVenueControlPage.js";
-import "./PisellVenueWallPage.js";
-import "./PisellReservationTablePage.js";
-import "./components/SelectFloorMapResourceDialog.js";
-export {};

package/es/plus/salesSdk/index.js

@@ -1,54 +0,0 @@
-import "./hosts/createInstanceHostBridge.js";
-import "./holderConfirm/createHolderConfirmBridge.js";
-import "./giftSelect/createGiftSelectBridge.js";
-import "./context/SalesSdkHostBridgesContext.js";
-import "./utils/formatHolderOptions.js";
-import "./utils/enrichCartLineHolderDisplay.js";
-import "./context/SalesSdkHolderContext.js";
-import "../multiCurrencySettlement/index.js";
-import "./utils/customerAuthGate.js";
-import "./context/SalesSdkBusinessAvailabilityContext.js";
-import "./utils/appendPromotionTags.js";
-import "./utils/productSkuOptions.js";
-import "./context/SalesSdkUIHostsContext.js";
-import "./utils/runAddProductFlow.js";
-import "./components/showAddToCartToast.js";
-import "./utils/resolveAddProductDebounceKey.js";
-import "./utils/identity.js";
-import "./utils/resolveInCartQuantityForAddToast.js";
-import "./utils/addProductWithFlowDebounced.js";
-import "./utils/bookingDate.js";
-import "./utils/holderSubmitValidation.js";
-import "./utils/removeOrderProducts.js";
-import "./selectors.js";
-import "./utils/enrich.js";
-import "./giftSelect/createOpenGiftSelectHost.js";
-import "./utils/ensureHoldersBeforeSubmit.js";
-import "./hooks/useSalesSdk.js";
-import "./bookingEditService/BookingEditServiceDrawer.js";
-import "./hosts/BookingEditHostRenderer.js";
-import "./hosts/CustomerAuthHostRenderer.js";
-import "./hooks/useSalesSdkCart.js";
-import "./hooks/useSalesSdkCustomer.js";
-import "./normalProductDetail/NormalProductDetailHostRenderer.js";
-import "./hosts/createOpenBookingEditHost.js";
-import "./hosts/createOpenMultiDaySelectHost.js";
-import "./hosts/createOpenHolderSelectHost.js";
-import "./hosts/createOpenCustomerAuthHost.js";
-import "./demo/hosts/legacyOpenProductDetail.js";
-import "./hosts/createCompositeOpenProductDetailHost.js";
-import "./normalProductDetail/createOpenNormalProductDetailHost.js";
-import "./normalProductDetail/createOpenBookingSelectionFlowHost.js";
-import "./giftSelect/GiftSelectModal.js";
-import "./giftSelect/GiftSelectHostRenderer.js";
-import "./allergy/AllergySelectionModal.js";
-import "./context/SalesSdkProvider.js";
-import "./context/SalesSdkDishContext.js";
-import "./context/SalesSdkBookingContext.js";
-import "./hooks/useSalesSdkSummary.js";
-import "./hooks/useSalesSdkProducts.js";
-import "./demo/index.js";
-import "./hooks/useSalesSdkDish.js";
-import "./hooks/useCurrentSalesSdkDish.js";
-import "./hooks/useSyncOsModule.js";
-export {};