@pisell/private-materials 6.12.306 → 6.12.308

package/es/plus/invoice/ReceiptRenderer.js

@@ -1,6 +1,6 @@
 import { _objectSpread2 } from "../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js";
 import { _objectWithoutProperties } from "../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectWithoutProperties.js";
-import { isInvoiceFieldVisible, isInvoiceModuleVisible } from "./invoiceVisibility.js";
+import { isInvoiceFieldVisible, isInvoiceModuleVisible, isInvoicePaymentTimeRow } from "./invoiceVisibility.js";
 import { getModuleImage, getModuleText, getReceiptBookingId, getReceiptLabel, getReceiptProductTotal, multiplyReceiptMoney, receiptMoneyValuesDiffer, subtractReceiptMoney, sumReceiptMoney } from "./receipt.js";
 import { bilingualText, mergeTranslatedRows, receiptLabel, withReceiptTranslations } from "./receiptTranslations.js";
 import dayjs from "dayjs";
@@ -372,23 +372,27 @@ const MODULE_RENDERERS = {
 			"settlement/original": "original_amount",
 			"settlement/item-discounts": "item_discounts"
 		});
-		return rows.length ? /* @__PURE__ */ React.createElement("section", null, /* @__PURE__ */ React.createElement(ReceiptRows, {
+		const summaryRows = isInvoiceFieldVisible(config, "payment_summary") ? receipt.paymentSummaryRows : [];
+		return rows.length || summaryRows.length ? /* @__PURE__ */ React.createElement("section", null, /* @__PURE__ */ React.createElement(ReceiptRows, {
 			locale: receipt.locale,
 			rows
-		})) : null;
+		}), summaryRows.length ? /* @__PURE__ */ React.createElement(React.Fragment, null, rows.length ? /* @__PURE__ */ React.createElement(ReceiptSeparator, null) : null, /* @__PURE__ */ React.createElement(ReceiptSectionTitle, null, receiptLabel(receipt, "Payment summary")), /* @__PURE__ */ React.createElement(ReceiptRows, {
+			locale: receipt.locale,
+			rows: summaryRows
+		})) : null) : null;
 	},
 	custom_2: renderCustom,
 	customer_2: renderCustom,
-	payment: ({ receipt }) => receipt.paymentSummaryRows.length || receipt.paymentRows.length || receipt.refundRows.length ? /* @__PURE__ */ React.createElement("section", null, receipt.paymentSummaryRows.length ? /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(ReceiptSectionTitle, null, receiptLabel(receipt, "Payment summary")), /* @__PURE__ */ React.createElement(ReceiptRows, {
-		locale: receipt.locale,
-		rows: receipt.paymentSummaryRows
-	})) : null, receipt.paymentRows.length ? /* @__PURE__ */ React.createElement(React.Fragment, null, receipt.paymentSummaryRows.length ? /* @__PURE__ */ React.createElement(ReceiptSeparator, null) : null, /* @__PURE__ */ React.createElement(ReceiptSectionTitle, null, receiptLabel(receipt, "Payment history")), /* @__PURE__ */ React.createElement(RecordGroups, {
-		groups: receipt.paymentRows,
-		locale: receipt.locale
-	})) : null, receipt.refundRows.length ? /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(ReceiptSectionTitle, null, receiptLabel(receipt, "Refund history")), /* @__PURE__ */ React.createElement(RecordGroups, {
-		groups: receipt.refundRows,
-		locale: receipt.locale
-	})) : null) : null,
+	payment: ({ config, receipt }) => {
+		const paymentRows = isInvoiceFieldVisible(config, "time") ? receipt.paymentRows : receipt.paymentRows.map((group) => group.filter((row) => !isInvoicePaymentTimeRow(row))).filter((group) => group.length > 0);
+		return paymentRows.length || receipt.refundRows.length ? /* @__PURE__ */ React.createElement("section", null, paymentRows.length ? /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(ReceiptSectionTitle, null, receiptLabel(receipt, "Payment history")), /* @__PURE__ */ React.createElement(RecordGroups, {
+			groups: paymentRows,
+			locale: receipt.locale
+		})) : null, receipt.refundRows.length ? /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(ReceiptSectionTitle, null, receiptLabel(receipt, "Refund history")), /* @__PURE__ */ React.createElement(RecordGroups, {
+			groups: receipt.refundRows,
+			locale: receipt.locale
+		})) : null) : null;
+	},
 	card: ({ receipt }) => receipt.walletRows.length ? /* @__PURE__ */ React.createElement("section", null, /* @__PURE__ */ React.createElement(ReceiptSectionTitle, null, receiptLabel(receipt, "Cards & Vouchers")), /* @__PURE__ */ React.createElement(RecordGroups, {
 		groups: receipt.walletRows,
 		locale: receipt.locale

package/es/plus/invoice/invoiceVisibility.js

@@ -58,7 +58,12 @@ const DETAIL_FIELDS = {
 		"allergies",
 		"base_price"
 	],
-	settlement: ["original_amount", "item_discounts"],
+	settlement: [
+		"original_amount",
+		"item_discounts",
+		"payment_summary"
+	],
+	payment: ["time"],
 	total_savings: ["description"]
 };
 /** Select the shared virtual-currency view only for the new detail protocol. */
@@ -68,6 +73,20 @@ function hasInvoiceDetailSettings(settings) {
 		return child && Object.prototype.hasOwnProperty.call(child, "is_show");
 	}));
 }
