@pisell/pisellos 0.10.35 → 0.10.37

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

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 5 | 3 | 1 | 2 | 4 | 6;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/model/strategy/adapter/promotion/index.js

@@ -1 +1,46 @@
-"use strict";
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "BUY_X_GET_Y_FREE_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.BUY_X_GET_Y_FREE_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "ITEM_REWARD_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.ITEM_REWARD_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "PromotionAdapter", {
+  enumerable: true,
+  get: function () {
+    return _adapter.PromotionAdapter;
+  }
+});
+Object.defineProperty(exports, "PromotionEvaluator", {
+  enumerable: true,
+  get: function () {
+    return _evaluator.PromotionEvaluator;
+  }
+});
+Object.defineProperty(exports, "X_ITEMS_FOR_Y_PRICE_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.X_ITEMS_FOR_Y_PRICE_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: function () {
+    return _adapter.default;
+  }
+});
+var _evaluator = require("./evaluator");
+var _adapter = _interopRequireWildcard(require("./adapter"));
+var _examples = require("./examples");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }

package/lib/modules/Order/index.js

@@ -72,13 +72,6 @@ function getVoucherPaymentLifecycleKey(payment) {
   if (!isVoucherPaymentRecord(payment)) return null;
   return `${String(payment.voucher_id)}::${String(payment.status || '')}`;
 }
