@pisell/pisellos 2.2.230 → 2.2.232

package/dist/server/index.js

@@ -269,20 +269,21 @@ var Server = /*#__PURE__*/function () {
      */
     _defineProperty(this, "handleProductQuery", /*#__PURE__*/function () {
       var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref5) {
-        var url, method, data, config, menu_list_ids, schedule_datetime, schedule_date, customer_id, ids, _ref7, callback, subscriberId;
+        var url, method, data, config, menu_list_ids, schedule_datetime, schedule_date, customer_id, ids, extension_type, _ref7, callback, subscriberId;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               url = _ref5.url, method = _ref5.method, data = _ref5.data, config = _ref5.config;
               console.log('[Server] handleProductQuery:', url, method, data, config);
-              menu_list_ids = data.menu_list_ids, schedule_datetime = data.schedule_datetime, schedule_date = data.schedule_date, customer_id = data.customer_id, ids = data.ids;
+              menu_list_ids = data.menu_list_ids, schedule_datetime = data.schedule_datetime, schedule_date = data.schedule_date, customer_id = data.customer_id, ids = data.ids, extension_type = data.extension_type;
               _ref7 = config || {}, callback = _ref7.callback, subscriberId = _ref7.subscriberId;
               _this.logInfo('handleProductQuery: 开始处理商品查询请求', {
                 menu_list_ids: menu_list_ids,
                 ids: ids,
                 schedule_datetime: schedule_datetime,
                 schedule_date: schedule_date,
-                customer_id: customer_id
+                customer_id: customer_id,
+                extension_type: extension_type
               });
 
               // 存储订阅者：后续 pubsub 数据变更时可通过 callback 推送最新结果
@@ -294,7 +295,8 @@ var Server = /*#__PURE__*/function () {
                     ids: ids,
                     schedule_date: schedule_date,
                     schedule_datetime: schedule_datetime,
-                    customer_id: customer_id
+                    customer_id: customer_id,
+                    extension_type: extension_type
                   }
                 });
                 _this.logInfo('handleProductQuery: 已注册订阅者', {
@@ -307,7 +309,8 @@ var Server = /*#__PURE__*/function () {
                 ids: ids,
                 schedule_date: schedule_date,
                 schedule_datetime: schedule_datetime,
-                customer_id: customer_id
+                customer_id: customer_id,
+                extension_type: extension_type
               }));
             case 7:
             case "end":
@@ -4146,19 +4149,20 @@ var Server = /*#__PURE__*/function () {
                 order: printableOrder
               });
             case 7:
-              _context44.next = 9;
+              debugger;
+              _context44.next = 10;
               return this.dispatchPrintOtherReceiptTask({
                 checkoutData: params.checkoutData,
                 syncedOrder: printableOrder,
                 response: params.response,
                 receiptOnly: true
               });
-            case 9:
+            case 10:
               return _context44.abrupt("return", {
                 printed: true,
                 order: printableOrder
               });
-            case 10:
+            case 11:
             case "end":
               return _context44.stop();
           }
@@ -5489,6 +5493,50 @@ var Server = /*#__PURE__*/function () {
       }
       return computeBookingQueryResult;
     }()