+function isInvoicePaymentTimeRow(row) {
+	return typeof row.receipt_key === "string" && /#payment-time\/history(?:\/secondary)?$/.test(row.receipt_key);
+}
+/** Hiding payment time requires identifiable rows, not a date-text heuristic. */
+function requiresInvoicePaymentTimeKeys(settings) {
+	return invoiceModules(settings).some((module) => module.key === "payment" && isInvoiceModuleVisible(module) && !isInvoiceFieldVisible(module, "time"));
+}
+function hasInvoicePaymentTimeKeys(data) {
+	return Object.values(data).every((localeData) => {
+		const groups = localeData.payment_data;
+		if (groups === void 0 || groups === null) return true;
+		return Array.isArray(groups) && groups.every((group) => Array.isArray(group) && (!group.length || group.every((row) => typeof (row === null || row === void 0 ? void 0 : row.receipt_key) === "string" && row.receipt_key.length > 0) && group.some(isInvoicePaymentTimeRow)));
+	});
+}
 function cardRequiresFiltering(config) {
 	return Boolean(config && (!isInvoiceModuleVisible(config) || Array.isArray(config.pass_type) && config.pass_type.length > 0));
 }
@@ -91,4 +110,4 @@ function requiresInvoiceDataFiltering(settings) {
 	});
 }
 //#endregion
-export { hasInvoiceDetailSettings, invoiceVisibility, isInvoiceFieldVisible, isInvoiceModuleVisible, permitsLegacyWalletFallback, requiresInvoiceDataFiltering };
+export { hasInvoiceDetailSettings, hasInvoicePaymentTimeKeys, invoiceVisibility, isInvoiceFieldVisible, isInvoiceModuleVisible, isInvoicePaymentTimeRow, permitsLegacyWalletFallback, requiresInvoiceDataFiltering, requiresInvoicePaymentTimeKeys };

package/es/plus/saleDetail/tmpl/B/components/Invoice/useInvoiceReceiptPreview.js

@@ -4,7 +4,7 @@ import { _asyncToGenerator } from "../../../../../../_virtual/_@oxc-project_runt
 import useLocale from "../../../../../../hooks/useLocale.js";
 import { isVirtualSettlementTempOrder } from "../../../../../multiCurrencySettlement/index.js";
 import { getLocalOrderReceiptSnapshot, getOrderSmallTicketData } from "../../../../serve.js";
-import { hasInvoiceDetailSettings, requiresInvoiceDataFiltering } from "../../../../../invoice/invoiceVisibility.js";
+import { hasInvoiceDetailSettings, hasInvoicePaymentTimeKeys, requiresInvoiceDataFiltering, requiresInvoicePaymentTimeKeys } from "../../../../../invoice/invoiceVisibility.js";
 import { buildInvoiceReceiptViewModel, formatReceiptPreviewTime, isSmallTicketData, resolveInvoiceLayoutConfig, resolveSmallTicketData, selectSmallTicketLocale } from "../../../../../invoice/receipt.js";
 import { useEffect, useMemo, useState } from "react";
 //#region src/plus/saleDetail/tmpl/B/components/Invoice/useInvoiceReceiptPreview.ts
