@pisell/pisellos 2.1.177 → 2.1.179

package/dist/modules/Rules/types.d.ts

@@ -29,7 +29,7 @@ export interface RulesModuleAPI {
         discountList: any[];
         productList: any[];
         holders: {
-            form_record_id: number;
+            form_record_id: number | string;
         }[];
         isFormSubject: boolean;
     }) => DiscountResult;
@@ -49,7 +49,7 @@ type ProductDetail = {
     original_price?: number | string;
     num?: number;
     quantity: number;
-    holder_id?: number | string;
+    holder_id?: number | string | Array<number | string>;
     vouchersApplicable?: boolean;
     startDate?: any;
 };

package/dist/plugins/window.d.ts

@@ -1,4 +1,5 @@
 import { Plugin } from '../types';
+import type { WalletPassEvaluator } from '../model/strategy/adapter/walletPass/evaluator';
 /**
  * WindowPlugin 接口定义
  */
@@ -14,6 +15,7 @@ export interface WindowPlugin extends Plugin {
     document: Partial<Document>;
     history: History;
     interaction?: any;
+    getWalletPassEvaluator?: () => WalletPassEvaluator | undefined;
     getLocalStorage?: (key: string) => string | null;
 }
 /**

package/dist/solution/ScanOrder/index.js

@@ -1463,7 +1463,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
         return 1;
       };
       return function (payload, _ref3) {
-        var _ref4, _tempOrder$resource_i, _tempOrder$metadata, _ref5, _pickOriginal, _resourceState$table_2, _resourceState$relati, _pickFirstCustomCapac;
+        var _ref4, _tempOrder$resource_i, _tempOrder$metadata, _resourceState$table_2, _this5$core, _coreState$core, _ref5, _ref6, _ref7, _ref8, _pickFromCandidates, _resourceState$table_3, _resourceState$relati, _pickFirstCustomCapac;
         var bookingUuid = _ref3.bookingUuid,
           tempOrder = _ref3.tempOrder;
         var resourceId = String((_ref4 = (_tempOrder$resource_i = tempOrder.resource_id) !== null && _tempOrder$resource_i !== void 0 ? _tempOrder$resource_i : resourceState === null || resourceState === void 0 ? void 0 : resourceState.relationId) !== null && _ref4 !== void 0 ? _ref4 : '').trim();
@@ -1477,14 +1477,46 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
         var rawCollectPax = (_tempOrder$metadata = tempOrder.metadata) === null || _tempOrder$metadata === void 0 ? void 0 : _tempOrder$metadata.collect_pax;
         var hasExplicitCollectPax = rawCollectPax !== null && rawCollectPax !== undefined && rawCollectPax !== '';
         var bookingCapacityValue = resolveBookingCapacityValue();
-        var pickOriginal = function pickOriginal(value) {
-          if (value && _typeof(value) === 'object' && !Array.isArray(value)) {
-            var original = value.original;
-            return typeof original === 'string' && original.length > 0 ? original : undefined;
+        var resourceNameCandidates = [tempOrder.table_number, resourceState === null || resourceState === void 0 || (_resourceState$table_2 = resourceState.table_form_record) === null || _resourceState$table_2 === void 0 ? void 0 : _resourceState$table_2.name];
+        var toNonEmptyString = function toNonEmptyString(value) {
+          return typeof value === 'string' && value.trim().length > 0 ? value : undefined;
+        };
+        var toNameMap = function toNameMap(value) {
+          return value && _typeof(value) === 'object' && !Array.isArray(value) ? value : undefined;
+        };
+        var pickFromCandidates = function pickFromCandidates(picker) {
+          for (var _i4 = 0, _resourceNameCandidat = resourceNameCandidates; _i4 < _resourceNameCandidat.length; _i4++) {
+            var candidate = _resourceNameCandidat[_i4];
+            var resolved = picker(candidate);
+            if (resolved !== undefined) return resolved;
+          }
+          return undefined;
+        };
+        var pickDirectOrOriginal = function pickDirectOrOriginal(value) {
+          var _toNonEmptyString, _toNameMap;
+          return (_toNonEmptyString = toNonEmptyString(value)) !== null && _toNonEmptyString !== void 0 ? _toNonEmptyString : toNonEmptyString((_toNameMap = toNameMap(value)) === null || _toNameMap === void 0 ? void 0 : _toNameMap.original);
+        };
+        var pickLocalized = function pickLocalized(value, locale) {
+          var _toNameMap2;
+          return toNonEmptyString((_toNameMap2 = toNameMap(value)) === null || _toNameMap2 === void 0 ? void 0 : _toNameMap2[locale]);
+        };
+        var pickFirstNonEmpty = function pickFirstNonEmpty(value) {
+          var nameMap = toNameMap(value);
+          if (!nameMap) return undefined;
+          for (var _i5 = 0, _Object$values = Object.values(nameMap); _i5 < _Object$values.length; _i5++) {
+            var candidate = _Object$values[_i5];
+            var resolved = toNonEmptyString(candidate);
+            if (resolved !== undefined) return resolved;
           }
           return undefined;
         };
-        var mainField = (_ref5 = (_pickOriginal = pickOriginal(tempOrder.table_number)) !== null && _pickOriginal !== void 0 ? _pickOriginal : pickOriginal(resourceState === null || resourceState === void 0 || (_resourceState$table_2 = resourceState.table_form_record) === null || _resourceState$table_2 === void 0 ? void 0 : _resourceState$table_2.name)) !== null && _ref5 !== void 0 ? _ref5 : '';
+        var coreState = (_this5$core = _this5.core) === null || _this5$core === void 0 || (_this5$core = _this5$core.getPlugin('shopStore')) === null || _this5$core === void 0 ? void 0 : _this5$core.get('core');
+        var activeLocale = String((coreState === null || coreState === void 0 ? void 0 : coreState.translateLocale) || (coreState === null || coreState === void 0 || (_coreState$core = coreState.core) === null || _coreState$core === void 0 || (_coreState$core = _coreState$core.shop) === null || _coreState$core === void 0 ? void 0 : _coreState$core.primary_locale) || 'en');
+        var mainField = (_ref5 = (_ref6 = (_ref7 = (_ref8 = (_pickFromCandidates = pickFromCandidates(pickDirectOrOriginal)) !== null && _pickFromCandidates !== void 0 ? _pickFromCandidates : toNonEmptyString(resourceState === null || resourceState === void 0 || (_resourceState$table_3 = resourceState.table_form_record) === null || _resourceState$table_3 === void 0 ? void 0 : _resourceState$table_3.main_field)) !== null && _ref8 !== void 0 ? _ref8 : pickFromCandidates(function (value) {
+          return pickLocalized(value, activeLocale);
+        })) !== null && _ref7 !== void 0 ? _ref7 : pickFromCandidates(function (value) {
+          return pickLocalized(value, 'en');
+        })) !== null && _ref6 !== void 0 ? _ref6 : pickFromCandidates(pickFirstNonEmpty)) !== null && _ref5 !== void 0 ? _ref5 : '';
         var resourceEntry = resourceState && resourceId ? {
           relation_type: 'form',
           like_status: 'common',
@@ -1528,9 +1560,9 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
         var nextProducts = _toConsumableArray(payload.products || []);
         // 加餐（已有 order_id）走 scanOrderMore，原单已含 booking 规则行，勿再追加虚拟规则商品
         if (ruleProduct && ruleProductUid && !tempOrder.order_id) {
-          var _ruleProduct$price, _ref6, _ruleProduct$original, _ruleProduct$is_gst;
+          var _ruleProduct$price, _ref9, _ruleProduct$original, _ruleProduct$is_gst;
           var sellingPrice = String((_ruleProduct$price = ruleProduct.price) !== null && _ruleProduct$price !== void 0 ? _ruleProduct$price : '0.00');
-          var originalPrice = String((_ref6 = (_ruleProduct$original = ruleProduct.original_price) !== null && _ruleProduct$original !== void 0 ? _ruleProduct$original : ruleProduct.price) !== null && _ref6 !== void 0 ? _ref6 : '0.00');
+          var originalPrice = String((_ref9 = (_ruleProduct$original = ruleProduct.original_price) !== null && _ruleProduct$original !== void 0 ? _ruleProduct$original : ruleProduct.price) !== null && _ref9 !== void 0 ? _ref9 : '0.00');
           nextProducts.push({
             product_id: ruleProduct.id,
             product_variant_id: 0,
@@ -2003,16 +2035,16 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 var rawProductId = (_node$product_id = node.product_id) !== null && _node$product_id !== void 0 ? _node$product_id : node.id;
                 var productId = Number(rawProductId);
                 if (Number.isFinite(productId) && productId > 0) {
-                  var _ref7, _node$product_variant;
-                  var productVariantId = Number((_ref7 = (_node$product_variant = node.product_variant_id) !== null && _node$product_variant !== void 0 ? _node$product_variant : node.variant_id) !== null && _ref7 !== void 0 ? _ref7 : 0);
+                  var _ref10, _node$product_variant;
+                  var productVariantId = Number((_ref10 = (_node$product_variant = node.product_variant_id) !== null && _node$product_variant !== void 0 ? _node$product_variant : node.variant_id) !== null && _ref10 !== void 0 ? _ref10 : 0);
                   var normalizedVariantId = Number.isNaN(productVariantId) ? 0 : productVariantId;
                   var key = buildProductKey(productId, normalizedVariantId);
                   if (!sourceMap.has(key)) {
                     sourceMap.set(key, node);
                   }
                 }
-                for (var _i4 = 0, _Object$values = Object.values(node); _i4 < _Object$values.length; _i4++) {
-                  var childValue = _Object$values[_i4];
+                for (var _i6 = 0, _Object$values2 = Object.values(node); _i6 < _Object$values2.length; _i6++) {
+                  var childValue = _Object$values2[_i6];
                   if (childValue && _typeof(childValue) === 'object') {
                     collectFromValue(childValue);
                   }
@@ -2528,18 +2560,18 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "checkResourceSchedule",
     value: function checkResourceSchedule(formRecord) {
-      var _this$core$getPlugin, _this$store$schedule, _coreState$core, _coreState$core2;
+      var _this$core$getPlugin, _this$store$schedule, _coreState$core2, _coreState$core3;
       var ids = formRecord === null || formRecord === void 0 ? void 0 : formRecord.schedule;
       if (!Array.isArray(ids) || !ids.length) return null;
       var coreState = (_this$core$getPlugin = this.core.getPlugin('shopStore')) === null || _this$core$getPlugin === void 0 ? void 0 : _this$core$getPlugin.get('core');
       var schedules = ((_this$store$schedule = this.store.schedule) === null || _this$store$schedule === void 0 ? void 0 : _this$store$schedule.getScheduleListByIds(ids.map(Number))) || [];
       var result = evaluateResourceSchedules({
         schedules: schedules,
-        timeZone: coreState === null || coreState === void 0 || (_coreState$core = coreState.core) === null || _coreState$core === void 0 || (_coreState$core = _coreState$core.shop) === null || _coreState$core === void 0 ? void 0 : _coreState$core.timezone,
+        timeZone: coreState === null || coreState === void 0 || (_coreState$core2 = coreState.core) === null || _coreState$core2 === void 0 || (_coreState$core2 = _coreState$core2.shop) === null || _coreState$core2 === void 0 ? void 0 : _coreState$core2.timezone,
         now: new Date()
       });
       if (result.available) return null;
-      var locale = String((coreState === null || coreState === void 0 ? void 0 : coreState.translateLocale) || (coreState === null || coreState === void 0 || (_coreState$core2 = coreState.core) === null || _coreState$core2 === void 0 || (_coreState$core2 = _coreState$core2.shop) === null || _coreState$core2 === void 0 ? void 0 : _coreState$core2.primary_locale) || 'en').toLowerCase();
+      var locale = String((coreState === null || coreState === void 0 ? void 0 : coreState.translateLocale) || (coreState === null || coreState === void 0 || (_coreState$core3 = coreState.core) === null || _coreState$core3 === void 0 || (_coreState$core3 = _coreState$core3.shop) === null || _coreState$core3 === void 0 ? void 0 : _coreState$core3.primary_locale) || 'en').toLowerCase();
       var errorTips = locale === 'zh-hk' || locale === 'zh-tw' ? '目前桌檯不在可用時段，請聯絡工作人員。' : locale.startsWith('zh') ? '当前桌台不在可用时段，请联系工作人员。' : 'This table is outside its available hours. Please contact staff.';
       return {
         mode: 'resource_block',
@@ -3252,14 +3284,14 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     key: "setOtherParams",
     value: function () {
       var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee41(params) {
-        var _ref9,
-          _ref9$cover,
+        var _ref12,
+          _ref12$cover,
           cover,
           _args41 = arguments;
         return _regeneratorRuntime().wrap(function _callee41$(_context41) {
           while (1) switch (_context41.prev = _context41.next) {
             case 0:
-              _ref9 = _args41.length > 1 && _args41[1] !== undefined ? _args41[1] : {}, _ref9$cover = _ref9.cover, cover = _ref9$cover === void 0 ? false : _ref9$cover;
+              _ref12 = _args41.length > 1 && _args41[1] !== undefined ? _args41[1] : {}, _ref12$cover = _ref12.cover, cover = _ref12$cover === void 0 ? false : _ref12$cover;
               if (cover) {
                 this.otherParams = params;
               } else {
@@ -3410,13 +3442,13 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     key: "syncAdditionalOrderFromResource",
     value: function () {
       var _syncAdditionalOrderFromResource = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee43(resourceId) {
-        var _ref10, _ref11, _ref12, _this$store$resource3, _this$store$resource4, _occupyDetails$2, _this$store$resource5, _this$otherParams18, _this$store$order9;
+        var _ref13, _ref14, _ref15, _this$store$resource3, _this$store$resource4, _occupyDetails$2, _this$store$resource5, _this$otherParams18, _this$store$order9;
         var tempOrder, normalizedResourceId, _result, occupyDetails, occupyDetail, resourceSelectType, allowAddItems, result;
         return _regeneratorRuntime().wrap(function _callee43$(_context43) {
           while (1) switch (_context43.prev = _context43.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
-              normalizedResourceId = String((_ref10 = (_ref11 = (_ref12 = resourceId !== null && resourceId !== void 0 ? resourceId : tempOrder.resource_id) !== null && _ref12 !== void 0 ? _ref12 : (_this$store$resource3 = this.store.resource) === null || _this$store$resource3 === void 0 ? void 0 : _this$store$resource3.relationId) !== null && _ref11 !== void 0 ? _ref11 : (_this$store$resource4 = this.store.resource) === null || _this$store$resource4 === void 0 ? void 0 : _this$store$resource4.relation_id) !== null && _ref10 !== void 0 ? _ref10 : '').trim();
+              normalizedResourceId = String((_ref13 = (_ref14 = (_ref15 = resourceId !== null && resourceId !== void 0 ? resourceId : tempOrder.resource_id) !== null && _ref15 !== void 0 ? _ref15 : (_this$store$resource3 = this.store.resource) === null || _this$store$resource3 === void 0 ? void 0 : _this$store$resource3.relationId) !== null && _ref14 !== void 0 ? _ref14 : (_this$store$resource4 = this.store.resource) === null || _this$store$resource4 === void 0 ? void 0 : _this$store$resource4.relation_id) !== null && _ref13 !== void 0 ? _ref13 : '').trim();
               this.logMethodStart('syncAdditionalOrderFromResource', {
                 resourceId: normalizedResourceId
               });

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

@@ -12,6 +12,8 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     private store;
     private options;
     private hooks?;
+    private entitlementPassEnabled;
+    setEntitlementPassEnabled(enabled: boolean): void;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: any): Promise<void>;
     destroy(): Promise<void>;
@@ -42,6 +44,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     batchSearchByProductIds(productIds: number[]): Promise<Discount[]>;
     scanCode(code: string, customerId?: number): Promise<{
         isAvailable: boolean;
+        isAccepted?: boolean;
         productList: Record<string, any>[];
         discountList: Discount[];
         type: "server" | "clientCalc";