@pisell/pisellos 0.10.19 → 0.10.20

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

@@ -0,0 +1,9 @@
+// 导出评估器
+export { PromotionEvaluator } from "./evaluator";
+
+// 导出适配器
+export { PromotionAdapter } from "./adapter";
+export { default } from "./adapter";
+
+// 导出策略配置示例常量
+export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY, ITEM_REWARD_STRATEGY } from "./examples";

package/dist/modules/OpenData/index.d.ts

@@ -3,7 +3,7 @@ import { BaseModule } from '../BaseModule';
 import type { ScheduleModule } from '../Schedule';
 import type { OpenDataConfig, OpenDataFetchParams, OpenDataAvailabilityResult, InvoiceLayoutConfig, InvoiceTemplateSettings } from './types';
 export * from './types';
-export { computeAvailability, getDefaultInvoiceLayoutConfig, getDefaultInvoiceTemplateSettings, normalizeInvoiceLayoutConfig, normalizeInvoiceTemplateSettings, normalizeRawInvoiceTemplateSettings, } from './utils';
+export { computeAvailability, getDefaultInvoiceLayoutConfig, getDefaultInvoiceTemplateSettings, normalizeInvoiceLayoutConfig, normalizeInvoiceTemplateSettings, normalizeRawInvoiceTemplateSettings, resolveInvoiceReceiptLocales, } from './utils';
 export declare class OpenDataModule extends BaseModule implements Module {
     protected defaultName: string;
     protected defaultVersion: string;

package/dist/modules/OpenData/index.js

@@ -18,7 +18,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { BaseModule } from "../BaseModule";
 import { computeAvailability, normalizeInvoiceLayoutConfig, normalizeInvoiceTemplateSettings } from "./utils";
 export * from "./types";
-export { computeAvailability, getDefaultInvoiceLayoutConfig, getDefaultInvoiceTemplateSettings, normalizeInvoiceLayoutConfig, normalizeInvoiceTemplateSettings, normalizeRawInvoiceTemplateSettings } from "./utils";
+export { computeAvailability, getDefaultInvoiceLayoutConfig, getDefaultInvoiceTemplateSettings, normalizeInvoiceLayoutConfig, normalizeInvoiceTemplateSettings, normalizeRawInvoiceTemplateSettings, resolveInvoiceReceiptLocales } from "./utils";
 export var OpenDataModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(OpenDataModule, _BaseModule);
   var _super = _createSuper(OpenDataModule);

package/dist/modules/OpenData/utils.d.ts

@@ -1,6 +1,11 @@
 import type { OpenDataConfig, OpenDataAvailabilityResult, ComputeAvailabilityParams, InvoiceLayoutConfig, InvoiceTemplateSettings } from './types';
 export declare function getDefaultInvoiceLayoutConfig(): InvoiceLayoutConfig;
 export declare function getDefaultInvoiceTemplateSettings(): InvoiceTemplateSettings;
+/**
+ * 将非 DEFAULT Invoice 模板启用的语言转换为 small_ticket_data locale。
+ * cn_en 是中英组合打印模式，因此展开为 en 与 zh_CN 两份数据。
+ */
+export declare function resolveInvoiceReceiptLocales(settings?: InvoiceTemplateSettings | null): string[];
 /**
  * 规范化已经提取出的公开 template_settings 值，供打印入口复用。
  */

package/dist/modules/OpenData/utils.js

@@ -3,6 +3,12 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 import dayjs from 'dayjs';
 import { getDateIsInSchedule } from "../Schedule/getDateIsInSchedule";
@@ -38,6 +44,42 @@ export function getDefaultInvoiceTemplateSettings() {
     modules: []
   };
 }