-function hasPersistedOrderId(orderId) {
-  if (orderId === undefined || orderId === null || orderId === '') return false;
-  if (typeof orderId === 'string' && orderId.startsWith('LOCAL_')) return false;
-  const normalizedOrderId = Number(orderId);
-  if (Number.isFinite(normalizedOrderId)) return normalizedOrderId > 0;
-  return String(orderId).trim() !== '';
-}
 class OrderModule extends _BaseModule.BaseModule {
   defaultName = 'order';
   defaultVersion = '1.0.0';
@@ -480,7 +473,6 @@ class OrderModule extends _BaseModule.BaseModule {
     this.store.virtualCurrencyList = prepareConfigResult?.virtualCurrencyList || [];
     if (prepareConfigResult) {
       this.writePointCardSnapshotFromPrepareConfig({
-        orderId,
         customerId: params.customerId,
         availableWalletPassList: prepareConfigResult.availableWalletPassList || []
       });
@@ -986,8 +978,6 @@ class OrderModule extends _BaseModule.BaseModule {
     const tempOrder = this.store.tempOrder;
     if (!tempOrder) return;
     if (String(tempOrder.customer_id ?? '') !== String(params.customerId)) return;
-    const effectiveOrderId = params.orderId ?? tempOrder.order_id;
-    if (hasPersistedOrderId(effectiveOrderId)) return;
     tempOrder.order_meta_list = {
       ...((0, _utils.normalizeOrderMetaList)(tempOrder.order_meta_list) || {}),
       point_cards_snapshot: (0, _utils.buildPointCardSnapshotFromWalletPassList)(params.availableWalletPassList)
@@ -2465,7 +2455,7 @@ class OrderModule extends _BaseModule.BaseModule {
       email: tempOrder.email
     });
     const nextCustomerId = tempOrder.customer_id ?? null;
-    if (String(previousCustomerId ?? '') !== String(nextCustomerId ?? '') && !hasPersistedOrderId(tempOrder.order_id)) {
+    if (String(previousCustomerId ?? '') !== String(nextCustomerId ?? '')) {
       this.store.availableWalletIds = [];
       this.clearTempOrderPointCardSnapshot(tempOrder);
     }
@@ -2505,9 +2495,7 @@ class OrderModule extends _BaseModule.BaseModule {
     if (String(previousCustomerId ?? '') !== String(nextCustomerId ?? '')) {
       this.store.availableWalletIds = [];
       this.store.virtualCurrencyList = [];
-      if (!hasPersistedOrderId(tempOrder.order_id)) {
-        this.clearTempOrderPointCardSnapshot(tempOrder);
-      }
+      this.clearTempOrderPointCardSnapshot(tempOrder);
       (0, _utils.clearTempOrderHolderAssignments)(tempOrder);
       this.clearCustomerBoundDiscounts(tempOrder);
       this.applyDiscount();
@@ -2547,9 +2535,7 @@ class OrderModule extends _BaseModule.BaseModule {
     if (tempOrder._extend) delete tempOrder._extend.customerSnapshot;
     this.store.availableWalletIds = [];
     this.store.virtualCurrencyList = [];
-    if (!hasPersistedOrderId(tempOrder.order_id)) {
-      this.clearTempOrderPointCardSnapshot(tempOrder);
-    }
+    this.clearTempOrderPointCardSnapshot(tempOrder);
     this.clearCustomerBoundDiscounts(tempOrder);
     this.applyDiscount();
     this.persistTempOrder();

package/lib/server/utils/small-ticket.d.ts

@@ -28,6 +28,8 @@ export interface SmallTicketItem {
     value: string;
     size?: number;
     align?: string;
+    product_uid?: string | number;
+    booking_uid?: string | number;
 }
 export interface SmallTicketProduct {
     product_title: string;
@@ -35,7 +37,7 @@ export interface SmallTicketProduct {
     selling_price: string;
     total_selling_price: string;
     original_price: string;
-    base_price: string;
+    base_price?: string;
     total_original_price: string;
     options_total_price?: string;
     package_items_total_price?: string;
@@ -53,11 +55,7 @@ export interface SmallTicketProduct {
     variant?: string;
     combinations?: any[];
 }
-export interface SmallTicketBookingSnapshot extends Record<string, any> {
-    product_uid?: string | number;
-    booking_uid?: string | number;
-}
-export type SmallTicketAppointment = SmallTicketItem[] | SmallTicketBookingSnapshot[];
+export type SmallTicketAppointment = SmallTicketItem[];
 export interface SmallTicketLocaleData {
     base_data: Record<string, any>;
     products: SmallTicketProduct[];

package/lib/server/utils/small-ticket.js

@@ -33,8 +33,13 @@ const LABELS = {
     redeemPoints: 'Redeem points',
     remainingPoints: 'Points balance',
     table: 'Table',
+    bookingId: 'Booking ID',
+    bookingDateTime: 'Date & time',
+    bookingResource: 'Resource',
+    bookingHolder: 'Holder',
     orderDiscount: 'Order discount',
     manualDiscount: 'Manual discount',
+    manualMarkup: 'Manual markup',
     payProcessingFee: 'Pay processing fee',
     surchargeIncluded: 'Surcharge(Included)',
     rounding: 'Rounding',
@@ -66,8 +71,13 @@ const LABELS = {
     redeemPoints: '本次使用积分',
     remainingPoints: '积分余额',
     table: '桌台',
+    bookingId: '预约编号',
+    bookingDateTime: '日期和时间',
+    bookingResource: '资源',
+    bookingHolder: '预约人',
     orderDiscount: '整单折扣',
     manualDiscount: '手动折扣',
+    manualMarkup: '手动加价',
     payProcessingFee: '支付手续费',
     surchargeIncluded: '手续费(已含)',
     rounding: '抹零',
@@ -99,8 +109,13 @@ const LABELS = {
     redeemPoints: '本次使用積分',
     remainingPoints: '積分餘額',
     table: '桌台',
+    bookingId: '預約編號',
+    bookingDateTime: '日期和時間',
+    bookingResource: '資源',
+    bookingHolder: '預約人',
     orderDiscount: '整單折扣',
     manualDiscount: '手動折扣',
+    manualMarkup: '手動加價',
     payProcessingFee: '支付手續費',
     surchargeIncluded: '手續費(已含)',
     rounding: '抹零',
@@ -130,8 +145,13 @@ const LABELS = {
     redeemPoints: '利用ポイント',
     remainingPoints: 'ポイント残高',
     table: 'テーブル',
+    bookingId: '予約ID',
+    bookingDateTime: '日時',
+    bookingResource: 'リソース',
+    bookingHolder: '予約者',
     orderDiscount: '注文割引',
     manualDiscount: '手動割引',
+    manualMarkup: '手動値上げ',
     payProcessingFee: '決済手数料',
     rounding: '端数調整',
     gross: '総重量',
@@ -162,8 +182,13 @@ const LABELS = {
     redeemPoints: 'Pontos utilizados',
     remainingPoints: 'Saldo de pontos',
     table: 'Mesa',
+    bookingId: 'ID da reserva',
+    bookingDateTime: 'Data e hora',
+    bookingResource: 'Recurso',
+    bookingHolder: 'Titular',
     orderDiscount: 'Desconto do pedido',
     manualDiscount: 'Desconto manual',
+    manualMarkup: 'Acréscimo manual',
     payProcessingFee: 'Taxa de processamento',
     rounding: 'Arredondamento',
     gross: 'Peso bruto',
@@ -281,7 +306,8 @@ function buildBaseData(params) {
 }
 function buildProducts(order, locale, productMap) {
   const products = Array.isArray(order.products) ? order.products : [];
-  return products.map(product => {
+  return products.map(rawProduct => {
+    const product = restoreReceiptDiscountHierarchy(rawProduct);
     const quantity = toNumber(product.product_quantity ?? product.quantity ?? product.num ?? 1, 1);
     const originalPrice = product.original_price ?? product.selling_price ?? product.payment_price ?? product.price ?? 0;
     const sellingPrice = product.selling_price ?? product.payment_price ?? product.price ?? originalPrice;
@@ -322,13 +348,16 @@ function buildProducts(order, locale, productMap) {
     const productNote = resolveProductNote(product, locale);
     const basePrice = resolveProductBasePrice(product);
     const resolvedCombinations = Array.isArray(product.combinations) && product.combinations.length ? normalizeExistingCombinations(product.combinations, locale, currencySymbol) : combinations;
+    const shouldIncludeBasePrice = options.length > 0 || resolvedCombinations.length > 0 || hasProductDiscount(product, extensionList);
     return {
       product_title: productTitle,
       product_quantity: quantity,
       selling_price: formatMoney(sellingPrice, currencySymbol),
       total_selling_price: formatCalculatedMoney(new _decimal.default(toMoneyNumber(sellingPrice)).mul(quantity), currencySymbol),
       original_price: formatMoney(originalPrice, currencySymbol),
-      base_price: formatCalculatedMoney(basePrice ?? 0, currencySymbol),
+      ...(shouldIncludeBasePrice ? {
+        base_price: formatCalculatedMoney(basePrice ?? 0, currencySymbol)
+      } : {}),
       total_original_price: formatMoney(new _decimal.default(toMoneyNumber(originalPrice)).mul(quantity), currencySymbol),
       ...(options.length ? {
         options_total_price: sumNormalizedOptionTotals(options, currencySymbol)
@@ -358,6 +387,73 @@ function buildProducts(order, locale, productMap) {
     };
   });
 }
+const RECEIPT_BUNDLE_MAP_ID_KEY = 'custom_product_bundle_map_id';
+function restoreReceiptDiscountHierarchy(source) {
+  if (!source || typeof source !== 'object' || Array.isArray(source)) {
+    return source;
+  }
+  const childKey = Array.isArray(source.combinations) && source.combinations.length ? 'combinations' : Array.isArray(source.product_bundle) && source.product_bundle.length ? 'product_bundle' : null;
+  if (!childKey) return {
+    ...source
+  };
+  const children = source[childKey].map(child => child && typeof child === 'object' && !Array.isArray(child) ? restoreReceiptDiscountHierarchy(child) : child);
+  const restored = {
+    ...source,
+    [childKey]: children
+  };
+  if (!Array.isArray(source.discount_list) || !source.discount_list.length) {
+    return restored;
+  }
+  const descendantsByMapId = new Map();
+  indexReceiptDiscountTargets(children, descendantsByMapId);
+  if (!descendantsByMapId.size) return restored;
+  const ownDiscounts = [];
+  for (const discount of source.discount_list) {
+    const mapId = getReceiptDiscountBundleMapId(discount);
+    const target = mapId ? descendantsByMapId.get(mapId) : undefined;
+    if (!target) {
+      ownDiscounts.push(discount);
+      continue;
+    }
+    const targetDiscounts = Array.isArray(target.discount_list) ? target.discount_list : [];
+    if (!targetDiscounts.some(item => isSameReceiptDiscount(item, discount))) {
+      target.discount_list = [...targetDiscounts, discount];
+    }
+  }
+  restored.discount_list = ownDiscounts;
+  return restored;
+}
+function indexReceiptDiscountTargets(nodes, targets) {
+  for (const node of nodes) {
+    if (!node || typeof node !== 'object' || Array.isArray(node)) continue;
+    const mapId = getReceiptBundleMapId(node);
+    if (mapId && !targets.has(mapId)) targets.set(mapId, node);
+    const children = Array.isArray(node.combinations) && node.combinations.length ? node.combinations : Array.isArray(node.product_bundle) ? node.product_bundle : [];
+    indexReceiptDiscountTargets(children, targets);
+  }
+}
+function normalizeReceiptId(value) {
+  if (value === undefined || value === null) return null;
+  const normalized = String(value).trim();
+  return normalized ? normalized : null;
+}
+function getReceiptBundleMapId(node) {
+  return normalizeReceiptId(node.metadata?.[RECEIPT_BUNDLE_MAP_ID_KEY] ?? node._id);
+}
+function getReceiptDiscountBundleMapId(discount) {
+  return normalizeReceiptId(discount?.metadata?.[RECEIPT_BUNDLE_MAP_ID_KEY]);
+}
+function isSameReceiptDiscount(left, right) {
+  const leftOrderDiscountId = normalizeReceiptId(left?.order_discount_id);
+  const rightOrderDiscountId = normalizeReceiptId(right?.order_discount_id);
+  if (leftOrderDiscountId && rightOrderDiscountId) {
+    return leftOrderDiscountId === rightOrderDiscountId;
+  }
+  const leftResourceId = normalizeReceiptId(left?.discount?.resource_id ?? left?.resource_id ?? left?.discount_id);
+  const rightResourceId = normalizeReceiptId(right?.discount?.resource_id ?? right?.resource_id ?? right?.discount_id);
+  if (!leftResourceId || !rightResourceId) return false;
+  return leftResourceId === rightResourceId && getReceiptDiscountBundleMapId(left) === getReceiptDiscountBundleMapId(right) && String(left?.amount ?? left?.value ?? left?.discount_amount ?? '') === String(right?.amount ?? right?.value ?? right?.discount_amount ?? '');
+}
 function resolveProductBasePrice(product) {
   const metadata = product.metadata || {};
   const origin = product._origin || metadata.origin || {};
@@ -373,18 +469,35 @@ function normalizeProductDiscounts(params) {
     currencySymbol,
     quantity
   } = params;
-  return normalizeArray(product.discount_list).filter(discount => {
+  const rows = normalizeArray(product.discount_list).filter(discount => {
     const amount = discount.amount ?? discount.value ?? discount.discount_amount;
     return isNonZero(amount);
   }).map(discount => {
     const title = resolveDiscountTitleWithPercent(discount, locale);
     const amount = discount.amount ?? discount.value ?? discount.discount_amount;
-    const formattedAmount = formatNegativeMoney(new _decimal.default(toMoneyNumber(amount)).mul(quantity), currencySymbol);
+    const isMarkup = isManualMarkup(discount);
+    const totalAmount = new _decimal.default(toMoneyNumber(amount)).mul(quantity);
+    const formattedAmount = isMarkup ? formatMoney(totalAmount.abs(), currencySymbol) : formatNegativeMoney(totalAmount, currencySymbol);
     return {
       item: title,
-      value: formattedAmount
+      value: formattedAmount,
+      isMarkup
     };
   });
+  return rows.sort((left, right) => Number(right.isMarkup) - Number(left.isMarkup)).map(({
+    isMarkup: _isMarkup,
+    ...row
+  }) => row);
+}
+function isManualMarkup(discount) {
+  if (discount.type !== 'product') return false;
+  if (discount.discount?.discount_type === 'change_price') return true;
+  const amount = discount.amount ?? discount.value ?? discount.discount_amount;
+  return new _decimal.default(toMoneyNumber(amount)).isNegative();
+}
+function hasProductDiscount(product, extensionList = []) {
+  const hasDiscountListAmount = normalizeArray(product.discount_list).some(discount => isNonZero(discount.amount ?? discount.value ?? discount.discount_amount));
+  return hasDiscountListAmount || extensionList.some(row => /^\s*-/.test(stringify(row?.value)));
 }
 function buildProductExtensionList(params) {
   const {
@@ -467,7 +580,9 @@ function resolveDiscountTitleWithPercent(discount, locale) {
 function resolveDiscountTitle(discount, locale) {
   const title = getLocalizedValue(discount.discount?.name ?? discount.discount?.title ?? discount.discount?.message ?? discount.name ?? discount.title ?? discount.message, locale);
   if (title) return title;
-  if (discount.type === 'product') return label(locale, 'manualDiscount');
+  if (discount.type === 'product') {
+    return label(locale, isManualMarkup(discount) ? 'manualMarkup' : 'manualDiscount');
+  }
   return '';
 }
 function resolveProductTitle(params) {
@@ -545,12 +660,22 @@ function normalizeProductCombinations(params) {
     const optionsTotal = sumNormalizedOptionTotals(combinationsOptions, currencySymbol);
     const explicitBasePrice = firstPresentValue(bundle.base_price, bundle.metadata?.source_product_price);
     const basePrice = isPresentId(explicitBasePrice) ? explicitBasePrice : 0;
+    const extensionList = buildProductExtensionList({
+      product: bundle,
+      locale,
+      currencySymbol,
+      quantity,
+      originalPrice: formattedPrice
+    });
+    const shouldIncludeBasePrice = combinationsOptions.length > 0 || nestedCombinations.length > 0 || hasProductDiscount(bundle, extensionList);
     return {
       product_title: baseTitle,
       product_quantity: quantity,
       price: formattedPrice,
       total_selling_price: formatCalculatedMoney(new _decimal.default(toMoneyNumber(formattedPrice)).mul(quantity), currencySymbol),
-      base_price: formatCalculatedMoney(basePrice, currencySymbol),
+      ...(shouldIncludeBasePrice ? {
+        base_price: formatCalculatedMoney(basePrice, currencySymbol)
+      } : {}),
       combinations_options: combinationsOptions,
       ...(combinationsOptions.length ? {
         options_total_price: optionsTotal
@@ -561,6 +686,9 @@ function normalizeProductCombinations(params) {
       ...(productNote ? {
         product_note: productNote
       } : {}),
+      ...(extensionList.length ? {
+        extension_list: extensionList
+      } : {}),
       ...(nestedCombinations.length ? {
         combinations: nestedCombinations
       } : {})
@@ -587,16 +715,27 @@ function normalizeExistingCombinations(combinations, locale, currencySymbol) {
     delete snapshot.product_note;
     delete snapshot.note;
     delete snapshot.combinations;
+    delete snapshot.discount_list;
     const quantity = toNumber(combination.product_quantity ?? combination.num ?? combination.quantity ?? 1, 1);
     const unitPrice = firstPresentValue(combination.selling_price, combination.price, combination.original_price) ?? 0;
     const optionsAmount = sumMoneyValues(normalizedOptions.map(option => option.total_price));
     const explicitBasePrice = firstPresentValue(combination.base_price);
     const basePrice = isPresentId(explicitBasePrice) ? explicitBasePrice : 0;
+    const extensionList = buildProductExtensionList({
+      product: combination,
+      locale,
+      currencySymbol,
+      quantity,
+      originalPrice: unitPrice
+    });
+    const shouldIncludeBasePrice = normalizedOptions.length > 0 || nestedCombinations.length > 0 || hasProductDiscount(combination, extensionList);
     return {
       ...snapshot,
       product_quantity: quantity,
       total_selling_price: formatCalculatedMoney(new _decimal.default(toMoneyNumber(unitPrice)).mul(quantity), currencySymbol),
-      base_price: formatCalculatedMoney(basePrice, currencySymbol),
+      ...(shouldIncludeBasePrice ? {
+        base_price: formatCalculatedMoney(basePrice, currencySymbol)
+      } : {}),
       ...(Array.isArray(combination.combinations_options) ? {
         combinations_options: normalizedOptions
       } : Array.isArray(combination.options) ? {
@@ -611,6 +750,9 @@ function normalizeExistingCombinations(combinations, locale, currencySymbol) {
       ...(productNote ? {
         product_note: productNote
       } : {}),
+      ...(extensionList.length ? {
+        extension_list: extensionList
+      } : {}),
       ...(nestedCombinations.length ? {
         combinations: nestedCombinations
       } : {})
@@ -985,24 +1127,13 @@ function buildDelivery(order, locale) {
 function buildAppointment(order, locale) {
   const bookings = sortBookings(normalizeArray(order.bookings));
   if (bookings.length) {
-    return bookings.map(booking => {
-      const snapshot = {
-        ...booking
-      };
-      delete snapshot.product_uid;
-      delete snapshot.booking_uid;
-      const productUid = firstPresentValue(booking.product_uid, booking.metadata?.product_uid);
-      const bookingUid = firstPresentValue(booking.metadata?.unique_identification_number, booking.booking_uid);
-      return {
-        ...snapshot,
-        ...(isPresentId(productUid) ? {
-          product_uid: productUid
-        } : {}),
-        ...(isPresentId(bookingUid) ? {
-          booking_uid: bookingUid
-        } : {})
-      };
-    });
+    const allResources = normalizeArray(order.resources || order.resource_list);
+    return bookings.flatMap(booking => buildAppointmentRows({
+      booking,
+      allResources,
+      bookingCount: bookings.length,
+      locale
+    }));
   }
   const tableName = order.table_name || order.metadata?.table_name || order.metadata?.table?.name || order.form_data?.table_name;
   if (!tableName) return [];
@@ -1011,6 +1142,82 @@ function buildAppointment(order, locale) {
     value: getLocalizedValue(tableName, locale)
   }];
 }
+function buildAppointmentRows(params) {
+  const {
+    booking,
+    allResources,
+    bookingCount,
+    locale
+  } = params;
+  const productUid = stringify(firstPresentValue(booking.product_uid, booking.metadata?.product_uid)).trim();
+  const bookingUid = stringify(firstPresentValue(booking.metadata?.unique_identification_number, booking.booking_uid)).trim();
+  const association = {
+    product_uid: productUid,
+    booking_uid: bookingUid
+  };
+  const bookingId = stringify(firstPresentValue(booking.booking_id, booking.schedule_event_id, bookingUid)).trim();
+  const bookingTime = formatBookingRange(booking, locale);
+  const resourceText = formatBookingResources(resolveBookingResourcesForReceipt(booking, allResources, bookingCount), locale);
+  const holder = getLocalizedValue(booking.holder?.name ?? booking.metadata?.holder?.name, locale).trim();
+  return [{
+    item: label(locale, 'bookingId'),
+    value: bookingId,
+    ...association
+  }, {
+    item: label(locale, 'bookingDateTime'),
+    value: bookingTime,
+    ...association
+  }, {
+    item: label(locale, 'bookingResource'),
+    value: resourceText,
+    ...association
+  }, {
+    item: label(locale, 'bookingHolder'),
+    value: holder,
+    ...association
+  }].filter(row => Boolean(row.value));
+}
+function formatBookingRange(booking, locale) {
+  const startDate = stringify(booking.start_date);
+  const startTime = stringify(booking.start_time);
+  const endDate = stringify(booking.end_date || startDate);
+  const endTime = stringify(booking.end_time);
+  const start = firstValidBookingDate(booking.start_at, booking.start_datetime, booking.start_date_time, `${startDate} ${startTime}`.trim());
+  const end = firstValidBookingDate(booking.end_at, booking.end_datetime, booking.end_date_time, endTime ? `${endDate} ${endTime}`.trim() : '');
+  if (!start) {
+    return [startDate, startTime, endTime ? `- ${endDate} ${endTime}` : ''].filter(Boolean).join(' ');
+  }
+  const dateFormat = locale === 'en' ? 'DD/MM/YYYY' : 'YYYY/MM/DD';
+  const startText = start.format(`${dateFormat} HH:mm`);
+  if (!end) return startText;
+  return `${startText} - ${end.isSame(start, 'day') ? end.format('HH:mm') : end.format(`${dateFormat} HH:mm`)}`;
+}
+function firstValidBookingDate(...values) {
+  for (const value of values) {
+    if (!isPresentId(value)) continue;
+    const parsed = (0, _dayjs.default)(value);
+    if (parsed.isValid()) return parsed;
+  }
+  return null;
+}
+function resolveBookingResourcesForReceipt(booking, allResources, bookingCount) {
+  const embedded = normalizeArray(booking.resources).filter(resource => Boolean(resource) && typeof resource === 'object' && !Array.isArray(resource));
+  const resourceIds = new Set([booking.resource_id, booking.relation_id, ...normalizeArray(booking.resource_ids), ...normalizeArray(booking.metadata?.resource_ids)].map(value => stringify(value).trim()).filter(Boolean));
+  for (const resource of embedded) {
+    const id = stringify(resource.id ?? resource.resource_id ?? resource.relation_id).trim();
+    if (id) resourceIds.add(id);
+  }
+  if (resourceIds.size) {
+    const matched = allResources.filter(resource => resourceIds.has(stringify(resource.id ?? resource.resource_id ?? resource.relation_id).trim()));
+    if (matched.length) return matched;
+  }
+  if (embedded.length) return embedded;
+  if (bookingCount === 1 && allResources.length) return allResources;
+  return [];
+}
+function formatBookingResources(resources, locale) {
+  return resources.map(resource => [getLocalizedValue(resource.form_title || resource.metadata?.form_name || resource.relation_form_name || resource.metadata?.relation_form_name, locale), getLocalizedValue(resource.title || resource.name || resource.main_field || resource.metadata?.main_field || resource.metadata?.resource_name, locale)].filter(Boolean).join(' ')).filter(Boolean).join(', ');
+}
 function sortBookings(bookings) {
   return bookings.map((booking, index) => ({
     booking,

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

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 5 | 3 | 1 | 2 | 4 | 6;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/package.json

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