@pisell/private-materials 6.12.181 → 6.12.182

package/lib/components/HDLKiosk/slices/payment/view.js

@@ -54,14 +54,14 @@ function createPaymentFeedback(snapshot, sales) {
 	};
 }
 function createCheckoutScreenModel(snapshot, sales, payment, completed = false, resetting = false, sourceData, paymentResult) {
-	var _sourceSummary$amount;
+	var _ref, _sourceData$amountDue;
 	const tempOrder = completed ? void 0 : sourceData === null || sourceData === void 0 ? void 0 : sourceData.tempOrder;
 	const completedOrder = completed ? sourceData === null || sourceData === void 0 ? void 0 : sourceData.completedOrder : void 0;
 	const sourceSummary = completed ? void 0 : sourceData === null || sourceData === void 0 ? void 0 : sourceData.summary;
 	const paymentSafeToChange = sales.payment.status === "idle" || sales.payment.status === "failed";
 	const interactionAvailable = !completed && !resetting && snapshot.status === "idle" && paymentSafeToChange;
 	const noPaymentRequired = !completed && require_utils.isZeroCheckoutDue(sales);
-	const sourceAmountDue = (_sourceSummary$amount = sourceSummary === null || sourceSummary === void 0 ? void 0 : sourceSummary.amount_gap) !== null && _sourceSummary$amount !== void 0 ? _sourceSummary$amount : sourceSummary === null || sourceSummary === void 0 ? void 0 : sourceSummary.expect_amount;
+	const sourceAmountDue = (_ref = (_sourceData$amountDue = sourceData === null || sourceData === void 0 ? void 0 : sourceData.amountDue) !== null && _sourceData$amountDue !== void 0 ? _sourceData$amountDue : sourceSummary === null || sourceSummary === void 0 ? void 0 : sourceSummary.amount_gap) !== null && _ref !== void 0 ? _ref : sourceSummary === null || sourceSummary === void 0 ? void 0 : sourceSummary.expect_amount;
 	const sourceCurrencySymbol = tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.currency_symbol;
 	const totalText = sales.summary.status === "ready" ? require_utils.formatCurrencyAmount(sales.summary.due, sales.summary.currencySymbol) : sourceAmountDue !== void 0 && sourceAmountDue !== null ? require_utils.formatCurrencyAmount(sourceAmountDue, sourceCurrencySymbol) : void 0;
 	return Object.freeze({

package/lib/components/HDLKiosk/ui/HDLKioskWorkflowView.js

@@ -44,11 +44,14 @@ function HDLKioskWorkflowCartOverlay({ model, busy, memberAction, send, renderCa
 		} : void 0
 	});
 }
-function HDLKioskWorkflowBlockingSurface({ snapshot, title, description, reference, hideBottomBar = false }) {
+function HDLKioskWorkflowBlockingSurface({ snapshot, title, description, reference, hideBottomBar = false, actionLabel, actionBusy = false, onAction }) {
 	return /* @__PURE__ */ react.default.createElement(require_index$4.HDLKioskShell, { snapshot }, /* @__PURE__ */ react.default.createElement(require_index$5.HDLKioskBottomBarHost, { mode: hideBottomBar ? "hidden" : void 0 }, /* @__PURE__ */ react.default.createElement(require_index$1.HDLKioskHeader, null), /* @__PURE__ */ react.default.createElement("main", { className: "hdl-shell__main" }, /* @__PURE__ */ react.default.createElement(require_index$6.BlockingNotice, {
 		title,
 		description,
-		reference
+		reference,
+		actionLabel,
+		actionBusy,
+		onAction
 	}))));
 }
 /**
@@ -126,6 +129,9 @@ function HDLKioskWorkflowView({ session, host, sales, config, isActive, returnin
 	const returnFromPaymentConflict = (0, react.useCallback)(() => {
 		returnToEntry("payment-order-conflict");
 	}, [returnToEntry]);
+	const recoverToEntry = (0, react.useCallback)(() => {
+		returnToEntry(snapshot.status === "blocked" ? "blocked-recovery" : "reset-retry");
+	}, [returnToEntry, snapshot.status]);
 	const customer = require_useHDLKioskCustomerController.useHDLKioskCustomerController({
 		session,
 		snapshot,
@@ -198,7 +204,10 @@ function HDLKioskWorkflowView({ session, host, sales, config, isActive, returnin
 		snapshot,
 		title: _pisell_utils.locales.getText("pisell2.hdl-kiosk.reset-failed-title"),
 		description: _pisell_utils.locales.getText("pisell2.hdl-kiosk.reset-failed-description"),
-		reference: returnError.traceId
+		reference: returnError.traceId,
+		actionLabel: _pisell_utils.locales.getText(returning ? "pisell2.hdl-kiosk.resetting-order" : "pisell2.hdl-kiosk.back-home"),
+		actionBusy: returning,
+		onAction: recoverToEntry
 	});
 	if (snapshot.status === "blocked") {
 		var _snapshot$lastError;
@@ -207,7 +216,10 @@ function HDLKioskWorkflowView({ session, host, sales, config, isActive, returnin
 			title: _pisell_utils.locales.getText("pisell2.hdl-kiosk.blocked-title"),
 			description: _pisell_utils.locales.getText("pisell2.hdl-kiosk.blocked-description"),
 			reference: (_snapshot$lastError = snapshot.lastError) === null || _snapshot$lastError === void 0 ? void 0 : _snapshot$lastError.traceId,
-			hideBottomBar: true
+			hideBottomBar: true,
+			actionLabel: _pisell_utils.locales.getText(returning ? "pisell2.hdl-kiosk.resetting-order" : "pisell2.hdl-kiosk.back-home"),
+			actionBusy: returning,
+			onAction: recoverToEntry
 		});
 	}
 	if (paymentOrderConflict) return /* @__PURE__ */ react.default.createElement(require_index$4.HDLKioskShell, { snapshot }, /* @__PURE__ */ react.default.createElement(require_index$5.HDLKioskBottomBarHost, { mode: "hidden" }, /* @__PURE__ */ react.default.createElement(require_index$1.HDLKioskHeader, null), /* @__PURE__ */ react.default.createElement("main", { className: "hdl-shell__main" }, /* @__PURE__ */ react.default.createElement(require_index$7.PaymentConflictNotice, {

package/lib/components/HDLKiosk/utils.js

@@ -48,7 +48,7 @@ function isMergedSourceBookingLine(line, product) {
 }
 /** 直接从 sourceData 就近派生 UI 所需字段，不经过 Host 或 Template DTO。 */
 function createSourceDataSalesView(sourceData) {
-	var _sourceData$cartItems, _tempOrder$payment_st, _tempOrder$currency_c, _tempOrder$currency_s, _summary$total_amount, _ref9, _summary$amount_gap, _customer$id, _tempOrder$order_id, _sourceData$salesStat, _summary$product_quan;
+	var _sourceData$cartItems, _tempOrder$payment_st, _tempOrder$currency_c, _tempOrder$currency_s, _summary$total_amount, _ref9, _ref10, _sourceData$amountDue, _customer$id, _tempOrder$order_id, _sourceData$salesStat, _summary$product_quan;
 	const lines = Object.freeze(((_sourceData$cartItems = sourceData === null || sourceData === void 0 ? void 0 : sourceData.cartItems) !== null && _sourceData$cartItems !== void 0 ? _sourceData$cartItems : []).map((rawLine) => {
 		var _ref2, _ref3, _rawLine$_extend$disp, _rawLine$_extend, _product$_extend5, _product$product_sku$, _product$product_sku2, _product$product_sku$2, _product$product_sku3, _ref4, _product$product_sku$3, _product$product_sku4, _product$total, _ref5, _product$image_url, _product$image, _product$main_image, _ref6, _product$product_id2, _ref7, _ref8, _product$title, _rawLine$_extend2;
 		const product = readSourceProduct(rawLine);
@@ -84,7 +84,7 @@ function createSourceDataSalesView(sourceData) {
 		currency: String((_tempOrder$currency_c = tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.currency_code) !== null && _tempOrder$currency_c !== void 0 ? _tempOrder$currency_c : ""),
 		currencySymbol: String((_tempOrder$currency_s = tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.currency_symbol) !== null && _tempOrder$currency_s !== void 0 ? _tempOrder$currency_s : ""),
 		total: String((_summary$total_amount = summary.total_amount) !== null && _summary$total_amount !== void 0 ? _summary$total_amount : 0),
-		due: String((_ref9 = (_summary$amount_gap = summary.amount_gap) !== null && _summary$amount_gap !== void 0 ? _summary$amount_gap : summary.expect_amount) !== null && _ref9 !== void 0 ? _ref9 : 0)
+		due: String((_ref9 = (_ref10 = (_sourceData$amountDue = sourceData === null || sourceData === void 0 ? void 0 : sourceData.amountDue) !== null && _sourceData$amountDue !== void 0 ? _sourceData$amountDue : summary.amount_gap) !== null && _ref10 !== void 0 ? _ref10 : summary.expect_amount) !== null && _ref9 !== void 0 ? _ref9 : 0)
 	} : { status: "missing" };
 	const customerId = String((_customer$id = customer === null || customer === void 0 ? void 0 : customer.id) !== null && _customer$id !== void 0 ? _customer$id : "");
 	const fingerprint = [

package/lib/components/bigSale/templates/HDLKiosk/index.js

@@ -5,6 +5,7 @@ const require_serve = require("../../../ticketBooking/serve.js");
 const require_locales = require("../../../HDLKiosk/locales.js");
 const require_index = require("../../../HDLKiosk/index.js");
 const require_config = require("../../../HDLKiosk/app/contracts/config.js");
+const require_transactionState = require("./utils/transactionState.js");
 const require_useBigSaleHDLKioskAdapter = require("./hooks/useBigSaleHDLKioskAdapter.js");
 const require_useHDLKioskEntryPreparationToast = require("./hooks/useHDLKioskEntryPreparationToast.js");
 const require_HDLKioskPaymentRuntime = require("./payment/HDLKioskPaymentRuntime.js");
@@ -138,6 +139,7 @@ function HDLKioskBigSaleTemplate({ isActive = true, context, businessCode, local
 			cartItems: (_context$cart$display = context.cart.displayLines) !== null && _context$cart$display !== void 0 ? _context$cart$display : context.cart.items,
 			customer: context.customer.selected,
 			summary: context.summary.summary,
+			amountDue: require_transactionState.resolveBigSaleCurrentAmountDue(context),
 			salesStatus: context.sales.status,
 			cartConsistencyPending: context.cart.consistencyPending
 		},

package/lib/components/bigSale/templates/HDLKiosk/payment/HDLKioskPaymentRuntime.js

@@ -34,7 +34,7 @@ function asKioskMethod(method) {
 	});
 }
 function currentAmount(context) {
-	const amount = require_transactionState.resolveBigSaleCheckoutAmountDue(context);
+	const amount = require_transactionState.resolveBigSaleCurrentAmountDue(context);
 	return typeof amount === "number" && Number.isFinite(amount) && amount > 0 ? amount : 0;
 }
 function HDLKioskPaymentRuntime({ context, controllerRef, onPaymentResultChange }) {

package/lib/components/bigSale/templates/HDLKiosk/payment/noPaymentOrder.js

@@ -23,7 +23,7 @@ function completeBigSaleNoPaymentOrder(_x) {
 function _completeBigSaleNoPaymentOrder() {
 	_completeBigSaleNoPaymentOrder = require_asyncToGenerator._asyncToGenerator(function* ({ context, signal, onCompleted }) {
 		var _data$payment_status;
-		if (require_transactionState.resolveBigSaleCheckoutAmountDue(context) !== 0) return require_normalize.failed("noPaymentAmountInvalid", "back");
+		if (require_transactionState.resolveBigSaleCurrentAmountDue(context) !== 0) return require_normalize.failed("noPaymentAmountInvalid", "back");
 		if (signal.aborted) return {
 			status: "cancelled",
 			reason: "noPaymentAbortedBeforeDispatch"

package/lib/components/bigSale/templates/HDLKiosk/utils/transactionState.js

@@ -17,8 +17,12 @@ function finiteMoney(value) {
 	const amount = Number(value);
 	return Number.isFinite(amount) ? value : void 0;
 }
-/** 与 BigSale Checkout 共用 OS 金额语义，优先使用 BaseSales 当前支付阶段 amountGap。 */
-function resolveBigSaleCheckoutAmountDue(context) {
+/**
+* 解析 HDLKiosk 当前临时订单的实时应付金额。
+* 仅用于提交前 To Pay、Payment Amount Due、支付入口和零元门禁；正式提交返回的
+* order_wait_pay_amount 只负责结果一致性确认，不能反向成为 Kiosk 展示状态。
+*/
+function resolveBigSaleCurrentAmountDue(context) {
 	var _context$summary$summ, _context$sales$bookin, _context$sales$bookin2, _finiteMoney;
 	const liveOrder = resolveBigSaleLiveTempOrder(context);
 	const summary = (_context$summary$summ = context.summary.summary) !== null && _context$summary$summ !== void 0 ? _context$summary$summ : liveOrder === null || liveOrder === void 0 ? void 0 : liveOrder.summary;
@@ -106,7 +110,7 @@ function projectBigSaleTransactionState(context, observationId = 0) {
 	const rawLines = (_context$cart$display = context.cart.displayLines) !== null && _context$cart$display !== void 0 ? _context$cart$display : context.cart.items;
 	const lines = Object.freeze(rawLines.map(projectBigSaleCartLine).filter((line) => line !== null));
 	const summary = context.summary.summary;
-	const amountDue = resolveBigSaleCheckoutAmountDue(context);
+	const amountDue = resolveBigSaleCurrentAmountDue(context);
 	const liveOrder = resolveBigSaleLiveTempOrder(context);
 	const normalizedSummary = summary && amountDue !== void 0 ? Object.freeze({
 		status: "ready",
@@ -164,6 +168,6 @@ function createBigSaleTransactionStateReader(getContext) {
 //#endregion
 exports.createBigSaleTransactionStateReader = createBigSaleTransactionStateReader;
 exports.projectBigSaleCartLine = projectBigSaleCartLine;
-exports.resolveBigSaleCheckoutAmountDue = resolveBigSaleCheckoutAmountDue;
+exports.resolveBigSaleCurrentAmountDue = resolveBigSaleCurrentAmountDue;
 exports.resolveBigSaleLineId = resolveBigSaleLineId;
 exports.resolveBigSaleLiveTempOrder = resolveBigSaleLiveTempOrder;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.12.181",
+  "version": "6.12.182",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -70,8 +70,8 @@
     "styled-components": "^6.0.0-rc.3",
     "use-sync-external-store": "^1.6.0",
     "@pisell/pi-payment-sdk": "0.0.3",
-    "@pisell/date-picker": "3.0.10",
     "@pisell/icon": "0.0.11",
+    "@pisell/date-picker": "3.0.10",
     "@pisell/utils": "3.0.4",
     "@pisell/materials": "6.12.52"
   },