@pisell/private-materials 6.12.336 → 6.12.337

package/es/plus/saleDetail/hooks/useAdjustTimeModal.js

@@ -13,11 +13,12 @@ import { useSalesSdkProducts } from "../../salesSdk/hooks/useSalesSdkProducts.js
 import { shouldCloseDialogAfterCheckout } from "../components/DetailActions/utils.js";
 import { AdjustTimeModal } from "../../salesSdk/adjustTime/AdjustTimeModal.js";
 import SelectBookingsModal from "../../salesSdk/adjustTime/components/SelectBookingsModal.js";
-import { getResourceEndTimeFromOrigin, mapSaleDetailAdjustTimeBooking, mapSaleDetailAdjustTimeProducts } from "../utils/adjustTimeAdapter.js";
+import { getResourceEndTimeFromOrigin, isSaleDetailAddTimeProductUsableForBookings, mapSaleDetailAdjustTimeBooking, mapSaleDetailAdjustTimeProducts, mapSaleDetailAdjustTimeProductsForBookings } from "../utils/adjustTimeAdapter.js";
 import { resolveAdjustTimeOrderAmounts } from "../utils/adjustTimeOrderAmounts.js";
 import dayjs from "dayjs";
 import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { message } from "antd";
+import { locales } from "@pisell/utils";
 import Decimal from "decimal.js";
 import { cloneDeep } from "lodash";
 import { useMemoizedFn } from "ahooks";
@@ -339,6 +340,19 @@ function useAdjustTimeModal(options) {
 			return acc;
 		}, []);
 	}, []);