@@ -77,6 +77,7 @@ function useInvoiceReceiptPreview(context) {
 				const layout = yield resolveInvoiceLayoutConfig(salesModule);
 				if (cancelled) return null;
 				const mustFilter = requiresInvoiceDataFiltering(layout);
+				const needsPaymentTimeKeys = requiresInvoicePaymentTimeKeys(layout);
 				const useSharedConfig = hasInvoiceDetailSettings(layout) || mustFilter;
 				const isVirtualOrder = isVirtualSettlementTempOrder(tempOrder) || isVirtualSettlementTempOrder(salesDetail === null || salesDetail === void 0 ? void 0 : salesDetail.raw);
 				const legacyVirtualResult = {
@@ -94,16 +95,17 @@ function useInvoiceReceiptPreview(context) {
 							const freshSnapshot = yield getLocalOrderReceiptSnapshot(orderId, [appLocale], layout);
 							if (!freshSnapshot || !isSmallTicketData(freshSnapshot.small_ticket_data)) throw new Error("Receipt snapshot is unavailable");
 							if (mustFilter && freshSnapshot.template_visibility_applied !== true) throw new Error("Receipt snapshot does not support template filtering");
+							if (needsPaymentTimeKeys && !hasInvoicePaymentTimeKeys(freshSnapshot.small_ticket_data)) throw new Error("Receipt snapshot does not identify payment history times");
 							if (requiresSource && !freshSnapshot.source) throw new Error("Virtual currency receipt source is unavailable");
 							return {
 								snapshot: freshSnapshot.small_ticket_data,
 								source: freshSnapshot.source || null
 							};
 						} catch (error) {
-							if (mustFilter || requiresSource) throw error;
+							if (mustFilter || needsPaymentTimeKeys || requiresSource) throw error;
 							console.warn("[SaleDetail.Invoice] Failed to rebuild local receipt snapshot", error);
 						}
-						if (mustFilter || requiresSource) throw new Error("A template-aware local receipt snapshot is required");
+						if (mustFilter || needsPaymentTimeKeys || requiresSource) throw new Error("A template-aware local receipt snapshot is required");
 						return {
 							snapshot: embeddedSnapshot || (orderId !== null && orderId !== void 0 ? yield getOrderSmallTicketData(orderId) : null),
 							source: null

package/lib/plus/invoice/ReceiptRenderer.js

@@ -375,23 +375,27 @@ const MODULE_RENDERERS = {
 			"settlement/original": "original_amount",
 			"settlement/item-discounts": "item_discounts"
 		});
-		return rows.length ? /* @__PURE__ */ react.default.createElement("section", null, /* @__PURE__ */ react.default.createElement(ReceiptRows, {
+		const summaryRows = require_invoiceVisibility.isInvoiceFieldVisible(config, "payment_summary") ? receipt.paymentSummaryRows : [];
+		return rows.length || summaryRows.length ? /* @__PURE__ */ react.default.createElement("section", null, /* @__PURE__ */ react.default.createElement(ReceiptRows, {
 			locale: receipt.locale,
 			rows
-		})) : null;
+		}), summaryRows.length ? /* @__PURE__ */ react.default.createElement(react.default.Fragment, null, rows.length ? /* @__PURE__ */ react.default.createElement(ReceiptSeparator, null) : null, /* @__PURE__ */ react.default.createElement(ReceiptSectionTitle, null, require_receiptTranslations.receiptLabel(receipt, "Payment summary")), /* @__PURE__ */ react.default.createElement(ReceiptRows, {
+			locale: receipt.locale,
+			rows: summaryRows
+		})) : null) : null;
 	},
 	custom_2: renderCustom,
 	customer_2: renderCustom,
-	payment: ({ receipt }) => receipt.paymentSummaryRows.length || receipt.paymentRows.length || receipt.refundRows.length ? /* @__PURE__ */ react.default.createElement("section", null, receipt.paymentSummaryRows.length ? /* @__PURE__ */ react.default.createElement(react.default.Fragment, null, /* @__PURE__ */ react.default.createElement(ReceiptSectionTitle, null, require_receiptTranslations.receiptLabel(receipt, "Payment summary")), /* @__PURE__ */ react.default.createElement(ReceiptRows, {
-		locale: receipt.locale,
-		rows: receipt.paymentSummaryRows
-	})) : null, receipt.paymentRows.length ? /* @__PURE__ */ react.default.createElement(react.default.Fragment, null, receipt.paymentSummaryRows.length ? /* @__PURE__ */ react.default.createElement(ReceiptSeparator, null) : null, /* @__PURE__ */ react.default.createElement(ReceiptSectionTitle, null, require_receiptTranslations.receiptLabel(receipt, "Payment history")), /* @__PURE__ */ react.default.createElement(RecordGroups, {
-		groups: receipt.paymentRows,
-		locale: receipt.locale
-	})) : null, receipt.refundRows.length ? /* @__PURE__ */ react.default.createElement(react.default.Fragment, null, /* @__PURE__ */ react.default.createElement(ReceiptSectionTitle, null, require_receiptTranslations.receiptLabel(receipt, "Refund history")), /* @__PURE__ */ react.default.createElement(RecordGroups, {
-		groups: receipt.refundRows,
-		locale: receipt.locale
-	})) : null) : null,
+	payment: ({ config, receipt }) => {
+		const paymentRows = require_invoiceVisibility.isInvoiceFieldVisible(config, "time") ? receipt.paymentRows : receipt.paymentRows.map((group) => group.filter((row) => !require_invoiceVisibility.isInvoicePaymentTimeRow(row))).filter((group) => group.length > 0);
+		return paymentRows.length || receipt.refundRows.length ? /* @__PURE__ */ react.default.createElement("section", null, paymentRows.length ? /* @__PURE__ */ react.default.createElement(react.default.Fragment, null, /* @__PURE__ */ react.default.createElement(ReceiptSectionTitle, null, require_receiptTranslations.receiptLabel(receipt, "Payment history")), /* @__PURE__ */ react.default.createElement(RecordGroups, {
+			groups: paymentRows,
+			locale: receipt.locale
+		})) : null, receipt.refundRows.length ? /* @__PURE__ */ react.default.createElement(react.default.Fragment, null, /* @__PURE__ */ react.default.createElement(ReceiptSectionTitle, null, require_receiptTranslations.receiptLabel(receipt, "Refund history")), /* @__PURE__ */ react.default.createElement(RecordGroups, {
+			groups: receipt.refundRows,
+			locale: receipt.locale
+		})) : null) : null;
+	},
 	card: ({ receipt }) => receipt.walletRows.length ? /* @__PURE__ */ react.default.createElement("section", null, /* @__PURE__ */ react.default.createElement(ReceiptSectionTitle, null, require_receiptTranslations.receiptLabel(receipt, "Cards & Vouchers")), /* @__PURE__ */ react.default.createElement(RecordGroups, {
 		groups: receipt.walletRows,
 		locale: receipt.locale

package/lib/plus/invoice/invoiceVisibility.js

@@ -58,7 +58,12 @@ const DETAIL_FIELDS = {
 		"allergies",
 		"base_price"
 	],
-	settlement: ["original_amount", "item_discounts"],
+	settlement: [
+		"original_amount",
+		"item_discounts",
+		"payment_summary"
+	],
+	payment: ["time"],
 	total_savings: ["description"]
 };
 /** Select the shared virtual-currency view only for the new detail protocol. */
@@ -68,6 +73,20 @@ function hasInvoiceDetailSettings(settings) {
 		return child && Object.prototype.hasOwnProperty.call(child, "is_show");
 	}));
 }
