@pisell/pisellos 2.2.302 → 2.2.303

package/dist/solution/ScanOrder/index.js

@@ -2023,7 +2023,11 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "getItemRuleRuntimeConfig",
     value: function getItemRuleRuntimeConfig() {
-      return this.itemRuleRuntimeConfig || {};
+      var _ref7, _runtimeConfig$channe, _runtimeConfig$custom, _this$otherParams13;
+      var runtimeConfig = this.itemRuleRuntimeConfig || {};
+      return _objectSpread(_objectSpread({}, runtimeConfig), {}, {
+        channel: (_ref7 = (_runtimeConfig$channe = runtimeConfig.channel) !== null && _runtimeConfig$channe !== void 0 ? _runtimeConfig$channe : (_runtimeConfig$custom = runtimeConfig.custom) === null || _runtimeConfig$custom === void 0 ? void 0 : _runtimeConfig$custom.channel) !== null && _ref7 !== void 0 ? _ref7 : (_this$otherParams13 = this.otherParams) === null || _this$otherParams13 === void 0 ? void 0 : _this$otherParams13.channel
+      });
     }
   }, {
     key: "ensureItemRuleConfigsLoaded",
@@ -2510,14 +2514,14 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "normalizeResourceState",
     value: function normalizeResourceState(detail, resourceSelectType, hasOrderId) {
-      var _detail$form_record, _this$otherParams13, _detail$resource_capa, _detail$resource_capa2;
+      var _detail$form_record, _this$otherParams14, _detail$resource_capa, _detail$resource_capa2;
       var currentOrderId = toPositiveString(detail === null || detail === void 0 ? void 0 : detail.order_id);
       var lastOrderId = toPositiveString(detail === null || detail === void 0 ? void 0 : detail.last_order_id);
       var relationId = toPositiveString(detail === null || detail === void 0 ? void 0 : detail.form_record_id);
       var tableFormId = toPositiveString(detail === null || detail === void 0 ? void 0 : detail.form_id);
       var formRecord = (_detail$form_record = detail === null || detail === void 0 ? void 0 : detail.form_record) !== null && _detail$form_record !== void 0 ? _detail$form_record : null;
       // 是否允许加餐
-      var allowSnack = ((_this$otherParams13 = this.otherParams) === null || _this$otherParams13 === void 0 || (_this$otherParams13 = _this$otherParams13.dineInConfig) === null || _this$otherParams13 === void 0 ? void 0 : _this$otherParams13['sale.allow_add_items']) || false;
+      var allowSnack = ((_this$otherParams14 = this.otherParams) === null || _this$otherParams14 === void 0 || (_this$otherParams14 = _this$otherParams14.dineInConfig) === null || _this$otherParams14 === void 0 ? void 0 : _this$otherParams14['sale.allow_add_items']) || false;
       // 开启同桌验证 - 本期没有这个配置，默认关掉
       var deskmateValid = false;
       var isExclusive = resourceSelectType === 'single';
@@ -2600,7 +2604,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     key: "fetchResourceOccupyDetailsByResourceId",
     value: function () {
       var _fetchResourceOccupyDetailsByResourceId = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(resourceId) {
-        var _this$otherParams14, _this$otherParams14$g, _response$data$occupy, _response$data;
+        var _this$otherParams15, _this$otherParams15$g, _response$data$occupy, _response$data;
         var formRecordId, shopId, response;
         return _regeneratorRuntime().wrap(function _callee36$(_context36) {
           while (1) switch (_context36.prev = _context36.next) {
@@ -2612,7 +2616,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               }
               throw new Error("[ScanOrder] \u975E\u6CD5\u684C\u53F0 resourceId: ".concat(resourceId));
             case 3:
-              shopId = (_this$otherParams14 = this.otherParams) === null || _this$otherParams14 === void 0 || (_this$otherParams14$g = _this$otherParams14.getStateData) === null || _this$otherParams14$g === void 0 ? void 0 : _this$otherParams14$g.call(_this$otherParams14, 'shop_id');
+              shopId = (_this$otherParams15 = this.otherParams) === null || _this$otherParams15 === void 0 || (_this$otherParams15$g = _this$otherParams15.getStateData) === null || _this$otherParams15$g === void 0 ? void 0 : _this$otherParams15$g.call(_this$otherParams15, 'shop_id');
               if (shopId) {
                 _context36.next = 6;
                 break;
@@ -2706,18 +2710,18 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
         var hasOrderId,
           normalizedResourceId,
           _this$otherParams$bus,
-          _this$otherParams15,
-          _this$otherParams$cha,
           _this$otherParams16,
+          _this$otherParams$cha,
           _this$otherParams17,
-          _this$otherParams17$g,
+          _this$otherParams18,
+          _this$otherParams18$g,
           _occupyDetails$,
           _occupyDetail$form_re,
           _occupyDetail$form_re2,
           _this$store$order6,
           _this$store$order7,
           _this$store$order7$ge,
-          _this$otherParams18,
+          _this$otherParams19,
           _this$store$resource3,
           _this$store$resource4,
           businessCode,
@@ -2775,11 +2779,11 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                 resourceId: normalizedResourceId
               });
               _context37.prev = 3;
-              businessCode = String((_this$otherParams$bus = (_this$otherParams15 = this.otherParams) === null || _this$otherParams15 === void 0 ? void 0 : _this$otherParams15.businessCode) !== null && _this$otherParams$bus !== void 0 ? _this$otherParams$bus : '').trim();
-              channel = String((_this$otherParams$cha = (_this$otherParams16 = this.otherParams) === null || _this$otherParams16 === void 0 ? void 0 : _this$otherParams16.channel) !== null && _this$otherParams$cha !== void 0 ? _this$otherParams$cha : '').trim();
+              businessCode = String((_this$otherParams$bus = (_this$otherParams16 = this.otherParams) === null || _this$otherParams16 === void 0 ? void 0 : _this$otherParams16.businessCode) !== null && _this$otherParams$bus !== void 0 ? _this$otherParams$bus : '').trim();
+              channel = String((_this$otherParams$cha = (_this$otherParams17 = this.otherParams) === null || _this$otherParams17 === void 0 ? void 0 : _this$otherParams17.channel) !== null && _this$otherParams$cha !== void 0 ? _this$otherParams$cha : '').trim();
               openDataTarget = businessCode && channel ? "".concat(businessCode, "+").concat(channel) : 'dine_in+scan_to_order';
               _context37.next = 9;
-              return (_this$otherParams17 = this.otherParams) === null || _this$otherParams17 === void 0 || (_this$otherParams17$g = _this$otherParams17.getOpenData) === null || _this$otherParams17$g === void 0 ? void 0 : _this$otherParams17$g.call(_this$otherParams17, {
+              return (_this$otherParams18 = this.otherParams) === null || _this$otherParams18 === void 0 || (_this$otherParams18$g = _this$otherParams18.getOpenData) === null || _this$otherParams18$g === void 0 ? void 0 : _this$otherParams18$g.call(_this$otherParams18, {
                 scope: 'board',
                 target: openDataTarget,
                 section_code: ['basic', 'fulfillment', 'reservation', 'sale', 'menu', 'availability', 'workflow']
@@ -3043,7 +3047,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               }, []) : []; // pax 由 setEntryPaxNumber 负责写入 itemRuleRuntimeConfig.pax
               _context37.next = 79;
               return this.setItemRuleRuntimeConfig({
-                serviceType: (_this$otherParams18 = this.otherParams) === null || _this$otherParams18 === void 0 ? void 0 : _this$otherParams18.businessCode,
+                serviceType: (_this$otherParams19 = this.otherParams) === null || _this$otherParams19 === void 0 ? void 0 : _this$otherParams19.businessCode,
                 submissionIndex: isAdditionalOrderMode ? 1 : 0,
                 historicalItems: historicalItems
               });
@@ -3169,14 +3173,14 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     key: "getProductList",
     value: function () {
       var _getProductList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee40() {
-        var _this$otherParams19;
+        var _this$otherParams20;
         var associatedMenus, menu_list_ids, res, productList, formattedRes;
         return _regeneratorRuntime().wrap(function _callee40$(_context40) {
           while (1) switch (_context40.prev = _context40.next) {
             case 0:
               this.logMethodStart('getProductList');
               // 可以直接通过配置里的 menu 读取
-              associatedMenus = (_this$otherParams19 = this.otherParams) === null || _this$otherParams19 === void 0 || (_this$otherParams19 = _this$otherParams19.dineInConfig) === null || _this$otherParams19 === void 0 ? void 0 : _this$otherParams19['menu.associated_menus'];
+              associatedMenus = (_this$otherParams20 = this.otherParams) === null || _this$otherParams20 === void 0 || (_this$otherParams20 = _this$otherParams20.dineInConfig) === null || _this$otherParams20 === void 0 ? void 0 : _this$otherParams20['menu.associated_menus'];
               menu_list_ids = associatedMenus.map(function (n) {
                 return Number(n.value);
               }) || [];
@@ -3235,14 +3239,14 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     key: "setOtherParams",
     value: function () {
       var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee41(params) {
-        var _ref8,
-          _ref8$cover,
+        var _ref9,
+          _ref9$cover,
           cover,
           _args41 = arguments;
         return _regeneratorRuntime().wrap(function _callee41$(_context41) {
           while (1) switch (_context41.prev = _context41.next) {
             case 0:
-              _ref8 = _args41.length > 1 && _args41[1] !== undefined ? _args41[1] : {}, _ref8$cover = _ref8.cover, cover = _ref8$cover === void 0 ? false : _ref8$cover;
+              _ref9 = _args41.length > 1 && _args41[1] !== undefined ? _args41[1] : {}, _ref9$cover = _ref9.cover, cover = _ref9$cover === void 0 ? false : _ref9$cover;
               if (cover) {
                 this.otherParams = params;
               } else {
@@ -3393,7 +3397,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     key: "syncAdditionalOrderFromResource",
     value: function () {
       var _syncAdditionalOrderFromResource = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee43(resourceId) {
-        var _ref9, _ref10, _ref11, _this$store$resource5, _this$store$resource6, _occupyDetails$2, _this$store$resource7, _this$otherParams20, _this$store$order8;
+        var _ref10, _ref11, _ref12, _this$store$resource5, _this$store$resource6, _occupyDetails$2, _this$store$resource7, _this$otherParams21, _this$store$order8;
         var tempOrder, normalizedResourceId, _result, occupyDetails, occupyDetail, resourceSelectType, allowAddItems, result;
         return _regeneratorRuntime().wrap(function _callee43$(_context43) {
           while (1) switch (_context43.prev = _context43.next) {
@@ -3405,7 +3409,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               throw new Error('order 模块未初始化');
             case 2:
               tempOrder = this.store.order.ensureTempOrder();
-              normalizedResourceId = String((_ref9 = (_ref10 = (_ref11 = resourceId !== null && resourceId !== void 0 ? resourceId : tempOrder.resource_id) !== null && _ref11 !== void 0 ? _ref11 : (_this$store$resource5 = this.store.resource) === null || _this$store$resource5 === void 0 ? void 0 : _this$store$resource5.relationId) !== null && _ref10 !== void 0 ? _ref10 : (_this$store$resource6 = this.store.resource) === null || _this$store$resource6 === void 0 ? void 0 : _this$store$resource6.relation_id) !== null && _ref9 !== void 0 ? _ref9 : '').trim();
+              normalizedResourceId = String((_ref10 = (_ref11 = (_ref12 = resourceId !== null && resourceId !== void 0 ? resourceId : tempOrder.resource_id) !== null && _ref12 !== void 0 ? _ref12 : (_this$store$resource5 = this.store.resource) === null || _this$store$resource5 === void 0 ? void 0 : _this$store$resource5.relationId) !== null && _ref11 !== void 0 ? _ref11 : (_this$store$resource6 = this.store.resource) === null || _this$store$resource6 === void 0 ? void 0 : _this$store$resource6.relation_id) !== null && _ref10 !== void 0 ? _ref10 : '').trim();
               this.logMethodStart('syncAdditionalOrderFromResource', {
                 resourceId: normalizedResourceId
               });
@@ -3426,7 +3430,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               occupyDetails = _context43.sent;
               occupyDetail = (_occupyDetails$2 = occupyDetails[0]) !== null && _occupyDetails$2 !== void 0 ? _occupyDetails$2 : null;
               resourceSelectType = ((_this$store$resource7 = this.store.resource) === null || _this$store$resource7 === void 0 ? void 0 : _this$store$resource7.resourceSelectType) || this.resolveResourceSelectType(toPositiveString(occupyDetail === null || occupyDetail === void 0 ? void 0 : occupyDetail.form_id));
-              allowAddItems = toBoolean((_this$otherParams20 = this.otherParams) === null || _this$otherParams20 === void 0 || (_this$otherParams20 = _this$otherParams20.dineInConfig) === null || _this$otherParams20 === void 0 ? void 0 : _this$otherParams20['sale.allow_add_items']);
+              allowAddItems = toBoolean((_this$otherParams21 = this.otherParams) === null || _this$otherParams21 === void 0 || (_this$otherParams21 = _this$otherParams21.dineInConfig) === null || _this$otherParams21 === void 0 ? void 0 : _this$otherParams21['sale.allow_add_items']);
               result = this.resolveAdditionalOrderFromOccupyDetail(occupyDetail, resourceSelectType, allowAddItems);
               if (!(!result.matched || !result.order_id)) {
                 _context43.next = 19;
@@ -3484,9 +3488,9 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "checkAllowAddItems",
     value: function checkAllowAddItems() {
-      var _this$otherParams21;
+      var _this$otherParams22;
       this.logMethodStart('checkAllowAddItems');
-      var dineInConfig = ((_this$otherParams21 = this.otherParams) === null || _this$otherParams21 === void 0 ? void 0 : _this$otherParams21.dineInConfig) || {};
+      var dineInConfig = ((_this$otherParams22 = this.otherParams) === null || _this$otherParams22 === void 0 ? void 0 : _this$otherParams22.dineInConfig) || {};
       var result = {
         enabled: toBoolean(dineInConfig['sale.allow_add_items'])
       };
@@ -3499,9 +3503,9 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "getFulfillmentModes",
     value: function getFulfillmentModes() {
-      var _this$otherParams22;
+      var _this$otherParams23;
       this.logMethodStart('getFulfillmentModes');
-      var dineInConfig = ((_this$otherParams22 = this.otherParams) === null || _this$otherParams22 === void 0 ? void 0 : _this$otherParams22.dineInConfig) || {};
+      var dineInConfig = ((_this$otherParams23 = this.otherParams) === null || _this$otherParams23 === void 0 ? void 0 : _this$otherParams23.dineInConfig) || {};
       var result = {
         enablePickup: Boolean(dineInConfig['fulfillment.enable_pickup']),
         enableTableService: Boolean(dineInConfig['fulfillment.enable_table_service'])
@@ -3515,9 +3519,9 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "checkManualPickupRef",
     value: function checkManualPickupRef() {
-      var _this$otherParams23;
+      var _this$otherParams24;
       this.logMethodStart('checkManualPickupRef');
-      var dineInConfig = ((_this$otherParams23 = this.otherParams) === null || _this$otherParams23 === void 0 ? void 0 : _this$otherParams23.dineInConfig) || {};
+      var dineInConfig = ((_this$otherParams24 = this.otherParams) === null || _this$otherParams24 === void 0 ? void 0 : _this$otherParams24.dineInConfig) || {};
       var refMode = dineInConfig['fulfillment.fulfillment_ref_mode'];
       var manualInputType = dineInConfig['fulfillment.manual_input_type'];
       var enabled = refMode === 'manual_input';

package/dist/solution/ScanOrder/utils.d.ts

@@ -78,6 +78,7 @@ export declare function buildItemRuleBusinessData(params: {
         pax?: Partial<PaxInfo>;
         historicalItems?: CartItemSummary[];
         serviceType?: string;
+        channel?: string;
         submissionIndex?: number;
         custom?: Record<string, any>;
     };

package/dist/solution/ScanOrder/utils.js

@@ -309,6 +309,7 @@ export function aggregateItemRuleLimit(matchedLimits) {
   };
 }
 export function buildItemRuleBusinessData(params) {
+  var _runtimeConfig$channe, _runtimeConfig$custom;
   var tempOrder = params.tempOrder,
     runtimeConfig = params.runtimeConfig,
     itemRuleConfigs = params.itemRuleConfigs;
@@ -345,6 +346,7 @@ export function buildItemRuleBusinessData(params) {
     cartItems: cartItems,
     historicalItems: historicalItems,
     serviceType: runtimeConfig.serviceType || 'dine-in',
+    channel: (_runtimeConfig$channe = runtimeConfig.channel) !== null && _runtimeConfig$channe !== void 0 ? _runtimeConfig$channe : (_runtimeConfig$custom = runtimeConfig.custom) === null || _runtimeConfig$custom === void 0 ? void 0 : _runtimeConfig$custom.channel,
     submissionIndex: typeof runtimeConfig.submissionIndex === 'number' ? toNonNegativeInt(runtimeConfig.submissionIndex) : tempOrder.order_id ? 1 : 0,
     custom: runtimeConfig.custom || {},
     strategyConfigs: itemRuleConfigs

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

@@ -1,11 +1,12 @@
 import type { Module, ModuleOptions, PisellCore } from '../../types';
 import type { ProductData } from '../../modules';
-import type { OpenDataConfig } from '../../modules/OpenData';
+import { type InvoiceLayoutConfig, type InvoiceTemplateSettings, type OpenDataConfig } from '../../modules/OpenData';
 import type { LoadScheduleAvailableDateParams, ScheduleItem } from '../../modules/Schedule/types';
-import type { ProductListLoadProductsParams } from '../../modules/ProductList';
+import type { ProductListLoadProductsParams, ProductListStoreQueryParams } from '../../modules/ProductList';
 import type { AvailabilityDateRange, AvailabilityOccupancy, AvailabilityProduct, AvailabilityResource, GetProductTimeRangesRequest } from '../../modules/ResourcePlanner';
-import type { AvailabilityContextRef, ContextualAvailabilityQuery, ContextualAvailabilityQueryResult, ContextualCommitAvailabilitySelectionParams, ContextualProductTimeRangeGroup, UnifiedBookingSalesAddRetailProductParams, UnifiedBookingSalesApplyPlannerDiscountsParams, UnifiedBookingSalesCommitAvailabilitySelectionResult, UnifiedBookingSalesDiscountResult, UnifiedBookingSalesLoadProductsByScheduleDateParams, UnifiedBookingSalesLoadOpenDataParams, UnifiedBookingSalesPrepareAvailabilityProjectionParams, UnifiedBookingSalesPolicyResponse, UnifiedBookingSalesStageRetailProductsParams, UnifiedBookingSalesState } from './types';
+import type { AvailabilityContextRef, ContextualAvailabilityQuery, ContextualAvailabilityQueryResult, ContextualCommitAvailabilitySelectionParams, ContextualProductTimeRangeGroup, UnifiedBookingSalesAddRetailProductParams, UnifiedBookingSalesApplyPlannerDiscountsParams, UnifiedBookingSalesCommitAvailabilitySelectionResult, UnifiedBookingSalesDiscountResult, UnifiedBookingSalesLoadProductsByScheduleDateParams, UnifiedBookingSalesLoadOpenDataParams, UnifiedBookingSalesPrepareAvailabilityProjectionParams, UnifiedBookingSalesPolicyResponse, UnifiedBookingSalesResolveProductAllergyRequirementParams, UnifiedBookingSalesStageRetailProductsParams, UnifiedBookingSalesState } from './types';
 import { BookingTicket } from '../BookingTicket';
+import type { AllergyRequirement } from '../../model/strategy/adapter/itemRule';
 export * from './types';
 export { AvailabilityError } from '../../modules/ResourcePlanner';
 /**
@@ -59,9 +60,6 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
     protected defaultVersion: string;
     protected store: UnifiedBookingSalesState;
     private unifiedProductCatalog;
-    private openDataTarget;
-    private loadOpenDataInFlight;
-    private loadOpenDataInFlightTarget;
     private availabilityRuntimeOffsetMinutes;
     private availabilityScheduleCatalog;
     private availabilityProjectionSequence;
@@ -76,6 +74,9 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
     private availabilityRemoteResourceQuerySequence;
     private availabilityRemoteResourceEpoch;
     private availabilityCommitLocks;
+    private allergyItemRuleEvaluator;
+    private allergyItemRuleConfigs;
+    private allergyItemRuleConfigsPromise;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     protected getSubmitOrderSalesChannel(): string;
     private createAvailabilityFacadeError;
@@ -147,6 +148,18 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
      */
     loadOpenData(params: UnifiedBookingSalesLoadOpenDataParams): Promise<OpenDataConfig>;
     getOpenData(): Promise<OpenDataConfig | null>;
+    private resetAllergyItemRuleState;
+    private fetchAllergyItemRuleConfigs;
+    private ensureAllergyItemRuleConfigsLoaded;
+    /**
+     * 评估当前渠道与商品是否命中 ALLERGY_CHECK。
+     * 只返回优先级最高 Action 中当前商品 Target 的 dataSource，不跨商品或 Action 合并。
+     */
+    resolveProductAllergyRequirement(params: UnifiedBookingSalesResolveProductAllergyRequirementParams): Promise<AllergyRequirement | null>;
+    clearOpenDataCache(): void;
+    getInvoiceLayoutConfig(): Promise<InvoiceLayoutConfig>;
+    getInvoiceTemplateSettings(): Promise<InvoiceTemplateSettings>;
+    protected isInvoiceOpenDataCacheCurrent(): boolean;
     /**
      * Load a resource policy without depending on the legacy appointmentBooking solution.
      */
@@ -159,6 +172,7 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
         callback?: (result: any) => void;
         subscriberId?: string;
     }): Promise<ProductData[]>;
+    queryProducts(params?: ProductListStoreQueryParams): Promise<ProductData[]>;
     /** Date-first entry point. It delegates protocol details and cache ownership to ScheduleModule. */
     loadScheduleAvailableDate(params: LoadScheduleAvailableDateParams): Promise<import("../../modules/Date/types").ITime[]>;
     /**