+    /**
+     * 规范商品扩展类型过滤参数。
+     *
+     * @example
+     * const types = this.normalizeProductExtensionTypes(['product_add_time']);
+     */
+    )
+  }, {
+    key: "normalizeProductExtensionTypes",
+    value: function normalizeProductExtensionTypes(extension_type) {
+      if (!Array.isArray(extension_type)) return [];
+      return extension_type.map(function (item) {
+        return String(item || '').trim();
+      }).filter(Boolean);
+    }
+
+    /**
+     * 请求包含 product_add_time 时，按传入 extension_type 数组配置过滤商品。
+     *
+     * @example
+     * const list = this.filterProductsByExtensionTypes(products, ['product_add_time']);
+     */
+  }, {
+    key: "filterProductsByExtensionTypes",
+    value: function filterProductsByExtensionTypes(products, extension_type) {
+      var extensionTypes = this.normalizeProductExtensionTypes(extension_type);
+      if (!extensionTypes.includes('product_add_time')) return products;
+      return products.filter(function (product) {
+        return extensionTypes.includes(String((product === null || product === void 0 ? void 0 : product.extension_type) || ''));
+      });
+    }
+
+    /**
+     * 判断本次查询是否需要跳过餐牌过滤，直接按扩展类型拉商品。
+     *
+     * @example
+     * const skipMenu = this.shouldQueryProductsByExtensionTypes(['product_add_time']);
+     */
+  }, {
+    key: "shouldQueryProductsByExtensionTypes",
+    value: function shouldQueryProductsByExtensionTypes(extension_type) {
+      return this.normalizeProductExtensionTypes(extension_type).includes('product_add_time');
+    }
+
     /**
      * 商品查询的核心计算逻辑（编排 Products、Menu、Schedule 模块）
      * 供 handleProductQuery 首次返回及 pubsub 变更推送复用
@@ -5496,19 +5544,18 @@ var Server = /*#__PURE__*/function () {
      * @param options 可选参数
      * @param options.changedIds 变更的商品 IDs，用于增量更新价格缓存
      */
-    )
   }, {
     key: "computeProductQueryResult",
     value: (function () {
       var _computeProductQueryResult = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee55(context, options) {
         var _menu_list_ids$length3,
           _this16 = this;
-        var tTotal, menu_list_ids, ids, schedule_date, schedule_datetime, customer_id, product_id, queryIds, uniqueIds, _tPrice, productsWithPrice, _filteredProducts, _published$find, pid, _tPrice2, allProductsWithPrice, published, item, activeMenuList, tMenu, menuList, tFilter, productScope, scopedProductIds, tPrice, filteredProducts, tStatus, beforeStatusCount, tSort;
+        var tTotal, menu_list_ids, ids, schedule_date, schedule_datetime, customer_id, extension_type, product_id, queryIds, uniqueIds, _tPrice, productsWithPrice, _filteredProducts, extensionFilteredProducts, _published$find, pid, _tPrice2, allProductsWithPrice, published, item, _tPrice3, _filteredProducts2, _tStatus, _beforeStatusCount, _tExtensionType, _beforeExtensionTypeCount, _tSort, activeMenuList, tMenu, menuList, tFilter, productScope, scopedProductIds, tPrice, filteredProducts, tStatus, beforeStatusCount, tExtensionType, beforeExtensionTypeCount, tSort;
         return _regeneratorRuntime().wrap(function _callee55$(_context55) {
           while (1) switch (_context55.prev = _context55.next) {
             case 0:
               tTotal = performance.now();
-              menu_list_ids = context.menu_list_ids, ids = context.ids, schedule_date = context.schedule_date, schedule_datetime = context.schedule_datetime, customer_id = context.customer_id, product_id = context.product_id;
+              menu_list_ids = context.menu_list_ids, ids = context.ids, schedule_date = context.schedule_date, schedule_datetime = context.schedule_datetime, customer_id = context.customer_id, extension_type = context.extension_type, product_id = context.product_id;
               queryIds = Array.isArray(ids) ? ids.map(function (id) {
                 return Number(id);
               }).filter(function (id) {
@@ -5520,6 +5567,7 @@ var Server = /*#__PURE__*/function () {
                 schedule_datetime: schedule_datetime,
                 schedule_date: schedule_date,
                 customer_id: customer_id,
+                extension_type: extension_type,
                 product_id: product_id,
                 changedIds: options === null || options === void 0 ? void 0 : options.changedIds
               });
@@ -5537,7 +5585,7 @@ var Server = /*#__PURE__*/function () {
               });
             case 7:
               if (!(queryIds.length > 0)) {
-                _context55.next = 18;
+                _context55.next = 19;
                 break;
               }
               uniqueIds = Array.from(new Set(queryIds));
@@ -5562,46 +5610,47 @@ var Server = /*#__PURE__*/function () {
               }).filter(function (p) {
                 return ((p === null || p === void 0 ? void 0 : p.status) || 'published') === 'published';
               });
+              extensionFilteredProducts = this.filterProductsByExtensionTypes(_filteredProducts, extension_type);
               perfMark('computeProductQueryResult', performance.now() - tTotal, {
                 mode: 'ids',
                 ids: uniqueIds,
-                count: _filteredProducts.length
+                count: extensionFilteredProducts.length
               });
               this.logInfo('computeProductQueryResult 完成（ids）', {
                 ids: uniqueIds,
-                count: _filteredProducts.length
+                count: extensionFilteredProducts.length
               });
               return _context55.abrupt("return", {
                 code: 200,
                 data: {
-                  list: _filteredProducts,
-                  count: _filteredProducts.length
+                  list: extensionFilteredProducts,
+                  count: extensionFilteredProducts.length
                 },
                 message: '',
                 status: true
               });
-            case 18:
+            case 19:
               if (!(product_id != null && Number.isFinite(Number(product_id)))) {
-                _context55.next = 30;
+                _context55.next = 31;
                 break;
               }
               pid = Number(product_id);
               _tPrice2 = performance.now();
-              _context55.next = 23;
+              _context55.next = 24;
               return this.products.getProductsWithPrice(schedule_date, {
                 scheduleModule: this.getSchedule()
               }, {
                 changedIds: options === null || options === void 0 ? void 0 : options.changedIds
               });
-            case 23:
+            case 24:
               allProductsWithPrice = _context55.sent;
               perfMark('computeQuery.getProductsWithPrice(single)', performance.now() - _tPrice2, {
                 count: allProductsWithPrice.length,
                 productId: pid
               });
-              published = allProductsWithPrice.filter(function (p) {
+              published = this.filterProductsByExtensionTypes(allProductsWithPrice.filter(function (p) {
                 return ((p === null || p === void 0 ? void 0 : p.status) || 'published') === 'published';
-              });
+              }), extension_type);
               item = (_published$find = published.find(function (p) {
                 return Number(p.id) === pid;
               })) !== null && _published$find !== void 0 ? _published$find : null;
@@ -5620,9 +5669,72 @@ var Server = /*#__PURE__*/function () {
                 message: item ? '' : '商品不存在或未发布',
                 status: true
               });
-            case 30:
+            case 31:
+              if (!this.shouldQueryProductsByExtensionTypes(extension_type)) {
+                _context55.next = 51;
+                break;
+              }
+              _tPrice3 = performance.now();
+              _context55.next = 35;
+              return this.products.getProductsWithPrice(schedule_date, {
+                scheduleModule: this.getSchedule(),
+                schedule_datetime: schedule_datetime,
+                customer_id: customer_id
+              }, {
+                changedIds: options === null || options === void 0 ? void 0 : options.changedIds
+              });
+            case 35:
+              _filteredProducts2 = _context55.sent;
+              perfMark('computeQuery.getProductsWithPrice(extensionType)', performance.now() - _tPrice3, {
+                count: _filteredProducts2.length,
+                extension_type: extension_type
+              });
+              _tStatus = performance.now();
+              _beforeStatusCount = _filteredProducts2.length;
+              _filteredProducts2 = _filteredProducts2.filter(function (p) {
+                return ((p === null || p === void 0 ? void 0 : p.status) || 'published') === 'published';
+              });
+              perfMark('computeQuery.filterByStatus(extensionType)', performance.now() - _tStatus, {
+                before: _beforeStatusCount,
+                after: _filteredProducts2.length
+              });
+              _tExtensionType = performance.now();
+              _beforeExtensionTypeCount = _filteredProducts2.length;
+              _filteredProducts2 = this.filterProductsByExtensionTypes(_filteredProducts2, extension_type);
+              perfMark('computeQuery.filterByExtensionType(extensionType)', performance.now() - _tExtensionType, {
+                before: _beforeExtensionTypeCount,
+                after: _filteredProducts2.length,
+                extension_type: extension_type
+              });
+              _tSort = performance.now();
+              _filteredProducts2 = _filteredProducts2.sort(function (a, b) {
+                var sortDiff = Number(b.sort) - Number(a.sort);
+                if (sortDiff !== 0) return sortDiff;
+                return (a.title || '').localeCompare(b.title || '');
+              });
+              perfMark('computeQuery.sort(extensionType)', performance.now() - _tSort, {
+                count: _filteredProducts2.length
+              });
+              perfMark('computeProductQueryResult', performance.now() - tTotal, {
+                mode: 'extensionType',
+                filteredCount: _filteredProducts2.length
+              });
+              this.logInfo('computeProductQueryResult 完成（extension_type）', {
+                filteredCount: _filteredProducts2.length,
+                extension_type: extension_type
+              });
+              return _context55.abrupt("return", {
+                code: 200,
+                data: {
+                  list: _filteredProducts2,
+                  count: _filteredProducts2.length
+                },
+                message: '',
+                status: true
+              });
+            case 51:
               if (this.menu) {
-                _context55.next = 33;
+                _context55.next = 54;
                 break;
               }
               this.logError('computeProductQueryResult: Menu 模块未注册');
@@ -5633,9 +5745,9 @@ var Server = /*#__PURE__*/function () {
                   count: 0
                 }
               });
-            case 33:
+            case 54:
               if (this.schedule) {
-                _context55.next = 36;
+                _context55.next = 57;
                 break;
               }
               this.logError('computeProductQueryResult: Schedule 模块未注册');
@@ -5646,7 +5758,7 @@ var Server = /*#__PURE__*/function () {
                   count: 0
                 }
               });
-            case 36:
+            case 57:
               activeMenuList = [];
               if (menu_list_ids && Array.isArray(menu_list_ids) && menu_list_ids.length > 0) {
                 tMenu = performance.now();
@@ -5670,10 +5782,10 @@ var Server = /*#__PURE__*/function () {
               });
               tPrice = performance.now();
               if (!(scopedProductIds.length > 0)) {
-                _context55.next = 49;
+                _context55.next = 70;
                 break;
               }
-              _context55.next = 46;
+              _context55.next = 67;
               return this.products.getProductsWithPrice(schedule_date, {
                 scheduleModule: this.getSchedule(),
                 schedule_datetime: schedule_datetime,
@@ -5682,13 +5794,13 @@ var Server = /*#__PURE__*/function () {
                 changedIds: options === null || options === void 0 ? void 0 : options.changedIds,
                 productIds: productScope.isAllProducts ? undefined : scopedProductIds
               });
-            case 46:
+            case 67:
               _context55.t0 = _context55.sent;
-              _context55.next = 50;
+              _context55.next = 71;
               break;
-            case 49:
+            case 70:
               _context55.t0 = [];
-            case 50:
+            case 71:
               filteredProducts = _context55.t0;
               perfMark('computeQuery.getProductsWithPrice', performance.now() - tPrice, {
                 count: filteredProducts.length,
@@ -5703,6 +5815,14 @@ var Server = /*#__PURE__*/function () {
                 before: beforeStatusCount,
                 after: filteredProducts.length
               });
+              tExtensionType = performance.now();
+              beforeExtensionTypeCount = filteredProducts.length;
+              filteredProducts = this.filterProductsByExtensionTypes(filteredProducts, extension_type);
+              perfMark('computeQuery.filterByExtensionType', performance.now() - tExtensionType, {
+                before: beforeExtensionTypeCount,
+                after: filteredProducts.length,
+                extension_type: extension_type
+              });
               tSort = performance.now();
               filteredProducts = filteredProducts.sort(function (a, b) {
                 var sortDiff = Number(b.sort) - Number(a.sort);
@@ -5731,7 +5851,7 @@ var Server = /*#__PURE__*/function () {
                 message: '',
                 status: true
               });
-            case 62:
+            case 87:
             case "end":
               return _context55.stop();
           }

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

@@ -1,9 +1,13 @@
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread 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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+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 ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 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; }
@@ -188,6 +192,11 @@ function buildProducts(order, locale, productMap) {
       currencySymbol: currencySymbol,
       parentProduct: parentProduct
     });
+    var resolvedVariant = resolveProductVariantText({
+      product: product,
+      parentProduct: parentProduct,
+      locale: locale
+    });
     return _objectSpread(_objectSpread(_objectSpread({
       product_title: productTitle,
       product_quantity: quantity,
@@ -197,8 +206,8 @@ function buildProducts(order, locale, productMap) {
       extension_list: Array.isArray(product.extension_list) ? product.extension_list : []
     }, options.length ? {
       options: options
-    } : {}), product.variant ? {
-      variant: getLocalizedValue(product.variant, locale)
+    } : {}), resolvedVariant ? {
+      variant: resolvedVariant
     } : {}), Array.isArray(product.combinations) ? {
       combinations: product.combinations
     } : combinations.length ? {
@@ -300,17 +309,92 @@ function resolveProductFromMap(productId, productMap) {
   if (productId === undefined || productId === null || productId === '') return null;
   return productMap[productId] || productMap[String(productId)] || null;
 }
+function resolveProductVariantText(params) {
+  var _product$product_vari;
+  var product = params.product,
+    parentProduct = params.parentProduct,
+    locale = params.locale;
+  if (product.variant) return getLocalizedValue(product.variant, locale);
+  if (!parentProduct) return '';
+  var productVariantId = (_product$product_vari = product.product_variant_id) !== null && _product$product_vari !== void 0 ? _product$product_vari : product.variant_id;
+  if (!isNonZeroId(productVariantId)) return '';
+  var matchedVariant = normalizeArray(parentProduct.variant).find(function (variant) {
+    return isSameId(variant.id, productVariantId);
+  });
+  if (!matchedVariant) return '';
+  var resolvedFromSkuKey = resolveVariantTextFromSkuKey({
+    skuKey: matchedVariant.sku_key,
+    parentProduct: parentProduct,
+    locale: locale
+  });
+  if (resolvedFromSkuKey) return resolvedFromSkuKey;
+  return resolveVariantTextFromNameMap({
+    nameMap: matchedVariant.name || matchedVariant.title,
+    parentProduct: parentProduct,
+    locale: locale
+  });
+}
+function resolveVariantTextFromSkuKey(params) {
+  var skuKey = stringify(params.skuKey);
+  if (!skuKey) return '';
+  return skuKey.split('_').map(function (item) {
+    var _item$split = item.split(':'),
+      _item$split2 = _slicedToArray(_item$split, 2),
+      groupPositionId = _item$split2[0],
+      itemPositionId = _item$split2[1];
+    return resolveVariantTextItem({
+      parentProduct: params.parentProduct,
+      groupPositionId: groupPositionId,
+      itemPositionId: itemPositionId,
+      locale: params.locale
+    });
+  }).filter(Boolean).join(',');
+}
+function resolveVariantTextFromNameMap(params) {
+  if (!params.nameMap || _typeof(params.nameMap) !== 'object') return '';
+  return Object.entries(params.nameMap).map(function (_ref13) {
+    var _ref14 = _slicedToArray(_ref13, 2),
+      groupPositionId = _ref14[0],
+      value = _ref14[1];
+    var group = resolveVariantGroup(params.parentProduct, groupPositionId);
+    if (!group) return '';
+    var groupName = getLocalizedValue(group.name, params.locale);
+    var itemName = getLocalizedValue(value, params.locale);
+    if (!groupName || !itemName) return '';
+    return "".concat(groupName, ":").concat(itemName);
+  }).filter(Boolean).join(',');
+}
+function resolveVariantTextItem(params) {
+  var group = resolveVariantGroup(params.parentProduct, params.groupPositionId);
+  var item = resolveVariantItem(group, params.itemPositionId);
+  if (!group || !item) return '';
+  var groupName = getLocalizedValue(group.name, params.locale);
+  var itemName = getLocalizedValue(item.name, params.locale);
+  if (!groupName || !itemName) return '';
+  return "".concat(groupName, ":").concat(itemName);
+}
+function resolveVariantGroup(parentProduct, groupPositionId) {
+  return normalizeArray(parentProduct.variant_group).find(function (group) {
+    return isSameId(group.position_id, groupPositionId) || isSameId(group.id, groupPositionId);
+  }) || null;
+}
+function resolveVariantItem(group, itemPositionId) {
+  if (!group) return null;
+  return normalizeArray(group.variant_item).find(function (item) {
+    return isSameId(item.position_id, itemPositionId) || isSameId(item.id, itemPositionId);
+  }) || null;
+}
 function getProductTitleSource(source, locale) {
   if (!source || _typeof(source) !== 'object') return '';
   return resolveTitleValue(source.product_title, locale) || resolveTitleValue(source.title, locale) || resolveTitleValue(source.name, locale);
 }
 function resolveTitleValue(value, locale) {
-  var _ref13, _ref14, _value$locale;
+  var _ref15, _ref16, _value$locale;
   if (value === undefined || value === null) return '';
   if (_typeof(value) !== 'object') return stringify(value);
   var dashedLocale = locale.replace('_', '-');
   var underscoredLocale = locale.replace('-', '_');
-  return stringify((_ref13 = (_ref14 = (_value$locale = value[locale]) !== null && _value$locale !== void 0 ? _value$locale : value[dashedLocale]) !== null && _ref14 !== void 0 ? _ref14 : value[underscoredLocale]) !== null && _ref13 !== void 0 ? _ref13 : '');
+  return stringify((_ref15 = (_ref16 = (_value$locale = value[locale]) !== null && _value$locale !== void 0 ? _value$locale : value[dashedLocale]) !== null && _ref16 !== void 0 ? _ref16 : value[underscoredLocale]) !== null && _ref15 !== void 0 ? _ref15 : '');
 }
 function resolveOptionTitleFromParentProduct(params) {
   var option = params.option,
@@ -328,17 +412,17 @@ function flattenOptionItems(parentProduct) {
   return optionGroups.flatMap(function (group) {
     var items = normalizeArray(group.option_item || group.option_items || group.option || group.options || group.items || group.children || group.product_option_item);
     return items.map(function (item) {
-      var _ref15, _item$option_group_id;
+      var _ref17, _item$option_group_id;
       return _objectSpread(_objectSpread({}, item), {}, {
-        option_group_id: (_ref15 = (_item$option_group_id = item.option_group_id) !== null && _item$option_group_id !== void 0 ? _item$option_group_id : group.id) !== null && _ref15 !== void 0 ? _ref15 : group.option_group_id
+        option_group_id: (_ref17 = (_item$option_group_id = item.option_group_id) !== null && _item$option_group_id !== void 0 ? _item$option_group_id : group.id) !== null && _ref17 !== void 0 ? _ref17 : group.option_group_id
       });
     });
   });
 }
 function isOptionItemMatch(option, item) {
-  var _ref16, _option$option_group_, _ref17, _item$option_group_it, _option$option_group_2, _item$option_group_id2;
-  var optionItemId = (_ref16 = (_option$option_group_ = option.option_group_item_id) !== null && _option$option_group_ !== void 0 ? _option$option_group_ : option.product_option_item_id) !== null && _ref16 !== void 0 ? _ref16 : option.id;
-  var itemId = (_ref17 = (_item$option_group_it = item.option_group_item_id) !== null && _item$option_group_it !== void 0 ? _item$option_group_it : item.product_option_item_id) !== null && _ref17 !== void 0 ? _ref17 : item.id;
+  var _ref18, _option$option_group_, _ref19, _item$option_group_it, _option$option_group_2, _item$option_group_id2;
+  var optionItemId = (_ref18 = (_option$option_group_ = option.option_group_item_id) !== null && _option$option_group_ !== void 0 ? _option$option_group_ : option.product_option_item_id) !== null && _ref18 !== void 0 ? _ref18 : option.id;
+  var itemId = (_ref19 = (_item$option_group_it = item.option_group_item_id) !== null && _item$option_group_it !== void 0 ? _item$option_group_it : item.product_option_item_id) !== null && _ref19 !== void 0 ? _ref19 : item.id;
   if (!isSameId(optionItemId, itemId)) return false;
   var optionGroupId = (_option$option_group_2 = option.option_group_id) !== null && _option$option_group_2 !== void 0 ? _option$option_group_2 : option.group_id;
   var itemGroupId = (_item$option_group_id2 = item.option_group_id) !== null && _item$option_group_id2 !== void 0 ? _item$option_group_id2 : item.group_id;
@@ -348,16 +432,16 @@ function isOptionItemMatch(option, item) {
   return true;
 }
 function resolveBundleItemFromParentProduct(params) {
-  var _ref18, _bundle$bundle_varian, _bundle$bundle_id, _bundle$bundle_group_, _ref20, _bundle$bundle_produc2;
+  var _ref20, _bundle$bundle_varian, _bundle$bundle_id, _bundle$bundle_group_, _ref22, _bundle$bundle_produc2;
   var bundle = params.bundle,
     parentProduct = params.parentProduct;
   if (!parentProduct) return null;
   var bundleItems = flattenBundleItems(parentProduct);
-  var bundleVariantId = (_ref18 = (_bundle$bundle_varian = bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle.variant_id) !== null && _ref18 !== void 0 ? _ref18 : bundle.product_variant_id;
+  var bundleVariantId = (_ref20 = (_bundle$bundle_varian = bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle.variant_id) !== null && _ref20 !== void 0 ? _ref20 : bundle.product_variant_id;
   if (isNonZeroId(bundleVariantId)) {
     var matchedByVariant = bundleItems.find(function (item) {
-      var _ref19, _item$bundle_variant_;
-      return isSameId((_ref19 = (_item$bundle_variant_ = item.bundle_variant_id) !== null && _item$bundle_variant_ !== void 0 ? _item$bundle_variant_ : item.variant_id) !== null && _ref19 !== void 0 ? _ref19 : item.product_variant_id, bundleVariantId);
+      var _ref21, _item$bundle_variant_;
+      return isSameId((_ref21 = (_item$bundle_variant_ = item.bundle_variant_id) !== null && _item$bundle_variant_ !== void 0 ? _item$bundle_variant_ : item.variant_id) !== null && _ref21 !== void 0 ? _ref21 : item.product_variant_id, bundleVariantId);
     });
     if (matchedByVariant) return matchedByVariant;
   }
@@ -370,18 +454,18 @@ function resolveBundleItemFromParentProduct(params) {
     if (matchedByBundleId) return matchedByBundleId;
   }
   var bundleGroupId = (_bundle$bundle_group_ = bundle.bundle_group_id) !== null && _bundle$bundle_group_ !== void 0 ? _bundle$bundle_group_ : bundle.group_id;
-  var bundleProductId = (_ref20 = (_bundle$bundle_produc2 = bundle.bundle_product_id) !== null && _bundle$bundle_produc2 !== void 0 ? _bundle$bundle_produc2 : bundle._bundle_product_id) !== null && _ref20 !== void 0 ? _ref20 : bundle.product_id;
+  var bundleProductId = (_ref22 = (_bundle$bundle_produc2 = bundle.bundle_product_id) !== null && _bundle$bundle_produc2 !== void 0 ? _bundle$bundle_produc2 : bundle._bundle_product_id) !== null && _ref22 !== void 0 ? _ref22 : bundle.product_id;
   if (isPresentId(bundleGroupId) && isPresentId(bundleProductId)) {
     var matchedByGroupAndProduct = bundleItems.find(function (item) {
-      var _item$group_id, _ref21, _item$bundle_product_;
-      return isSameId((_item$group_id = item.group_id) !== null && _item$group_id !== void 0 ? _item$group_id : item.bundle_group_id, bundleGroupId) && isSameId((_ref21 = (_item$bundle_product_ = item.bundle_product_id) !== null && _item$bundle_product_ !== void 0 ? _item$bundle_product_ : item._bundle_product_id) !== null && _ref21 !== void 0 ? _ref21 : item.product_id, bundleProductId);
+      var _item$group_id, _ref23, _item$bundle_product_;
+      return isSameId((_item$group_id = item.group_id) !== null && _item$group_id !== void 0 ? _item$group_id : item.bundle_group_id, bundleGroupId) && isSameId((_ref23 = (_item$bundle_product_ = item.bundle_product_id) !== null && _item$bundle_product_ !== void 0 ? _item$bundle_product_ : item._bundle_product_id) !== null && _ref23 !== void 0 ? _ref23 : item.product_id, bundleProductId);
     });
     if (matchedByGroupAndProduct) return matchedByGroupAndProduct;
   }
   if (isPresentId(bundleProductId)) {
     return bundleItems.find(function (item) {
-      var _ref22, _item$bundle_product_2;
-      return isSameId((_ref22 = (_item$bundle_product_2 = item.bundle_product_id) !== null && _item$bundle_product_2 !== void 0 ? _item$bundle_product_2 : item._bundle_product_id) !== null && _ref22 !== void 0 ? _ref22 : item.product_id, bundleProductId);
+      var _ref24, _item$bundle_product_2;
+      return isSameId((_ref24 = (_item$bundle_product_2 = item.bundle_product_id) !== null && _item$bundle_product_2 !== void 0 ? _item$bundle_product_2 : item._bundle_product_id) !== null && _ref24 !== void 0 ? _ref24 : item.product_id, bundleProductId);
     }) || null;
   }
   return null;
@@ -391,9 +475,9 @@ function flattenBundleItems(parentProduct) {
   return bundleGroups.flatMap(function (group) {
     var items = Array.isArray(group.bundle_item) ? group.bundle_item : [];
     return items.map(function (item) {
-      var _ref23, _item$group_id2;
+      var _ref25, _item$group_id2;
       return _objectSpread(_objectSpread({}, item), {}, {
-        group_id: (_ref23 = (_item$group_id2 = item.group_id) !== null && _item$group_id2 !== void 0 ? _item$group_id2 : group.id) !== null && _ref23 !== void 0 ? _ref23 : group.group_id
+        group_id: (_ref25 = (_item$group_id2 = item.group_id) !== null && _item$group_id2 !== void 0 ? _item$group_id2 : group.id) !== null && _ref25 !== void 0 ? _ref25 : group.group_id
       });
     });
   });
@@ -419,8 +503,8 @@ function buildOptionTitleSuffix(options) {
   return text ? "(".concat(text, ")") : '';
 }
 function formatBundlePrice(bundle, currencySymbol) {
-  var _ref24, _ref25, _bundle$bundle_sellin;
-  var value = (_ref24 = (_ref25 = (_bundle$bundle_sellin = bundle.bundle_selling_price) !== null && _bundle$bundle_sellin !== void 0 ? _bundle$bundle_sellin : bundle.bundle_sum_price) !== null && _ref25 !== void 0 ? _ref25 : bundle.price) !== null && _ref24 !== void 0 ? _ref24 : 0;
+  var _ref26, _ref27, _bundle$bundle_sellin;
+  var value = (_ref26 = (_ref27 = (_bundle$bundle_sellin = bundle.bundle_selling_price) !== null && _bundle$bundle_sellin !== void 0 ? _bundle$bundle_sellin : bundle.bundle_sum_price) !== null && _ref27 !== void 0 ? _ref27 : bundle.price) !== null && _ref26 !== void 0 ? _ref26 : 0;
   var amount = new Decimal(toMoneyNumber(value));
   var isNegative = bundle.price_type === 'markdown' || bundle.price_type === 'markup' && bundle.price_type_ext === 'product_price';
   if (isNegative) return "-".concat(currencySymbol).concat(amount.abs().toFixed(2));
@@ -435,9 +519,9 @@ function buildFees(params) {
     currencySymbol = params.currencySymbol;
   var fees = [];
   for (var _i = 0, _normalizeArray = normalizeArray(order.surcharges || summary.surcharges); _i < _normalizeArray.length; _i++) {
-    var _ref26, _surcharge$amount;
+    var _ref28, _surcharge$amount;
     var surcharge = _normalizeArray[_i];
-    var value = (_ref26 = (_surcharge$amount = surcharge.amount) !== null && _surcharge$amount !== void 0 ? _surcharge$amount : surcharge.value) !== null && _ref26 !== void 0 ? _ref26 : surcharge.total_amount;
+    var value = (_ref28 = (_surcharge$amount = surcharge.amount) !== null && _surcharge$amount !== void 0 ? _surcharge$amount : surcharge.value) !== null && _ref28 !== void 0 ? _ref28 : surcharge.total_amount;
     if (!isNonZero(value)) continue;
     fees.push({
       item: getLocalizedValue(surcharge.name || surcharge.title || surcharge.item, locale),
@@ -572,8 +656,8 @@ function buildPaymentData(params) {
         currencySymbol: params.currencySymbol
       })));
     } else {
-      var _ref27, _payment$remaining_am, _payment$metadata;
-      var remainingAmount = (_ref27 = (_payment$remaining_am = payment.remaining_amount) !== null && _payment$remaining_am !== void 0 ? _payment$remaining_am : payment.balance) !== null && _ref27 !== void 0 ? _ref27 : (_payment$metadata = payment.metadata) === null || _payment$metadata === void 0 ? void 0 : _payment$metadata.remaining_amount;
+      var _ref29, _payment$remaining_am, _payment$metadata;
+      var remainingAmount = (_ref29 = (_payment$remaining_am = payment.remaining_amount) !== null && _payment$remaining_am !== void 0 ? _payment$remaining_am : payment.balance) !== null && _ref29 !== void 0 ? _ref29 : (_payment$metadata = payment.metadata) === null || _payment$metadata === void 0 ? void 0 : _payment$metadata.remaining_amount;
       if (remainingAmount !== undefined && remainingAmount !== null) {
         items.push({
           item: label(params.locale, 'remainingAmount'),
@@ -681,11 +765,11 @@ function label(locale, key) {
   return ((_LABELS$locale = LABELS[locale]) === null || _LABELS$locale === void 0 ? void 0 : _LABELS$locale[key]) || LABELS.en[key] || key;
 }
 function getLocalizedValue(value, locale) {
-  var _ref28, _ref29, _ref30, _value$locale2;
+  var _ref30, _ref31, _ref32, _value$locale2;
   if (value === undefined || value === null) return '';
   if (_typeof(value) !== 'object') return stringify(value);
   var dashedLocale = locale.replace('_', '-');
-  return stringify((_ref28 = (_ref29 = (_ref30 = (_value$locale2 = value[locale]) !== null && _value$locale2 !== void 0 ? _value$locale2 : value[dashedLocale]) !== null && _ref30 !== void 0 ? _ref30 : value.default) !== null && _ref29 !== void 0 ? _ref29 : value.en) !== null && _ref28 !== void 0 ? _ref28 : '');
+  return stringify((_ref30 = (_ref31 = (_ref32 = (_value$locale2 = value[locale]) !== null && _value$locale2 !== void 0 ? _value$locale2 : value[dashedLocale]) !== null && _ref32 !== void 0 ? _ref32 : value.default) !== null && _ref31 !== void 0 ? _ref31 : value.en) !== null && _ref30 !== void 0 ? _ref30 : '');
 }
 function serviceTypeToLabelKey(serviceType) {
   var normalized = serviceType.toLowerCase();

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

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