@pisell/private-materials 6.12.312 → 6.12.314

package/es/components/HDLKiosk/slices/payment/Screen/index.js

@@ -25,23 +25,52 @@ function ConfirmOrderIcon() {
 		"aria-hidden": "true"
 	}, /* @__PURE__ */ React.createElement("path", { d: "m5 12 4 4L19 6" }));
 }
-/** 与 PaymentModal 一致：EFTPOS/信用卡使用 credit，其余自定义方式使用 custom。 */
-function PaymentMethodIcon({ code, type }) {
-	const isCard = code === "EFTPOS" || type === "credit-card" || type === "eftpos";
+/** 名称含 cash 时优先展示纸币，否则按卡支付、现金配置和自定义支付区分。 */
+function PaymentMethodIcon({ code, name, type, eftpos, cash }) {
+	const nameContainsCash = /cash/i.test(name);
+	const isCash = nameContainsCash || cash;
+	const isCard = !nameContainsCash && (eftpos || code === "EFTPOS" || type === "credit-card" || type === "eftpos");
 	return /* @__PURE__ */ React.createElement("span", {
 		className: "hdl-payment-method__icon",
-		style: { background: isCard ? "#FE8279" : "#D277E4" },
+		style: { background: isCard ? "#FE8279" : isCash ? "#D69B28" : "#D277E4" },
 		"aria-hidden": "true"
-	}, /* @__PURE__ */ React.createElement(Iconfont, {
-		type: isCard ? "pisell2-credit" : "pisell2-custom",
+	}, isCard ? /* @__PURE__ */ React.createElement(Iconfont, {
+		type: "pisell2-credit-card-02",
 		style: {
 			fontSize: "46px",
 			color: "#fff"
 		}
-	}));
+	}) : /* @__PURE__ */ React.createElement("svg", {
+		viewBox: "0 0 32 32",
+		width: "48",
+		height: "48",
+		fill: "none",
+		stroke: "#fff",
+		strokeWidth: "1.8",
+		strokeLinecap: "round",
+		strokeLinejoin: "round",
+		focusable: "false"
+	}, isCash ? /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement("rect", {
+		x: "3",
+		y: "6",
+		width: "26",
+		height: "17",
+		rx: "3"
+	}), /* @__PURE__ */ React.createElement("path", { d: "M7 26h18M3 11a5 5 0 0 0 5-5m16 0a5 5 0 0 0 5 5M3 18a5 5 0 0 1 5 5m16 0a5 5 0 0 1 5-5" }), /* @__PURE__ */ React.createElement("ellipse", {
+		cx: "16",
+		cy: "14.5",
+		rx: "3.5",
+		ry: "4.5"
+	})) : /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement("rect", {
+		x: "7",
+		y: "4",
+		width: "14",
+		height: "9",
+		rx: "2"
+	}), /* @__PURE__ */ React.createElement("path", { d: "M11 8.5h6M14 13v3M8 16h16l4 7v4a1 1 0 0 1-1 1H5a1 1 0 0 1-1-1v-4l4-7ZM4 23h24M13 25.5h6M10 19.5h2m3 0h2m3 0h2" }))));
 }
 function CheckoutScreen({ model, orderBar, send }) {
-	var _model$paymentFeedbac;
+	var _model$paymentFeedbac2, _model$paymentFeedbac4, _model$paymentFeedbac5;
 	const sendRef = useRef(send);
 	sendRef.current = send;
 	const goBack = useCallback(() => {
@@ -53,6 +82,47 @@ function CheckoutScreen({ model, orderBar, send }) {
 	const canReturnToCart = Boolean(orderBar && orderBar.cartLineCount > 0) && model.canLeavePayment;
 	const [restartOrderOpen, setRestartOrderOpen] = useState(false);
 	const [dismissedFeedbackKey, setDismissedFeedbackKey] = useState();
+	const automaticPaymentHandled = useRef(false);
+	const confirmNoPayment = useCallback(() => {
+		var _model$paymentFeedbac;
+		automaticPaymentHandled.current = true;
+		setDismissedFeedbackKey((_model$paymentFeedbac = model.paymentFeedback) === null || _model$paymentFeedbac === void 0 ? void 0 : _model$paymentFeedbac.key);
+		sendRef.current({
+			kind: "command",
+			command: "checkout.completeNoPayment"
+		});
+	}, [(_model$paymentFeedbac2 = model.paymentFeedback) === null || _model$paymentFeedbac2 === void 0 ? void 0 : _model$paymentFeedbac2.key]);
+	const selectPayment = useCallback((method) => {
+		var _model$paymentFeedbac3;
+		automaticPaymentHandled.current = true;
+		setDismissedFeedbackKey((_model$paymentFeedbac3 = model.paymentFeedback) === null || _model$paymentFeedbac3 === void 0 ? void 0 : _model$paymentFeedbac3.key);
+		sendRef.current({
+			kind: "command",
+			command: method.eftpos ? "checkout.payEftpos" : "checkout.requestStaffPaymentApproval",
+			input: { paymentMethodId: method.id }
+		});
+	}, [(_model$paymentFeedbac4 = model.paymentFeedback) === null || _model$paymentFeedbac4 === void 0 ? void 0 : _model$paymentFeedbac4.key]);
+	useEffect(() => {
+		if (model.paymentFeedback) automaticPaymentHandled.current = true;
+		if (automaticPaymentHandled.current || model.busy || model.resetting || model.paymentResult || model.paymentResultPending || restartOrderOpen || !model.totalText) return;
+		let startPayment;
+		if (model.noPaymentRequired) {
+			if (model.canCompleteNoPayment) startPayment = confirmNoPayment;
+		} else if (model.canSelectPayment && !model.paymentMethodsLoading && !model.paymentMethodsErrorReference && model.paymentMethods.length === 1) startPayment = () => selectPayment(model.paymentMethods[0]);
+		if (!startPayment) return;
+		let cancelled = false;
+		Promise.resolve().then(() => {
+			if (!cancelled && !automaticPaymentHandled.current) startPayment();
+		});
+		return () => {
+			cancelled = true;
+		};
+	}, [
+		model,
+		restartOrderOpen,
+		confirmNoPayment,
+		selectPayment
+	]);
 	const [returnCountdown, setReturnCountdown] = useState(10);
 	const resetOrder = useCallback((source) => sendRef.current({
 		kind: "session",
@@ -148,11 +218,7 @@ function CheckoutScreen({ model, orderBar, send }) {
 		role: "status"
 	}, /* @__PURE__ */ React.createElement("span", { className: "hdl-operation-overlay__spinner" }), /* @__PURE__ */ React.createElement("strong", null, locales.getText("pisell2.hdl-kiosk.payment-processing"))));
 	const paymentDisabled = !model.canSelectPayment || !model.totalText;
-	const visibleFeedback = ((_model$paymentFeedbac = model.paymentFeedback) === null || _model$paymentFeedbac === void 0 ? void 0 : _model$paymentFeedbac.key) === dismissedFeedbackKey ? void 0 : model.paymentFeedback;
-	const dismissCurrentFeedback = () => {
-		var _model$paymentFeedbac2;
-		return setDismissedFeedbackKey((_model$paymentFeedbac2 = model.paymentFeedback) === null || _model$paymentFeedbac2 === void 0 ? void 0 : _model$paymentFeedbac2.key);
-	};
+	const visibleFeedback = ((_model$paymentFeedbac5 = model.paymentFeedback) === null || _model$paymentFeedbac5 === void 0 ? void 0 : _model$paymentFeedbac5.key) === dismissedFeedbackKey ? void 0 : model.paymentFeedback;
 	return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement("section", {
 		className: "hdl-checkout-screen",
 		"aria-labelledby": "hdl-payment-method-title"
@@ -167,13 +233,7 @@ function CheckoutScreen({ model, orderBar, send }) {
 		className: "hdl-payment-method hdl-no-payment-confirm",
 		"aria-busy": model.busy,
 		disabled: !model.canCompleteNoPayment,
-		onClick: () => {
-			dismissCurrentFeedback();
-			send({
-				kind: "command",
-				command: "checkout.completeNoPayment"
-			});
-		}
+		onClick: confirmNoPayment
 	}, /* @__PURE__ */ React.createElement("span", { className: "hdl-no-payment-confirm__icon" }, /* @__PURE__ */ React.createElement(ConfirmOrderIcon, null)), /* @__PURE__ */ React.createElement("strong", null, locales.getText(model.busy ? "pisell2.hdl-kiosk.no-payment-confirming" : "pisell2.hdl-kiosk.no-payment-confirm")), /* @__PURE__ */ React.createElement(NextIcon, null)) : /* @__PURE__ */ React.createElement(React.Fragment, null, model.paymentMethodsLoading ? /* @__PURE__ */ React.createElement("p", {
 		className: "hdl-payment-methods__notice",
 		role: "status"
@@ -182,32 +242,21 @@ function CheckoutScreen({ model, orderBar, send }) {
 		role: model.paymentMethodsErrorReference ? "alert" : "status"
 	}, locales.getText("pisell2.hdl-kiosk.payment-methods-unavailable")) : null, model.paymentMethods.map((method) => {
 		const eftpos = method.eftpos;
+		const displayName = method.name.replace(/-Linkly/g, "");
 		return /* @__PURE__ */ React.createElement("button", {
 			key: method.id,
 			type: "button",
 			className: `hdl-payment-method hdl-payment-method--${eftpos ? "card" : "cash"}`,
-			"aria-label": method.name,
+			"aria-label": displayName,
 			disabled: paymentDisabled,
-			onClick: () => {
-				dismissCurrentFeedback();
-				if (eftpos) {
-					send({
-						kind: "command",
-						command: "checkout.payEftpos",
-						input: { paymentMethodId: method.id }
-					});
-					return;
-				}
-				send({
-					kind: "command",
-					command: "checkout.requestStaffPaymentApproval",
-					input: { paymentMethodId: method.id }
-				});
-			}
+			onClick: () => selectPayment(method)
 		}, /* @__PURE__ */ React.createElement(PaymentMethodIcon, {
 			code: method.code,
-			type: method.type
-		}), /* @__PURE__ */ React.createElement("span", null, /* @__PURE__ */ React.createElement("strong", null, method.name)), /* @__PURE__ */ React.createElement(NextIcon, null));
+			name: method.name,
+			type: method.type,
+			eftpos: method.eftpos,
+			cash: method.cash
+		}), /* @__PURE__ */ React.createElement("span", null, /* @__PURE__ */ React.createElement("strong", null, displayName)), /* @__PURE__ */ React.createElement(NextIcon, null));
 	}))), /* @__PURE__ */ React.createElement("div", { className: "hdl-payment-restart-section" }, /* @__PURE__ */ React.createElement(RestartOrderButton, {
 		disabled: !model.canRestartOrder,
 		title: model.restartOrderBlockedReason,

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

@@ -71,10 +71,13 @@ function createCheckoutScreenModel(snapshot, sales, payment, completed = false,
 		busy: snapshot.status === "running",
 		noPaymentRequired,
 		canCompleteNoPayment: noPaymentRequired && interactionAvailable,
-		paymentMethods: payment.methods,
+		paymentMethods: payment.methods.map((method) => {
+			var _method$metadata, _method$metadata2;
+			return _objectSpread2(_objectSpread2({}, method), {}, { cash: method.type === "custom" && (((_method$metadata = method.metadata) === null || _method$metadata === void 0 ? void 0 : _method$metadata.order_open_cash_drawer) === 1 || ((_method$metadata2 = method.metadata) === null || _method$metadata2 === void 0 ? void 0 : _method$metadata2.order_open_cash_drawer) === "1") });
+		}),
 		paymentMethodsLoading: payment.loading,
 		paymentMethodsErrorReference: payment.errorReference,
-		canSelectPayment: interactionAvailable,
+		canSelectPayment: interactionAvailable && sales.summary.status === "ready",
 		canLeavePayment: interactionAvailable,
 		canRestartOrder: interactionAvailable,
 		restartOrderBlockedReason: paymentSafeToChange ? void 0 : locales.getText("pisell2.hdl-kiosk.restart-order-payment-blocked"),

package/es/components/bigSale/index.js

@@ -117,7 +117,7 @@ const BigSale = ({ osKey = DEFAULT_OS_KEY, enableMultiCurrencySettlement = false
 		variant
 	]);
 	const isPosProductSelectionFlow = resolvedTemplate !== "kiosk" && isProductSelectionFlow;
-	const fulfillmentOtherParams = useMemo(() => _objectSpread2(_objectSpread2({}, otherParams), {}, { enablePickupTiming: resolvedTemplate !== "HDLKiosk" }), [otherParams, resolvedTemplate]);
+	const fulfillmentOtherParams = useMemo(() => _objectSpread2(_objectSpread2({ enforceSingleBookingStartDate: false }, otherParams), {}, { enablePickupTiming: resolvedTemplate !== "HDLKiosk" }), [otherParams, resolvedTemplate]);
 	const resolvedSaleDetailModuleConfig = useMemo(() => isPosProductSelectionFlow ? _objectSpread2(_objectSpread2({}, saleDetailModuleConfig), {}, { cartItems: _objectSpread2(_objectSpread2({}, saleDetailModuleConfig === null || saleDetailModuleConfig === void 0 ? void 0 : saleDetailModuleConfig.cartItems), {}, { bookingQuantityMode: "editable" }) }) : saleDetailModuleConfig, [isPosProductSelectionFlow, saleDetailModuleConfig]);
 	const runtimeRef = useRef({
 		date: void 0,

package/es/components/bigSale/templates/Kiosk/index.js

@@ -244,6 +244,7 @@ function KioskBigSaleTemplate({ isActive = true, osKey, productListPreferencesCh
 	const app = (_utils$getApp = utils.getApp) === null || _utils$getApp === void 0 ? void 0 : _utils$getApp.call(utils);
 	const hostChannel = String((engineContext === null || engineContext === void 0 || (_engineContext$appHel2 = engineContext.appHelper) === null || _engineContext$appHel2 === void 0 || (_engineContext$appHel2 = _engineContext$appHel2.constants) === null || _engineContext$appHel2 === void 0 || (_engineContext$appHel2 = _engineContext$appHel2.config) === null || _engineContext$appHel2 === void 0 ? void 0 : _engineContext$appHel2.channel) || "").trim().toLowerCase();
 	const shouldUseConsumerPayment = hostChannel === "pc" || hostChannel === "h5";
+	const shouldUseFulfillmentCheckout = shouldUseConsumerPayment || platform === "kiosk";
 	const shouldRequireLogin = isRequireLoginChannel(hostChannel);
 	const { isLoggedIn, openLoginModal } = useSalesUserLogin();
 	const [view, setView] = useState(() => normalizeKioskNavigableView(kioskShellLayout, readKioskSessionView(context.sales.bookingTicket)));
@@ -264,8 +265,8 @@ function KioskBigSaleTemplate({ isActive = true, osKey, productListPreferencesCh
 	const fulfillmentOpeningRef = useRef(false);
 	const fulfillmentCheckout = useKioskFulfillmentCheckout({
 		context,
-		enabled: shouldUseConsumerPayment,
-		scopeKey: `${osKey || ""}:${businessCode || ""}:${hostChannel}`,
+		enabled: shouldUseFulfillmentCheckout,
+		scopeKey: `${osKey || ""}:${businessCode || ""}:${hostChannel}:${platform}`,
 		isActive,
 		mobile: hostChannel === "h5"
 	});
@@ -417,7 +418,7 @@ function KioskBigSaleTemplate({ isActive = true, osKey, productListPreferencesCh
 				...((_saleDetailModuleConf = saleDetailModuleConfig === null || saleDetailModuleConfig === void 0 ? void 0 : saleDetailModuleConfig.hidden) !== null && _saleDetailModuleConf !== void 0 ? _saleDetailModuleConf : []).filter((moduleKey) => !KIOSK_REQUIRED_MODULES.has(moduleKey))
 			])],
 			cartItems: _objectSpread2(_objectSpread2({}, saleDetailModuleConfig === null || saleDetailModuleConfig === void 0 ? void 0 : saleDetailModuleConfig.cartItems), {}, {
-				beforeContent: shouldUseConsumerPayment ? saleDetailModuleConfig === null || saleDetailModuleConfig === void 0 || (_saleDetailModuleConf2 = saleDetailModuleConfig.cartItems) === null || _saleDetailModuleConf2 === void 0 ? void 0 : _saleDetailModuleConf2.beforeContent : /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(KioskPickupTiming, {
+				beforeContent: shouldUseFulfillmentCheckout ? saleDetailModuleConfig === null || saleDetailModuleConfig === void 0 || (_saleDetailModuleConf2 = saleDetailModuleConfig.cartItems) === null || _saleDetailModuleConf2 === void 0 ? void 0 : _saleDetailModuleConf2.beforeContent : /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(KioskPickupTiming, {
 					key: `${osKey || ""}:${businessCode || ""}:${hostChannel}:${String(((_context$sales$tempOr = context.sales.tempOrder) === null || _context$sales$tempOr === void 0 || (_context$sales$tempOr = _context$sales$tempOr._extend) === null || _context$sales$tempOr === void 0 ? void 0 : _context$sales$tempOr.localId) || ((_context$sales$tempOr2 = context.sales.tempOrder) === null || _context$sales$tempOr2 === void 0 ? void 0 : _context$sales$tempOr2.external_sale_number) || ((_context$sales$tempOr3 = context.sales.tempOrder) === null || _context$sales$tempOr3 === void 0 ? void 0 : _context$sales$tempOr3.order_id) || orderId || "draft")}`,
 					context,
 					mobile: variant === "phone",
@@ -463,7 +464,7 @@ function KioskBigSaleTemplate({ isActive = true, osKey, productListPreferencesCh
 		orderId,
 		osKey,
 		pickupTimingError,
-		shouldUseConsumerPayment,
+		shouldUseFulfillmentCheckout,
 		saleDetailModuleConfig,
 		requestRemoveItemConfirmation,
 		variant
@@ -645,7 +646,7 @@ function KioskBigSaleTemplate({ isActive = true, osKey, productListPreferencesCh
 	};
 	const performCheckout = function() {
 		var _ref22 = _asyncToGenerator(function* () {
-			if (checkoutOpeningRef.current || !shouldUseConsumerPayment && isPickupTimingPending || cartItemCount === 0) return;
+			if (checkoutOpeningRef.current || !shouldUseFulfillmentCheckout && isPickupTimingPending || cartItemCount === 0) return;
 			checkoutOpeningRef.current = true;
 			const openingScope = fulfillmentCheckout.captureScope();
 			const isCurrentCheckoutRequest = () => {
@@ -669,15 +670,15 @@ function KioskBigSaleTemplate({ isActive = true, osKey, productListPreferencesCh
 				setPickupTimingError(void 0);
 				try {
 					var _context$sales$bookin4, _context$sales$bookin5;
-					if (shouldUseConsumerPayment && !(yield fulfillmentCheckout.request(true))) {
+					if (shouldUseFulfillmentCheckout && !(yield fulfillmentCheckout.request(true))) {
 						setNavigableView("cart");
 						return;
 					}
-					if (shouldUseConsumerPayment && !fulfillmentCheckout.isCurrent(openingScope)) return;
+					if (shouldUseFulfillmentCheckout && !fulfillmentCheckout.isCurrent(openingScope)) return;
 					yield context.cart.waitForCartConsistency();
-					if (shouldUseConsumerPayment && !fulfillmentCheckout.isCurrent(openingScope)) return;
+					if (shouldUseFulfillmentCheckout && !fulfillmentCheckout.isCurrent(openingScope)) return;
 					yield (_context$sales$bookin4 = context.sales.bookingTicket) === null || _context$sales$bookin4 === void 0 || (_context$sales$bookin5 = _context$sales$bookin4.preparePickupTimingForCheckout) === null || _context$sales$bookin5 === void 0 ? void 0 : _context$sales$bookin5.call(_context$sales$bookin4);
-					if (shouldUseConsumerPayment && !fulfillmentCheckout.isCurrent(openingScope)) return;
+					if (shouldUseFulfillmentCheckout && !fulfillmentCheckout.isCurrent(openingScope)) return;
 					context.cart.refreshCartSnapshot();
 					if (!isCurrentCheckoutRequest()) return;
 				} catch (reason) {
@@ -940,7 +941,7 @@ function KioskBigSaleTemplate({ isActive = true, osKey, productListPreferencesCh
 	const beginCheckoutWithFulfillment = function() {
 		var _ref25 = _asyncToGenerator(function* () {
 			if (!(yield businessAvailability.ensureCanShop())) return;
-			if (!shouldUseConsumerPayment) {
+			if (!shouldUseFulfillmentCheckout) {
 				continueCheckout();
 				return;
 			}
@@ -996,9 +997,9 @@ function KioskBigSaleTemplate({ isActive = true, osKey, productListPreferencesCh
 						openCustomerAuth: (payload) => salesHostBridges.customerAuth.request(payload),
 						setOrderCustomer: (_context$sales$bookin31 = context.sales.bookingTicket) === null || _context$sales$bookin31 === void 0 || (_context$sales$bookin31 = _context$sales$bookin31.setOrderCustomer) === null || _context$sales$bookin31 === void 0 ? void 0 : _context$sales$bookin31.bind(context.sales.bookingTicket),
 						loadDiscountConfig: () => context.cart.loadDiscountConfig(),
-						isActive: () => isActiveRef.current && (!shouldUseConsumerPayment || fulfillmentCheckout.isCurrent(openingScope))
+						isActive: () => isActiveRef.current && (!shouldUseFulfillmentCheckout || fulfillmentCheckout.isCurrent(openingScope))
 					}).then((canProceed) => {
-						if (canProceed && isActiveRef.current && (!shouldUseConsumerPayment || fulfillmentCheckout.isCurrent(openingScope))) return beginCheckoutWithFulfillment();
+						if (canProceed && isActiveRef.current && (!shouldUseFulfillmentCheckout || fulfillmentCheckout.isCurrent(openingScope))) return beginCheckoutWithFulfillment();
 					}).catch((error) => {
 						console.warn("[KioskBigSale] Login2 登录后同步下单客户失败", error);
 					}).finally(() => {
@@ -1015,7 +1016,7 @@ function KioskBigSaleTemplate({ isActive = true, osKey, productListPreferencesCh
 						},
 						callback: createKioskLoginContinuationHandler({
 							continueCheckout: beginCheckoutWithFulfillment,
-							isActive: () => isActiveRef.current && (!shouldUseConsumerPayment || fulfillmentCheckout.isCurrent(openingScope)),
+							isActive: () => isActiveRef.current && (!shouldUseFulfillmentCheckout || fulfillmentCheckout.isCurrent(openingScope)),
 							syncAuthenticatedOrderCustomer: () => syncKioskAuthenticatedOrderCustomer({
 								bookingTicket: context.sales.bookingTicket,
 								loadDiscountConfig: () => context.cart.loadDiscountConfig()
@@ -1147,8 +1148,8 @@ function KioskBigSaleTemplate({ isActive = true, osKey, productListPreferencesCh
 	})) : null, layoutState.showCart ? /* @__PURE__ */ React.createElement("section", {
 		"aria-label": locales.getText("pisell2.big-sale.kiosk.your-order"),
 		className: "pisell-kiosk-sale__screen pisell-kiosk-sale__cart-screen",
-		"data-fulfillment": !shouldUseConsumerPayment && isPickupTimingVisible ? "true" : "false"
-	}, shouldUseConsumerPayment || !isPickupTimingVisible ? /* @__PURE__ */ React.createElement("header", { className: "pisell-kiosk-sale__cart-header" }, /* @__PURE__ */ React.createElement("h1", null, locales.getText("pisell2.big-sale.kiosk.your-order"), " ", "(", cartItemCount, ")")) : null, /* @__PURE__ */ React.createElement("div", { className: "pisell-kiosk-sale__cart-body" }, shouldUseConsumerPayment && pickupTimingError ? /* @__PURE__ */ React.createElement(Alert, {
+		"data-fulfillment": !shouldUseFulfillmentCheckout && isPickupTimingVisible ? "true" : "false"
+	}, shouldUseFulfillmentCheckout || !isPickupTimingVisible ? /* @__PURE__ */ React.createElement("header", { className: "pisell-kiosk-sale__cart-header" }, /* @__PURE__ */ React.createElement("h1", null, locales.getText("pisell2.big-sale.kiosk.your-order"), " ", "(", cartItemCount, ")")) : null, /* @__PURE__ */ React.createElement("div", { className: "pisell-kiosk-sale__cart-body" }, shouldUseFulfillmentCheckout && pickupTimingError ? /* @__PURE__ */ React.createElement(Alert, {
 		type: "error",
 		showIcon: true,
 		message: pickupTimingError,
@@ -1176,7 +1177,7 @@ function KioskBigSaleTemplate({ isActive = true, osKey, productListPreferencesCh
 		promotionAppliedCount: selectedCustomerVoucherCount,
 		onAddNote: openOrderNoteModal,
 		onBack: handleCapsuleBack,
-		checkoutLoading: isCheckoutLoading || !shouldUseConsumerPayment && view === "cart" && isPickupTimingPending,
+		checkoutLoading: isCheckoutLoading || !shouldUseFulfillmentCheckout && view === "cart" && isPickupTimingPending,
 		checkoutDisabled: shoppingBlocked,
 		onCheckout: handleCheckout,
 		onTogglePromotion: isVirtualSettlementOrder ? void 0 : handleToggleFloatingPromotion,

package/es/components/kioskSale/index.js

@@ -63,7 +63,7 @@ function KioskSale(props) {
 		const { menu_list_ids: _ignoredMenuListIds } = productLoadParams;
 		return _objectWithoutProperties(productLoadParams, _excluded2);
 	}, [productLoadParams]);
-	const resolvedOtherParams = useMemo(() => _objectSpread2(_objectSpread2(_objectSpread2({}, otherParams || {}), channel ? { channel } : {}), {}, { enableBusinessAvailability: Boolean(kioskPresentation.platform) }, kioskPresentation.platform ? { platform: kioskPresentation.platform } : {}), [
+	const resolvedOtherParams = useMemo(() => _objectSpread2(_objectSpread2(_objectSpread2({}, otherParams || {}), {}, { enforceSingleBookingStartDate: true }, channel ? { channel } : {}), {}, { enableBusinessAvailability: Boolean(kioskPresentation.platform) }, kioskPresentation.platform ? { platform: kioskPresentation.platform } : {}), [
 		channel,
 		kioskPresentation.platform,
 		otherParams

package/es/plus/saasDevice/devicePasscodes/model.js

@@ -1,10 +1,10 @@
 import { _objectSpread2 } from "../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js";
 import dayjs from "dayjs";
-import timezone from "dayjs/plugin/timezone";
-import utc from "dayjs/plugin/utc";
+import timezonePlugin from "dayjs/plugin/timezone";
+import utcPlugin from "dayjs/plugin/utc";
 //#region src/plus/saasDevice/devicePasscodes/model.ts
-dayjs.extend(utc);
-dayjs.extend(timezone);
+dayjs.extend(utcPlugin);
+dayjs.extend(timezonePlugin);
 const INITIAL_DEVICE_PASSCODE_STATE = {
 	deviceIds: [],
 	devicesById: {}

package/es/plus/salesSdk/context/SalesSdkCartContext.js

@@ -983,7 +983,8 @@ const SalesSdkCartProvider = ({ children, normalProductDetailConfig, deferHolder
 				}
 				return products;
 			}
-			const products = yield bookingTicket.addProductToOrder(productToAdd, booking, Object.keys(addOptions).length > 0 ? addOptions : void 0);
+			let products = yield bookingTicket.addProductToOrder(productToAdd, booking, Object.keys(addOptions).length > 0 ? addOptions : void 0);
+			if (booking && bookingTicket.removeBookingProductsOutsideStartDate) products = yield bookingTicket.removeBookingProductsOutsideStartDate(booking.start_date);
 			const deferredConsistencyRefresh = scheduleDeferredAddConsistencyRefresh();
 			refreshCartSnapshot(deferredConsistencyRefresh.refreshVersion);
 			yield deferredConsistencyRefresh.promise;

package/es/plus/salesSdk/types.d.ts

@@ -1028,6 +1028,7 @@ interface BookingTicketHandle extends PickupTimingHandle {
   setSalesNote?: (input: SalesSdkSetSalesNoteInput) => Promise<SalesSdkSalesNote>;
   removeSalesNote?: (uuid: string) => Promise<void>;
   getOrderProducts: () => ScanOrderOrderProduct[];
+  removeBookingProductsOutsideStartDate?: (startDate: unknown) => Promise<ScanOrderOrderProduct[]>;
   getDiscountList: () => any[];
   getOriginalDiscountList?: () => any[];
   replaceDiscountStoreLists?: (params: {

package/es/plus/salesSdk/utils/editCartLineBooking.js

@@ -581,6 +581,7 @@ function _editCartLineBooking() {
 			}, allowBookingReprice ? { allow_booking_reprice: true } : {}));
 		}
 		commitLifecycle === null || commitLifecycle === void 0 || commitLifecycle.beforeCommit();
+		if (bookingTicket.removeBookingProductsOutsideStartDate) yield bookingTicket.removeBookingProductsOutsideStartDate(bookingPatch === null || bookingPatch === void 0 ? void 0 : bookingPatch.start_date);
 		products = input.syncQuantityByRows ? yield input.syncQuantityByRows({
 			sources: targets,
 			targetQuantity,

package/es/plus/walletPassGallery/components/timelineSection/index.js

@@ -6,12 +6,12 @@ import React, { useCallback, useEffect, useMemo, useRef } from "react";
 import { locales } from "@pisell/utils";
 import { Button, PisellEmpty, PisellModal, PisellStatisticList, Skeleton, Timeline, usePisellConfig } from "@pisell/materials";
 import { useRequest } from "ahooks";
-import timezone from "dayjs/plugin/timezone";
-import utc from "dayjs/plugin/utc";
+import timezonePlugin from "dayjs/plugin/timezone";
+import utcPlugin from "dayjs/plugin/utc";
 import "./index.less";
 //#region src/plus/walletPassGallery/components/timelineSection/index.tsx
-dayjs.extend(timezone);
-dayjs.extend(utc);
+dayjs.extend(timezonePlugin);
+dayjs.extend(utcPlugin);
 const stateTimeUnix = 1723255863;
 const POLL_INTERVAL = 2e3;
 const POLL_MAX_TIMES = 5;

package/lib/components/HDLKiosk/slices/payment/Screen/index.js

@@ -27,23 +27,52 @@ function ConfirmOrderIcon() {
 		"aria-hidden": "true"
 	}, /* @__PURE__ */ react.default.createElement("path", { d: "m5 12 4 4L19 6" }));
 }
-/** 与 PaymentModal 一致：EFTPOS/信用卡使用 credit，其余自定义方式使用 custom。 */
-function PaymentMethodIcon({ code, type }) {
-	const isCard = code === "EFTPOS" || type === "credit-card" || type === "eftpos";
+/** 名称含 cash 时优先展示纸币，否则按卡支付、现金配置和自定义支付区分。 */
+function PaymentMethodIcon({ code, name, type, eftpos, cash }) {
+	const nameContainsCash = /cash/i.test(name);
+	const isCash = nameContainsCash || cash;
+	const isCard = !nameContainsCash && (eftpos || code === "EFTPOS" || type === "credit-card" || type === "eftpos");
 	return /* @__PURE__ */ react.default.createElement("span", {
 		className: "hdl-payment-method__icon",
-		style: { background: isCard ? "#FE8279" : "#D277E4" },
+		style: { background: isCard ? "#FE8279" : isCash ? "#D69B28" : "#D277E4" },
 		"aria-hidden": "true"
-	}, /* @__PURE__ */ react.default.createElement(_pisell_materials.Iconfont, {
-		type: isCard ? "pisell2-credit" : "pisell2-custom",
+	}, isCard ? /* @__PURE__ */ react.default.createElement(_pisell_materials.Iconfont, {
+		type: "pisell2-credit-card-02",
 		style: {
 			fontSize: "46px",
 			color: "#fff"
 		}
-	}));
+	}) : /* @__PURE__ */ react.default.createElement("svg", {
+		viewBox: "0 0 32 32",
+		width: "48",
+		height: "48",
+		fill: "none",
+		stroke: "#fff",
+		strokeWidth: "1.8",
+		strokeLinecap: "round",
+		strokeLinejoin: "round",
+		focusable: "false"
+	}, isCash ? /* @__PURE__ */ react.default.createElement(react.default.Fragment, null, /* @__PURE__ */ react.default.createElement("rect", {
+		x: "3",
+		y: "6",
+		width: "26",
+		height: "17",
+		rx: "3"
+	}), /* @__PURE__ */ react.default.createElement("path", { d: "M7 26h18M3 11a5 5 0 0 0 5-5m16 0a5 5 0 0 0 5 5M3 18a5 5 0 0 1 5 5m16 0a5 5 0 0 1 5-5" }), /* @__PURE__ */ react.default.createElement("ellipse", {
+		cx: "16",
+		cy: "14.5",
+		rx: "3.5",
+		ry: "4.5"
+	})) : /* @__PURE__ */ react.default.createElement(react.default.Fragment, null, /* @__PURE__ */ react.default.createElement("rect", {
+		x: "7",
+		y: "4",
+		width: "14",
+		height: "9",
+		rx: "2"
+	}), /* @__PURE__ */ react.default.createElement("path", { d: "M11 8.5h6M14 13v3M8 16h16l4 7v4a1 1 0 0 1-1 1H5a1 1 0 0 1-1-1v-4l4-7ZM4 23h24M13 25.5h6M10 19.5h2m3 0h2m3 0h2" }))));
 }
 function CheckoutScreen({ model, orderBar, send }) {
-	var _model$paymentFeedbac;
+	var _model$paymentFeedbac2, _model$paymentFeedbac4, _model$paymentFeedbac5;
 	const sendRef = (0, react.useRef)(send);
 	sendRef.current = send;
 	const goBack = (0, react.useCallback)(() => {
@@ -55,6 +84,47 @@ function CheckoutScreen({ model, orderBar, send }) {
 	const canReturnToCart = Boolean(orderBar && orderBar.cartLineCount > 0) && model.canLeavePayment;
 	const [restartOrderOpen, setRestartOrderOpen] = (0, react.useState)(false);
 	const [dismissedFeedbackKey, setDismissedFeedbackKey] = (0, react.useState)();
+	const automaticPaymentHandled = (0, react.useRef)(false);
+	const confirmNoPayment = (0, react.useCallback)(() => {
+		var _model$paymentFeedbac;
+		automaticPaymentHandled.current = true;
+		setDismissedFeedbackKey((_model$paymentFeedbac = model.paymentFeedback) === null || _model$paymentFeedbac === void 0 ? void 0 : _model$paymentFeedbac.key);
+		sendRef.current({
+			kind: "command",
+			command: "checkout.completeNoPayment"
+		});
+	}, [(_model$paymentFeedbac2 = model.paymentFeedback) === null || _model$paymentFeedbac2 === void 0 ? void 0 : _model$paymentFeedbac2.key]);
+	const selectPayment = (0, react.useCallback)((method) => {
+		var _model$paymentFeedbac3;
+		automaticPaymentHandled.current = true;
+		setDismissedFeedbackKey((_model$paymentFeedbac3 = model.paymentFeedback) === null || _model$paymentFeedbac3 === void 0 ? void 0 : _model$paymentFeedbac3.key);
+		sendRef.current({
+			kind: "command",
+			command: method.eftpos ? "checkout.payEftpos" : "checkout.requestStaffPaymentApproval",
+			input: { paymentMethodId: method.id }
+		});
+	}, [(_model$paymentFeedbac4 = model.paymentFeedback) === null || _model$paymentFeedbac4 === void 0 ? void 0 : _model$paymentFeedbac4.key]);
+	(0, react.useEffect)(() => {
+		if (model.paymentFeedback) automaticPaymentHandled.current = true;
+		if (automaticPaymentHandled.current || model.busy || model.resetting || model.paymentResult || model.paymentResultPending || restartOrderOpen || !model.totalText) return;
+		let startPayment;
+		if (model.noPaymentRequired) {
+			if (model.canCompleteNoPayment) startPayment = confirmNoPayment;
+		} else if (model.canSelectPayment && !model.paymentMethodsLoading && !model.paymentMethodsErrorReference && model.paymentMethods.length === 1) startPayment = () => selectPayment(model.paymentMethods[0]);
+		if (!startPayment) return;
+		let cancelled = false;
+		Promise.resolve().then(() => {
+			if (!cancelled && !automaticPaymentHandled.current) startPayment();
+		});
+		return () => {
+			cancelled = true;
+		};
+	}, [
+		model,
+		restartOrderOpen,
+		confirmNoPayment,
+		selectPayment
+	]);
 	const [returnCountdown, setReturnCountdown] = (0, react.useState)(10);
 	const resetOrder = (0, react.useCallback)((source) => sendRef.current({
 		kind: "session",
@@ -150,11 +220,7 @@ function CheckoutScreen({ model, orderBar, send }) {
 		role: "status"
 	}, /* @__PURE__ */ react.default.createElement("span", { className: "hdl-operation-overlay__spinner" }), /* @__PURE__ */ react.default.createElement("strong", null, _pisell_utils.locales.getText("pisell2.hdl-kiosk.payment-processing"))));
 	const paymentDisabled = !model.canSelectPayment || !model.totalText;
-	const visibleFeedback = ((_model$paymentFeedbac = model.paymentFeedback) === null || _model$paymentFeedbac === void 0 ? void 0 : _model$paymentFeedbac.key) === dismissedFeedbackKey ? void 0 : model.paymentFeedback;
-	const dismissCurrentFeedback = () => {
-		var _model$paymentFeedbac2;
-		return setDismissedFeedbackKey((_model$paymentFeedbac2 = model.paymentFeedback) === null || _model$paymentFeedbac2 === void 0 ? void 0 : _model$paymentFeedbac2.key);
-	};
+	const visibleFeedback = ((_model$paymentFeedbac5 = model.paymentFeedback) === null || _model$paymentFeedbac5 === void 0 ? void 0 : _model$paymentFeedbac5.key) === dismissedFeedbackKey ? void 0 : model.paymentFeedback;
 	return /* @__PURE__ */ react.default.createElement(react.default.Fragment, null, /* @__PURE__ */ react.default.createElement("section", {
 		className: "hdl-checkout-screen",
 		"aria-labelledby": "hdl-payment-method-title"
@@ -169,13 +235,7 @@ function CheckoutScreen({ model, orderBar, send }) {
 		className: "hdl-payment-method hdl-no-payment-confirm",
 		"aria-busy": model.busy,
 		disabled: !model.canCompleteNoPayment,
-		onClick: () => {
-			dismissCurrentFeedback();
-			send({
-				kind: "command",
-				command: "checkout.completeNoPayment"
-			});
-		}
+		onClick: confirmNoPayment
 	}, /* @__PURE__ */ react.default.createElement("span", { className: "hdl-no-payment-confirm__icon" }, /* @__PURE__ */ react.default.createElement(ConfirmOrderIcon, null)), /* @__PURE__ */ react.default.createElement("strong", null, _pisell_utils.locales.getText(model.busy ? "pisell2.hdl-kiosk.no-payment-confirming" : "pisell2.hdl-kiosk.no-payment-confirm")), /* @__PURE__ */ react.default.createElement(NextIcon, null)) : /* @__PURE__ */ react.default.createElement(react.default.Fragment, null, model.paymentMethodsLoading ? /* @__PURE__ */ react.default.createElement("p", {
 		className: "hdl-payment-methods__notice",
 		role: "status"
@@ -184,32 +244,21 @@ function CheckoutScreen({ model, orderBar, send }) {
 		role: model.paymentMethodsErrorReference ? "alert" : "status"
 	}, _pisell_utils.locales.getText("pisell2.hdl-kiosk.payment-methods-unavailable")) : null, model.paymentMethods.map((method) => {
 		const eftpos = method.eftpos;
+		const displayName = method.name.replace(/-Linkly/g, "");
 		return /* @__PURE__ */ react.default.createElement("button", {
 			key: method.id,
 			type: "button",
 			className: `hdl-payment-method hdl-payment-method--${eftpos ? "card" : "cash"}`,
-			"aria-label": method.name,
+			"aria-label": displayName,
 			disabled: paymentDisabled,
-			onClick: () => {
-				dismissCurrentFeedback();
-				if (eftpos) {
-					send({
-						kind: "command",
-						command: "checkout.payEftpos",
-						input: { paymentMethodId: method.id }
-					});
-					return;
-				}
-				send({
-					kind: "command",
-					command: "checkout.requestStaffPaymentApproval",
-					input: { paymentMethodId: method.id }
-				});
-			}
+			onClick: () => selectPayment(method)
 		}, /* @__PURE__ */ react.default.createElement(PaymentMethodIcon, {
 			code: method.code,
-			type: method.type
-		}), /* @__PURE__ */ react.default.createElement("span", null, /* @__PURE__ */ react.default.createElement("strong", null, method.name)), /* @__PURE__ */ react.default.createElement(NextIcon, null));
+			name: method.name,
+			type: method.type,
+			eftpos: method.eftpos,
+			cash: method.cash
+		}), /* @__PURE__ */ react.default.createElement("span", null, /* @__PURE__ */ react.default.createElement("strong", null, displayName)), /* @__PURE__ */ react.default.createElement(NextIcon, null));
 	}))), /* @__PURE__ */ react.default.createElement("div", { className: "hdl-payment-restart-section" }, /* @__PURE__ */ react.default.createElement(require_index$3.RestartOrderButton, {
 		disabled: !model.canRestartOrder,
 		title: model.restartOrderBlockedReason,

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

@@ -73,10 +73,13 @@ function createCheckoutScreenModel(snapshot, sales, payment, completed = false,
 		busy: snapshot.status === "running",
 		noPaymentRequired,
 		canCompleteNoPayment: noPaymentRequired && interactionAvailable,
-		paymentMethods: payment.methods,
+		paymentMethods: payment.methods.map((method) => {
+			var _method$metadata, _method$metadata2;
+			return require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, method), {}, { cash: method.type === "custom" && (((_method$metadata = method.metadata) === null || _method$metadata === void 0 ? void 0 : _method$metadata.order_open_cash_drawer) === 1 || ((_method$metadata2 = method.metadata) === null || _method$metadata2 === void 0 ? void 0 : _method$metadata2.order_open_cash_drawer) === "1") });
+		}),
 		paymentMethodsLoading: payment.loading,
 		paymentMethodsErrorReference: payment.errorReference,
-		canSelectPayment: interactionAvailable,
+		canSelectPayment: interactionAvailable && sales.summary.status === "ready",
 		canLeavePayment: interactionAvailable,
 		canRestartOrder: interactionAvailable,
 		restartOrderBlockedReason: paymentSafeToChange ? void 0 : _pisell_utils.locales.getText("pisell2.hdl-kiosk.restart-order-payment-blocked"),

package/lib/components/bigSale/index.js

@@ -119,7 +119,7 @@ const BigSale = ({ osKey = DEFAULT_OS_KEY, enableMultiCurrencySettlement = false
 		variant
 	]);
 	const isPosProductSelectionFlow = resolvedTemplate !== "kiosk" && isProductSelectionFlow;
-	const fulfillmentOtherParams = (0, react.useMemo)(() => require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, otherParams), {}, { enablePickupTiming: resolvedTemplate !== "HDLKiosk" }), [otherParams, resolvedTemplate]);
+	const fulfillmentOtherParams = (0, react.useMemo)(() => require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({ enforceSingleBookingStartDate: false }, otherParams), {}, { enablePickupTiming: resolvedTemplate !== "HDLKiosk" }), [otherParams, resolvedTemplate]);
 	const resolvedSaleDetailModuleConfig = (0, react.useMemo)(() => isPosProductSelectionFlow ? require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, saleDetailModuleConfig), {}, { cartItems: require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, saleDetailModuleConfig === null || saleDetailModuleConfig === void 0 ? void 0 : saleDetailModuleConfig.cartItems), {}, { bookingQuantityMode: "editable" }) }) : saleDetailModuleConfig, [isPosProductSelectionFlow, saleDetailModuleConfig]);
 	const runtimeRef = (0, react.useRef)({
 		date: void 0,