+	/** 在任何逐票写入前整组校验，也阻止重新选票前的旧结果被提交。 */
+	const assertAddTimeProductsUsable = useMemoizedFn((result) => {
+		if (result.actionType === "restart" || result.actionType === "changeTime") return;
+		const cacheItems = selectedBookings.map(resolveCacheItem);
+		const usableProductIds = new Set(products.filter((product) => isSaleDetailAddTimeProductUsableForBookings(product._originalProduct, cacheItems)).map((product) => String(product.id)));
+		const lines = buildPreviewAddTimeLines(result);
+		const invalidSelectedProduct = result.actionType === "product" && (result.selectedProductId == null || !usableProductIds.has(String(result.selectedProductId)));
+		const invalidLines = lines.length !== (result.autoPricing.lines || []).length || lines.some((line) => {
+			var _line$product$id;
+			return !usableProductIds.has(String((_line$product$id = line.product.id) !== null && _line$product$id !== void 0 ? _line$product$id : line.product.product_id)) || !isSaleDetailAddTimeProductUsableForBookings(line.product, cacheItems);
+		});
+		if (invalidSelectedProduct || invalidLines) throw new Error(locales.getText("pisell2.sale-detail.add-time-products-not-applicable"));
+	});
 	const buildChangeTimePreviewQueries = useMemoizedFn((result) => {
 		var _bookingTicket$getTem, _bookingTicket$getTem2;
 		const bookingTicket = sales === null || sales === void 0 ? void 0 : sales.bookingTicket;
@@ -420,6 +434,7 @@ function useAdjustTimeModal(options) {
 				return;
 			}
 			const addTimeLines = buildPreviewAddTimeLines(result);
+			assertAddTimeProductsUsable(result);
 			if (!addTimeLines.length) return;
 			for (const selectedBooking of selectedBookings) yield salesSdkCart.addAddTimeProducts({
 				booking: selectedBooking,
@@ -520,7 +535,7 @@ function useAdjustTimeModal(options) {
 				yield ensureAdjustTimeResourcesReady(sales, primaryItem);
 				const cacheItem = resolveCacheItem(primaryItem);
 				const quotationSchedule = resolveBookingQuotationSchedule(primaryItem, cacheItem);
-				const mappedProducts = mapSaleDetailAdjustTimeProducts((quotationSchedule.schedule_date ? yield getAddTimeProductsWithCache(quotationSchedule) : rawAddTimeProducts) || [], cacheItem);
+				const mappedProducts = mapSaleDetailAdjustTimeProductsForBookings((quotationSchedule.schedule_date ? yield getAddTimeProductsWithCache(quotationSchedule) : rawAddTimeProducts) || [], items.map(resolveCacheItem));
 				const relationId = (_ref17 = (_cacheItem$_extend$re = cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend3 = cacheItem._extend) === null || _cacheItem$_extend3 === void 0 ? void 0 : _cacheItem$_extend3.relation_id) !== null && _cacheItem$_extend$re !== void 0 ? _cacheItem$_extend$re : (_primaryItem$resource = primaryItem.resources) === null || _primaryItem$resource === void 0 || (_primaryItem$resource = _primaryItem$resource[0]) === null || _primaryItem$resource === void 0 ? void 0 : _primaryItem$resource.relation_id) !== null && _ref17 !== void 0 ? _ref17 : primaryItem.relation_id;
 				const resourcesOrigin = (booking === null || booking === void 0 || (_booking$getResources = booking.getResourcesOrigin) === null || _booking$getResources === void 0 ? void 0 : _booking$getResources.call(booking)) || [];
 				const nextSnapshot = combineBookingSnapshots(items.map((item) => mapSaleDetailAdjustTimeBooking(item, resolveCacheItem(item))));
@@ -653,14 +668,15 @@ function useAdjustTimeModal(options) {
 	* await submitAdjustTimeResult(result, 'save');
 	*/
 	const submitAdjustTimeResult = useMemoizedFn(function() {
-		var _ref24 = _asyncToGenerator(function* (_result, mode) {
+		var _ref24 = _asyncToGenerator(function* (result, mode) {
 			if (!selectedBookings.length) return;
 			try {
+				yield previewQueueRef.current;
+				yield salesSdkCart.waitForCartConsistency();
+				assertAddTimeProductsUsable(result);
 				if (yield function() {
 					var _ref23 = _asyncToGenerator(function* () {
 						if (mode === "checkout") {
-							yield previewQueueRef.current;
-							yield salesSdkCart.waitForCartConsistency();
 							const checkoutResult = yield sales === null || sales === void 0 ? void 0 : sales.openCheckout();
 							const isBackWithPaymentChanged = (checkoutResult === null || checkoutResult === void 0 ? void 0 : checkoutResult.reason) === "back" && (checkoutResult === null || checkoutResult === void 0 ? void 0 : checkoutResult.isChangePaymentNotIncludeVoucher) === true;
 							const isBackWithoutPayment = (checkoutResult === null || checkoutResult === void 0 ? void 0 : checkoutResult.reason) === "back" && !isBackWithPaymentChanged;

package/es/plus/saleDetail/locales.js

@@ -1,6 +1,7 @@
 //#region src/plus/saleDetail/locales.ts
 var locales_default = {
 	en: {
+		"pisell2.sale-detail.add-time-products-not-applicable": "These time extension products are not available for all selected tickets. Please select tickets again.",
 		"pisell2.text.checkout": "Checkout",
 		"pisell2.text.add-order-notes": "Add Order Note",
 		"pisell1.text.edit-status-success": "Edit status successfully",
@@ -396,6 +397,7 @@ var locales_default = {
 		"pisell2.sale-detail.order-saved-success": "Order saved. You can find it in Order List."
 	},
 	"zh-CN": {
+		"pisell2.sale-detail.add-time-products-not-applicable": "加时商品不适用于全部已选票，请重新选票。",
 		"pisell2.text.checkout": "结账",
 		"pisell2.text.add-order-notes": "添加订单备注",
 		"pisell1.text.edit-status-success": "编辑状态成功",
@@ -791,6 +793,7 @@ var locales_default = {
 		"pisell2.sale-detail.order-saved-success": "订单已保存。您可以在订单列表中找到它。"
 	},
 	"zh-HK": {
+		"pisell2.sale-detail.add-time-products-not-applicable": "加時商品不適用於全部已選票，請重新選票。",
 		"pisell2.text.checkout": "結賬",
 		"pisell2.text.add-order-notes": "添加訂單備注",
 		"pisell1.text.edit-status-success": "編輯狀態成功",
@@ -1186,6 +1189,7 @@ var locales_default = {
 		"pisell2.sale-detail.order-saved-success": "訂單已保存。 您可以在訂單清單中找到它。"
 	},
 	ja: {
+		"pisell2.sale-detail.add-time-products-not-applicable": "選択したすべてのチケットに適用できない延長商品があります。チケットを選択し直してください。",
 		"pisell2.text.checkout": "チェックアウト",
 		"pisell2.text.add-order-notes": "注文メモを追加",
 		"pisell1.text.edit-status-success": "ステータスの編集に成功",
@@ -1581,6 +1585,7 @@ var locales_default = {
 		"pisell2.sale-detail.order-saved-success": "注文が保存されました。注文リストで確認できます。"
 	},
 	pt: {
+		"pisell2.sale-detail.add-time-products-not-applicable": "Estes produtos de extensão de tempo não se aplicam a todos os bilhetes selecionados. Selecione os bilhetes novamente.",
 		"pisell2.text.checkout": "Checkout",
 		"pisell2.text.add-order-notes": "Adicionar Nota do Pedido",
 		"pisell1.text.edit-status-success": "Status editado com sucesso",

package/es/plus/saleDetail/utils/adjustTimeAdapter.js

@@ -73,9 +73,13 @@ function buildAddTimeMatchingCacheItem(cacheItem) {
 		collection
 	});
 }
-const mapSaleDetailAdjustTimeProducts = (rawProducts, cacheItem) => {
-	const matchingCacheItem = buildAddTimeMatchingCacheItem(cacheItem);
-	return (rawProducts || []).filter((item) => isUsableProduct(item.add_time, matchingCacheItem)).map((item) => {
+const mapSaleDetailAdjustTimeProducts = (rawProducts, cacheItem) => mapSaleDetailAdjustTimeProductsForBookings(rawProducts, [cacheItem]);
+/** 批量加时商品必须适用于每张票，不能用第一张票代表整组。 */
+const isSaleDetailAddTimeProductUsableForBookings = (product, cacheItems) => {
+	return cacheItems.length > 0 && Boolean(product === null || product === void 0 ? void 0 : product.add_time) && cacheItems.every((cacheItem) => Boolean(cacheItem) && isUsableProduct(product.add_time, buildAddTimeMatchingCacheItem(cacheItem)));
+};
+const mapSaleDetailAdjustTimeProductsForBookings = (rawProducts, cacheItems) => {
+	return (rawProducts || []).filter((item) => isSaleDetailAddTimeProductUsableForBookings(item, cacheItems)).map((item) => {
 		var _item$add_time, _item$add_time2, _item$add_time3, _item$add_time4, _item$add_time5, _item$add_time6;
 		return {
 			id: item.id,
@@ -90,4 +94,4 @@ const mapSaleDetailAdjustTimeProducts = (rawProducts, cacheItem) => {
 	});
 };
 //#endregion
-export { getResourceEndTimeFromOrigin, mapSaleDetailAdjustTimeBooking, mapSaleDetailAdjustTimeProducts };
+export { getResourceEndTimeFromOrigin, isSaleDetailAddTimeProductUsableForBookings, mapSaleDetailAdjustTimeBooking, mapSaleDetailAdjustTimeProducts, mapSaleDetailAdjustTimeProductsForBookings };

package/lib/plus/saleDetail/hooks/useAdjustTimeModal.js

@@ -21,6 +21,7 @@ dayjs = require_runtime.__toESM(dayjs);
 let react = require("react");
 react = require_runtime.__toESM(react);
 let antd = require("antd");
+let _pisell_utils = require("@pisell/utils");
 let decimal_js = require("decimal.js");
 decimal_js = require_runtime.__toESM(decimal_js);
 let lodash = require("lodash");
@@ -343,6 +344,19 @@ function useAdjustTimeModal(options) {
 			return acc;
 		}, []);
 	}, []);
+	/** 在任何逐票写入前整组校验，也阻止重新选票前的旧结果被提交。 */
+	const assertAddTimeProductsUsable = (0, ahooks.useMemoizedFn)((result) => {
+		if (result.actionType === "restart" || result.actionType === "changeTime") return;
+		const cacheItems = selectedBookings.map(resolveCacheItem);
+		const usableProductIds = new Set(products.filter((product) => require_adjustTimeAdapter.isSaleDetailAddTimeProductUsableForBookings(product._originalProduct, cacheItems)).map((product) => String(product.id)));
+		const lines = buildPreviewAddTimeLines(result);
+		const invalidSelectedProduct = result.actionType === "product" && (result.selectedProductId == null || !usableProductIds.has(String(result.selectedProductId)));
+		const invalidLines = lines.length !== (result.autoPricing.lines || []).length || lines.some((line) => {
+			var _line$product$id;
+			return !usableProductIds.has(String((_line$product$id = line.product.id) !== null && _line$product$id !== void 0 ? _line$product$id : line.product.product_id)) || !require_adjustTimeAdapter.isSaleDetailAddTimeProductUsableForBookings(line.product, cacheItems);
+		});
+		if (invalidSelectedProduct || invalidLines) throw new Error(_pisell_utils.locales.getText("pisell2.sale-detail.add-time-products-not-applicable"));
+	});
 	const buildChangeTimePreviewQueries = (0, ahooks.useMemoizedFn)((result) => {
 		var _bookingTicket$getTem, _bookingTicket$getTem2;
 		const bookingTicket = sales === null || sales === void 0 ? void 0 : sales.bookingTicket;
@@ -424,6 +438,7 @@ function useAdjustTimeModal(options) {
 				return;
 			}
 			const addTimeLines = buildPreviewAddTimeLines(result);
+			assertAddTimeProductsUsable(result);
 			if (!addTimeLines.length) return;
 			for (const selectedBooking of selectedBookings) yield salesSdkCart.addAddTimeProducts({
 				booking: selectedBooking,
@@ -524,7 +539,7 @@ function useAdjustTimeModal(options) {
 				yield ensureAdjustTimeResourcesReady(sales, primaryItem);
 				const cacheItem = resolveCacheItem(primaryItem);
 				const quotationSchedule = resolveBookingQuotationSchedule(primaryItem, cacheItem);
-				const mappedProducts = require_adjustTimeAdapter.mapSaleDetailAdjustTimeProducts((quotationSchedule.schedule_date ? yield getAddTimeProductsWithCache(quotationSchedule) : rawAddTimeProducts) || [], cacheItem);
+				const mappedProducts = require_adjustTimeAdapter.mapSaleDetailAdjustTimeProductsForBookings((quotationSchedule.schedule_date ? yield getAddTimeProductsWithCache(quotationSchedule) : rawAddTimeProducts) || [], items.map(resolveCacheItem));
 				const relationId = (_ref17 = (_cacheItem$_extend$re = cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend3 = cacheItem._extend) === null || _cacheItem$_extend3 === void 0 ? void 0 : _cacheItem$_extend3.relation_id) !== null && _cacheItem$_extend$re !== void 0 ? _cacheItem$_extend$re : (_primaryItem$resource = primaryItem.resources) === null || _primaryItem$resource === void 0 || (_primaryItem$resource = _primaryItem$resource[0]) === null || _primaryItem$resource === void 0 ? void 0 : _primaryItem$resource.relation_id) !== null && _ref17 !== void 0 ? _ref17 : primaryItem.relation_id;
 				const resourcesOrigin = (booking === null || booking === void 0 || (_booking$getResources = booking.getResourcesOrigin) === null || _booking$getResources === void 0 ? void 0 : _booking$getResources.call(booking)) || [];
 				const nextSnapshot = combineBookingSnapshots(items.map((item) => require_adjustTimeAdapter.mapSaleDetailAdjustTimeBooking(item, resolveCacheItem(item))));
@@ -657,14 +672,15 @@ function useAdjustTimeModal(options) {
 	* await submitAdjustTimeResult(result, 'save');
 	*/
 	const submitAdjustTimeResult = (0, ahooks.useMemoizedFn)(function() {
-		var _ref24 = require_asyncToGenerator._asyncToGenerator(function* (_result, mode) {
+		var _ref24 = require_asyncToGenerator._asyncToGenerator(function* (result, mode) {
 			if (!selectedBookings.length) return;
 			try {
+				yield previewQueueRef.current;
+				yield salesSdkCart.waitForCartConsistency();
+				assertAddTimeProductsUsable(result);
 				if (yield function() {
 					var _ref23 = require_asyncToGenerator._asyncToGenerator(function* () {
 						if (mode === "checkout") {
-							yield previewQueueRef.current;
-							yield salesSdkCart.waitForCartConsistency();
 							const checkoutResult = yield sales === null || sales === void 0 ? void 0 : sales.openCheckout();
 							const isBackWithPaymentChanged = (checkoutResult === null || checkoutResult === void 0 ? void 0 : checkoutResult.reason) === "back" && (checkoutResult === null || checkoutResult === void 0 ? void 0 : checkoutResult.isChangePaymentNotIncludeVoucher) === true;
 							const isBackWithoutPayment = (checkoutResult === null || checkoutResult === void 0 ? void 0 : checkoutResult.reason) === "back" && !isBackWithPaymentChanged;

package/lib/plus/saleDetail/locales.js

@@ -1,6 +1,7 @@
 //#region src/plus/saleDetail/locales.ts
 var locales_default = {
 	en: {
+		"pisell2.sale-detail.add-time-products-not-applicable": "These time extension products are not available for all selected tickets. Please select tickets again.",
 		"pisell2.text.checkout": "Checkout",
 		"pisell2.text.add-order-notes": "Add Order Note",
 		"pisell1.text.edit-status-success": "Edit status successfully",
@@ -396,6 +397,7 @@ var locales_default = {
 		"pisell2.sale-detail.order-saved-success": "Order saved. You can find it in Order List."
 	},
 	"zh-CN": {
+		"pisell2.sale-detail.add-time-products-not-applicable": "加时商品不适用于全部已选票，请重新选票。",
 		"pisell2.text.checkout": "结账",
 		"pisell2.text.add-order-notes": "添加订单备注",
 		"pisell1.text.edit-status-success": "编辑状态成功",
@@ -791,6 +793,7 @@ var locales_default = {
 		"pisell2.sale-detail.order-saved-success": "订单已保存。您可以在订单列表中找到它。"
 	},
 	"zh-HK": {
+		"pisell2.sale-detail.add-time-products-not-applicable": "加時商品不適用於全部已選票，請重新選票。",
 		"pisell2.text.checkout": "結賬",
 		"pisell2.text.add-order-notes": "添加訂單備注",
 		"pisell1.text.edit-status-success": "編輯狀態成功",
@@ -1186,6 +1189,7 @@ var locales_default = {
 		"pisell2.sale-detail.order-saved-success": "訂單已保存。 您可以在訂單清單中找到它。"
 	},
 	ja: {
+		"pisell2.sale-detail.add-time-products-not-applicable": "選択したすべてのチケットに適用できない延長商品があります。チケットを選択し直してください。",
 		"pisell2.text.checkout": "チェックアウト",
 		"pisell2.text.add-order-notes": "注文メモを追加",
 		"pisell1.text.edit-status-success": "ステータスの編集に成功",
@@ -1581,6 +1585,7 @@ var locales_default = {
 		"pisell2.sale-detail.order-saved-success": "注文が保存されました。注文リストで確認できます。"
 	},
 	pt: {
+		"pisell2.sale-detail.add-time-products-not-applicable": "Estes produtos de extensão de tempo não se aplicam a todos os bilhetes selecionados. Selecione os bilhetes novamente.",
 		"pisell2.text.checkout": "Checkout",
 		"pisell2.text.add-order-notes": "Adicionar Nota do Pedido",
 		"pisell1.text.edit-status-success": "Status editado com sucesso",

package/lib/plus/saleDetail/utils/adjustTimeAdapter.js

@@ -75,9 +75,13 @@ function buildAddTimeMatchingCacheItem(cacheItem) {
 		collection
 	});
 }
-const mapSaleDetailAdjustTimeProducts = (rawProducts, cacheItem) => {
-	const matchingCacheItem = buildAddTimeMatchingCacheItem(cacheItem);
-	return (rawProducts || []).filter((item) => require_utils.isUsableProduct(item.add_time, matchingCacheItem)).map((item) => {
+const mapSaleDetailAdjustTimeProducts = (rawProducts, cacheItem) => mapSaleDetailAdjustTimeProductsForBookings(rawProducts, [cacheItem]);
+/** 批量加时商品必须适用于每张票，不能用第一张票代表整组。 */
+const isSaleDetailAddTimeProductUsableForBookings = (product, cacheItems) => {
+	return cacheItems.length > 0 && Boolean(product === null || product === void 0 ? void 0 : product.add_time) && cacheItems.every((cacheItem) => Boolean(cacheItem) && require_utils.isUsableProduct(product.add_time, buildAddTimeMatchingCacheItem(cacheItem)));
+};
+const mapSaleDetailAdjustTimeProductsForBookings = (rawProducts, cacheItems) => {
+	return (rawProducts || []).filter((item) => isSaleDetailAddTimeProductUsableForBookings(item, cacheItems)).map((item) => {
 		var _item$add_time, _item$add_time2, _item$add_time3, _item$add_time4, _item$add_time5, _item$add_time6;
 		return {
 			id: item.id,
@@ -93,5 +97,7 @@ const mapSaleDetailAdjustTimeProducts = (rawProducts, cacheItem) => {
 };
 //#endregion
 exports.getResourceEndTimeFromOrigin = getResourceEndTimeFromOrigin;
+exports.isSaleDetailAddTimeProductUsableForBookings = isSaleDetailAddTimeProductUsableForBookings;
 exports.mapSaleDetailAdjustTimeBooking = mapSaleDetailAdjustTimeBooking;
 exports.mapSaleDetailAdjustTimeProducts = mapSaleDetailAdjustTimeProducts;
+exports.mapSaleDetailAdjustTimeProductsForBookings = mapSaleDetailAdjustTimeProductsForBookings;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.12.336",
+  "version": "6.12.337",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -72,10 +72,10 @@
     "styled-components": "^6.0.0-rc.3",
     "use-sync-external-store": "^1.6.0",
     "@pisell/pi-payment-sdk": "0.0.3",
-    "@pisell/utils": "3.0.7",
-    "@pisell/icon": "0.0.11",
     "@pisell/materials": "6.12.81",
-    "@pisell/date-picker": "3.0.12"
+    "@pisell/utils": "3.0.7",
+    "@pisell/date-picker": "3.0.12",
+    "@pisell/icon": "0.0.11"
   },
   "peerDependencies": {
     "react": "^18.0.0",