+function isInvoicePaymentTimeRow(row) {
+	return typeof row.receipt_key === "string" && /#payment-time\/history(?:\/secondary)?$/.test(row.receipt_key);
+}
+/** Hiding payment time requires identifiable rows, not a date-text heuristic. */
+function requiresInvoicePaymentTimeKeys(settings) {
+	return invoiceModules(settings).some((module) => module.key === "payment" && isInvoiceModuleVisible(module) && !isInvoiceFieldVisible(module, "time"));
+}
+function hasInvoicePaymentTimeKeys(data) {
+	return Object.values(data).every((localeData) => {
+		const groups = localeData.payment_data;
+		if (groups === void 0 || groups === null) return true;
+		return Array.isArray(groups) && groups.every((group) => Array.isArray(group) && (!group.length || group.every((row) => typeof (row === null || row === void 0 ? void 0 : row.receipt_key) === "string" && row.receipt_key.length > 0) && group.some(isInvoicePaymentTimeRow)));
+	});
+}
 function cardRequiresFiltering(config) {
 	return Boolean(config && (!isInvoiceModuleVisible(config) || Array.isArray(config.pass_type) && config.pass_type.length > 0));
 }
@@ -92,8 +111,11 @@ function requiresInvoiceDataFiltering(settings) {
 }
 //#endregion
 exports.hasInvoiceDetailSettings = hasInvoiceDetailSettings;
