@pisell/private-materials 6.12.312 → 6.12.314

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

@@ -245,6 +245,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 = require_useSalesUserLogin.isRequireLoginChannel(hostChannel);
 	const { isLoggedIn, openLoginModal } = require_useSalesUserLogin.default();
 	const [view, setView] = (0, react.useState)(() => require_layout.normalizeKioskNavigableView(kioskShellLayout, readKioskSessionView(context.sales.bookingTicket)));
@@ -265,8 +266,8 @@ function KioskBigSaleTemplate({ isActive = true, osKey, productListPreferencesCh
 	const fulfillmentOpeningRef = (0, react.useRef)(false);
 	const fulfillmentCheckout = require_useKioskFulfillmentCheckout.default({
 		context,
-		enabled: shouldUseConsumerPayment,
-		scopeKey: `${osKey || ""}:${businessCode || ""}:${hostChannel}`,
+		enabled: shouldUseFulfillmentCheckout,
+		scopeKey: `${osKey || ""}:${businessCode || ""}:${hostChannel}:${platform}`,
 		isActive,
 		mobile: hostChannel === "h5"
 	});
@@ -418,7 +419,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: require_objectSpread2._objectSpread2(require_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.default.createElement(react.default.Fragment, null, /* @__PURE__ */ react.default.createElement(require_KioskPickupTiming.default, {
+				beforeContent: shouldUseFulfillmentCheckout ? saleDetailModuleConfig === null || saleDetailModuleConfig === void 0 || (_saleDetailModuleConf2 = saleDetailModuleConfig.cartItems) === null || _saleDetailModuleConf2 === void 0 ? void 0 : _saleDetailModuleConf2.beforeContent : /* @__PURE__ */ react.default.createElement(react.default.Fragment, null, /* @__PURE__ */ react.default.createElement(require_KioskPickupTiming.default, {
 					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",
@@ -464,7 +465,7 @@ function KioskBigSaleTemplate({ isActive = true, osKey, productListPreferencesCh
 		orderId,
 		osKey,
 		pickupTimingError,
-		shouldUseConsumerPayment,
+		shouldUseFulfillmentCheckout,
 		saleDetailModuleConfig,
 		requestRemoveItemConfirmation,
 		variant
@@ -646,7 +647,7 @@ function KioskBigSaleTemplate({ isActive = true, osKey, productListPreferencesCh
 	};
 	const performCheckout = function() {
 		var _ref22 = require_asyncToGenerator._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 = () => {
@@ -670,15 +671,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) {
@@ -941,7 +942,7 @@ function KioskBigSaleTemplate({ isActive = true, osKey, productListPreferencesCh
 	const beginCheckoutWithFulfillment = function() {
 		var _ref25 = require_asyncToGenerator._asyncToGenerator(function* () {
 			if (!(yield businessAvailability.ensureCanShop())) return;
-			if (!shouldUseConsumerPayment) {
+			if (!shouldUseFulfillmentCheckout) {
 				continueCheckout();
 				return;
 			}
@@ -997,9 +998,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(() => {
@@ -1016,7 +1017,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()
@@ -1148,8 +1149,8 @@ function KioskBigSaleTemplate({ isActive = true, osKey, productListPreferencesCh
 	})) : null, layoutState.showCart ? /* @__PURE__ */ react.default.createElement("section", {
 		"aria-label": _pisell_utils.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.default.createElement("header", { className: "pisell-kiosk-sale__cart-header" }, /* @__PURE__ */ react.default.createElement("h1", null, _pisell_utils.locales.getText("pisell2.big-sale.kiosk.your-order"), " ", "(", cartItemCount, ")")) : null, /* @__PURE__ */ react.default.createElement("div", { className: "pisell-kiosk-sale__cart-body" }, shouldUseConsumerPayment && pickupTimingError ? /* @__PURE__ */ react.default.createElement(antd.Alert, {
+		"data-fulfillment": !shouldUseFulfillmentCheckout && isPickupTimingVisible ? "true" : "false"
+	}, shouldUseFulfillmentCheckout || !isPickupTimingVisible ? /* @__PURE__ */ react.default.createElement("header", { className: "pisell-kiosk-sale__cart-header" }, /* @__PURE__ */ react.default.createElement("h1", null, _pisell_utils.locales.getText("pisell2.big-sale.kiosk.your-order"), " ", "(", cartItemCount, ")")) : null, /* @__PURE__ */ react.default.createElement("div", { className: "pisell-kiosk-sale__cart-body" }, shouldUseFulfillmentCheckout && pickupTimingError ? /* @__PURE__ */ react.default.createElement(antd.Alert, {
 		type: "error",
 		showIcon: true,
 		message: pickupTimingError,
@@ -1177,7 +1178,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/lib/components/kioskSale/index.js

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

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

@@ -986,7 +986,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/lib/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/lib/plus/salesSdk/utils/editCartLineBooking.js

@@ -583,6 +583,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/package.json

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