@pisell/pisellos 2.3.141 → 2.3.142

package/lib/shared/receipt/small-ticket.js

@@ -8,6 +8,7 @@ exports.hasSmallTicketData = hasSmallTicketData;
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _decimal = _interopRequireDefault(require("decimal.js"));
 var _pickupTiming = require("../../modules/Order/pickupTiming");
+var _templateVisibility = require("./templateVisibility");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const DEFAULT_LOCALES = ['en', 'zh_CN'];
 
@@ -291,12 +292,14 @@ function buildSmallTicketData(params) {
   const shopInfo = params.shopInfo || {};
   const locales = resolveLocales(shopInfo, params.locales);
   const productMap = params.productMap || {};
+  const visibility = (0, _templateVisibility.resolveInvoiceDataVisibility)(params.templateSettings);
   const result = locales.reduce((data, locale) => {
     data[locale] = buildLocaleData({
       order,
       shopInfo,
       locale,
-      productMap
+      productMap,
+      visibility
     });
     return data;
   }, {});
@@ -311,13 +314,14 @@ function buildLocaleData(params) {
     order,
     shopInfo,
     locale,
-    productMap
+    productMap,
+    visibility
   } = params;
   const products = buildProducts(order, locale, productMap);
   const summary = getSummary(order);
   const currencySymbol = getCurrencySymbol(order, shopInfo);
   const financials = resolveReceiptFinancials(order, summary);
-  const delivery = buildDelivery(order, locale);
+  const delivery = buildDelivery(order, locale, visibility.handover);
   return {
     base_data: buildBaseData({
       order,
@@ -336,7 +340,7 @@ function buildLocaleData(params) {
       currencySymbol,
       financials
     }),
-    customer: buildCustomer(order, locale),
+    customer: buildCustomer(order, locale, visibility.customer),
     appointment: buildAppointment(order, locale),
     ...(delivery.length ? {
       delivery
@@ -347,12 +351,15 @@ function buildLocaleData(params) {
       locale,
       currencySymbol
     }),
-    wallets: buildWallets({
+    wallets: visibility.card.show ? buildWallets({
       order,
       locale,
-      currencySymbol
-    }),
-    tickets: Array.isArray(order.tickets) ? order.tickets.map(group => Array.isArray(group) ? group.map(row => row && typeof row === 'object' ? {
+      currencySymbol,
+      passTypes: visibility.card.passTypes
+    }) : [],
+    // Native printers fall back to tickets when wallets is empty. Legacy rows
+    // have no trustworthy asset tags, so they cannot bypass a card whitelist.
+    tickets: visibility.card.show && visibility.card.passTypes === null && Array.isArray(order.tickets) ? order.tickets.map(group => Array.isArray(group) ? group.map(row => row && typeof row === 'object' ? {
       ...row,
       ...receiptKey(row, 'ticket')
     } : row) : group) : [],
@@ -1240,7 +1247,9 @@ function calculateProductOriginalAmount(order) {
     return total.plus(new _decimal.default(toMoneyNumber(originalPrice)).mul(quantity));
   }, new _decimal.default(0));
 }
-function buildCustomer(order, locale) {
+function buildCustomer(order, locale, visibility) {
+  if (!visibility.show) return [];
+  const fields = [visibility.name, visibility.phone, visibility.email];
   return [{
     ...receiptKey(order, 'customer.contactName'),
     item: label(locale, 'contactName'),
@@ -1253,7 +1262,7 @@ function buildCustomer(order, locale) {
     ...receiptKey(order, 'customer.email'),
     item: label(locale, 'email'),
     value: stringify(order.email || order.customer?.email)
-  }];
+  }].filter((_row, index) => fields[index]);
 }
 function normalizeCustomerDisplayValue(value) {
   const text = stringify(value).trim();
@@ -1261,16 +1270,18 @@ function normalizeCustomerDisplayValue(value) {
   if (text.toLowerCase() === 'select a customer') return 'Walk-In';
   return text;
 }
-function buildDelivery(order, locale) {
+function buildDelivery(order, locale, visibility) {
+  if (!visibility.show) return [];
   const serviceType = stringify(order.metadata?.shop_service_data?.service_type).trim();
   const serviceTypeLabelKey = resolveServiceTypeLabelKey(serviceType);
   if (!serviceTypeLabelKey) return [];
-  const items = [{
+  const items = visibility.method ? [{
     ...receiptKey(order, 'service-type'),
     item: label(locale, serviceTypeLabelKey),
     value: '',
     size: 2
-  }];
+  }] : [];
+  if (!visibility.fulfillmentTime) return items;
   if (serviceType === 'pick_up') {
     const pickupTime = formatPickupBookingStart(order.bookings, locale);
     if (pickupTime) {
@@ -1563,9 +1574,77 @@ function resolveRefundPayment(refund, payments) {
   const matchedPayment = payments.find(payment => isSameId(firstPresentValue(payment.order_payment_id, payment.id), orderPaymentId));
   return matchedPayment || refund;
 }
+function getPaymentWalletAssetIdentity(payment) {
+  const record = getFundRecord(payment);
+  return {
+    id: firstNormalizedWalletAssetId(record?.voucher_id, payment.voucher_id),
+    codes: normalizeWalletAssetCodes(record?.code, record?.encoded)
+  };
+}
+function getProductWalletAssetTag(record) {
+  // Rules normalizes product_discount_card to type=discount_card. That
+  // ambiguous alias cannot establish the original asset tag for a whitelist.
+  for (const tag of [record.tag, record.discount?.tag]) {
+    if (typeof tag === 'string' && tag) return tag;
+  }
+  for (const type of [record.type, record.discount?.type]) {
+    if (typeof type === 'string' && type !== 'discount_card' && PRODUCT_WALLET_DISCOUNT_TYPES.has(type)) return type;
+  }
+  return undefined;
+}
+function createWalletAssetFilter(order, passTypes) {
+  if (passTypes === null) return () => true;
+  const assets = [];
+  const remember = (identity, tag) => {
+    if (typeof tag === 'string' && tag && (identity.id || identity.codes.length)) assets.push({
+      identity,
+      tag
+    });
+  };
+  for (const asset of [...normalizeArray(order.vouchers), ...normalizeArray(order.order_meta_list?.point_cards_snapshot), ...normalizeArray(order.order_meta_list?.virtual_currency_snapshot)]) {
+    if (asset && typeof asset === 'object') remember(getVoucherAssetIdentity(asset), asset.tag);
+  }
+  // Some order snapshots retain the original selected assets at the root.
+  // Only their explicit tag is authoritative; do not infer it from type.
+  for (const record of normalizeArray(order.discount_list)) {
+    if (!record || typeof record !== 'object') continue;
+    remember({
+      id: getProductWalletDiscountAssetId(record),
+      codes: getProductWalletDiscountCodes(record)
+    }, record.tag ?? record.discount?.tag);
+  }
+  const visit = product => {
+    if (!product || typeof product !== 'object') return;
+    for (const record of normalizeArray(product.discount_list)) {
+      if (!record || typeof record !== 'object') continue;
+      remember({
+        id: getProductWalletDiscountAssetId(record),
+        codes: getProductWalletDiscountCodes(record)
+      }, getProductWalletAssetTag(record));
+    }
+    for (const key of ['combinations', 'product_bundle', 'bundle']) normalizeArray(product[key]).forEach(visit);
+  };
+  normalizeArray(order.products).forEach(product => {
+    if (product && typeof product === 'object') visit(restoreReceiptDiscountHierarchy(product));
+  });
+  return (identity, tag, resolvePaymentSource = false) => {
+    const directTag = typeof tag === 'string' && tag ? tag : undefined;
+    if (directTag && !resolvePaymentSource) return passTypes.has(directTag);
+    const exactMatches = identity.id ? assets.filter(asset => asset.identity.id === identity.id) : [];
+    // A known asset ID is stronger than an unrelated code-only snapshot.
+    const matches = exactMatches.length ? exactMatches : assets.filter(asset => isSameWalletAssetIdentity(asset.identity, identity));
+    const tags = new Set(matches.map(asset => asset.tag));
+    if (!tags.size) return !!directTag && passTypes.has(directTag);
+    // A conflicting fund record is not reliable evidence for a payment's tag.
+    // It must not claim the identity ahead of the original typed asset.
+    if (tags.size !== 1 || directTag && !tags.has(directTag)) return false;
+    return passTypes.has(matches[0].tag);
+  };
+}
 function buildWallets(params) {
-  const virtualCurrencySnapshots = collectVirtualCurrencySnapshots(params.order);
-  const displayedWalletPayments = normalizeArray(params.order.payments).filter(payment => isPrintablePayment(payment) && !!getFundRecord(payment));
+  const allowAsset = createWalletAssetFilter(params.order, params.passTypes);
+  const virtualCurrencySnapshots = collectVirtualCurrencySnapshots(params.order, allowAsset);
+  const displayedWalletPayments = normalizeArray(params.order.payments).filter(payment => isPrintablePayment(payment) && !!getFundRecord(payment) && allowAsset(getPaymentWalletAssetIdentity(payment), getFundRecord(payment)?.tag, true));
   const paymentWallets = displayedWalletPayments.map(payment => {
     const virtualCurrencySnapshot = findVirtualCurrencySnapshotForPayment(payment, virtualCurrencySnapshots.byId);
     return buildPaymentItems({
@@ -1581,20 +1660,24 @@ function buildWallets(params) {
   const displayedWalletAssetIdentities = collectDisplayedWalletAssetIdentities(displayedWalletPayments);
   const voucherWallets = buildVoucherAssets({
     ...params,
+    allowAsset,
     displayedWalletAssetIdentities
   });
   const productDiscountWallets = buildProductDiscountAssets({
     ...params,
+    allowAsset,
     displayedWalletAssetIdentities
   });
   return [...paymentWallets, ...voucherWallets, ...productDiscountWallets, ...buildPointCardSnapshotAssets({
     order: params.order,
     locale: params.locale,
+    allowAsset,
     displayedWalletAssetIdentities
   }), ...buildVirtualCurrencySnapshotAssets({
     snapshots: virtualCurrencySnapshots.items,
     order: params.order,
     locale: params.locale,
+    allowAsset,
     displayedWalletAssetIdentities
   })];
 }
@@ -1623,7 +1706,7 @@ function collectDisplayedWalletAssetIdentities(payments) {
 const PRODUCT_WALLET_DISCOUNT_TYPES = new Set(['good_pass', 'discount_card', 'product_discount_card', 'entitlement_pass']);
 function buildProductDiscountAssets(params) {
   const fallbackAssetTime = firstPresentValue(params.order.updated_at, params.order.created_at);
-  return collectProductWalletDiscountAssets(params.order).flatMap(asset => {
+  return collectProductWalletDiscountAssets(params.order, params.allowAsset).flatMap(asset => {
     if (!claimWalletAssetIdentity(params.displayedWalletAssetIdentities, {
       id: asset.id,
       codes: asset.codes
@@ -1667,16 +1750,16 @@ function buildProductDiscountAssets(params) {
     }] : []), ...(timeRow ? [timeRow] : [])]];
   });
 }
-function collectProductWalletDiscountAssets(order) {
+function collectProductWalletDiscountAssets(order, allowAsset) {
   const assets = [];
   const assetsById = new Map();
   normalizeArray(order.products).forEach(rawProduct => {
     if (!rawProduct || typeof rawProduct !== 'object') return;
-    visitProductWalletDiscounts(restoreReceiptDiscountHierarchy(rawProduct), assets, assetsById);
+    visitProductWalletDiscounts(restoreReceiptDiscountHierarchy(rawProduct), assets, assetsById, allowAsset);
   });
   return assets;
 }
-function visitProductWalletDiscounts(product, assets, assetsById) {
+function visitProductWalletDiscounts(product, assets, assetsById, allowAsset) {
   normalizeArray(product.discount_list).forEach(record => {
     if (!record || typeof record !== 'object' || Array.isArray(record)) return;
     const type = getProductWalletDiscountType(record);
@@ -1684,6 +1767,10 @@ function visitProductWalletDiscounts(product, assets, assetsById) {
     const id = getProductWalletDiscountAssetId(record);
     if (!id) return;
     const codes = getProductWalletDiscountCodes(record);
+    if (allowAsset && !allowAsset({
+      id,
+      codes
+    }, getProductWalletAssetTag(record))) return;
     const existing = assetsById.get(id);
     if (existing) {
       existing.records.push(record);
@@ -1702,7 +1789,7 @@ function visitProductWalletDiscounts(product, assets, assetsById) {
   for (const childKey of ['combinations', 'product_bundle', 'bundle']) {
     normalizeArray(product[childKey]).forEach(child => {
       if (!child || typeof child !== 'object' || Array.isArray(child)) return;
-      visitProductWalletDiscounts(child, assets, assetsById);
+      visitProductWalletDiscounts(child, assets, assetsById, allowAsset);
     });
   }
 }
@@ -1818,6 +1905,7 @@ function buildPointCardSnapshotAssets(params) {
     const pointCard = snapshot;
     if (stringify(pointCard.tag).trim().toLowerCase() !== 'point_card') return [];
     const assetId = normalizeWalletPassId(pointCard.id);
+    if (!params.allowAsset(getVoucherAssetIdentity(pointCard), pointCard.tag)) return [];
     if (!assetId || !claimWalletAssetIdentity(params.displayedWalletAssetIdentities, {
       id: assetId,
       codes: []
@@ -1845,7 +1933,7 @@ function buildPointCardSnapshotAssets(params) {
     return [rows];
   });
 }
-function collectVirtualCurrencySnapshots(order) {
+function collectVirtualCurrencySnapshots(order, allowAsset) {
   const items = [];
   const byId = new Map();
   const snapshots = order.order_meta_list?.virtual_currency_snapshot;
@@ -1857,6 +1945,7 @@ function collectVirtualCurrencySnapshots(order) {
     if (!snapshot || typeof snapshot !== 'object' || Array.isArray(snapshot)) return;
     const virtualCurrency = snapshot;
     if (stringify(virtualCurrency.tag).trim().toLowerCase() !== 'virtual_currency') return;
+    if (!allowAsset(getVoucherAssetIdentity(virtualCurrency), virtualCurrency.tag)) return;
     const id = normalizeWalletPassId(virtualCurrency.id);
     if (!id || byId.has(id)) return;
     byId.set(id, virtualCurrency);
@@ -1881,13 +1970,14 @@ function buildVirtualCurrencySnapshotAssets(params) {
   const snapshotTime = firstPresentValue(params.order.updated_at, params.order.created_at);
   return params.snapshots.flatMap(virtualCurrency => {
     const assetId = normalizeWalletPassId(virtualCurrency.id);
+    if (!params.allowAsset(getVoucherAssetIdentity(virtualCurrency), virtualCurrency.tag)) return [];
     if (!assetId || !claimWalletAssetIdentity(params.displayedWalletAssetIdentities, {
       id: assetId,
       codes: []
     })) return [];
     const rows = [{
       ...receiptKey(virtualCurrency, 'asset-name'),
-      item: stringify(virtualCurrency.product_name).trim(),
+      item: appendMaskedCardCode(stringify(virtualCurrency.product_name).trim(), virtualCurrency.code),
       value: ''
     }];
     const balance = getVirtualCurrencySnapshotBalance(virtualCurrency);
@@ -1991,6 +2081,7 @@ function buildVoucherAssets(params) {
   const fallbackAssetTime = firstPresentValue(params.order.updated_at, params.order.created_at);
   return normalizeArray(params.order.vouchers).flatMap(voucher => {
     if (!voucher || typeof voucher !== 'object' || Array.isArray(voucher)) return [];
+    if (!params.allowAsset(getVoucherAssetIdentity(voucher), voucher.tag)) return [];
     if (!claimWalletAssetIdentity(params.displayedWalletAssetIdentities, getVoucherAssetIdentity(voucher))) return [];
     const name = getVoucherAssetName(voucher, params.locale);
     const assetTime = firstPresentValue(voucher.updated_at, voucher.created_at, voucher.collection_time, fallbackAssetTime);

package/lib/shared/receipt/templateVisibility.d.ts

@@ -0,0 +1,23 @@
+/** Template children are direct module members; legacy missing values stay visible. */
+export interface InvoiceDataVisibility {
+    handover: {
+        show: boolean;
+        method: boolean;
+        fulfillmentTime: boolean;
+    };
+    customer: {
+        show: boolean;
+        name: boolean;
+        email: boolean;
+        phone: boolean;
+    };
+    card: {
+        show: boolean;
+        passTypes: ReadonlySet<string> | null;
+    };
+}
+export declare function invoiceSettingIsVisible(value: unknown): boolean;
+export declare function getInvoiceTemplateModules(settings: unknown): Record<string, any>[];
+export declare function resolveInvoiceDataVisibility(settings: unknown): InvoiceDataVisibility;
+/** Whether an old unfiltered snapshot is unsafe for this template. */
+export declare function requiresInvoiceDataFiltering(settings: unknown): boolean;

package/lib/shared/receipt/templateVisibility.js

@@ -0,0 +1,63 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getInvoiceTemplateModules = getInvoiceTemplateModules;
+exports.invoiceSettingIsVisible = invoiceSettingIsVisible;
+exports.requiresInvoiceDataFiltering = requiresInvoiceDataFiltering;
+exports.resolveInvoiceDataVisibility = resolveInvoiceDataVisibility;
+/** Template children are direct module members; legacy missing values stay visible. */
+
+function invoiceSettingIsVisible(value) {
+  return value !== 0 && value !== false;
+}
+function getInvoiceTemplateModules(settings) {
+  if (Array.isArray(settings)) return settings.filter(isRecord);
+  if (!isRecord(settings)) return [];
+  if (isRecord(settings.template_settings)) {
+    return getInvoiceTemplateModules(settings.template_settings);
+  }
+  const modules = settings.modules ?? settings.module;
+  return Array.isArray(modules) ? modules.filter(isRecord) : [];
+}
+function isRecord(value) {
+  return !!value && typeof value === 'object' && !Array.isArray(value);
+}
+function resolveInvoiceDataVisibility(settings) {
+  const modules = getInvoiceTemplateModules(settings);
+  // Native templates use the first occurrence of each module.
+  const module = key => modules.find(item => item.key === key);
+  const handover = module('handover');
+  const customer = module('customer');
+  const card = module('card');
+  const field = (config, key) => invoiceSettingIsVisible(config?.[key]?.is_show);
+  const passTypes = Array.isArray(card?.pass_type) && card.pass_type.length > 0 ? new Set(card.pass_type.filter(tag => typeof tag === 'string' && tag.length > 0)) : null;
+  return {
+    handover: {
+      show: invoiceSettingIsVisible(handover?.is_show),
+      method: field(handover, 'method'),
+      fulfillmentTime: field(handover, 'fulfillment_time')
+    },
+    customer: {
+      show: invoiceSettingIsVisible(customer?.is_show),
+      name: field(customer, 'name'),
+      email: field(customer, 'email'),
+      phone: field(customer, 'phone')
+    },
+    card: {
+      show: invoiceSettingIsVisible(card?.is_show),
+      passTypes
+    }
+  };
+}
+
+/** Whether an old unfiltered snapshot is unsafe for this template. */
+function requiresInvoiceDataFiltering(settings) {
+  const {
+    handover,
+    customer,
+    card
+  } = resolveInvoiceDataVisibility(settings);
+  return !handover.show || !handover.method || !handover.fulfillmentTime || !customer.show || !customer.name || !customer.email || !customer.phone || !card.show || card.passTypes !== null;
+}

package/lib/solution/BookingByStep/index.d.ts

@@ -210,6 +210,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      *     product: ProductData;
      *     date?: { startTime: string; endTime: string } | null;
      *     account?: Account | null;
+     *     isLegacyOrder?: boolean;
      *   })} {
      *     product,
      *     date,
@@ -218,13 +219,14 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      * @return {*}
      * @memberof BookingByStepImpl
      */
-    addProductToCart({ product, date, account, }: {
+    addProductToCart({ product, date, account, isLegacyOrder, }: {
         product: ProductData;
         date?: {
             startTime: string;
             endTime: string;
         } | null;
         account?: Account | null;
+        isLegacyOrder?: boolean;
     }): {
         success: boolean;
         errorCode?: string;
@@ -326,7 +328,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 6 | 4 | 5 | 3;
+        weekNum: 0 | 1 | 2 | 5 | 4 | 3 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/BookingByStep/index.js

@@ -636,7 +636,8 @@ class BookingByStepImpl extends _BaseModule.BaseModule {
     // 直接调用 addProductToCart，不传递 date 参数以避免日期检查逻辑
     return this.addProductToCart({
       product: productData,
-      account: activeAccount
+      account: activeAccount,
+      isLegacyOrder: true
     });
   }
 
@@ -647,6 +648,7 @@ class BookingByStepImpl extends _BaseModule.BaseModule {
    *     product: ProductData;
    *     date?: { startTime: string; endTime: string } | null;
    *     account?: Account | null;
+   *     isLegacyOrder?: boolean;
    *   })} {
    *     product,
    *     date,
@@ -658,7 +660,8 @@ class BookingByStepImpl extends _BaseModule.BaseModule {
   addProductToCart({
     product,
     date,
-    account
+    account,
+    isLegacyOrder = false
   }) {
     const {
       bundle,
@@ -725,7 +728,8 @@ class BookingByStepImpl extends _BaseModule.BaseModule {
       product: productData,
       bundle,
       options,
-      quantity
+      quantity,
+      isLegacyOrder
     };
     if (date) {
       addItemParams.date = date;

package/lib/solution/OrderInvoicePreview/index.js

@@ -165,7 +165,8 @@ class OrderInvoicePreviewImpl extends _BaseModule.BaseModule {
           order: source,
           shopInfo: shop,
           locales: [...new Set(languageOptions.flatMap(option => option.locales))],
-          includeReceiptKeys: true
+          includeReceiptKeys: true,
+          templateSettings: template.layout
         })
       };
       this.publish({

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.3.141",
+  "version": "2.3.142",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",