+var INVOICE_RECEIPT_LOCALE_ORDER = ['en', 'zh_CN', 'zh_HK', 'ja', 'pt'];
+var INVOICE_RECEIPT_LOCALE_MAPPING = {
+  en: ['en'],
+  zh_cn: ['zh_CN'],
+  zh_hk: ['zh_HK'],
+  ja: ['ja'],
+  pt: ['pt'],
+  cn_en: ['en', 'zh_CN']
+};
+
+/**
+ * 将非 DEFAULT Invoice 模板启用的语言转换为 small_ticket_data locale。
+ * cn_en 是中英组合打印模式，因此展开为 en 与 zh_CN 两份数据。
+ */
+export function resolveInvoiceReceiptLocales(settings) {
+  if (typeof (settings === null || settings === void 0 ? void 0 : settings.template) !== 'string' || settings.template.trim().length === 0 || settings.template.trim().toUpperCase() === 'DEFAULT' || !isRecord(settings.language)) {
+    return [];
+  }
+  var enabledLocales = new Set();
+  Object.entries(settings.language).forEach(function (_ref) {
+    var _INVOICE_RECEIPT_LOCA;
+    var _ref2 = _slicedToArray(_ref, 2),
+      rawKey = _ref2[0],
+      count = _ref2[1];
+    if (typeof count !== 'number' || !Number.isFinite(count) || count <= 0) {
+      return;
+    }
+    var key = rawKey.trim().toLowerCase().replace(/-/g, '_');
+    (_INVOICE_RECEIPT_LOCA = INVOICE_RECEIPT_LOCALE_MAPPING[key]) === null || _INVOICE_RECEIPT_LOCA === void 0 || _INVOICE_RECEIPT_LOCA.forEach(function (locale) {
+      enabledLocales.add(locale);
+    });
+  });
+  return INVOICE_RECEIPT_LOCALE_ORDER.filter(function (locale) {
+    return enabledLocales.has(locale);
+  });
+}
 function normalizeInvoiceTemplate(value) {
   if (typeof value !== 'string' || value.trim().length === 0) return 'DEFAULT';
   return value.trim().toUpperCase() === 'DEFAULT' ? 'DEFAULT' : value;

package/dist/server/index.d.ts

@@ -532,6 +532,11 @@ declare class Server {
     private handleOrderDraftSubmit;
     private handlePendingSyncCheckoutOrder;
     private buildPendingSyncCheckoutOrder;
+    /**
+     * Checkout 与本地小票必须消费同一份规范化子项快照。
+     * 商品/预约只折叠持久化 ID 或协议 UID 相同的行；支付额外兼容 payment_number。
+     */
+    private normalizeCheckoutCollections;
     /**
      * Android 结账自动小票由当前设备设置控制；其它平台保持原有行为。
      */

package/dist/server/index.js

@@ -43,7 +43,8 @@ import { filterBookingsFromOrders, sortBookings } from "./modules/order/utils/fi
 import { buildSmallTicketData, hasSmallTicketData } from "./utils/small-ticket";
 import { BaseSalesImpl } from "../solution/BaseSales";
 import { getOrderPaymentIdentityKeys, isIdentifiedPendingOrderPayment, isPendingOrderPayment, mergeOrderPaymentListsByIdentity } from "../modules/Order/payment-utils";
-import { getDefaultInvoiceLayoutConfig, getDefaultInvoiceTemplateSettings, normalizeRawInvoiceTemplateSettings } from "../modules/OpenData";
+import { normalizeOrderCollections } from "../modules/Order/utils/orderCollectionIdentity";
+import { getDefaultInvoiceLayoutConfig, getDefaultInvoiceTemplateSettings, normalizeRawInvoiceTemplateSettings, resolveInvoiceReceiptLocales } from "../modules/OpenData";
 var OS_FULFILLMENT_REF_MODE_FIELD = '_os_fulfillment_ref_mode';
 var OS_INVOICE_LAYOUT_CONFIG_FIELD = '_os_invoice_layout_config';
 var OS_INVOICE_TEMPLATE_SETTINGS_FIELD = '_os_invoice_template_settings';
@@ -2435,7 +2436,7 @@ var Server = /*#__PURE__*/function () {
               return this.ensureCheckoutOrderNumbers(normalizedData, title);
             case 6:
               numberedData = _context31.sent;
-              checkoutData = this.applyCheckoutFulfillmentBuzzer(numberedData, title);
+              checkoutData = this.normalizeCheckoutCollections(this.applyCheckoutFulfillmentBuzzer(numberedData, title));
               remoteCheckoutData = this.buildRemoteCheckoutData(checkoutData, title);
               if ((_this$app5 = this.app) !== null && _this$app5 !== void 0 && (_this$app5 = _this$app5.request) !== null && _this$app5 !== void 0 && _this$app5.post) {
                 _context31.next = 11;
@@ -5824,7 +5825,8 @@ var Server = /*#__PURE__*/function () {
             case 2:
               _context58.next = 4;
               return this.withLocalSmallTicketData(params.order, {
-                requireFullyPaid: params.requireFullyPaid
+                requireFullyPaid: params.requireFullyPaid,
+                invoiceTemplateSettings: params.invoiceTemplateSettings
               });
             case 4:
               printableOrder = _context58.sent;
@@ -6085,13 +6087,14 @@ var Server = /*#__PURE__*/function () {
               return this.ensureCheckoutOrderNumbers(normalizedData, title);
             case 14:
               numberedData = _context60.sent;
-              checkoutData = this.applyCheckoutFulfillmentBuzzer(numberedData, title);
+              checkoutData = this.normalizeCheckoutCollections(this.applyCheckoutFulfillmentBuzzer(numberedData, title));
               _context60.next = 18;
               return this.handlePendingSyncCheckoutOrder({
                 backendPath: backendPath,
                 data: checkoutData,
                 title: title,
-                reason: 'checkout 已转入设备任务同步'
+                reason: 'checkout 已转入设备任务同步',
+                invoiceTemplateSettings: invoiceTemplateSettings
               });
             case 18:
               pendingResult = _context60.sent;
@@ -6338,13 +6341,13 @@ var Server = /*#__PURE__*/function () {
     value: function () {
       var _handlePendingSyncCheckoutOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee63(params) {
         var _this14 = this;
-        var backendPath, data, title, reason, pendingOrder, _pendingOrder$payment, _pendingOrder$summary, _pendingOrder$summary2, _pendingOrder$summary3, changeGivenAmount, errorMessage;
+        var backendPath, data, title, reason, invoiceTemplateSettings, pendingOrder, _pendingOrder$payment, _pendingOrder$summary, _pendingOrder$summary2, _pendingOrder$summary3, changeGivenAmount, errorMessage;
         return _regeneratorRuntime().wrap(function _callee63$(_context63) {
           while (1) switch (_context63.prev = _context63.next) {
             case 0:
-              backendPath = params.backendPath, data = params.data, title = params.title, reason = params.reason;
+              backendPath = params.backendPath, data = params.data, title = params.title, reason = params.reason, invoiceTemplateSettings = params.invoiceTemplateSettings;
               _context63.next = 3;
-              return this.buildPendingSyncCheckoutOrder(data);
+              return this.buildPendingSyncCheckoutOrder(data, invoiceTemplateSettings);
             case 3:
               pendingOrder = _context63.sent;
               if (pendingOrder) {
@@ -6435,7 +6438,7 @@ var Server = /*#__PURE__*/function () {
   }, {
     key: "buildPendingSyncCheckoutOrder",
     value: function () {
-      var _buildPendingSyncCheckoutOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee64(data) {
+      var _buildPendingSyncCheckoutOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee64(data, invoiceTemplateSettings) {
         var hasStorageKey, pendingOrder, productMap, orderWithProductTitles;
         return _regeneratorRuntime().wrap(function _callee64$(_context64) {
           while (1) switch (_context64.prev = _context64.next) {
@@ -6453,10 +6456,10 @@ var Server = /*#__PURE__*/function () {
               }
               return _context64.abrupt("return", null);
             case 5:
-              pendingOrder = _objectSpread(_objectSpread({}, data), {}, {
+              pendingOrder = this.normalizeCheckoutCollections(_objectSpread(_objectSpread({}, data), {}, {
                 need_sync: 1,
                 is_draft_order: 0
-              });
+              }));
               _context64.next = 8;
               return this.buildSmallTicketProductMap(pendingOrder);
             case 8:
@@ -6464,7 +6467,8 @@ var Server = /*#__PURE__*/function () {
               orderWithProductTitles = this.withPendingSyncProductTitles(pendingOrder, productMap);
               return _context64.abrupt("return", this.withLocalSmallTicketData(orderWithProductTitles, {
                 requireFullyPaid: true,
-                productMap: productMap
+                productMap: productMap,
+                invoiceTemplateSettings: invoiceTemplateSettings
               }));
             case 11:
             case "end":
@@ -6472,11 +6476,28 @@ var Server = /*#__PURE__*/function () {
           }
         }, _callee64, this);
       }));
-      function buildPendingSyncCheckoutOrder(_x71) {
+      function buildPendingSyncCheckoutOrder(_x71, _x72) {
         return _buildPendingSyncCheckoutOrder.apply(this, arguments);
       }
       return buildPendingSyncCheckoutOrder;
     }()
+    /**
+     * Checkout 与本地小票必须消费同一份规范化子项快照。
+     * 商品/预约只折叠持久化 ID 或协议 UID 相同的行；支付额外兼容 payment_number。
+     */
+  }, {
+    key: "normalizeCheckoutCollections",
+    value: function normalizeCheckoutCollections(data) {
+      if (!data || _typeof(data) !== 'object' || Array.isArray(data)) return data;
+      var normalized = normalizeOrderCollections(data, {
+        ensureUid: false
+      }).order;
+      if (Array.isArray(normalized.payments)) {
+        normalized.payments = mergeOrderPaymentListsByIdentity([], normalized.payments);
+      }
+      return normalized;
+    }
+
     /**
      * Android 结账自动小票由当前设备设置控制；其它平台保持原有行为。
      */
@@ -6609,7 +6630,7 @@ var Server = /*#__PURE__*/function () {
                     }
                   }, _callee65, null, [[0, 7]]);
                 }));
-                return function (_x73) {
+                return function (_x74) {
                   return _ref70.apply(this, arguments);
                 };
               }()));
@@ -6629,7 +6650,7 @@ var Server = /*#__PURE__*/function () {
           }
         }, _callee66, this);
       }));
-      function buildSmallTicketProductMap(_x72) {
+      function buildSmallTicketProductMap(_x73) {
         return _buildSmallTicketProductMap.apply(this, arguments);
       }
       return buildSmallTicketProductMap;
@@ -6692,7 +6713,7 @@ var Server = /*#__PURE__*/function () {
           }
         }, _callee67, this, [[4, 10]]);
       }));
