@pisell/pisellos 2.3.141 → 2.3.143

package/dist/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/dist/solution/BookingByStep/index.js

@@ -1189,7 +1189,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       // 直接调用 addProductToCart，不传递 date 参数以避免日期检查逻辑
       return this.addProductToCart({
         product: productData,
-        account: activeAccount
+        account: activeAccount,
+        isLegacyOrder: true
       });
     }
 
@@ -1200,6 +1201,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
      *     product: ProductData;
      *     date?: { startTime: string; endTime: string } | null;
      *     account?: Account | null;
+     *     isLegacyOrder?: boolean;
      *   })} {
      *     product,
      *     date,
@@ -1213,7 +1215,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     value: function addProductToCart(_ref6) {
       var product = _ref6.product,
         date = _ref6.date,
-        account = _ref6.account;
+        account = _ref6.account,
+        _ref6$isLegacyOrder = _ref6.isLegacyOrder,
+        isLegacyOrder = _ref6$isLegacyOrder === void 0 ? false : _ref6$isLegacyOrder;
       var _ref7 = product || {},
         bundle = _ref7.bundle,
         options = _ref7.options,
@@ -1278,7 +1282,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         product: productData,
         bundle: bundle,
         options: options,
-        quantity: quantity
+        quantity: quantity,
+        isLegacyOrder: isLegacyOrder
       };
       if (date) {
         addItemParams.date = date;

package/dist/solution/OrderInvoicePreview/index.js

@@ -244,7 +244,8 @@ export var OrderInvoicePreviewImpl = /*#__PURE__*/function (_BaseModule) {
                   locales: _toConsumableArray(new Set(languageOptions.flatMap(function (option) {
                     return option.locales;
                   }))),
-                  includeReceiptKeys: true
+                  includeReceiptKeys: true,
+                  templateSettings: template.layout
                 })
               });
               _this3.publish({

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/BookingContext/utils/resources.js

@@ -241,7 +241,7 @@ function getResourceMaxFreeTime(resource, isAutoAllocationOn) {
   if (!isAutoAllocationOn(form_id)) return [];
   const usableList = (renderList || []).filter(d => d.usable && d.id !== 0);
   let defaultResource = [];
-  let maxFreeTime = 0;
+  let maxFreeTime = -1;
   usableList.forEach(d => {
     const {
       times = []

package/lib/modules/Cart/index.js

@@ -89,7 +89,8 @@ class CartModule extends _BaseModule.BaseModule {
       bundle,
       options,
       date,
-      quantity = 1
+      quantity = 1,
+      isLegacyOrder
     } = params;
     // 生成一个唯一的 ID
     let cartItem = {
@@ -108,7 +109,8 @@ class CartModule extends _BaseModule.BaseModule {
         bundle,
         options,
         product_variant_id: newProduct.product_variant_id,
-        quantity
+        quantity,
+        isLegacyOrder
       });
     }
     if (account) {

package/lib/modules/Cart/types.d.ts

@@ -180,6 +180,8 @@ export interface IAddItemParams {
     };
     /** 商品组合规格ID */
     product_variant_id?: number;
+    /** 是否由旧版下单流程加入购物车 */
+    isLegacyOrder?: boolean;
 }
 /**
  * 更新购物车信息参数

package/lib/modules/Cart/utils/cartProduct.d.ts

@@ -21,6 +21,7 @@ export declare const formatProductToCartItem: (params: {
     product_variant_id?: number;
     quantity?: number;
     discounts?: any[];
+    isLegacyOrder?: boolean;
 }) => CartItem;
 export declare const formatProductToCartItemOrigin: (params: {
     cartItem: CartItem;
@@ -29,6 +30,7 @@ export declare const formatProductToCartItemOrigin: (params: {
     options?: any;
     product_variant_id?: number;
     quantity?: number;
+    isLegacyOrder?: boolean;
 }) => any;
 /**
  * 获取商品总价
@@ -61,7 +63,7 @@ export declare const getProductOriginTotalPrice: (params: {
  * @param options 套餐规格信息
  * @returns 格式化后的套餐规格信息
  */
-export declare const formatOptions: (options: any) => any;
+export declare const formatOptions: (options: any, product?: ProductData) => any;
 export declare const formatOptionsToOrigin: (options: any) => any;
 /**
  * 格式化商品套餐信息

package/lib/modules/Cart/utils/cartProduct.js

@@ -106,7 +106,7 @@ const formatProductToCartItem = params => {
     cartItem.bundle = formatBundle(bundle);
   }
   if (options?.length) {
-    cartItem.options = formatOptions(options);
+    cartItem.options = formatOptions(options, product);
   }
   // 拼装出 product_option_string
   if (product_variant_id) {
@@ -148,22 +148,32 @@ const formatProductToCartItemOrigin = params => {
     bundle,
     options,
     product_variant_id,
-    quantity = 1
+    quantity = 1,
+    isLegacyOrder = false
   } = params;
   let origin = cartItem._origin;
   const product_discount_difference = (origin.product?.discount_list || []).filter(item => !item?.metadata?.custom_product_bundle_map_id).reduce((pre, cur) => {
     return pre + (cur?.metadata?.product_discount_difference || 0);
   }, 0);
   if (product) {
+    const {
+      option: _option,
+      ...legacyProductSku
+    } = origin.product?.product_sku || {};
     origin.product = {
       ...(origin.product || {}),
       num: quantity,
       product_id: product.id,
       product_variant_id: product_variant_id || 0,
       product_bundle: origin.product?.product_bundle || [],
-      product_sku: origin.product?.product_sku || {
-        option: []
-      },
+      ...(isLegacyOrder ? {
+        product_sku: legacyProductSku,
+        product_option_item: origin.product?.product_option_item || []
+      } : {
+        product_sku: origin.product?.product_sku || {
+          option: []
+        }
+      }),
       metadata: {
         product_discount_difference
       }
@@ -176,17 +186,22 @@ const formatProductToCartItemOrigin = params => {
       origin.product.product_bundle = formatBundleToOrigin(bundle);
     }
     if (options?.length) {
-      origin.product.product_sku = {
-        ...(origin.product.product_sku || {}),
-        option: formatOptionsToOrigin(options).map(option => {
-          const next = {
-            ...option,
-            add_price: option.add_price ?? option.price
-          };
-          delete next.price;
-          return next;
-        })
-      };
+      const formattedOptions = formatOptionsToOrigin(options);
+      if (isLegacyOrder) {
+        origin.product.product_option_item = formattedOptions;
+      } else {
+        origin.product.product_sku = {
+          ...(origin.product.product_sku || {}),
+          option: formattedOptions.map(option => {
+            const next = {
+              ...option,
+              add_price: option.add_price ?? option.price
+            };
+            delete next.price;
+            return next;
+          })
+        };
+      }
     }
   }
   return origin;
@@ -299,12 +314,16 @@ const getProductOriginTotalPrice = params => {
  * @returns 格式化后的套餐规格信息
  */
 exports.getProductOriginTotalPrice = getProductOriginTotalPrice;
-const formatOptions = options => {
+const formatOptions = (options, product) => {
   if (!options?.length) return [];
   return options.map(item => {
+    const optionGroupId = item?.option_group_id;
+    const optionItemId = item?.id ?? item?.option_group_item_id ?? item?.product_option_item_id;
+    const optionGroup = product?.option_group?.find(group => String(group?.id) === String(optionGroupId));
+    const optionItem = optionGroup?.option_item?.find(candidate => String(candidate?.id) === String(optionItemId));
     return {
-      id: item?.id,
-      name: item?.name,
+      id: optionItemId,
+      name: item?.name ?? item?.title ?? optionItem?.name ?? optionItem?.title,
       num: item?.num,
       price: item?.price,
       total: item?.price,
@@ -320,7 +339,7 @@ const formatOptionsToOrigin = options => {
   return options.map(d => {
     return {
       num: d.num,
-      option_group_item_id: d.option_group_item_id,
+      option_group_item_id: d?.option_group_item_id || d?.product_option_item_id,
       option_group_id: d.option_group_id
     };
   });

package/lib/modules/Order/index.d.ts

@@ -592,7 +592,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/modules/Order/types.d.ts

@@ -213,6 +213,7 @@ export interface VirtualCurrencySnapshotItem {
     id: number | string;
     tag: 'virtual_currency';
     product_id?: number | string;
+    code?: string;
     product_name: string;
     par_value: string;
     used_par_value: string;

package/lib/modules/Order/utils.js

@@ -284,6 +284,10 @@ function normalizeVirtualCurrencySnapshotItem(value) {
   if (productId !== undefined) {
     snapshot.product_id = productId;
   }
+  const code = normalizeSnapshotScalar(value.code);
+  if (code !== undefined) {
+    snapshot.code = String(code).trim();
+  }
   return snapshot;
 }
 function normalizeVirtualCurrencySnapshotList(value) {
@@ -314,6 +318,10 @@ function buildVirtualCurrencySnapshotFromList(value) {
     if (productId !== undefined) {
       snapshot.product_id = productId;
     }
+    const code = normalizeSnapshotScalar(item.code);
+    if (code !== undefined) {
+      snapshot.code = String(code).trim();
+    }
     result.push(snapshot);
     return result;
   }, []);

package/lib/modules/Product/types.d.ts

@@ -218,6 +218,17 @@ export interface ProductData {
     bundle?: any[];
     /** 商品选项组成 */
     options?: any[];
+    /** 单规格组；用于由已选 option 反查规格项名称、价格等商品快照字段。 */
+    option_group?: Array<{
+        id: number | string;
+        option_item?: Array<{
+            id: number | string;
+            name?: string | Record<string, any>;
+            title?: string | Record<string, any>;
+            [key: string]: any;
+        }>;
+        [key: string]: any;
+    }>;
     /** 商品原信息 */
     origin?: any;
     /** 容量 */

package/lib/server/index.js

@@ -25,6 +25,7 @@ var _types3 = require("./modules/order/types");
 var _filterOrders = require("./modules/order/utils/filterOrders");
 var _filterBookings = require("./modules/order/utils/filterBookings");
 var _smallTicket = require("./utils/small-ticket");
+var _templateVisibility = require("../shared/receipt/templateVisibility");
 var _BaseSales = require("../solution/BaseSales");
 var _paymentUtils = require("../modules/Order/payment-utils");
 var _salesNotes = require("../modules/Order/salesNotes");
@@ -3851,7 +3852,8 @@ class Server {
     }
     const printableOrder = await this.withLocalSmallTicketData(params.order, {
       requireFullyPaid: params.requireFullyPaid,
-      invoiceTemplateSettings: params.invoiceTemplateSettings
+      invoiceTemplateSettings: params.invoiceTemplateSettings,
+      applyTemplateVisibility: true
     });
     if (!(0, _smallTicket.hasSmallTicketData)(printableOrder.payment_info?.small_ticket_data)) {
       return {
@@ -3873,9 +3875,11 @@ class Server {
       invoiceLayoutConfig: params.invoiceLayoutConfig,
       invoiceTemplateSettings: params.invoiceTemplateSettings
     });
+    // Receipt visibility belongs to this output only. Do not return a filtered
+    // snapshot to callers that may retain the order for later sync or reprints.
     return {
       printed: true,
-      order: printableOrder
+      order: (0, _templateVisibility.requiresInvoiceDataFiltering)(params.invoiceTemplateSettings) ? params.order : printableOrder
     };
   }
   shouldLookupLocalPrintOrder(input) {
@@ -4084,7 +4088,10 @@ class Server {
         small_ticket_data_flag: 1,
         payment_info: paymentInfo
       }, {
-        locales: this.normalizeRequestedReceiptLocales(input.locales)
+        locales: this.normalizeRequestedReceiptLocales(input.locales),
+        invoiceTemplateSettings: input.template_settings === undefined ? undefined : this.normalizePrintInvoiceTemplateSettings(input.template_settings),
+        applyTemplateVisibility: true,
+        includeReceiptKeys: input.template_settings !== undefined
       });
       const smallTicketData = rebuiltOrder.payment_info?.small_ticket_data;
       if (!(0, _smallTicket.hasSmallTicketData)(smallTicketData)) {
@@ -4102,7 +4109,17 @@ class Server {
         status: true,
         message: '',
         data: {
-          small_ticket_data: smallTicketData
+          small_ticket_data: smallTicketData,
+          template_visibility_applied: true,
+          // These products and currency settings are the exact source used for
+          // this receipt, not the potentially newer active tempOrder.
+          source: {
+            ...rebuiltOrder,
+            payment_info: {
+              ...(rebuiltOrder.payment_info || {}),
+              small_ticket_data: undefined
+            }
+          }
         }
       };
     } catch (error) {
@@ -4343,15 +4360,24 @@ class Server {
     });
     if (pendingResult?.status === true) {
       const pendingOrder = pendingResult.data;
-      if (pendingOrder && this.shouldBuildSmallTicketData(checkoutData) && this.isSalesOrderFullyPaid(pendingOrder) && this.shouldAutoPrintCheckoutReceipt()) {
-        await this.dispatchLocalReceiptPrint({
-          checkoutData,
-          order: pendingOrder,
-          response: pendingResult,
-          requireFullyPaid: true,
-          invoiceLayoutConfig,
-          invoiceTemplateSettings
-        });
+      if (pendingOrder && this.shouldBuildSmallTicketData(checkoutData, invoiceTemplateSettings) && this.isSalesOrderFullyPaid(pendingOrder) && this.shouldAutoPrintCheckoutReceipt()) {
+        try {
+          await this.dispatchLocalReceiptPrint({
+            checkoutData,
+            order: pendingOrder,
+            response: pendingResult,
+            requireFullyPaid: true,
+            invoiceLayoutConfig,
+            invoiceTemplateSettings
+          });
+        } catch (error) {
+          // The sale is already persisted. A failed receipt must not cancel its
+          // sync task or send an unfiltered fallback to the printer.
+          pendingResult.receipt_print_error = this.getUnknownErrorMessage(error);
+          this.logError(`${title}: 小票生成失败，订单仍继续同步`, {
+            error: pendingResult.receipt_print_error
+          });
+        }
       }
       await this.dispatchCheckoutSyncTask({
         backendPath,
@@ -4409,16 +4435,24 @@ class Server {
       }
       const response = this.withSyncedOrderIdInCheckoutResponse(syncResult.normalizedResponse, syncResult.syncedOrder);
       const syncedOrder = syncResult.syncedOrder;
-      if (syncedOrder && this.shouldBuildSmallTicketData(syncResult.checkoutData) && this.isSalesOrderFullyPaid(syncedOrder)) {
-        await this.dispatchLocalReceiptPrint({
-          checkoutData: syncResult.checkoutData,
-          order: syncedOrder,
-          response: syncResult.normalizedResponse,
-          requireFullyPaid: true,
-          invoiceLayoutConfig,
-          invoiceTemplateSettings
-          // print_all 的 type=0 是收据打印；不要沿用同步成功后的券/手环打印 type=99。
-        });
+      if (syncedOrder && this.shouldBuildSmallTicketData(syncResult.checkoutData, invoiceTemplateSettings) && this.isSalesOrderFullyPaid(syncedOrder)) {
+        try {
+          await this.dispatchLocalReceiptPrint({
+            checkoutData: syncResult.checkoutData,
+            order: syncedOrder,
+            response: syncResult.normalizedResponse,
+            requireFullyPaid: true,
+            invoiceLayoutConfig,
+            invoiceTemplateSettings
+          });
+        } catch (error) {
+          // Checkout already succeeded remotely; report the receipt failure
+          // separately instead of implying that payment/order creation failed.
+          response.receipt_print_error = this.getUnknownErrorMessage(error);
+          this.logError(`${title}: 小票生成失败，订单已同步`, {
+            error: response.receipt_print_error
+          });
+        }
       }
       return response;
     } catch (error) {
@@ -4627,10 +4661,12 @@ class Server {
     if (this.core.context?.getPlatform?.() !== 'android') return true;
     return this.app?.storage?.getStorage?.(AUTO_PRINT_STORAGE_KEY) !== 'false';
   }
-  shouldBuildSmallTicketData(order) {
+  shouldBuildSmallTicketData(order, invoiceTemplateSettings) {
     if (!order || typeof order !== 'object') return false;
-    // if (hasSmallTicketData(order.payment_info?.small_ticket_data)) return false;
-    return Number(order.small_ticket_data_flag ?? order.smallTicketDataFlag ?? 0) === 1;
+    const flag = order.small_ticket_data_flag ?? order.smallTicketDataFlag;
+    // A synced order can omit the generation flag; required display filtering
+    // still rebuilds its output. An explicit 0 retains the no-auto-print intent.
+    return Number(flag ?? 0) === 1 || flag == null && (0, _templateVisibility.requiresInvoiceDataFiltering)(invoiceTemplateSettings);
   }
   shouldPrintSyncedOrder(params) {
     if (this.hasPaymentStatus(params.syncedOrder)) {
@@ -4934,7 +4970,8 @@ class Server {
     }
   }
   async withLocalSmallTicketData(order, options) {
-    if (!this.shouldBuildSmallTicketData(order)) return order;
+    const mustApplyVisibility = options?.applyTemplateVisibility === true && (0, _templateVisibility.requiresInvoiceDataFiltering)(options.invoiceTemplateSettings);
+    if (!this.shouldBuildSmallTicketData(order) && !mustApplyVisibility) return order;
     if (options?.requireFullyPaid && !this.isSalesOrderFullyPaid(order)) return order;
     try {
       const normalizedCollections = (0, _orderCollectionIdentity.normalizeOrderCollections)(order, {
@@ -4958,7 +4995,9 @@ class Server {
         order: enrichedOrder,
         shopInfo: this.getSmallTicketShopInfo(),
         locales: [...(0, _OpenData.resolveInvoiceReceiptLocales)(options?.invoiceTemplateSettings), ...(options?.locales || [])],
-        productMap
+        productMap,
+        includeReceiptKeys: options?.includeReceiptKeys,
+        templateSettings: options?.applyTemplateVisibility ? options.invoiceTemplateSettings : undefined
       });
       return {
         ...enrichedOrder,
@@ -4971,6 +5010,7 @@ class Server {
       this.logError('withLocalSmallTicketData: 生成本地小票数据失败', {
         error: error instanceof Error ? error.message : String(error)
       });
+      if (mustApplyVisibility) throw error;
       return order;
     }
   }

package/lib/server/modules/order/types.d.ts

@@ -463,6 +463,7 @@ export interface OrderData {
             id: number | string;
             tag: 'virtual_currency';
             product_id?: number | string;
+            code?: string;
             product_name: string;
             par_value: string;
             used_par_value: string;

package/lib/shared/receipt/small-ticket.d.ts

@@ -22,6 +22,8 @@ export interface BuildSmallTicketDataParams {
     shopInfo?: SmallTicketShopInfo | null;
     locales?: string[];
     productMap?: Record<string | number, Record<string, any>>;
+    /** Resolved template settings or layout; omitted settings preserve native compatibility. */
+    templateSettings?: unknown;
     /** Customer preview only: stable source identities for bilingual rows. */
     includeReceiptKeys?: boolean;
 }