@pisell/private-materials 6.12.238 → 6.12.240

package/lib/components/wallet/utils.js

@@ -1,17 +1,13 @@
+const require_runtime = require("../../_virtual/_rolldown/runtime.js");
+let dayjs = require("dayjs");
+dayjs = require_runtime.__toESM(dayjs);
+let _pisell_utils = require("@pisell/utils");
 //#region src/components/wallet/utils.ts
 function formatDateTime(dateTime, isAll = false, locale = "zh-CN") {
-	const date = new Date(dateTime);
-	const year = date.getFullYear();
-	const month = String(date.getMonth() + 1).padStart(2, "0");
-	const day = String(date.getDate()).padStart(2, "0");
-	const hours = date.getHours();
-	const minutes = String(date.getMinutes()).padStart(2, "0");
-	if (isAll) if (locale === "en") return `${day}/${month}/${year}`;
-	else return `${year}-${month}-${day}`;
-	if (locale === "en") {
-		const period = hours >= 12 ? "PM" : "AM";
-		return `${day}/${month}/${year} ${hours === 0 ? 12 : hours > 12 ? hours - 12 : hours}:${minutes} ${period}`;
-	} else return `${year}-${month}-${day} ${String(hours).padStart(2, "0")}:${minutes}`;
+	const date = (0, dayjs.default)(dateTime);
+	if (!date.isValid()) return "";
+	const dateFormat = locale === "en" ? "DD/MM/YYYY" : "YYYY-MM-DD";
+	return date.format(isAll ? dateFormat : `${dateFormat} ${locale === "en" ? "h:mm A" : "HH:mm"}`);
 }
 const textConfig = {
 	"zh-HK": {
@@ -36,6 +32,7 @@ const textConfig = {
 		year: "年",
 		available: "可用",
 		unlimited: "无限期",
+		noAvailableDates: "無可用日期",
 		weekPrefix: "周"
 	},
 	"zh-CN": {
@@ -60,6 +57,7 @@ const textConfig = {
 		year: "年",
 		available: "可用",
 		unlimited: "无限期",
+		noAvailableDates: "无可用日期",
 		weekPrefix: "周"
 	},
 	"en": {
@@ -84,12 +82,13 @@ const textConfig = {
 		year: "year",
 		available: "available",
 		unlimited: "unlimited",
+		noAvailableDates: "No available dates",
 		weekPrefix: ""
 	}
 };
 function getWeekdayText(dayNumbers, locale) {
 	const config = textConfig[locale];
-	return dayNumbers.map((day) => config.weekdays[day]).join(config.separator);
+	return [...new Set(dayNumbers)].sort((a, b) => a - b).map((day) => config.weekdays[day]).join(config.separator);
 }
 function getRepeatFrequencyText(repeatType, frequency, locale) {
 	const config = textConfig[locale];
@@ -108,124 +107,84 @@ function getRepeatFrequencyText(repeatType, frequency, locale) {
 	}
 }
 /**
-* 根据scheduleList格式化文案展示
-* @param scheduleList 日程列表
-* @returns 格式化后的文案结果数组，每个日程对应一个结果
+* 格式化日程与卡有效期的交集。仅生成展示文案，不修改原日程。
 */
-function formatScheduleText(scheduleList, locale = "en") {
-	const results = [];
-	const config = textConfig[locale];
-	scheduleList.forEach((schedule) => {
+function formatScheduleText(scheduleList, locale = "en", validity) {
+	const displayLocale = locale === "zh-CN" || locale === "zh-HK" ? locale : "en";
+	const config = textConfig[displayLocale];
+	if (!Array.isArray(scheduleList) || !scheduleList.length) return [];
+	const formatRange = (start, end, isAllDay = true, collapseSingleDate = false) => {
+		const range = (0, _pisell_utils.getWalletValidityRange)(start, end, validity);
+		if (range.isEmpty) return "";
+		const effectiveStart = range.startDate === (0, _pisell_utils.getWalletValidityRange)(start).startDate ? start : `${range.startDate} 00:00:00`;
+		const effectiveEnd = range.endDate === (0, _pisell_utils.getWalletValidityRange)(null, end).endDate ? end : `${range.endDate} 23:59:59`;
+		const startText = range.startDate ? formatDateTime(effectiveStart, isAllDay, displayLocale) : "";
+		const endText = range.endDate ? formatDateTime(effectiveEnd, isAllDay, displayLocale) : config.unlimited;
+		if (!startText) return endText;
+		if (collapseSingleDate && startText === endText) return startText;
+		return `${startText}${config.rangeSeparator}${endText}`;
+	};
+	const formatExceptions = (dates = []) => dates.filter((item) => {
+		const range = (0, _pisell_utils.getWalletValidityRange)(item.start, item.end);
+		return range.startDate && range.endDate;
+	}).map((item) => formatRange(item.start, item.end, true, true)).filter(Boolean);
+	const results = scheduleList.map((schedule) => {
 		var _schedule$repeat_rule, _schedule$repeat_rule2;
 		const validityTexts = [];
-		const excluded_date = [];
-		const included_date = [];
-		if ((_schedule$repeat_rule = schedule.repeat_rule) === null || _schedule$repeat_rule === void 0 ? void 0 : _schedule$repeat_rule.excluded_date) schedule.repeat_rule.excluded_date.forEach((excludeItem) => {
-			const startDate = formatDateTime(excludeItem.start, true, locale);
-			const endDate = formatDateTime(excludeItem.end, true, locale);
-			if (excludeItem.start === excludeItem.end) excluded_date.push(startDate);
-			else excluded_date.push(`${startDate}${config.rangeSeparator}${endDate}`);
-		});
-		if ((_schedule$repeat_rule2 = schedule.repeat_rule) === null || _schedule$repeat_rule2 === void 0 ? void 0 : _schedule$repeat_rule2.included_date) schedule.repeat_rule.included_date.forEach((includeItem) => {
-			const startDate = formatDateTime(includeItem.start, true, locale);
-			const endDate = formatDateTime(includeItem.end, true, locale);
-			if (includeItem.start === includeItem.end) included_date.push(startDate);
-			else included_date.push(`${startDate}${config.rangeSeparator}${endDate}`);
-		});
+		const excluded_date = formatExceptions(((_schedule$repeat_rule = schedule.repeat_rule) === null || _schedule$repeat_rule === void 0 ? void 0 : _schedule$repeat_rule.excluded_date) || []);
+		const included_date = formatExceptions(((_schedule$repeat_rule2 = schedule.repeat_rule) === null || _schedule$repeat_rule2 === void 0 ? void 0 : _schedule$repeat_rule2.included_date) || []);
 		const isAllDay = schedule.is_all === 1;
-		let validityText = "";
-		if (schedule.repeat_type === "none") {
+		if (schedule.type === "designation" && schedule.designation) schedule.designation.forEach((item) => {
+			const allDay = isAllDay || item.start_time === "00:00" && item.end_time === "23:59";
+			const text = formatRange(`${item.start_date} ${item.start_time}`, `${item.end_date} ${item.end_time}`, allDay);
+			if (text) validityTexts.push(text);
+		});
+		else if (schedule.repeat_type === "none") {
+			var _schedule$time_slot;
 			if (schedule.type === "standard") {
-				const startDateTime = formatDateTime(schedule.start_time, isAllDay, locale);
-				const endDateTime = formatDateTime(schedule.end_time, isAllDay, locale);
-				validityText = `${startDateTime}${config.rangeSeparator}${endDateTime}`;
-			} else if (schedule.type === "time-slots" && schedule.time_slot.length > 0) {
-				const baseDate = formatDateTime(schedule.start_time, true, locale);
-				if (isAllDay) validityText = `${baseDate}`;
-				else validityText = `${baseDate} ${schedule.time_slot.map((slot) => `${slot.start_time}${config.timeSeparator}${slot.end_time}`).join(config.timeSlotSeparator)}`;
-			} else if (schedule.type === "designation" && schedule.designation) {
-				const designationTexts = schedule.designation.map((item) => {
-					if (isAllDay || item.start_time === "00:00" && item.end_time === "23:59") {
-						const startDate = formatDateTime(item.start_date, true, locale);
-						const endDate = formatDateTime(item.end_date, true, locale);
-						return `${startDate}${config.rangeSeparator}${endDate}`;
-					} else return `${formatDateTime(item.start_date, true, locale)} ${item.start_time}${config.timeSeparator}${item.end_time}`;
-				});
-				validityTexts.push(...designationTexts);
+				const text = formatRange(schedule.start_time, schedule.end_time, isAllDay);
+				if (text) validityTexts.push(text);
+			} else if (schedule.type === "time-slots" && ((_schedule$time_slot = schedule.time_slot) === null || _schedule$time_slot === void 0 ? void 0 : _schedule$time_slot.length)) {
+				const dateText = formatRange(schedule.start_time, schedule.start_time, true, true);
+				if (dateText) {
+					const slots = isAllDay ? "" : schedule.time_slot.map((slot) => `${slot.start_time}${config.timeSeparator}${slot.end_time}`).join(config.timeSlotSeparator);
+					validityTexts.push([dateText, slots].filter(Boolean).join(" "));
+				}
 			}
 		} else if (schedule.repeat_rule) {
-			const { frequency, frequency_date } = schedule.repeat_rule;
-			const startText = isAllDay ? formatDateTime(schedule.start_time, true, locale) : formatDateTime(schedule.start_time, false, locale);
-			let endDateText = "";
-			if (schedule.repeat_rule.end.type === "never") endDateText = config.unlimited;
-			else if (schedule.repeat_rule.end.end_date) endDateText = formatDateTime(schedule.repeat_rule.end.end_date, true, locale);
-			if (schedule.type === "standard") {
-				if (schedule.repeat_type === "daily") if (isAllDay) {
-					const frequencyText = getRepeatFrequencyText("daily", frequency, locale);
-					if (locale === "en") validityText = `${startText}${config.rangeSeparator}${endDateText}, ${config.available} ${frequencyText}`;
-					else validityText = `${startText}${config.rangeSeparator}${endDateText}，${frequencyText}${config.available}`;
-				} else {
-					const startTime = formatDateTime(schedule.start_time, false, locale);
-					const endTime = formatDateTime(schedule.end_time, false, locale);
-					const timeRange = locale === "en" ? `${startTime.split(" ")[1]} ${startTime.split(" ")[2]}${config.timeSeparator}${endTime.split(" ")[1]} ${endTime.split(" ")[2]}` : `${startTime.split(" ")[1]}${config.timeSeparator}${endTime.split(" ")[1]}`;
-					const frequencyText = getRepeatFrequencyText("daily", frequency, locale);
-					const dateRange = locale === "en" ? `${startTime.split(" ")[0]}${config.rangeSeparator}${endDateText}` : `${startText.split(" ")[0]}${config.rangeSeparator}${endDateText}`;
-					if (locale === "en") validityText = `${dateRange}, ${config.available} ${frequencyText} ${timeRange}`;
-					else validityText = `${dateRange}，${frequencyText} ${timeRange} ${config.available}`;
-				}
-				else if (schedule.repeat_type === "weekly") {
-					const weekdaysText = getWeekdayText(frequency_date, locale);
-					if (isAllDay) if (locale === "en") {
-						const frequencyText = frequency === 1 ? "every week" : `every ${frequency} weeks`;
-						validityText = `${startText}${config.rangeSeparator}${endDateText}, ${frequencyText} on ${weekdaysText} `;
-					} else {
-						const frequencyText = frequency === 1 ? "每周" : `每${frequency}周的`;
-						validityText = `${startText}${config.rangeSeparator}${endDateText}，${frequencyText}${config.weekPrefix}${weekdaysText}${config.available}`;
-					}
-					else {
-						const startTime = formatDateTime(schedule.start_time, false, locale);
-						const endTime = formatDateTime(schedule.end_time, false, locale);
-						const timeRange = locale === "en" ? `${startTime.split(" ")[1]} ${startTime.split(" ")[2]}${config.timeSeparator}${endTime.split(" ")[1]} ${endTime.split(" ")[2]}` : `${startTime.split(" ")[1]}${config.timeSeparator}${endTime.split(" ")[1]}`;
-						const dateRange = locale === "en" ? `${startTime.split(" ")[0]}${config.rangeSeparator}${endDateText}` : `${startText.split(" ")[0]}${config.rangeSeparator}${endDateText}`;
-						if (locale === "en") validityText = `${dateRange}, ${frequency === 1 ? "every week" : `every ${frequency} weeks`} on ${weekdaysText} ${timeRange}`;
-						else validityText = `${dateRange}，${frequency === 1 ? "每周" : `每${frequency}周的`}${config.weekPrefix}${weekdaysText} ${timeRange}`;
+			const { frequency, frequency_date, end } = schedule.repeat_rule;
+			const dateText = formatRange(schedule.start_time, end.type === "never" ? null : end.end_date);
+			if (dateText) {
+				let timeText = "";
+				if (!isAllDay) {
+					if (schedule.type === "time-slots") timeText = (schedule.time_slot || []).map((slot) => `${slot.start_time}${config.timeSeparator}${slot.end_time}`).join(config.timeSlotSeparator);
+					else if (schedule.start_time && schedule.end_time) {
+						const timeFormat = displayLocale === "en" ? "h:mm A" : "HH:mm";
+						timeText = `${(0, dayjs.default)(schedule.start_time).format(timeFormat)}${config.timeSeparator}${(0, dayjs.default)(schedule.end_time).format(timeFormat)}`;
 					}
 				}
-			} else if (schedule.type === "time-slots" && schedule.time_slot.length > 0) {
-				const baseDate = formatDateTime(schedule.start_time, true, locale);
-				const timeSlotsText = schedule.time_slot.map((slot) => `${slot.start_time}${config.timeSeparator}${slot.end_time}`).join(config.timeSlotSeparator);
-				if (schedule.repeat_type === "daily") {
-					const frequencyText = getRepeatFrequencyText("daily", frequency, locale);
-					if (locale === "en") validityText = `${baseDate}${config.rangeSeparator}${endDateText}, ${config.available} ${frequencyText} ${timeSlotsText}`;
-					else validityText = `${baseDate}${config.rangeSeparator}${endDateText}，${frequencyText} ${timeSlotsText} ${config.available}`;
-				} else if (schedule.repeat_type === "weekly") {
-					const weekdaysText = getWeekdayText(frequency_date, locale);
-					if (locale === "en") {
-						const frequencyText = frequency === 1 ? "every week" : `every ${frequency} weeks`;
-						validityText = `${baseDate}${config.rangeSeparator}${endDateText}, ${frequencyText} on ${weekdaysText} ${timeSlotsText}`;
-					} else {
-						const frequencyText = frequency === 1 ? "每周" : `每${frequency}周的`;
-						validityText = `${baseDate}${config.rangeSeparator}${endDateText}，${frequencyText}${config.weekPrefix}${weekdaysText} ${timeSlotsText} ${config.available}`;
-					}
+				const frequencyText = getRepeatFrequencyText(schedule.repeat_type, frequency, displayLocale);
+				if (schedule.repeat_type === "weekly") {
+					const weekdays = getWeekdayText(frequency_date, displayLocale);
+					const repeatText = displayLocale === "en" ? `${frequencyText} on ${weekdays}` : `${frequencyText}${weekdays}${config.available}`;
+					validityTexts.push(`${dateText}${config.timeSlotSeparator}${[repeatText, timeText].filter(Boolean).join(" ")}`);
+				} else if (schedule.repeat_type === "daily") {
+					const repeatText = displayLocale === "en" ? `${config.available} ${frequencyText}` : `${frequencyText}${config.available}`;
+					validityTexts.push(`${dateText}${config.timeSlotSeparator}${[repeatText, timeText].filter(Boolean).join(" ")}`);
 				}
 			}
-		} else if (schedule.type === "designation" && schedule.designation) {
-			const designationTexts = schedule.designation.map((item) => {
-				if (isAllDay || item.start_time === "00:00" && item.end_time === "23:59") {
-					const startDate = formatDateTime(item.start_date, true, locale);
-					const endDate = formatDateTime(item.end_date, true, locale);
-					return `${startDate}${config.rangeSeparator}${endDate}`;
-				} else return `${formatDateTime(item.start_date, true, locale)} ${item.start_time}${config.timeSeparator}${item.end_time}`;
-			});
-			validityTexts.push(...designationTexts);
 		}
-		if (validityText) validityTexts.push(validityText);
-		results.push({
+		return {
 			validityTexts,
 			excluded_date,
 			included_date
-		});
+		};
 	});
+	if (!results.some((item) => item.validityTexts.length || item.included_date.length)) return [{
+		validityTexts: [config.noAvailableDates],
+		excluded_date: [],
+		included_date: []
+	}];
 	return results;
 }
 //#endregion

package/lib/plus/walletPassGallery/components/passDetail/index.js

@@ -54,7 +54,7 @@ const PassDetail = (props) => {
 		var _context$appHelper4;
 		require_index$1.request.setRequest((_context$appHelper4 = context.appHelper) === null || _context$appHelper4 === void 0 || (_context$appHelper4 = _context$appHelper4.utils) === null || _context$appHelper4 === void 0 ? void 0 : _context$appHelper4.request);
 	}
-	const { id = "", code = "", tag = "", product_title = "", product_name = "", encoded = "", balance, expire_date = "", product = {}, custom_schedule_snapshot, customer_id, limit_status } = dataSource || {};
+	const { id = "", code = "", tag = "", product_title = "", product_name = "", encoded = "", balance, start_date, expire_date = "", expire_time, product = {}, custom_schedule_snapshot, customer_id, limit_status } = dataSource || {};
 	const mobileWalletPassType = require_capability.normalizeMobileWalletPassType(tag);
 	const { description = "", extension_data = [], customer_order_behavior_count = 0 } = product || {};
 	const _getDetail = (0, ahooks.useRequest)(() => require_serve.getDetailApi({
@@ -112,8 +112,16 @@ const PassDetail = (props) => {
 	}, []);
 	const descs = (0, react.useMemo)(() => {
 		var _context$engine2;
-		const detail = require_utils$4.formatScheduleText(scheduleList, context === null || context === void 0 || (_context$engine2 = context.engine) === null || _context$engine2 === void 0 || (_context$engine2 = _context$engine2.props) === null || _context$engine2 === void 0 ? void 0 : _context$engine2.locale);
-		let expireText = expire_date ? expire_date : _pisell_utils.locales.getText("wallet-pass-gallery.expireDate");
+		const detail = require_utils$4.formatScheduleText(scheduleList, context === null || context === void 0 || (_context$engine2 = context.engine) === null || _context$engine2 === void 0 || (_context$engine2 = _context$engine2.props) === null || _context$engine2 === void 0 ? void 0 : _context$engine2.locale, {
+			start_date,
+			expire_date,
+			expire_time
+		});
+		const { endDate } = (0, _pisell_utils.getWalletValidityRange)(null, null, {
+			expire_date,
+			expire_time
+		});
+		let expireText = endDate ? (0, dayjs.default)(endDate).format(locale === "en" ? "DD/MM/YYYY" : "YYYY-MM-DD") : _pisell_utils.locales.getText("wallet-pass-gallery.expireDate");
 		if (scheduleList.length > 0) {
 			let validityTexts = "";
 			let excludedText = "";

package/lib/plus/walletPassGallery/components/passList/index.js

@@ -19,7 +19,6 @@ const _excluded = [
 	"balance",
 	"code",
 	"encoded",
-	"expire_date",
 	"shop",
 	"limit_status",
 	"product_cover",
@@ -55,7 +54,8 @@ const PassList = (props) => {
 		loadMore: _loadMore,
 		loading,
 		renderItem: (item, index) => {
-			const { id, tag, product_title = "", product_name = "", balance = 0, code = "", encoded = "", expire_date = "", shop = { name: "" }, limit_status, product_cover = "", par_value = "", unified_available_status, unified_messages = {}, holder, currency_display, virtual_currency_display } = item, rest = require_objectWithoutProperties._objectWithoutProperties(item, _excluded);
+			var _item$custom_schedule, _item$custom_schedule2;
+			const { id, tag, product_title = "", product_name = "", balance = 0, code = "", encoded = "", shop = { name: "" }, limit_status, product_cover = "", par_value = "", unified_available_status, unified_messages = {}, holder, currency_display, virtual_currency_display } = item, rest = require_objectWithoutProperties._objectWithoutProperties(item, _excluded);
 			const itemValue = item === null || item === void 0 ? void 0 : item[valuePropName];
 			const { title: disabledReason = "" } = unified_messages;
 			const { name: storeName = "" } = shop;
@@ -113,7 +113,10 @@ const PassList = (props) => {
 				discount: isDiscountCard ? Number(par_value) : void 0,
 				showDiscount: isDiscountCard,
 				code: encoded,
-				validDate: expire_date,
+				validDate: (0, _pisell_utils.getWalletValidityRange)(null, null, item).endDate || "",
+				validDateBySchedule: Boolean((_item$custom_schedule = item.custom_schedule_snapshot) === null || _item$custom_schedule === void 0 || (_item$custom_schedule = _item$custom_schedule.data) === null || _item$custom_schedule === void 0 ? void 0 : _item$custom_schedule.length),
+				scheduleList: ((_item$custom_schedule2 = item.custom_schedule_snapshot) === null || _item$custom_schedule2 === void 0 ? void 0 : _item$custom_schedule2.data) || [],
+				walletValidity: item,
 				holder,
 				onSetHolder: isTerminalEnv ? void 0 : () => {
 					var _holder$metadata;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.12.238",
+  "version": "6.12.240",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -69,11 +69,11 @@
     "react-zoom-pan-pinch": "^3.7.0",
     "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.6",
     "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "3.0.10",
-    "@pisell/utils": "3.0.4",
-    "@pisell/materials": "6.12.65"
+    "@pisell/materials": "6.12.67",
+    "@pisell/pi-payment-sdk": "0.0.3",
+    "@pisell/date-picker": "3.0.12"
   },
   "peerDependencies": {
     "react": "^18.0.0",