-      function buildSalesDetailProductSnapshotMap(_x74) {
+      function buildSalesDetailProductSnapshotMap(_x75) {
         return _buildSalesDetailProductSnapshotMap.apply(this, arguments);
       }
       return buildSalesDetailProductSnapshotMap;
@@ -6794,7 +6815,7 @@ var Server = /*#__PURE__*/function () {
           }
         }, _callee68, this);
       }));
-      function withSalesDetailProductSnapshots(_x75) {
+      function withSalesDetailProductSnapshots(_x76) {
         return _withSalesDetailProductSnapshots.apply(this, arguments);
       }
       return withSalesDetailProductSnapshots;
@@ -6997,7 +7018,7 @@ var Server = /*#__PURE__*/function () {
           }
         }, _callee69, this, [[4, 21]]);
       }));
-      function enrichPaymentNamesByCode(_x76) {
+      function enrichPaymentNamesByCode(_x77) {
         return _enrichPaymentNamesByCode.apply(this, arguments);
       }
       return enrichPaymentNamesByCode;
@@ -7044,6 +7065,7 @@ var Server = /*#__PURE__*/function () {
               smallTicketData = buildSmallTicketData({
                 order: enrichedOrder,
                 shopInfo: this.getSmallTicketShopInfo(),
+                locales: resolveInvoiceReceiptLocales(options === null || options === void 0 ? void 0 : options.invoiceTemplateSettings),
                 productMap: productMap
               });
               return _context70.abrupt("return", _objectSpread(_objectSpread({}, enrichedOrder), {}, {
@@ -7064,7 +7086,7 @@ var Server = /*#__PURE__*/function () {
           }
         }, _callee70, this, [[4, 20]]);
       }));
