@pisell/private-materials 6.12.373 → 6.12.374

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

@@ -33,7 +33,7 @@ import { resolveKioskPresentation } from "../../../kioskSale/resolveKioskPresent
 import { resolveKioskCartItemsConfig } from "./cartPresentation.js";
 import KioskPaymentPage from "./payment/index.js";
 import { normalizeKioskNavigableView, resolveKioskLayoutState, resolveKioskProductListPreferencesChannel, resolveKioskPromotionRevealTarget } from "./layout.js";
-import { isH5ZeroAmountValue, isKioskPlatformZeroAmountCheckout, resolveKioskNoPaymentResultViewModel, resolveKioskNoPaymentSubmitParams, resolveKioskSubmittedPayableAmount, shouldSubmitKioskOrderBeforeCheckout, toFiniteKioskAmount, validateKioskNoPaymentSubmitResult } from "./zeroAmountCheckout.js";
+import { isKioskPlatformZeroAmountCheckout, isOnlineOrderingZeroAmountValue, resolveKioskNoPaymentResultViewModel, resolveKioskNoPaymentSubmitParams, resolveKioskSubmittedPayableAmount, shouldSubmitKioskOrderBeforeCheckout, toFiniteKioskAmount, validateKioskNoPaymentSubmitResult } from "./zeroAmountCheckout.js";
 import { openKioskCheckoutCustomerAuth, resolveKioskCheckoutCustomerAuthRequest } from "./checkoutCustomerAuth.js";
 import KioskPickupTiming from "./KioskPickupTiming.js";
 import useKioskFulfillmentCheckout from "./useKioskFulfillmentCheckout.js";
