@pisell/private-materials 6.12.170 → 6.12.172

package/es/components/HDLKiosk/app/workflow/predicates.js

@@ -7,7 +7,7 @@ const DEFAULT_PREDICATES = Object.freeze({
 	"fulfillment.selected": ({ workflow }) => workflow.fulfillment === "dine_in" || workflow.fulfillment === "takeaway",
 	"checkout.locallyEligible": ({ sales }) => sales.cart.lineCount > 0 && !sales.cart.consistencyPending && sales.summary.status === "ready" && sales.payment.status !== "pending" && sales.payment.status !== "unknown",
 	"payment.notPending": ({ sales }) => sales.payment.status !== "pending" && sales.payment.status !== "unknown",
-	"payment.succeeded": ({ sales }) => sales.payment.status === "succeeded"
+	"payment.succeeded": ({ sales, receipt }) => sales.payment.status === "succeeded" || receipt != null && typeof receipt === "object" && typeof receipt.orderId === "string" && receipt.orderId.trim() !== "" && Number.isFinite(Number(receipt.amount))
 });
 function createPredicateRegistry(overrides = {}) {
 	const predicates = Object.freeze(_objectSpread2(_objectSpread2({}, DEFAULT_PREDICATES), overrides));

package/es/components/HDLKiosk/runtime/operations/coordinator.js

@@ -56,7 +56,7 @@ function createOperationCoordinator(host, registry, options = {}) {
 		} catch (_unused2) {}
 		if (event.type === "finished") emitError(event.metadata.definitionId, request, event.result);
 	};