-      function withLocalSmallTicketData(_x77, _x78) {
+      function withLocalSmallTicketData(_x78, _x79) {
         return _withLocalSmallTicketData.apply(this, arguments);
       }
       return withLocalSmallTicketData;
@@ -7233,7 +7255,7 @@ var Server = /*#__PURE__*/function () {
           }
         }, _callee71, this, [[7, 37]]);
       }));
-      function fetchAndPersistSalesOrderByLookup(_x79, _x80, _x81) {
+      function fetchAndPersistSalesOrderByLookup(_x80, _x81, _x82) {
         return _fetchAndPersistSalesOrderByLookup.apply(this, arguments);
       }
       return fetchAndPersistSalesOrderByLookup;
@@ -7475,7 +7497,7 @@ var Server = /*#__PURE__*/function () {
           }
         }, _callee72, this, [[11, 17], [24, 36, 39, 42], [48, 53]]);
       }));
-      function handleUpdateLocalOrdersBatch(_x82) {
+      function handleUpdateLocalOrdersBatch(_x83) {
         return _handleUpdateLocalOrdersBatch.apply(this, arguments);
       }
       return handleUpdateLocalOrdersBatch;
@@ -7967,7 +7989,7 @@ var Server = /*#__PURE__*/function () {
           }
         }, _callee74, this);
       }));