@@ -1026,8 +1026,8 @@ function KioskBigSaleTemplate({ isActive = true, catalogPreparation, osKey, prod
 						showCheckoutFailure(String(locales.getText("pisell2.big-sale.kiosk.payment-failure-description")));
 						return;
 					}
-					const shouldRedirectH5ZeroAmount = isH5ZeroAmountValue(platform, totalAmount);
-					if (shouldUseConsumerPayment || shouldRedirectH5ZeroAmount) {
+					const shouldRedirectOnlineOrderingZeroAmount = isOnlineOrderingZeroAmountValue(platform, totalAmount);
+					if (shouldUseConsumerPayment || shouldRedirectOnlineOrderingZeroAmount) {
 						publishKioskCollaborationPreviewStatus(app, "checkout");
 						yield launchKioskConsumerPaymentAfterReset({
 							action: utils.action,
@@ -1050,7 +1050,7 @@ function KioskBigSaleTemplate({ isActive = true, catalogPreparation, osKey, prod
 								persistKioskSessionView(context.sales.bookingTicket, "catalog");
 							},
 							recalcSummary: context.cart.recalcSummary,
-							redirectZeroAmount: shouldRedirectH5ZeroAmount,
+							redirectZeroAmount: shouldRedirectOnlineOrderingZeroAmount,
 							replace: (path) => {
 								var _utils$history3, _app$history6;
 								if (typeof (utils === null || utils === void 0 || (_utils$history3 = utils.history) === null || _utils$history3 === void 0 ? void 0 : _utils$history3.replace) === "function") {

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

@@ -9,6 +9,8 @@ function toFiniteKioskAmount(value) {
 function resolveKioskAmountDue(summary) {
 	var _toFiniteKioskAmount;
 	if (!summary) return null;
+	const serverWaitPayAmount = toFiniteKioskAmount(summary.order_wait_pay_amount);
+	if (serverWaitPayAmount !== null) return serverWaitPayAmount;
 	const orderPaidAmount = toFiniteKioskAmount(summary.order_paid_amount);
 	if (orderPaidAmount !== null && orderPaidAmount > 0) return toFiniteKioskAmount(summary.amount_gap);
 	return (_toFiniteKioskAmount = toFiniteKioskAmount(summary.expect_amount)) !== null && _toFiniteKioskAmount !== void 0 ? _toFiniteKioskAmount : toFiniteKioskAmount(summary.total_amount);
@@ -16,17 +18,23 @@ function resolveKioskAmountDue(summary) {
 function isKioskZeroAmountCheckout(summary) {
 	return resolveKioskAmountDue(summary) === 0;
 }
-function isH5ZeroAmountCheckout(platform, summary) {
-	return isH5ZeroAmountValue(platform, resolveKioskAmountDue(summary));
+/**
+* Online ordering runs in both H5 and desktop (pc) containers.  A zero due
+* amount must submit directly in either container instead of opening the
+* payment-method UI.
+*/
+function isOnlineOrderingZeroAmountCheckout(platform, summary) {
+	return isOnlineOrderingZeroAmountValue(platform, resolveKioskAmountDue(summary));
 }
-function isH5ZeroAmountValue(platform, amount) {
-	return String(platform || "").trim().toLowerCase() === "h5" && toFiniteKioskAmount(amount) === 0;
+function isOnlineOrderingZeroAmountValue(platform, amount) {
+	const normalizedPlatform = String(platform || "").trim().toLowerCase();
+	return (normalizedPlatform === "h5" || normalizedPlatform === "pc") && toFiniteKioskAmount(amount) === 0;
 }
 function isKioskPlatformZeroAmountCheckout(platform, summary) {
 	return isSelfServicePlatform(platform) && isKioskZeroAmountCheckout(summary);
 }
 function shouldSubmitKioskOrderBeforeCheckout(options) {
-	return options.shouldUseConsumerPayment || isH5ZeroAmountCheckout(options.platform, options.summary) || isKioskPlatformZeroAmountCheckout(options.platform, options.summary);
+	return options.shouldUseConsumerPayment || isOnlineOrderingZeroAmountCheckout(options.platform, options.summary) || isKioskPlatformZeroAmountCheckout(options.platform, options.summary);
 }
 function resolveKioskSubmittedPayableAmount(result, tempOrderSummary, contextSummary) {
 	var _result$data, _result$data2, _result$data3;
@@ -83,4 +91,4 @@ function resolveKioskNoPaymentResultViewModel(options) {
 	});
 }
 //#endregion
-export { isH5ZeroAmountCheckout, isH5ZeroAmountValue, isKioskPlatformZeroAmountCheckout, resolveKioskAmountDue, resolveKioskNoPaymentResultViewModel, resolveKioskNoPaymentSubmitParams, resolveKioskSubmittedPayableAmount, shouldSubmitKioskOrderBeforeCheckout, toFiniteKioskAmount, validateKioskNoPaymentSubmitResult };
+export { isKioskPlatformZeroAmountCheckout, isOnlineOrderingZeroAmountCheckout, isOnlineOrderingZeroAmountValue, resolveKioskAmountDue, resolveKioskNoPaymentResultViewModel, resolveKioskNoPaymentSubmitParams, resolveKioskSubmittedPayableAmount, shouldSubmitKioskOrderBeforeCheckout, toFiniteKioskAmount, validateKioskNoPaymentSubmitResult };

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

@@ -1027,8 +1027,8 @@ function KioskBigSaleTemplate({ isActive = true, catalogPreparation, osKey, prod
 						showCheckoutFailure(String(_pisell_utils.locales.getText("pisell2.big-sale.kiosk.payment-failure-description")));
 						return;
 					}
-					const shouldRedirectH5ZeroAmount = require_zeroAmountCheckout.isH5ZeroAmountValue(platform, totalAmount);
-					if (shouldUseConsumerPayment || shouldRedirectH5ZeroAmount) {
+					const shouldRedirectOnlineOrderingZeroAmount = require_zeroAmountCheckout.isOnlineOrderingZeroAmountValue(platform, totalAmount);
+					if (shouldUseConsumerPayment || shouldRedirectOnlineOrderingZeroAmount) {
 						publishKioskCollaborationPreviewStatus(app, "checkout");
 						yield launchKioskConsumerPaymentAfterReset({
 							action: utils.action,
@@ -1051,7 +1051,7 @@ function KioskBigSaleTemplate({ isActive = true, catalogPreparation, osKey, prod
 								persistKioskSessionView(context.sales.bookingTicket, "catalog");
 							},
 							recalcSummary: context.cart.recalcSummary,
-							redirectZeroAmount: shouldRedirectH5ZeroAmount,
+							redirectZeroAmount: shouldRedirectOnlineOrderingZeroAmount,
 							replace: (path) => {
 								var _utils$history3, _app$history6;
 								if (typeof (utils === null || utils === void 0 || (_utils$history3 = utils.history) === null || _utils$history3 === void 0 ? void 0 : _utils$history3.replace) === "function") {

package/lib/components/bigSale/templates/Kiosk/zeroAmountCheckout.js

@@ -9,6 +9,8 @@ function toFiniteKioskAmount(value) {
 function resolveKioskAmountDue(summary) {
 	var _toFiniteKioskAmount;
 	if (!summary) return null;
+	const serverWaitPayAmount = toFiniteKioskAmount(summary.order_wait_pay_amount);
+	if (serverWaitPayAmount !== null) return serverWaitPayAmount;
 	const orderPaidAmount = toFiniteKioskAmount(summary.order_paid_amount);
 	if (orderPaidAmount !== null && orderPaidAmount > 0) return toFiniteKioskAmount(summary.amount_gap);
 	return (_toFiniteKioskAmount = toFiniteKioskAmount(summary.expect_amount)) !== null && _toFiniteKioskAmount !== void 0 ? _toFiniteKioskAmount : toFiniteKioskAmount(summary.total_amount);
@@ -16,17 +18,23 @@ function resolveKioskAmountDue(summary) {
 function isKioskZeroAmountCheckout(summary) {
 	return resolveKioskAmountDue(summary) === 0;
 }
-function isH5ZeroAmountCheckout(platform, summary) {
-	return isH5ZeroAmountValue(platform, resolveKioskAmountDue(summary));
+/**
+* Online ordering runs in both H5 and desktop (pc) containers.  A zero due
+* amount must submit directly in either container instead of opening the
+* payment-method UI.
+*/
+function isOnlineOrderingZeroAmountCheckout(platform, summary) {
+	return isOnlineOrderingZeroAmountValue(platform, resolveKioskAmountDue(summary));
 }
-function isH5ZeroAmountValue(platform, amount) {
-	return String(platform || "").trim().toLowerCase() === "h5" && toFiniteKioskAmount(amount) === 0;
+function isOnlineOrderingZeroAmountValue(platform, amount) {
+	const normalizedPlatform = String(platform || "").trim().toLowerCase();
+	return (normalizedPlatform === "h5" || normalizedPlatform === "pc") && toFiniteKioskAmount(amount) === 0;
 }
 function isKioskPlatformZeroAmountCheckout(platform, summary) {
 	return require_platform.isSelfServicePlatform(platform) && isKioskZeroAmountCheckout(summary);
 }
 function shouldSubmitKioskOrderBeforeCheckout(options) {
-	return options.shouldUseConsumerPayment || isH5ZeroAmountCheckout(options.platform, options.summary) || isKioskPlatformZeroAmountCheckout(options.platform, options.summary);
+	return options.shouldUseConsumerPayment || isOnlineOrderingZeroAmountCheckout(options.platform, options.summary) || isKioskPlatformZeroAmountCheckout(options.platform, options.summary);
 }
 function resolveKioskSubmittedPayableAmount(result, tempOrderSummary, contextSummary) {
 	var _result$data, _result$data2, _result$data3;
@@ -83,9 +91,9 @@ function resolveKioskNoPaymentResultViewModel(options) {
 	});
 }
 //#endregion
-exports.isH5ZeroAmountCheckout = isH5ZeroAmountCheckout;
-exports.isH5ZeroAmountValue = isH5ZeroAmountValue;
 exports.isKioskPlatformZeroAmountCheckout = isKioskPlatformZeroAmountCheckout;
+exports.isOnlineOrderingZeroAmountCheckout = isOnlineOrderingZeroAmountCheckout;
+exports.isOnlineOrderingZeroAmountValue = isOnlineOrderingZeroAmountValue;
 exports.resolveKioskAmountDue = resolveKioskAmountDue;
 exports.resolveKioskNoPaymentResultViewModel = resolveKioskNoPaymentResultViewModel;
 exports.resolveKioskNoPaymentSubmitParams = resolveKioskNoPaymentSubmitParams;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.12.373",
+  "version": "6.12.374",
   "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/date-picker": "3.0.12",
-    "@pisell/icon": "0.0.11"
+    "@pisell/icon": "0.0.11",
+    "@pisell/date-picker": "3.0.12"
   },
   "peerDependencies": {
     "react": "^18.0.0",