+exports.hasInvoicePaymentTimeKeys = hasInvoicePaymentTimeKeys;
 exports.invoiceVisibility = invoiceVisibility;
 exports.isInvoiceFieldVisible = isInvoiceFieldVisible;
 exports.isInvoiceModuleVisible = isInvoiceModuleVisible;
+exports.isInvoicePaymentTimeRow = isInvoicePaymentTimeRow;
 exports.permitsLegacyWalletFallback = permitsLegacyWalletFallback;
 exports.requiresInvoiceDataFiltering = requiresInvoiceDataFiltering;
+exports.requiresInvoicePaymentTimeKeys = requiresInvoicePaymentTimeKeys;

package/lib/plus/saleDetail/tmpl/B/components/Invoice/useInvoiceReceiptPreview.js

@@ -78,6 +78,7 @@ function useInvoiceReceiptPreview(context) {
 				const layout = yield require_receipt.resolveInvoiceLayoutConfig(salesModule);
 				if (cancelled) return null;
 				const mustFilter = require_invoiceVisibility.requiresInvoiceDataFiltering(layout);
+				const needsPaymentTimeKeys = require_invoiceVisibility.requiresInvoicePaymentTimeKeys(layout);
 				const useSharedConfig = require_invoiceVisibility.hasInvoiceDetailSettings(layout) || mustFilter;
 				const isVirtualOrder = require_index.isVirtualSettlementTempOrder(tempOrder) || require_index.isVirtualSettlementTempOrder(salesDetail === null || salesDetail === void 0 ? void 0 : salesDetail.raw);
 				const legacyVirtualResult = {
@@ -95,16 +96,17 @@ function useInvoiceReceiptPreview(context) {
 							const freshSnapshot = yield require_serve.getLocalOrderReceiptSnapshot(orderId, [appLocale], layout);
 							if (!freshSnapshot || !require_receipt.isSmallTicketData(freshSnapshot.small_ticket_data)) throw new Error("Receipt snapshot is unavailable");
 							if (mustFilter && freshSnapshot.template_visibility_applied !== true) throw new Error("Receipt snapshot does not support template filtering");
+							if (needsPaymentTimeKeys && !require_invoiceVisibility.hasInvoicePaymentTimeKeys(freshSnapshot.small_ticket_data)) throw new Error("Receipt snapshot does not identify payment history times");
 							if (requiresSource && !freshSnapshot.source) throw new Error("Virtual currency receipt source is unavailable");
 							return {
 								snapshot: freshSnapshot.small_ticket_data,
 								source: freshSnapshot.source || null
 							};
 						} catch (error) {
-							if (mustFilter || requiresSource) throw error;
+							if (mustFilter || needsPaymentTimeKeys || requiresSource) throw error;
 							console.warn("[SaleDetail.Invoice] Failed to rebuild local receipt snapshot", error);
 						}
-						if (mustFilter || requiresSource) throw new Error("A template-aware local receipt snapshot is required");
+						if (mustFilter || needsPaymentTimeKeys || requiresSource) throw new Error("A template-aware local receipt snapshot is required");
 						return {
 							snapshot: embeddedSnapshot || (orderId !== null && orderId !== void 0 ? yield require_serve.getOrderSmallTicketData(orderId) : null),
 							source: null

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.12.306",
+  "version": "6.12.308",
   "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.78",
-    "@pisell/date-picker": "3.0.12"
+    "@pisell/utils": "3.0.7",
+    "@pisell/date-picker": "3.0.12",
+    "@pisell/materials": "6.12.78"
   },
   "peerDependencies": {
     "react": "^18.0.0",