-      function computeOrderQueryResult(_x83) {
+      function computeOrderQueryResult(_x84) {
         return _computeOrderQueryResult.apply(this, arguments);
       }
       return computeOrderQueryResult;
@@ -8021,7 +8043,7 @@ var Server = /*#__PURE__*/function () {
           }
         }, _callee75, this);
       }));
-      function computeBookingQueryResult(_x84) {
+      function computeBookingQueryResult(_x85) {
         return _computeBookingQueryResult.apply(this, arguments);
       }
       return computeBookingQueryResult;
@@ -8386,7 +8408,7 @@ var Server = /*#__PURE__*/function () {
           }
         }, _callee76, this);
       }));
-      function computeProductQueryResult(_x85, _x86) {
+      function computeProductQueryResult(_x86, _x87) {
         return _computeProductQueryResult.apply(this, arguments);
       }
       return computeProductQueryResult;
@@ -8487,7 +8509,7 @@ var Server = /*#__PURE__*/function () {
           }
         }, _callee77, this, [[4, 24, 27, 30], [8, 16]]);
       }));
-      function recomputeAndNotifyProductQuery(_x87) {
+      function recomputeAndNotifyProductQuery(_x88) {
         return _recomputeAndNotifyProductQuery.apply(this, arguments);
       }
       return recomputeAndNotifyProductQuery;

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

@@ -95,6 +95,58 @@ var LABELS = {
     rounding: '抹零',
     gross: '重量',
     tare: '去皮'
+  },
+  ja: {
+    contactName: '連絡先名',
+    contactMobile: '連絡先電話',
+    email: 'メール',
+    dineIn: '店内飲食',
+    takeAway: 'テイクアウト',
+    delivery: '配達',
+    pickUp: '受け取り',
+    shopService: '店内飲食',
+    pickUpTime: '受取時間',
+    asap: 'できるだけ早く',
+    cash: '現金',
+    eftpos: 'カード',
+    wallet: 'ウォレット',
+    giftCard: 'ギフトカード',
+    remainingAmount: '残高',
+    redeemPoints: '利用ポイント',
+    remainingPoints: '残りポイント',
+    table: 'テーブル',
+    orderDiscount: '注文割引',
+    manualDiscount: '手動割引',
+    payProcessingFee: '決済手数料',
+    rounding: '端数調整',
+    gross: '総重量',
+    tare: '風袋'
+  },
+  pt: {
+    contactName: 'Nome de contato',
+    contactMobile: 'Celular de contato',
+    email: 'e-mail',
+    dineIn: 'Consumo no local',
+    takeAway: 'Para levar',
+    delivery: 'Entrega',
+    pickUp: 'Recolha',
+    shopService: 'Consumo no local',
+    pickUpTime: 'Hora de recolha',
+    asap: 'Assim que possível',
+    cash: 'Dinheiro',
+    eftpos: 'Cartão',
+    wallet: 'Carteira',
+    giftCard: 'Cartão-presente',
+    remainingAmount: 'Saldo restante',
+    redeemPoints: 'Pontos utilizados',
+    remainingPoints: 'Pontos restantes',
+    table: 'Mesa',
+    orderDiscount: 'Desconto do pedido',
+    manualDiscount: 'Desconto manual',
+    payProcessingFee: 'Taxa de processamento',
+    rounding: 'Arredondamento',
+    gross: 'Peso bruto',
+    tare: 'Tara'
   }
 };
 export function buildSmallTicketData(params) {

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 | 1 | 2 | 3 | 4 | 6 | 5;
+        weekNum: 0 | 1 | 2 | 5 | 4 | 3 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -339,7 +339,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

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/OpenData/index.d.ts

@@ -3,7 +3,7 @@ import { BaseModule } from '../BaseModule';
 import type { ScheduleModule } from '../Schedule';
 import type { OpenDataConfig, OpenDataFetchParams, OpenDataAvailabilityResult, InvoiceLayoutConfig, InvoiceTemplateSettings } from './types';
 export * from './types';
-export { computeAvailability, getDefaultInvoiceLayoutConfig, getDefaultInvoiceTemplateSettings, normalizeInvoiceLayoutConfig, normalizeInvoiceTemplateSettings, normalizeRawInvoiceTemplateSettings, } from './utils';
+export { computeAvailability, getDefaultInvoiceLayoutConfig, getDefaultInvoiceTemplateSettings, normalizeInvoiceLayoutConfig, normalizeInvoiceTemplateSettings, normalizeRawInvoiceTemplateSettings, resolveInvoiceReceiptLocales, } from './utils';
 export declare class OpenDataModule extends BaseModule implements Module {
     protected defaultName: string;
     protected defaultVersion: string;

package/lib/modules/OpenData/index.js

@@ -10,7 +10,8 @@ var _exportNames = {
   getDefaultInvoiceTemplateSettings: true,
   normalizeInvoiceLayoutConfig: true,
   normalizeInvoiceTemplateSettings: true,
-  normalizeRawInvoiceTemplateSettings: true
+  normalizeRawInvoiceTemplateSettings: true,
+  resolveInvoiceReceiptLocales: true
 };
 exports.OpenDataModule = void 0;
 Object.defineProperty(exports, "computeAvailability", {
@@ -49,6 +50,12 @@ Object.defineProperty(exports, "normalizeRawInvoiceTemplateSettings", {
     return _utils.normalizeRawInvoiceTemplateSettings;
   }
 });
+Object.defineProperty(exports, "resolveInvoiceReceiptLocales", {
+  enumerable: true,
+  get: function () {
+    return _utils.resolveInvoiceReceiptLocales;
+  }
+});
 var _BaseModule = require("../BaseModule");
 var _utils = require("./utils");
 var _types = require("./types");

package/lib/modules/OpenData/utils.d.ts

@@ -1,6 +1,11 @@
 import type { OpenDataConfig, OpenDataAvailabilityResult, ComputeAvailabilityParams, InvoiceLayoutConfig, InvoiceTemplateSettings } from './types';
 export declare function getDefaultInvoiceLayoutConfig(): InvoiceLayoutConfig;
 export declare function getDefaultInvoiceTemplateSettings(): InvoiceTemplateSettings;
+/**
+ * 将非 DEFAULT Invoice 模板启用的语言转换为 small_ticket_data locale。
+ * cn_en 是中英组合打印模式，因此展开为 en 与 zh_CN 两份数据。
+ */
+export declare function resolveInvoiceReceiptLocales(settings?: InvoiceTemplateSettings | null): string[];
 /**
  * 规范化已经提取出的公开 template_settings 值，供打印入口复用。
  */

package/lib/modules/OpenData/utils.js

@@ -9,6 +9,7 @@ exports.getDefaultInvoiceTemplateSettings = getDefaultInvoiceTemplateSettings;
 exports.normalizeInvoiceLayoutConfig = normalizeInvoiceLayoutConfig;
 exports.normalizeInvoiceTemplateSettings = normalizeInvoiceTemplateSettings;
 exports.normalizeRawInvoiceTemplateSettings = normalizeRawInvoiceTemplateSettings;
+exports.resolveInvoiceReceiptLocales = resolveInvoiceReceiptLocales;
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _getDateIsInSchedule = require("../Schedule/getDateIsInSchedule");
 var _types = require("./types");
@@ -42,6 +43,36 @@ function getDefaultInvoiceTemplateSettings() {
     modules: []
   };
 }
+const INVOICE_RECEIPT_LOCALE_ORDER = ['en', 'zh_CN', 'zh_HK', 'ja', 'pt'];
+const INVOICE_RECEIPT_LOCALE_MAPPING = {
+  en: ['en'],
+  zh_cn: ['zh_CN'],
+  zh_hk: ['zh_HK'],
+  ja: ['ja'],
+  pt: ['pt'],
+  cn_en: ['en', 'zh_CN']
+};
+
+/**
+ * 将非 DEFAULT Invoice 模板启用的语言转换为 small_ticket_data locale。
+ * cn_en 是中英组合打印模式，因此展开为 en 与 zh_CN 两份数据。
+ */
+function resolveInvoiceReceiptLocales(settings) {
+  if (typeof settings?.template !== 'string' || settings.template.trim().length === 0 || settings.template.trim().toUpperCase() === 'DEFAULT' || !isRecord(settings.language)) {
+    return [];
+  }
+  const enabledLocales = new Set();
+  Object.entries(settings.language).forEach(([rawKey, count]) => {
+    if (typeof count !== 'number' || !Number.isFinite(count) || count <= 0) {
+      return;
+    }
+    const key = rawKey.trim().toLowerCase().replace(/-/g, '_');
+    INVOICE_RECEIPT_LOCALE_MAPPING[key]?.forEach(locale => {
+      enabledLocales.add(locale);
+    });
+  });
+  return INVOICE_RECEIPT_LOCALE_ORDER.filter(locale => enabledLocales.has(locale));
+}
 function normalizeInvoiceTemplate(value) {
   if (typeof value !== 'string' || value.trim().length === 0) return 'DEFAULT';
   return value.trim().toUpperCase() === 'DEFAULT' ? 'DEFAULT' : value;

package/lib/server/index.d.ts

@@ -532,6 +532,11 @@ declare class Server {
     private handleOrderDraftSubmit;
     private handlePendingSyncCheckoutOrder;
     private buildPendingSyncCheckoutOrder;
+    /**
+     * Checkout 与本地小票必须消费同一份规范化子项快照。
+     * 商品/预约只折叠持久化 ID 或协议 UID 相同的行；支付额外兼容 payment_number。
+     */
+    private normalizeCheckoutCollections;
     /**
      * Android 结账自动小票由当前设备设置控制；其它平台保持原有行为。
      */

package/lib/server/index.js

@@ -27,6 +27,7 @@ var _filterBookings = require("./modules/order/utils/filterBookings");
 var _smallTicket = require("./utils/small-ticket");
 var _BaseSales = require("../solution/BaseSales");
 var _paymentUtils = require("../modules/Order/payment-utils");
+var _orderCollectionIdentity = require("../modules/Order/utils/orderCollectionIdentity");
 var _OpenData = require("../modules/OpenData");
 var _modules = require("./modules");
 Object.keys(_modules).forEach(function (key) {
@@ -631,7 +632,7 @@ class Server {
     } = params;
     const normalizedData = await this.normalizeCheckoutSubmitData(params.data, title);
     const numberedData = await this.ensureCheckoutOrderNumbers(normalizedData, title);
-    const checkoutData = this.applyCheckoutFulfillmentBuzzer(numberedData, title);
+    const checkoutData = this.normalizeCheckoutCollections(this.applyCheckoutFulfillmentBuzzer(numberedData, title));
     const remoteCheckoutData = this.buildRemoteCheckoutData(checkoutData, title);
     if (!this.app?.request?.post) {
       throw new Error('app.request 不可用');
@@ -3725,7 +3726,8 @@ class Server {
       };
     }
     const printableOrder = await this.withLocalSmallTicketData(params.order, {
-      requireFullyPaid: params.requireFullyPaid
+      requireFullyPaid: params.requireFullyPaid,
+      invoiceTemplateSettings: params.invoiceTemplateSettings
     });
     if (!(0, _smallTicket.hasSmallTicketData)(printableOrder.payment_info?.small_ticket_data)) {
       return {
@@ -4114,12 +4116,13 @@ class Server {
     }
     const normalizedData = await this.normalizeCheckoutSubmitData(data, title);
     const numberedData = await this.ensureCheckoutOrderNumbers(normalizedData, title);
-    const checkoutData = this.applyCheckoutFulfillmentBuzzer(numberedData, title);
+    const checkoutData = this.normalizeCheckoutCollections(this.applyCheckoutFulfillmentBuzzer(numberedData, title));
     const pendingResult = await this.handlePendingSyncCheckoutOrder({
       backendPath,
       data: checkoutData,
       title,
-      reason: 'checkout 已转入设备任务同步'
+      reason: 'checkout 已转入设备任务同步',
+      invoiceTemplateSettings
     });
     if (pendingResult?.status === true) {
       const pendingOrder = pendingResult.data;
@@ -4298,9 +4301,10 @@ class Server {
       backendPath,
       data,
       title,
-      reason
+      reason,
+      invoiceTemplateSettings
     } = params;
-    const pendingOrder = await this.buildPendingSyncCheckoutOrder(data);
+    const pendingOrder = await this.buildPendingSyncCheckoutOrder(data, invoiceTemplateSettings);
     if (!pendingOrder) {
       this.logError(`${title}: checkout 失败且订单缺少本地存储标识`, {
         backendPath,
@@ -4366,23 +4370,39 @@ class Server {
       };
     }
   }
-  async buildPendingSyncCheckoutOrder(data) {
+  async buildPendingSyncCheckoutOrder(data, invoiceTemplateSettings) {
     if (!data || typeof data !== 'object') return null;
     const hasStorageKey = data.external_sale_number !== undefined && data.external_sale_number !== null && data.external_sale_number !== '' ? true : data.order_id !== undefined && data.order_id !== null && data.order_id !== '';
     if (!hasStorageKey) return null;
-    const pendingOrder = {
+    const pendingOrder = this.normalizeCheckoutCollections({
       ...data,
       need_sync: 1,
       is_draft_order: 0
-    };
+    });
     const productMap = await this.buildSmallTicketProductMap(pendingOrder);
     const orderWithProductTitles = this.withPendingSyncProductTitles(pendingOrder, productMap);
     return this.withLocalSmallTicketData(orderWithProductTitles, {
       requireFullyPaid: true,
-      productMap
+      productMap,
+      invoiceTemplateSettings
     });
   }
 
+  /**
+   * Checkout 与本地小票必须消费同一份规范化子项快照。
+   * 商品/预约只折叠持久化 ID 或协议 UID 相同的行；支付额外兼容 payment_number。
+   */
+  normalizeCheckoutCollections(data) {
+    if (!data || typeof data !== 'object' || Array.isArray(data)) return data;
+    const normalized = (0, _orderCollectionIdentity.normalizeOrderCollections)(data, {
+      ensureUid: false
+    }).order;
+    if (Array.isArray(normalized.payments)) {
+      normalized.payments = (0, _paymentUtils.mergeOrderPaymentListsByIdentity)([], normalized.payments);
+    }
+    return normalized;
+  }
+
   /**
    * Android 结账自动小票由当前设备设置控制；其它平台保持原有行为。
    */
@@ -4705,6 +4725,7 @@ class Server {
       const smallTicketData = (0, _smallTicket.buildSmallTicketData)({
         order: enrichedOrder,
         shopInfo: this.getSmallTicketShopInfo(),
+        locales: (0, _OpenData.resolveInvoiceReceiptLocales)(options?.invoiceTemplateSettings),
         productMap
       });
       return {

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

@@ -87,6 +87,58 @@ const LABELS = {
     rounding: '抹零',
     gross: '重量',
     tare: '去皮'
+  },
+  ja: {
+    contactName: '連絡先名',
+    contactMobile: '連絡先電話',
+    email: 'メール',
+    dineIn: '店内飲食',
+    takeAway: 'テイクアウト',
+    delivery: '配達',
+    pickUp: '受け取り',
+    shopService: '店内飲食',
+    pickUpTime: '受取時間',
+    asap: 'できるだけ早く',
+    cash: '現金',
+    eftpos: 'カード',
+    wallet: 'ウォレット',
+    giftCard: 'ギフトカード',
+    remainingAmount: '残高',
+    redeemPoints: '利用ポイント',
+    remainingPoints: '残りポイント',
+    table: 'テーブル',
+    orderDiscount: '注文割引',
+    manualDiscount: '手動割引',
+    payProcessingFee: '決済手数料',
+    rounding: '端数調整',
+    gross: '総重量',
+    tare: '風袋'
+  },
+  pt: {
+    contactName: 'Nome de contato',
+    contactMobile: 'Celular de contato',
+    email: 'e-mail',
+    dineIn: 'Consumo no local',
+    takeAway: 'Para levar',
+    delivery: 'Entrega',
+    pickUp: 'Recolha',
+    shopService: 'Consumo no local',
+    pickUpTime: 'Hora de recolha',
+    asap: 'Assim que possível',
+    cash: 'Dinheiro',
+    eftpos: 'Cartão',
+    wallet: 'Carteira',
+    giftCard: 'Cartão-presente',
+    remainingAmount: 'Saldo restante',
+    redeemPoints: 'Pontos utilizados',
+    remainingPoints: 'Pontos restantes',
+    table: 'Mesa',
+    orderDiscount: 'Desconto do pedido',
+    manualDiscount: 'Desconto manual',
+    payProcessingFee: 'Taxa de processamento',
+    rounding: 'Arredondamento',
+    gross: 'Peso bruto',
+    tare: 'Tara'
   }
 };
 function buildSmallTicketData(params) {

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 | 1 | 2 | 3 | 4 | 6 | 5;
+        weekNum: 0 | 1 | 2 | 5 | 4 | 3 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -339,7 +339,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/package.json

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