-	return createKernelOperationCoordinator(registry, {
+	const coordinator = createKernelOperationCoordinator(registry, {
 		createContext: ({ request }) => {
 			var _options$getWorkflowC, _options$getWorkflowC2;
 			return {
@@ -103,6 +103,7 @@ function createOperationCoordinator(host, registry, options = {}) {
 			matches: (operation) => operation.conflictScope === "cart"
 		}
 	}, { initialSessionEpoch: options.initialSessionEpoch });
+	return Object.freeze(_objectSpread2(_objectSpread2({}, coordinator), {}, { confirmPaymentSucceeded: checkoutSafety.markSucceeded }));
 }
 //#endregion
 export { createOperationCoordinator };

package/es/components/HDLKiosk/runtime/operations/session.js

@@ -8,9 +8,10 @@ function forwardFailure(result) {
 }
 const sessionEnsureOperationBinding = bindOperation(sessionEnsureOperation, { execute: ({ host }, _input, signal) => host.sales.ensureSession(signal) });
 const sessionResetOperationBinding = bindOperation(sessionResetOperation, { execute: function() {
-	var _ref = _asyncToGenerator(function* ({ host }, _input, signal) {
+	var _ref = _asyncToGenerator(function* (context, _input, signal) {
+		const { host } = context;
 		const before = host.sales.getObservedSnapshot();
-		if (before.payment.status === "pending" || before.payment.status === "unknown") return operationUnknown("resetBlockedByPaymentState");
+		if ((before.payment.status === "pending" || before.payment.status === "unknown") && context.checkoutSafety.state() !== "succeeded") return operationUnknown("resetBlockedByPaymentState");
 		const reset = yield host.sales.clearAndReset(signal);
 		if (reset.status !== "succeeded") return forwardFailure(reset);
 		if (!reset.data.cartEmpty) return operationUnknown("resetHostResultNotEmpty");

package/es/components/HDLKiosk/runtime/session/createSession.js

@@ -69,27 +69,49 @@ function createHDLKioskWorkflowSession(entry, host, options = {}) {
 	});
 	actorRef = workflowActor;
 	let paymentProjectionObservationId;
+	let staffPaymentPending = false;
+	let staffPaymentOutcome;
 	const advanceConfirmedPayment = () => {
-		var _definition$nodes$sna;
+		var _staffPaymentOutcome, _definition$nodes$sna;
 		const snapshot = workflowActor.getSnapshot();
 		const projection = host.sales.getObservedSnapshot();
-		if (snapshot.status !== "idle" || ((_definition$nodes$sna = definition.nodes[snapshot.nodeId]) === null || _definition$nodes$sna === void 0 ? void 0 : _definition$nodes$sna.activity) !== "paymentMethod" || projection.payment.status !== "succeeded" || paymentProjectionObservationId === projection.observationId) return;
+		const projectionOutcome = projection.payment.status === "succeeded" ? Object.freeze(_objectSpread2(_objectSpread2(_objectSpread2({
+			orderId: projection.payment.orderId,
+			amount: projection.payment.amount
+		}, projection.summary.status === "ready" && projection.summary.currencySymbol ? { currencySymbol: projection.summary.currencySymbol } : {}), projection.pickupNumber ? { pickupNumber: projection.pickupNumber } : {}), projection.customer ? { member: projection.customer.member === true } : {})) : void 0;
+		const outcome = (_staffPaymentOutcome = staffPaymentOutcome) !== null && _staffPaymentOutcome !== void 0 ? _staffPaymentOutcome : projectionOutcome;
+		if (snapshot.status !== "idle" || ((_definition$nodes$sna = definition.nodes[snapshot.nodeId]) === null || _definition$nodes$sna === void 0 ? void 0 : _definition$nodes$sna.activity) !== "paymentMethod" || staffPaymentPending && !staffPaymentOutcome || !outcome || !staffPaymentOutcome && paymentProjectionObservationId === projection.observationId) return;
 		paymentProjectionObservationId = projection.observationId;
 		workflowActor.send({
 			type: "ACTIVITY_INTENT",
 			stepId: snapshot.nodeId,
 			activityId: "paymentMethod",
 			intent: "complete",
-			intentId: `projection:payment:${snapshot.sessionEpoch}:${projection.observationId}`
+			intentId: staffPaymentOutcome ? `staff-payment:${snapshot.sessionEpoch}:${projection.observationId}` : `projection:payment:${snapshot.sessionEpoch}:${projection.observationId}`,
+			receipt: outcome
 		});
 	};
 	let unsubscribePaymentProjection = () => void 0;
 	let unsubscribePaymentWorkflow = () => void 0;
+	let unsubscribeStaffPayment = () => void 0;
 	try {
 		unsubscribePaymentProjection = host.sales.subscribe(advanceConfirmedPayment);
 		unsubscribePaymentWorkflow = workflowActor.subscribe(advanceConfirmedPayment);
+		unsubscribeStaffPayment = host.sales.subscribeStaffPaymentAuthorizationResult((result) => {
+			if (result.status === "pending") {
+				staffPaymentPending = true;
+				staffPaymentOutcome = void 0;
+				return;
+			}
+			staffPaymentPending = false;
+			staffPaymentOutcome = result.status === "succeeded" ? result.data : void 0;
+			if (staffPaymentOutcome) coordinator.confirmPaymentSucceeded();
+			advanceConfirmedPayment();
+		});
 	} catch (error) {
 		unsubscribePaymentProjection();
+		unsubscribePaymentWorkflow();
+		unsubscribeStaffPayment();
 		workflowActor.dispose();
 		throw error;
 	}
@@ -120,6 +142,7 @@ function createHDLKioskWorkflowSession(entry, host, options = {}) {
 		disposed = true;
 		unsubscribePaymentProjection();
 		unsubscribePaymentWorkflow();
+		unsubscribeStaffPayment();
 		workflowActor.dispose();
 	};
 	const publicActor = Object.freeze(_objectSpread2(_objectSpread2({}, workflowActor), {}, { dispose: disposeSession }));

package/es/components/HDLKiosk/runtime/session/transitionRunner.js

@@ -39,7 +39,8 @@ function createHDLKioskTransitionRunner({ host, coordinator, predicates, now = D
 				if (exitPolicy === null || exitPolicy === void 0 ? void 0 : exitPolicy.precondition) try {
 					if (!predicates.evaluate(exitPolicy.precondition, {
 						workflow: context,
-						sales: host.sales.getObservedSnapshot()
+						sales: host.sales.getObservedSnapshot(),
+						receipt: "receipt" in event ? event.receipt : void 0
 					})) return { status: "stay" };
 				} catch (cause) {
 					const error = createDomainWorkflowError("workflowPredicateEvaluationFailed", "staff", cause);
@@ -51,7 +52,10 @@ function createHDLKioskTransitionRunner({ host, coordinator, predicates, now = D
 				}
 				const operationInput = "operationInput" in event ? event.operationInput : void 0;
 				const command = exitPolicy === null || exitPolicy === void 0 ? void 0 : exitPolicy.command;
-				if (!command) return { status: "advance" };
+				if (!command) return {
+					status: "advance",
+					receipt: "receipt" in event ? event.receipt : void 0
+				};
 				const result = yield coordinator.execute(command.id, {
 					operationId: executionId,
 					intentId: event.intentId,

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

@@ -51,7 +51,16 @@ function createPaymentFeedback(snapshot, sales) {
 		message: locales.getText("pisell2.hdl-kiosk.payment-failed-retry")
 	};
 }
+function readPaymentResultReceipt(snapshot) {
+	const receipt = snapshot.receipt;
+	if (!receipt || typeof receipt !== "object") return void 0;
+	const candidate = receipt;
+	if (typeof candidate.orderId !== "string" || !candidate.orderId.trim() || candidate.amount === void 0 || candidate.amount === null || !Number.isFinite(Number(candidate.amount))) return;
+	return candidate;
+}
 function createCheckoutScreenModel(snapshot, sales, payment, completed = false, resetting = false) {
+	var _paymentResultReceipt, _paymentResultReceipt2;
+	const paymentResultReceipt = completed ? readPaymentResultReceipt(snapshot) : void 0;
 	const paymentSafeToChange = sales.payment.status === "idle" || sales.payment.status === "failed";
 	const interactionAvailable = !completed && !resetting && snapshot.status === "idle" && paymentSafeToChange;
 	const totalText = sales.summary.status === "ready" ? formatCurrencyAmount(sales.summary.due, sales.summary.currencySymbol) : void 0;
@@ -72,12 +81,12 @@ function createCheckoutScreenModel(snapshot, sales, payment, completed = false,
 		paymentResult: completed ? resolvePaymentResultToastV2ViewModel({
 			status: "success",
 			paymentStatus: "paid",
-			currencySymbol: sales.summary.status === "ready" ? sales.summary.currencySymbol : void 0,
-			orderTotalAmount: sales.payment.status === "succeeded" ? sales.payment.amount : sales.summary.status === "ready" ? sales.summary.total : void 0,
+			currencySymbol: (_paymentResultReceipt = paymentResultReceipt === null || paymentResultReceipt === void 0 ? void 0 : paymentResultReceipt.currencySymbol) !== null && _paymentResultReceipt !== void 0 ? _paymentResultReceipt : sales.summary.status === "ready" ? sales.summary.currencySymbol : void 0,
+			orderTotalAmount: (_paymentResultReceipt2 = paymentResultReceipt === null || paymentResultReceipt === void 0 ? void 0 : paymentResultReceipt.amount) !== null && _paymentResultReceipt2 !== void 0 ? _paymentResultReceipt2 : sales.payment.status === "succeeded" ? sales.payment.amount : sales.summary.status === "ready" ? sales.summary.total : void 0,
 			prominentReference: {
 				label: locales.getText("pisell2.hdl-kiosk.pickup-number"),
-				value: sales.pickupNumber || locales.getText("pisell2.hdl-kiosk.pickup-number-pending"),
-				pending: !sales.pickupNumber
+				value: (paymentResultReceipt === null || paymentResultReceipt === void 0 ? void 0 : paymentResultReceipt.pickupNumber) || sales.pickupNumber || locales.getText("pisell2.hdl-kiosk.pickup-number-pending"),
+				pending: !((paymentResultReceipt === null || paymentResultReceipt === void 0 ? void 0 : paymentResultReceipt.pickupNumber) || sales.pickupNumber)
 			},
 			disableDetail: true
 		}) : void 0,

package/es/components/bigSale/components/BookingFloatingPanel/useBookingPanelController.js

@@ -1,5 +1,6 @@
 import useEngineContext from "../../../../hooks/useEngineContext.js";
 import { subscribeBookingDateChange } from "../../../../plus/salesSdk/utils/bookingDate.js";
+import "../../../../plus/salesSdk/index.js";
 import dayjs from "dayjs";
 import { useCallback, useEffect, useState } from "react";
 //#region src/components/bigSale/components/BookingFloatingPanel/useBookingPanelController.ts

package/es/components/bigSale/components/TimeBar/index.js

@@ -4,6 +4,7 @@ import withResponsive from "../../../../responsive/withResponsive.js";
 import useInitLocalesOnce from "../../../../hooks/useInitLocalesOnce.js";
 import { subscribeBookingDateChange } from "../../../../plus/salesSdk/utils/bookingDate.js";
 import { useSalesSdkBookingContext } from "../../../../plus/salesSdk/context/SalesSdkBookingContext.js";
+import "../../../../plus/salesSdk/index.js";
 import locales_default from "../../locales/index.js";
 import dayjs from "dayjs";
 import React, { forwardRef, useEffect, useImperativeHandle, useMemo, useRef, useState } from "react";

package/es/components/bigSale/dialog.js

@@ -5,6 +5,7 @@ import { buildInitBookingContextParams, collectBookingIdsFromTempOrder } from ".
 import { useSalesSdk } from "../../plus/salesSdk/hooks/useSalesSdk.js";
 import { useSalesSdkCart } from "../../plus/salesSdk/hooks/useSalesSdkCart.js";
 import { SalesSdkPrepareOrderSwitchContext, SalesSdkRootRefreshContext } from "../../plus/salesSdk/context/SalesSdkProvider.js";
+import "../../plus/salesSdk/index.js";
 import { seedDineInReservationToCart } from "../../plus/pisellReservation/utils/seedDineInReservationToCart.js";
 import BigSale from "./index.js";
 import dayjs from "dayjs";

package/es/components/bigSale/hooks/useBigSaleContext.js

@@ -4,6 +4,7 @@ import { useSalesSdkCustomer } from "../../../plus/salesSdk/hooks/useSalesSdkCus
 import { useSalesSdkBookingContext } from "../../../plus/salesSdk/context/SalesSdkBookingContext.js";
 import { useSalesSdkSummary } from "../../../plus/salesSdk/hooks/useSalesSdkSummary.js";
 import { useSalesSdkProducts } from "../../../plus/salesSdk/hooks/useSalesSdkProducts.js";
+import "../../../plus/salesSdk/index.js";
 import { useMemo } from "react";
 //#region src/components/bigSale/hooks/useBigSaleContext.ts
 /**

package/es/components/bigSale/hooks/useSelectFloorMapResourceForBigSale.js

@@ -3,6 +3,7 @@ import useEngineContext from "../../../hooks/useEngineContext.js";
 import { buildInitBookingContextParams, collectBookingIdsFromTempOrder } from "../../../plus/salesSdk/utils/buildDefaultLoadProductsParams.js";
 import { useSalesSdkUIHosts } from "../../../plus/salesSdk/context/SalesSdkUIHostsContext.js";
 import { SalesSdkRootRefreshContext } from "../../../plus/salesSdk/context/SalesSdkProvider.js";
+import "../../../plus/salesSdk/index.js";
 import { resolveOrderIdForHostActions } from "../../../plus/pisellReservation/components/bookingDetailModal/bookingDetailHostActions.js";
 import { usePicoCodingOpenData } from "../../../plus/pisellReservation/hooks/usePicoCodingOpenData.js";
 import { seedDineInReservationToCart } from "../../../plus/pisellReservation/utils/seedDineInReservationToCart.js";

package/es/components/bigSale/index.js

@@ -8,6 +8,7 @@ import { useSalesSdk } from "../../plus/salesSdk/hooks/useSalesSdk.js";
 import { useSalesSdkCustomer } from "../../plus/salesSdk/hooks/useSalesSdkCustomer.js";
 import { SalesSdkProvider } from "../../plus/salesSdk/context/SalesSdkProvider.js";
 import { SalesSdkBookingContextProvider } from "../../plus/salesSdk/context/SalesSdkBookingContext.js";
+import "../../plus/salesSdk/index.js";
 import { ResponsiveBigSaleBase } from "./Base.js";
 import { isBigSaleProductSelectionFlowScene, resolveBigSaleSelectionFlowConfig } from "./selectionFlowConfig.js";
 import { isKioskPresentation } from "./templateCapabilities.js";

package/es/components/bigSale/templates/HDLKiosk/adapter/host/projection.js

@@ -142,7 +142,7 @@ function buildSnapshot(context, observationId, pickupReferenceMode) {
 		currency: String((_context$sales$tempOr2 = (_context$sales$tempOr3 = context.sales.tempOrder) === null || _context$sales$tempOr3 === void 0 ? void 0 : _context$sales$tempOr3.currency_code) !== null && _context$sales$tempOr2 !== void 0 ? _context$sales$tempOr2 : ""),
 		currencySymbol: String((_context$sales$tempOr4 = (_context$sales$tempOr5 = context.sales.tempOrder) === null || _context$sales$tempOr5 === void 0 ? void 0 : _context$sales$tempOr5.currency_symbol) !== null && _context$sales$tempOr4 !== void 0 ? _context$sales$tempOr4 : ""),
 		total: String(summary.total_amount),
-		due: String(summary.expect_amount)
+		due: String(summary.amount_gap)
 	}) : context.sales.status === "loading" ? Object.freeze({ status: "calculating" }) : Object.freeze({ status: "missing" });
 	const avatarUrl = typeof ((_context$customer$sel = context.customer.selected) === null || _context$customer$sel === void 0 ? void 0 : _context$customer$sel.avatar) === "string" && context.customer.selected.avatar.trim() ? context.customer.selected.avatar.trim() : void 0;
 	const customer = context.customer.selected ? Object.freeze(_objectSpread2(_objectSpread2({

package/es/components/bigSale/templates/HDLKiosk/adapter/sales/session.js

@@ -28,7 +28,9 @@ function createBigSaleSessionOperations({ getContext }) {
 					data: void 0
 				};
 				try {
-					const createdOrder = isCommittedPaidOrder(currentOrder) ? yield context.sales.clearCartAndReset() : yield context.sales.createNew();
+					const resetPaidOrder = isCommittedPaidOrder(currentOrder);
+					const createdOrder = resetPaidOrder ? yield context.sales.clearCartAndReset() : yield context.sales.createNew();
+					if (resetPaidOrder) yield context.cart.recalcSummary();
 					if (signal.aborted) return unknown("ensureSessionAbortedAfterDispatch");
 					const liveCreatedOrder = resolveBigSaleLiveTempOrder(getContext());
 					const createdPaymentStatus = readPaymentStatus(liveCreatedOrder !== null && liveCreatedOrder !== void 0 ? liveCreatedOrder : createdOrder);
@@ -50,9 +52,12 @@ function createBigSaleSessionOperations({ getContext }) {
 				if (signal.aborted) return { status: "cancelled" };
 				try {
 					var _resetOrder$products$, _resetOrder$products, _resetOrder$bookings$, _resetOrder$bookings;
-					const resetOrder = yield getContext().sales.clearCartAndReset();
+					const context = getContext();
+					const resetOrder = yield context.sales.clearCartAndReset();
 					if (signal.aborted) return unknown("resetAbortedAfterDispatch");
 					if (!(((_resetOrder$products$ = (_resetOrder$products = resetOrder.products) === null || _resetOrder$products === void 0 ? void 0 : _resetOrder$products.length) !== null && _resetOrder$products$ !== void 0 ? _resetOrder$products$ : 0) === 0 && ((_resetOrder$bookings$ = (_resetOrder$bookings = resetOrder.bookings) === null || _resetOrder$bookings === void 0 ? void 0 : _resetOrder$bookings.length) !== null && _resetOrder$bookings$ !== void 0 ? _resetOrder$bookings$ : 0) === 0)) return unknown("resetHostResultNotEmpty");
+					yield context.cart.recalcSummary();
+					if (signal.aborted) return unknown("resetAbortedAfterRecalculation");
 					return {
 						status: "succeeded",
 						data: { cartEmpty: true }

package/es/components/bigSale/templates/HDLKiosk/runtime/HDLKioskPaymentRuntime.js

@@ -1,18 +1,17 @@
 import { _asyncToGenerator } from "../../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/asyncToGenerator.js";
-import { _objectWithoutProperties } from "../../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectWithoutProperties.js";
 import useEngineContext from "../../../../../hooks/useEngineContext.js";
-import { CHECKOUT_VISIBLE_PAYMENT_CODES, resolvePiPaymentProvider } from "../../../../checkout/constants.js";
+import { CHECKOUT_VISIBLE_PAYMENT_CODES } from "../../../../checkout/constants.js";
 import PaymentMethodRuntime_default from "../../../../checkout/paymentRuntime/PaymentMethodRuntime.js";
-import { completePendingEftposPayment, discardPendingEftposPayment, preparePendingEftposPayment } from "../../../../checkout/paymentRuntime/pendingEftposLifecycle.js";
-import { getCurrentDeviceNumber, reorderPaymentMethodList } from "../../../../checkout/utils.js";
-import { failed, unknown } from "../adapter/normalize.js";
+import { reorderPaymentMethodList } from "../../../../checkout/utils.js";
+import { failed } from "../adapter/normalize.js";
+import { executeEftposPayment } from "./eftposPayment.js";
+import { createStaffPaymentAuthorizationStore, finalizeStaffPaymentOutcome, isStaffPaymentAuthorizationCancelled, resolveStaffPaymentResult } from "./staffPaymentAuthorization.js";
 import React, { useEffect, useMemo, useRef } from "react";
 //#region src/components/bigSale/templates/HDLKiosk/runtime/HDLKioskPaymentRuntime.tsx
 /**
 * BigSale 模板内的 Kiosk 支付桥。它持有需要 React/设备 UI 的 PaymentMethodRuntime，
 * 再把窄命令交给独立 HDLKiosk Host；Core 不感知 BigSale、PiPayment 或 window.app。
 */
-const _excluded = ["unique_payment_number"];
 function asKioskMethod(method) {
 	var _raw$channel_applicat;
 	const raw = method;
@@ -35,45 +34,26 @@ function currentAmount(context) {
 	const amount = Number((_ref = (_summary$expect_amoun = summary === null || summary === void 0 ? void 0 : summary.expect_amount) !== null && _summary$expect_amoun !== void 0 ? _summary$expect_amoun : summary === null || summary === void 0 ? void 0 : summary.product_expect_amount) !== null && _ref !== void 0 ? _ref : summary === null || summary === void 0 ? void 0 : summary.total_amount);
 	return Number.isFinite(amount) && amount > 0 ? amount : 0;
 }
-function isStaffPaymentAuthorizationCancelled(result) {
-	var _record$status, _record$reason;
-	if (!result || typeof result !== "object") return false;
-	const record = result;
-	return [
-		"cancelled",
-		"canceled",
-		"closed"
-	].includes(String((_record$status = record.status) !== null && _record$status !== void 0 ? _record$status : "").toLowerCase()) || [
-		"cancelled",
-		"canceled",
-		"cancel"
-	].includes(String((_record$reason = record.reason) !== null && _record$reason !== void 0 ? _record$reason : "").toLowerCase());
-}
-function checkoutSuccess(baseSales) {
-	var _baseSales$getTempOrd, _baseSales$getOrderId, _ref2, _baseSales$getOrderAm, _baseSales$getOrderAm2;
-	const order = (baseSales === null || baseSales === void 0 || (_baseSales$getTempOrd = baseSales.getTempOrder) === null || _baseSales$getTempOrd === void 0 ? void 0 : _baseSales$getTempOrd.call(baseSales)) || {};
-	const orderId = ((baseSales === null || baseSales === void 0 || (_baseSales$getOrderId = baseSales.getOrderIdentity) === null || _baseSales$getOrderId === void 0 ? void 0 : _baseSales$getOrderId.call(baseSales)) || {}).orderId || order.order_id;
-	if (!orderId) return unknown("eftposSuccessMissingOrderId");
-	return {
-		status: "succeeded",
-		data: {
-			orderId: String(orderId),
-			amount: String((_ref2 = (_baseSales$getOrderAm = baseSales === null || baseSales === void 0 || (_baseSales$getOrderAm2 = baseSales.getOrderAmountSnapshot) === null || _baseSales$getOrderAm2 === void 0 || (_baseSales$getOrderAm2 = _baseSales$getOrderAm2.call(baseSales)) === null || _baseSales$getOrderAm2 === void 0 ? void 0 : _baseSales$getOrderAm2.expectAmount) !== null && _baseSales$getOrderAm !== void 0 ? _baseSales$getOrderAm : order.expect_amount) !== null && _ref2 !== void 0 ? _ref2 : 0)
-		}
-	};
-}
 function HDLKioskPaymentRuntime({ context, controllerRef }) {
 	var _context$sales$tempOr, _engineContext$appHel5;
 	const engineContext = useEngineContext();
 	const runtimeRef = useRef(null);
 	const methodsRef = useRef([]);
 	const rawMethodsRef = useRef(/* @__PURE__ */ new Map());
-	const authorizationListenersRef = useRef(/* @__PURE__ */ new Set());
+	const authorizationStore = useMemo(() => createStaffPaymentAuthorizationStore(), []);
 	const baseSales = context.sales.bookingTicket;
 	const currencySymbol = ((_context$sales$tempOr = context.sales.tempOrder) === null || _context$sales$tempOr === void 0 ? void 0 : _context$sales$tempOr.currency_symbol) || "$";
+	const staffPaymentOutcomeContextRef = useRef({
+		baseSales,
+		loadDetail: context.sales.loadDetail
+	});
+	staffPaymentOutcomeContextRef.current = {
+		baseSales,
+		loadDetail: context.sales.loadDetail
+	};
 	const controller = useMemo(() => ({
 		loadPaymentMethods: function() {
-			var _ref3 = _asyncToGenerator(function* () {
+			var _ref2 = _asyncToGenerator(function* () {
 				if (!(baseSales === null || baseSales === void 0 ? void 0 : baseSales.getPaymentMethodsAsync)) return failed("paymentMethodsUnavailable", "staff");
 				try {
 					var _engineContext$appHel;
@@ -92,12 +72,12 @@ function HDLKioskPaymentRuntime({ context, controllerRef }) {
 				}
 			});
 			return function loadPaymentMethods() {
-				return _ref3.apply(this, arguments);
+				return _ref2.apply(this, arguments);
 			};
 		}(),
 		payEftpos: function() {
-			var _ref5 = _asyncToGenerator(function* ({ paymentMethodId }) {
-				var _engineContext$appHel2, _engineContext$appHel3;
+			var _ref3 = _asyncToGenerator(function* ({ paymentMethodId }) {
+				var _engineContext$appHel2, _engineContext$appHel3, _engineContext$appHel4;
 				const method = methodsRef.current.find((item) => item.id === paymentMethodId);
 				if (!(method === null || method === void 0 ? void 0 : method.eftpos)) return failed("eftposMethodUnavailable", "back");
 				const rawMethod = rawMethodsRef.current.get(paymentMethodId);
@@ -106,103 +86,39 @@ function HDLKioskPaymentRuntime({ context, controllerRef }) {
 				if (amount <= 0) return failed("paymentAmountInvalid", "back");
 				const runtime = runtimeRef.current;
 				if (!runtime) return failed("paymentRuntimeUnavailable", "retry");
-				const piProvider = resolvePiPaymentProvider(method.code, Boolean((_engineContext$appHel2 = engineContext.appHelper) === null || _engineContext$appHel2 === void 0 || (_engineContext$appHel2 = _engineContext$appHel2.utils) === null || _engineContext$appHel2 === void 0 || (_engineContext$appHel2 = _engineContext$appHel2.businessUtils) === null || _engineContext$appHel2 === void 0 || (_engineContext$appHel3 = _engineContext$appHel2.isPiPaymentEnabled) === null || _engineContext$appHel3 === void 0 ? void 0 : _engineContext$appHel3.call(_engineContext$appHel2)));
-				let prepared;
-				let shouldDiscardPrepared = false;
-				try {
-					var _engineContext$appHel4, _baseSales$getOrderId2, _baseSales$getTempOrd2;
-					if (piProvider) {
-						prepared = yield preparePendingEftposPayment({
-							amount,
-							baseSales,
-							method: rawMethod
-						});
-						shouldDiscardPrepared = true;
-						if (!prepared.salesId) throw new Error("Unable to resolve sales id before opening PiPayment.");
-					}
-					const deviceNumber = yield getCurrentDeviceNumber((_engineContext$appHel4 = engineContext.appHelper) === null || _engineContext$appHel4 === void 0 || (_engineContext$appHel4 = _engineContext$appHel4.utils) === null || _engineContext$appHel4 === void 0 ? void 0 : _engineContext$appHel4.interaction);
-					const result = yield runtime.execute({
-						method: rawMethod,
-						amount,
-						currencySymbol,
-						deviceNumber,
-						preparedPayment: prepared ? {
-							paymentNumber: prepared.paymentNumber,
-							salesId: prepared.salesId
-						} : void 0
-					});
-					if (result.preservePendingPayment) shouldDiscardPrepared = false;
-					if (prepared && result.preservePendingPayment && result.status !== "success") return unknown("eftposPendingPaymentUnresolved", result);
-					if (result.status === "cancelled" || result.status === "provider-handled") {
-						if (prepared && shouldDiscardPrepared) yield discardPendingEftposPayment(baseSales, prepared.paymentNumber);
-						return {
-							status: "cancelled",
-							reason: result.status
-						};
-					}
-					if (result.status === "cancel-order") {
-						if (prepared && shouldDiscardPrepared) yield discardPendingEftposPayment(baseSales, prepared.paymentNumber);
-						return {
-							status: "cancelled",
-							reason: "cancelOrder"
-						};
-					}
-					if (result.status !== "success") {
-						if (prepared && shouldDiscardPrepared) yield discardPendingEftposPayment(baseSales, prepared.paymentNumber);
-						return failed("eftposPaymentFailed", "retry", result.message);
-					}
-					if (prepared) {
-						shouldDiscardPrepared = false;
-						const _ref4 = result.metadata || {}, { unique_payment_number: transactionNumber } = _ref4, metadata = _objectWithoutProperties(_ref4, _excluded);
-						yield completePendingEftposPayment({
-							amount: result.amount,
-							baseSales,
-							paymentNumber: prepared.paymentNumber,
-							transactionNumber,
-							serviceCharge: result.serviceCharge,
-							updates: { metadata }
-						});
-					} else if (typeof (baseSales === null || baseSales === void 0 ? void 0 : baseSales.commitPaymentMethodPayment) === "function") yield baseSales.commitPaymentMethodPayment({
-						paymentMethodId: method.id,
-						paymentMethodCode: method.code,
-						amount: result.amount,
-						serviceCharge: result.serviceCharge,
-						metadata: result.metadata
-					});
-					else return failed("paymentCommitUnavailable", "staff");
-					const orderId = (baseSales === null || baseSales === void 0 || (_baseSales$getOrderId2 = baseSales.getOrderIdentity) === null || _baseSales$getOrderId2 === void 0 || (_baseSales$getOrderId2 = _baseSales$getOrderId2.call(baseSales)) === null || _baseSales$getOrderId2 === void 0 ? void 0 : _baseSales$getOrderId2.orderId) || (baseSales === null || baseSales === void 0 || (_baseSales$getTempOrd2 = baseSales.getTempOrder) === null || _baseSales$getTempOrd2 === void 0 || (_baseSales$getTempOrd2 = _baseSales$getTempOrd2.call(baseSales)) === null || _baseSales$getTempOrd2 === void 0 ? void 0 : _baseSales$getTempOrd2.order_id);
-					if (orderId && typeof context.sales.loadDetail === "function") yield context.sales.loadDetail({
-						orderId,
-						forceRemote: true
-					});
-					return checkoutSuccess(baseSales);
-				} catch (error) {
-					try {
-						if (prepared && shouldDiscardPrepared) yield discardPendingEftposPayment(baseSales, prepared.paymentNumber);
-					} catch (discardError) {
-						return unknown("eftposPendingRollbackFailed", discardError);
-					}
-					if (prepared && !shouldDiscardPrepared) return unknown("eftposPaymentFinalizationUnresolved", error);
-					return failed("eftposPaymentFailed", "retry", error);
-				}
+				return executeEftposPayment({
+					amount,
+					baseSales,
+					currencySymbol,
+					interaction: (_engineContext$appHel2 = engineContext.appHelper) === null || _engineContext$appHel2 === void 0 || (_engineContext$appHel2 = _engineContext$appHel2.utils) === null || _engineContext$appHel2 === void 0 ? void 0 : _engineContext$appHel2.interaction,
+					isPiPaymentEnabled: Boolean((_engineContext$appHel3 = engineContext.appHelper) === null || _engineContext$appHel3 === void 0 || (_engineContext$appHel3 = _engineContext$appHel3.utils) === null || _engineContext$appHel3 === void 0 || (_engineContext$appHel3 = _engineContext$appHel3.businessUtils) === null || _engineContext$appHel3 === void 0 || (_engineContext$appHel4 = _engineContext$appHel3.isPiPaymentEnabled) === null || _engineContext$appHel4 === void 0 ? void 0 : _engineContext$appHel4.call(_engineContext$appHel3)),
+					loadDetail: context.sales.loadDetail,
+					method,
+					rawMethod,
+					runtime
+				});
 			});
 			return function payEftpos(_x) {
-				return _ref5.apply(this, arguments);
+				return _ref3.apply(this, arguments);
 			};
 		}(),
 		requestStaffPaymentApproval: function() {
-			var _ref6 = _asyncToGenerator(function* ({ paymentMethodId }) {
+			var _ref4 = _asyncToGenerator(function* ({ paymentMethodId }) {
+				var _window;
 				const method = methodsRef.current.find((item) => item.id === paymentMethodId);
 				const amount = currentAmount(context);
 				if (!method || method.eftpos || amount <= 0) return failed("staffPaymentAuthorizationInvalid", "back");
+				const globalApp = (_window = window) === null || _window === void 0 || (_window = _window.app) === null || _window === void 0 || (_window = _window.applicationManager) === null || _window === void 0 ? void 0 : _window.get("global");
+				if (typeof (globalApp === null || globalApp === void 0 ? void 0 : globalApp.runFunction) !== "function") return failed("staffPaymentAuthorizationUnavailable", "staff");
+				const authorization = authorizationStore.begin({
+					amount,
+					currencySymbol,
+					member: context.customer.selected != null
+				});
+				if (!authorization) return failed("staffPaymentAuthorizationInProgress", "retry");
 				try {
-					var _baseSales$getOtherPa, _window;
+					var _baseSales$getOtherPa;
 					const otherParams = (yield baseSales === null || baseSales === void 0 || (_baseSales$getOtherPa = baseSales.getOtherParams) === null || _baseSales$getOtherPa === void 0 ? void 0 : _baseSales$getOtherPa.call(baseSales)) || (baseSales === null || baseSales === void 0 ? void 0 : baseSales.otherParams) || {};
-					const globalApp = (_window = window) === null || _window === void 0 || (_window = _window.app) === null || _window === void 0 || (_window = _window.applicationManager) === null || _window === void 0 ? void 0 : _window.get("global");
-					if (typeof (globalApp === null || globalApp === void 0 ? void 0 : globalApp.runFunction) !== "function") return failed("staffPaymentAuthorizationUnavailable", "staff");
-					const notifyClosed = () => {
-						authorizationListenersRef.current.forEach((listener) => listener({ status: "cancelled" }));
-					};
 					const result = yield globalApp.runFunction("authorizeAction", {
 						params: {
 							action: "pay",
@@ -211,27 +127,40 @@ function HDLKioskPaymentRuntime({ context, controllerRef }) {
 							paymentMethodType: method.type,
 							amount
 						},
-						onClose: notifyClosed
+						onClose: () => authorizationStore.cancel(authorization)
 					});
-					if (isStaffPaymentAuthorizationCancelled(result)) return failed("staffPaymentAuthorizationCancelled", "retry");
-					if ((result === null || result === void 0 ? void 0 : result.status) !== "success") return failed("staffPaymentAuthorizationDispatchFailed", "retry", result.msg);
+					if (authorizationStore.isSettling(authorization)) return {
+						status: "succeeded",
+						data: void 0
+					};
+					if (isStaffPaymentAuthorizationCancelled(result)) {
+						authorizationStore.cancel(authorization);
+						return failed("staffPaymentAuthorizationCancelled", "retry");
+					}
+					if ((result === null || result === void 0 ? void 0 : result.status) !== "success") {
+						authorizationStore.fail(authorization);
+						return failed("staffPaymentAuthorizationDispatchFailed", "retry", result.msg);
+					}
 					return {
 						status: "succeeded",
 						data: void 0
 					};
 				} catch (error) {
+					if (authorizationStore.isSettling(authorization)) return {
+						status: "succeeded",
+						data: void 0
+					};
+					authorizationStore.fail(authorization);
 					return failed("staffPaymentAuthorizationDispatchFailed", "retry", error);
 				}
 			});
 			return function requestStaffPaymentApproval(_x2) {
-				return _ref6.apply(this, arguments);
+				return _ref4.apply(this, arguments);
 			};
 		}(),
-		subscribeStaffPaymentAuthorizationResult: (listener) => {
-			authorizationListenersRef.current.add(listener);
-			return () => authorizationListenersRef.current.delete(listener);
-		}
+		subscribeStaffPaymentAuthorizationResult: authorizationStore.subscribe
 	}), [
+		authorizationStore,
 		baseSales,
 		context,
 		currencySymbol,
@@ -239,32 +168,50 @@ function HDLKioskPaymentRuntime({ context, controllerRef }) {
 	]);
 	useEffect(() => {
 		let cleanup;
+		let globalApp;
 		try {
 			var _window2, _app$applicationManag, _globalApp$runFunctio;
 			const app = (_window2 = window) === null || _window2 === void 0 ? void 0 : _window2.app;
-			const globalApp = app === null || app === void 0 || (_app$applicationManag = app.applicationManager) === null || _app$applicationManag === void 0 ? void 0 : _app$applicationManag.get("global");
+			globalApp = app === null || app === void 0 || (_app$applicationManag = app.applicationManager) === null || _app$applicationManag === void 0 ? void 0 : _app$applicationManag.get("global");
 			cleanup = globalApp === null || globalApp === void 0 || (_globalApp$runFunctio = globalApp.runFunction) === null || _globalApp$runFunctio === void 0 ? void 0 : _globalApp$runFunctio.call(globalApp, "listenExternalCommand", {
 				app,
-				handler: (command) => {
-					var _globalApp$runFunctio2, _command$params;
-					if (command.command === "authorization_close") {
-						authorizationListenersRef.current.forEach((listener) => listener({ status: "cancelled" }));
-						return;
-					}
-					if (command.command !== "payment_result") return;
-					globalApp === null || globalApp === void 0 || (_globalApp$runFunctio2 = globalApp.runFunction) === null || _globalApp$runFunctio2 === void 0 || _globalApp$runFunctio2.call(globalApp, "closeAuthorization");
-					const status = (_command$params = command.params) === null || _command$params === void 0 ? void 0 : _command$params.status;
-					authorizationListenersRef.current.forEach((listener) => {
-						var _command$params2;
-						return listener({ status: ((_command$params2 = command.params) === null || _command$params2 === void 0 ? void 0 : _command$params2.ok) === true && status === "success" ? "succeeded" : status === "cancelled" ? "cancelled" : "failed" });
+				handler: function() {
+					var _ref5 = _asyncToGenerator(function* (command) {
+						if (command.command !== "payment_result") return;
+						const authorization = authorizationStore.beginSettlement();
+						if (!authorization) return;
+						const outcomeContext = staffPaymentOutcomeContextRef.current;
+						const result = yield resolveStaffPaymentResult({
+							params: command.params || {},
+							closeAuthorization: () => {
+								var _globalApp$runFunctio2;
+								return globalApp === null || globalApp === void 0 || (_globalApp$runFunctio2 = globalApp.runFunction) === null || _globalApp$runFunctio2 === void 0 ? void 0 : _globalApp$runFunctio2.call(globalApp, "closeAuthorization");
+							},
+							finalizeOutcome: () => finalizeStaffPaymentOutcome({
+								params: command.params || {},
+								baseSales: outcomeContext.baseSales,
+								loadDetail: outcomeContext.loadDetail,
+								fallbackAmount: authorization.amount,
+								currencySymbol: authorization.currencySymbol,
+								member: authorization.member
+							})
+						});
+						authorizationStore.complete(authorization, result);
 					});
-				}
+					return function handler(_x3) {
+						return _ref5.apply(this, arguments);
+					};
+				}()
 			});
 		} catch (_unused) {}
 		return () => {
 			if (typeof cleanup === "function") cleanup();
+			if (authorizationStore.dispose()) try {
+				var _globalApp$runFunctio3;
+				globalApp === null || globalApp === void 0 || (_globalApp$runFunctio3 = globalApp.runFunction) === null || _globalApp$runFunctio3 === void 0 || _globalApp$runFunctio3.call(globalApp, "closeAuthorization");
+			} catch (_unused2) {}
 		};
-	}, []);
+	}, [authorizationStore]);
 	useEffect(() => {
 		controllerRef.current = controller;
 		return () => {