@pisell/pisellos 2.2.186 → 2.2.188

package/dist/modules/Rules/index.js

@@ -314,7 +314,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "calcDiscount",
     value: function calcDiscount(_ref2, options) {
-      var _this3 = this;
+      var _options$selectedList,
+        _this3 = this;
       var discountList = _ref2.discountList,
         productList = _ref2.productList,
         holders = _ref2.holders,
@@ -360,6 +361,13 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var filteredDiscountList = addModeDiscount.filter(function (discount) {
         return !discount.isManualSelect;
       });
+      var hasDiscountInput = editModeDiscount.length > 0 || addModeDiscount.length > 0 || Boolean(options === null || options === void 0 ? void 0 : options.discountId) || Boolean(options === null || options === void 0 || (_options$selectedList = options.selectedList) === null || _options$selectedList === void 0 ? void 0 : _options$selectedList.length) || Boolean(options === null || options === void 0 ? void 0 : options.scan);
+      if (!hasDiscountInput) {
+        return {
+          discountList: discountList,
+          productList: productList
+        };
+      }
 
       // 🔥 扁平化商品列表：将 bundle 子商品展开为虚拟商品
       var flattenProductsWithBundle = function flattenProductsWithBundle(productList) {
@@ -1177,8 +1185,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var _product$discount_lis9;
           // 主商品：检查自己的 discount_list
           if (flatItem.type === 'main' && (_product$discount_lis9 = product.discount_list) !== null && _product$discount_lis9 !== void 0 && _product$discount_lis9.some(function (item) {
-            var _options$selectedList;
-            return options === null || options === void 0 || (_options$selectedList = options.selectedList) === null || _options$selectedList === void 0 ? void 0 : _options$selectedList.some(function (n) {
+            var _options$selectedList2;
+            return options === null || options === void 0 || (_options$selectedList2 = options.selectedList) === null || _options$selectedList2 === void 0 ? void 0 : _options$selectedList2.some(function (n) {
               var _item$discount4;
               return n.discountId === ((_item$discount4 = item.discount) === null || _item$discount4 === void 0 ? void 0 : _item$discount4.resource_id);
             });
@@ -1189,14 +1197,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           if (flatItem.type === 'bundle') {
             var _product$discount_lis10, _flatItem$parentProdu8;
             if ((_product$discount_lis10 = product.discount_list) !== null && _product$discount_lis10 !== void 0 && _product$discount_lis10.some(function (item) {
-              var _options$selectedList2;
-              return options === null || options === void 0 || (_options$selectedList2 = options.selectedList) === null || _options$selectedList2 === void 0 ? void 0 : _options$selectedList2.some(function (n) {
+              var _options$selectedList3;
+              return options === null || options === void 0 || (_options$selectedList3 = options.selectedList) === null || _options$selectedList3 === void 0 ? void 0 : _options$selectedList3.some(function (n) {
                 var _item$discount5;
                 return n.discountId === ((_item$discount5 = item.discount) === null || _item$discount5 === void 0 ? void 0 : _item$discount5.resource_id);
               });
             }) || (_flatItem$parentProdu8 = flatItem.parentProduct) !== null && _flatItem$parentProdu8 !== void 0 && (_flatItem$parentProdu8 = _flatItem$parentProdu8.discount_list) !== null && _flatItem$parentProdu8 !== void 0 && _flatItem$parentProdu8.some(function (item) {
-              var _options$selectedList3;
-              return options === null || options === void 0 || (_options$selectedList3 = options.selectedList) === null || _options$selectedList3 === void 0 ? void 0 : _options$selectedList3.some(function (n) {
+              var _options$selectedList4;
+              return options === null || options === void 0 || (_options$selectedList4 = options.selectedList) === null || _options$selectedList4 === void 0 ? void 0 : _options$selectedList4.some(function (n) {
                 var _item$discount6;
                 return n.discountId === ((_item$discount6 = item.discount) === null || _item$discount6 === void 0 ? void 0 : _item$discount6.resource_id);
               });
@@ -1871,7 +1879,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             } else {
               // 🔥 没有子商品被拆分，使用原有逻辑
               mainProductArr.forEach(function (mainProduct) {
-                var _ref14, _mainProductData$main, _mainProductData$disc, _mainProductData$disc2, _mainProductData$disc3;
+                var _ref15, _mainProductData$main, _mainProductData$disc, _mainProductData$disc2, _mainProductData$disc3;
                 var mainProductData = _this3.hooks.getProduct(mainProduct);
 
                 // 重组bundle
@@ -1886,6 +1894,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                     } else {
                       // 🔥 关键：拆分后的bundle item
                       processedBundleItems.forEach(function (item) {
+                        var _item$price, _ref14, _item$bundle_selling_;
+                        var nextBundlePrice = (_item$price = item.price) !== null && _item$price !== void 0 ? _item$price : bundleItem.price;
+                        var nextBundleSellingPrice = (_ref14 = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref14 !== void 0 ? _ref14 : bundleItem.bundle_selling_price;
                         // 🔥 更新 discount_list 中的 num，使其与拆分后的 item.num 一致
                         var updatedDiscountList = (item.discount_list || []).map(function (discount) {
                           var _discount$metadata10;
@@ -1900,10 +1911,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                         newBundle.push(_objectSpread(_objectSpread({}, bundleItem), {}, {
                           _id: item._id,
                           product_id: bundleItem.product_id,
-                          price: item.price,
+                          price: nextBundlePrice,
                           num: item.num,
                           discount_list: updatedDiscountList,
-                          bundle_selling_price: bundleItem.bundle_selling_price !== undefined ? item.price : undefined
+                          bundle_selling_price: bundleItem.bundle_selling_price !== undefined ? nextBundleSellingPrice : undefined
                         }));
                       });
                     }
@@ -1912,7 +1923,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
                 // 主商品已经在前面的 setProduct 中应用过折扣；这里只替换 bundle，
                 // 避免把主商品 discount_list 再扣一次。
-                var mainSellingPrice = (_ref14 = (_mainProductData$main = mainProductData.main_product_selling_price) !== null && _mainProductData$main !== void 0 ? _mainProductData$main : mainProductData.price) !== null && _ref14 !== void 0 ? _ref14 : 0;
+                var mainSellingPrice = (_ref15 = (_mainProductData$main = mainProductData.main_product_selling_price) !== null && _mainProductData$main !== void 0 ? _mainProductData$main : mainProductData.price) !== null && _ref15 !== void 0 ? _ref15 : 0;
                 var newTotal = Number(mainSellingPrice || 0);
                 var newOriginTotal = Number(mainProductData.original_price || mainProductData.price || 0);
 
@@ -1930,8 +1941,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                   // 累加 bundle 的折后价格（只累加一次）
                   if (newBundle.length > 0) {
                     newBundle.forEach(function (item) {
-                      var _item$bundle_selling_;
-                      var bundleSellingPrice = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price;
+                      var _item$bundle_selling_2;
+                      var bundleSellingPrice = (_item$bundle_selling_2 = item.bundle_selling_price) !== null && _item$bundle_selling_2 !== void 0 ? _item$bundle_selling_2 : item.price;
                       newTotal += Number(bundleSellingPrice) * Number(item.num);
                     });
 
@@ -2060,14 +2071,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var ruleType = usageRules.type;
       // 套餐适用范围配置
       var packageScope = usageRules === null || usageRules === void 0 ? void 0 : usageRules.package_scope;
-      var _ref15 = packageScope || {},
-        scopeType = _ref15.type,
-        _ref15$exclude_bundle = _ref15.exclude_bundle_product_ids,
-        exclude_bundle_product_ids = _ref15$exclude_bundle === void 0 ? [] : _ref15$exclude_bundle,
-        _ref15$include_bundle = _ref15.include_bundle_product_ids,
-        include_bundle_product_ids = _ref15$include_bundle === void 0 ? [] : _ref15$include_bundle,
-        _ref15$filter = _ref15.filter,
-        filter = _ref15$filter === void 0 ? 0 : _ref15$filter;
+      var _ref16 = packageScope || {},
+        scopeType = _ref16.type,
+        _ref16$exclude_bundle = _ref16.exclude_bundle_product_ids,
+        exclude_bundle_product_ids = _ref16$exclude_bundle === void 0 ? [] : _ref16$exclude_bundle,
+        _ref16$include_bundle = _ref16.include_bundle_product_ids,
+        include_bundle_product_ids = _ref16$include_bundle === void 0 ? [] : _ref16$include_bundle,
+        _ref16$filter = _ref16.filter,
+        filter = _ref16$filter === void 0 ? 0 : _ref16$filter;
       var isMainProduct = flatItem.type === 'main'; // 单独购买
       var isBundleItem = flatItem.type === 'bundle'; // 套餐中购买
 

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

@@ -180,6 +180,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
         smallTicketDataFlag?: number;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
+    private getSubmitPaymentStatus;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     /** 读取当前 BaseSales 订单上下文中的 Sales 协议支付项。 */
     getOrderPayments(): OrderPaymentData[];

package/dist/solution/BaseSales/index.js

@@ -607,7 +607,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               };
               externalSaleNumber = params.externalSaleNumber || params.external_sale_number;
               if (params.forceRemote) {
-                _context5.next = 35;
+                _context5.next = 36;
                 break;
               }
               if (!(params.orderId !== undefined)) {
@@ -650,58 +650,59 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               _context5.t0 = _context5.t1;
             case 26:
               localRecord = _context5.t0;
+              debugger;
               if (!localRecord) {
-                _context5.next = 35;
+                _context5.next = 36;
                 break;
               }
-              _context5.next = 30;
+              _context5.next = 31;
               return this.store.order.hydrateTempOrderFromRecord(localRecord, {
                 recalcOnHydrate: false
               });
-            case 30:
+            case 31:
               _sales = _context5.sent;
               this.currentSalesDetail = _sales;
-              _context5.next = 34;
+              _context5.next = 35;
               return this.core.effects.emit("".concat(this.name, ":onSalesOrderLoaded"), {
                 sales: _sales
               });
-            case 34:
-              return _context5.abrupt("return", _sales);
             case 35:
+              return _context5.abrupt("return", _sales);
+            case 36:
               if (!(params.orderId === undefined || params.orderId === null)) {
-                _context5.next = 37;
+                _context5.next = 38;
                 break;
               }
               throw new Error('加载销售详情需要 orderId，或本地库中存在对应 externalSaleNumber/orderNumber');
-            case 37:
-              _context5.next = 39;
+            case 38:
+              _context5.next = 40;
               return this.store.order.getOrderInfoByRemote(Number(params.orderId));
-            case 39:
+            case 40:
               res = _context5.sent;
               if (!(!res || res.code !== 200)) {
-                _context5.next = 43;
+                _context5.next = 44;
                 break;
               }
               message = res && (res.message || res.msg) || "\u52A0\u8F7D\u9500\u552E\u8BE6\u60C5\u5931\u8D25: ".concat(params.orderId);
               throw new Error(message);
-            case 43:
-              _context5.next = 45;
+            case 44:
+              _context5.next = 46;
               return this.store.order.hydrateTempOrderFromRecord(res.data, {
                 recalcOnHydrate: false
               });
-            case 45:
+            case 46:
               sales = _context5.sent;
-              _context5.next = 48;
+              _context5.next = 49;
               return this.store.order.saveDraft();
-            case 48:
+            case 49:
               this.currentSalesDetail = sales;
-              _context5.next = 51;
+              _context5.next = 52;
               return this.core.effects.emit("".concat(this.name, ":onSalesOrderLoaded"), {
                 sales: sales
               });
-            case 51:
-              return _context5.abrupt("return", sales);
             case 52:
+              return _context5.abrupt("return", sales);
+            case 53:
             case "end":
               return _context5.stop();
           }
@@ -1790,7 +1791,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _submitSalesOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(params) {
         var _this$otherParams6, _this$otherParams7, _this$otherParams8;
-        var submitParams;
+        var inferredPaymentStatus, submitParams;
         return _regeneratorRuntime().wrap(function _callee18$(_context18) {
           while (1) switch (_context18.prev = _context18.next) {
             case 0:
@@ -1801,6 +1802,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               throw new Error('BaseSales 解决方案需要 order 模块支持');
             case 2:
               this.store.order.persistTempOrder();
+              inferredPaymentStatus = this.getSubmitPaymentStatus(params === null || params === void 0 ? void 0 : params.paymentStatus);
               submitParams = _objectSpread(_objectSpread(_objectSpread(_objectSpread({
                 cacheId: this.cacheId,
                 platform: (_this$otherParams6 = this.otherParams) === null || _this$otherParams6 === void 0 ? void 0 : _this$otherParams6.platform,
@@ -1809,8 +1811,8 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 type: (_this$otherParams8 = this.otherParams) === null || _this$otherParams8 === void 0 ? void 0 : _this$otherParams8.type
               }, (params === null || params === void 0 ? void 0 : params.payments) !== undefined ? {
                 payments: params.payments
-              } : {}), (params === null || params === void 0 ? void 0 : params.paymentStatus) !== undefined ? {
-                paymentStatus: params.paymentStatus
+              } : {}), inferredPaymentStatus !== undefined ? {
+                paymentStatus: inferredPaymentStatus
               } : {}), (params === null || params === void 0 ? void 0 : params.smallTicketDataFlag) !== undefined ? {
                 smallTicketDataFlag: params.smallTicketDataFlag
               } : {}), (params === null || params === void 0 ? void 0 : params.enhancePayload) !== undefined ? {
@@ -1818,7 +1820,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               } : {});
               console.log(submitParams, 'submitParams123');
               return _context18.abrupt("return", this.store.order.submitTempOrder(submitParams));
-            case 6:
+            case 7:
             case "end":
               return _context18.stop();
           }
@@ -1829,6 +1831,19 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
       }
       return submitSalesOrder;
     }())
+  }, {
+    key: "getSubmitPaymentStatus",
+    value: function getSubmitPaymentStatus(paymentStatus) {
+      var _this$store$order3, _this$store$order3$ge;
+      if (paymentStatus !== undefined) return paymentStatus;
+      var amountSnapshot = (_this$store$order3 = this.store.order) === null || _this$store$order3 === void 0 || (_this$store$order3$ge = _this$store$order3.getOrderAmountSnapshot) === null || _this$store$order3$ge === void 0 ? void 0 : _this$store$order3$ge.call(_this$store$order3);
+      if (!amountSnapshot) return undefined;
+      try {
+        return new Decimal(amountSnapshot.amountGap || 0).lte(0) ? 'paid' : undefined;
+      } catch (_unused2) {
+        return undefined;
+      }
+    }
   }, {
     key: "syncPaymentsToOrder",
     value: function () {
@@ -1978,8 +1993,8 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getWalletProductList",
     value: function getWalletProductList() {
-      var _this$store$order3, _tempOrder$products, _tempOrder$products2;
-      var tempOrder = (_this$store$order3 = this.store.order) === null || _this$store$order3 === void 0 ? void 0 : _this$store$order3.getTempOrder();
+      var _this$store$order4, _tempOrder$products, _tempOrder$products2;
+      var tempOrder = (_this$store$order4 = this.store.order) === null || _this$store$order4 === void 0 ? void 0 : _this$store$order4.getTempOrder();
       if (!(tempOrder !== null && tempOrder !== void 0 && (_tempOrder$products = tempOrder.products) !== null && _tempOrder$products !== void 0 && _tempOrder$products.length)) return [];
       // 过滤出有 product_id的商品来，如果没有代表他是自定义商品，不需要参与 wallet
       var products = tempOrder === null || tempOrder === void 0 || (_tempOrder$products2 = tempOrder.products) === null || _tempOrder$products2 === void 0 ? void 0 : _tempOrder$products2.filter(function (n) {
@@ -2555,16 +2570,16 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getUnfulfilledPromotions",
     value: function getUnfulfilledPromotions() {
-      var _this$store$order4;
-      return ((_this$store$order4 = this.store.order) === null || _this$store$order4 === void 0 ? void 0 : _this$store$order4.getUnfulfilledPromotions()) || [];
+      var _this$store$order5;
+      return ((_this$store$order5 = this.store.order) === null || _this$store$order5 === void 0 ? void 0 : _this$store$order5.getUnfulfilledPromotions()) || [];
     }
 
     /** 最近一次促销计算输出的赠品操作 diff。 */
   }, {
     key: "getLastGiftActions",
     value: function getLastGiftActions() {
-      var _this$store$order5;
-      return ((_this$store$order5 = this.store.order) === null || _this$store$order5 === void 0 ? void 0 : _this$store$order5.getLastGiftActions()) || null;
+      var _this$store$order6;
+      return ((_this$store$order6 = this.store.order) === null || _this$store$order6 === void 0 ? void 0 : _this$store$order6.getLastGiftActions()) || null;
     }
 
     // 获取商品列表

package/dist/solution/BaseSales/utils/cartPromotion.js

@@ -230,7 +230,7 @@ export function mergeIdenticalPromotionCartLines(products) {
     _step;
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var _line$metadata, _ref2, _line$metadata$source, _line$metadata2, _ref3, _promotion$finalPrice, _line$metadata3, _line$booking_uid, _line$metadata4, _line$product_variant;
+      var _line$metadata, _ref2, _line$metadata$source, _line$metadata2, _ref3, _promotion$finalPrice, _line$metadata3, _line$booking_uid, _line$metadata4, _line$order_detail_id, _line$product_variant;
       var line = _step.value;
       if (getGiftInfo(line)) {
         merged.push(line);
@@ -245,7 +245,8 @@ export function mergeIdenticalPromotionCartLines(products) {
       var unitPrice = String((_ref2 = (_line$metadata$source = (_line$metadata2 = line.metadata) === null || _line$metadata2 === void 0 ? void 0 : _line$metadata2.source_product_price) !== null && _line$metadata$source !== void 0 ? _line$metadata$source : line.selling_price) !== null && _ref2 !== void 0 ? _ref2 : '');
       var promoUnitPrice = String((_ref3 = (_promotion$finalPrice = promotion.finalPrice) !== null && _promotion$finalPrice !== void 0 ? _promotion$finalPrice : (_line$metadata3 = line.metadata) === null || _line$metadata3 === void 0 ? void 0 : _line$metadata3.main_product_selling_price) !== null && _ref3 !== void 0 ? _ref3 : '');
       var bookingUid = (_line$booking_uid = line === null || line === void 0 ? void 0 : line.booking_uid) !== null && _line$booking_uid !== void 0 ? _line$booking_uid : line === null || line === void 0 || (_line$metadata4 = line.metadata) === null || _line$metadata4 === void 0 ? void 0 : _line$metadata4.booking_uid;
-      var mergeKey = [line.product_id, (_line$product_variant = line.product_variant_id) !== null && _line$product_variant !== void 0 ? _line$product_variant : 0, fingerprint, bookingUid ? String(bookingUid) : '', promotion.strategyId, unitPrice, promoUnitPrice].join('#');
+      var orderDetailId = (_line$order_detail_id = line === null || line === void 0 ? void 0 : line.order_detail_id) !== null && _line$order_detail_id !== void 0 ? _line$order_detail_id : line === null || line === void 0 ? void 0 : line.orderDetailId;
+      var mergeKey = [line.product_id, (_line$product_variant = line.product_variant_id) !== null && _line$product_variant !== void 0 ? _line$product_variant : 0, fingerprint, bookingUid ? String(bookingUid) : '', orderDetailId !== undefined && orderDetailId !== null && orderDetailId !== '' ? String(orderDetailId) : '', promotion.strategyId, unitPrice, promoUnitPrice].join('#');
       var hitIndex = indexByKey.get(mergeKey);
       if (hitIndex === undefined) {
         indexByKey.set(mergeKey, merged.length);
@@ -413,6 +414,15 @@ function getGiftInfo(product) {
   var _product$metadata2;
   return (product === null || product === void 0 || (_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2._giftInfo) || (product === null || product === void 0 ? void 0 : product._giftInfo) || null;
 }
+function isPersistedGeneratedVoucher(product) {
+  var _product$order_detail;
+  var orderDetailId = (_product$order_detail = product === null || product === void 0 ? void 0 : product.order_detail_id) !== null && _product$order_detail !== void 0 ? _product$order_detail : product === null || product === void 0 ? void 0 : product.orderDetailId;
+  if (orderDetailId === undefined || orderDetailId === null || orderDetailId === '') {
+    return false;
+  }
+  var metadata = (product === null || product === void 0 ? void 0 : product.metadata) || {};
+  return (product === null || product === void 0 ? void 0 : product.extension_type) === 'product_voucher' || metadata.parent_order_detail_id !== undefined || metadata.gift_card_type !== undefined;
+}
 function getProductBundleForEvaluator(product) {
   var bundles = Array.isArray(product === null || product === void 0 ? void 0 : product.product_bundle) ? product.product_bundle : [];
   return bundles.map(function (b) {
@@ -441,14 +451,19 @@ function getProductBundleForEvaluator(product) {
  * // => 单行 num=4，清除 _promotion 后重新评估
  */
 export function buildConsolidateKeyForPromotion(item) {
-  var _item$booking_uid, _item$metadata, _item$product_variant2;
+  var _item$booking_uid, _item$metadata, _item$order_detail_id, _item$product_variant3;
   var fingerprint = buildProductLineFingerprint(item.product_option_item, item.product_bundle);
   var bookingUid = (_item$booking_uid = item === null || item === void 0 ? void 0 : item.booking_uid) !== null && _item$booking_uid !== void 0 ? _item$booking_uid : item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.booking_uid;
-  if (bookingUid !== undefined && bookingUid !== null && String(bookingUid) !== '') {
+  var orderDetailId = (_item$order_detail_id = item === null || item === void 0 ? void 0 : item.order_detail_id) !== null && _item$order_detail_id !== void 0 ? _item$order_detail_id : item === null || item === void 0 ? void 0 : item.orderDetailId;
+  if (orderDetailId !== undefined && orderDetailId !== null && orderDetailId !== '') {
     var _item$product_variant;
-    return [item.product_id, (_item$product_variant = item.product_variant_id) !== null && _item$product_variant !== void 0 ? _item$product_variant : 0, fingerprint, String(bookingUid)].join('#');
+    return [item.product_id, (_item$product_variant = item.product_variant_id) !== null && _item$product_variant !== void 0 ? _item$product_variant : 0, fingerprint, String(orderDetailId)].join('#');
+  }
+  if (bookingUid !== undefined && bookingUid !== null && String(bookingUid) !== '') {
+    var _item$product_variant2;
+    return [item.product_id, (_item$product_variant2 = item.product_variant_id) !== null && _item$product_variant2 !== void 0 ? _item$product_variant2 : 0, fingerprint, String(bookingUid)].join('#');
   }
-  return [item.product_id, (_item$product_variant2 = item.product_variant_id) !== null && _item$product_variant2 !== void 0 ? _item$product_variant2 : 0, fingerprint].join('#');
+  return [item.product_id, (_item$product_variant3 = item.product_variant_id) !== null && _item$product_variant3 !== void 0 ? _item$product_variant3 : 0, fingerprint].join('#');
 }
 function consolidateMainProductsForPromotion(entries) {
   if (!Array.isArray(entries) || entries.length <= 1) {
@@ -882,11 +897,11 @@ export function appendPromotionTags(products, evaluator) {
 
   // 评估器期望的 product shape，最少字段集
   var evaluatorInput = products.map(function (item, index) {
-    var _ref14, _item$id, _item$product_variant3, _item$price, _item$quantity;
+    var _ref14, _item$id, _item$product_variant4, _item$price, _item$quantity;
     return {
       id: index,
       product_id: Number((_ref14 = (_item$id = item === null || item === void 0 ? void 0 : item.id) !== null && _item$id !== void 0 ? _item$id : item === null || item === void 0 ? void 0 : item.product_id) !== null && _ref14 !== void 0 ? _ref14 : 0) || 0,
-      product_variant_id: Number((_item$product_variant3 = item === null || item === void 0 ? void 0 : item.product_variant_id) !== null && _item$product_variant3 !== void 0 ? _item$product_variant3 : 0) || 0,
+      product_variant_id: Number((_item$product_variant4 = item === null || item === void 0 ? void 0 : item.product_variant_id) !== null && _item$product_variant4 !== void 0 ? _item$product_variant4 : 0) || 0,
       name: (item === null || item === void 0 ? void 0 : item.title) || (item === null || item === void 0 ? void 0 : item.name) || '',
       price: Number((_item$price = item === null || item === void 0 ? void 0 : item.price) !== null && _item$price !== void 0 ? _item$price : 0) || 0,
       quantity: Number((_item$quantity = item === null || item === void 0 ? void 0 : item.quantity) !== null && _item$quantity !== void 0 ? _item$quantity : 1) || 1,
@@ -975,7 +990,12 @@ export function processCartPromotion(list, evaluator, options) {
   for (var i = 0; i < list.length; i++) {
     var item = list[i];
     var giftInfo = getGiftInfo(item);
-    if (giftInfo) {
+    if (isPersistedGeneratedVoucher(item)) {
+      editProductsWithIndex.push({
+        item: item,
+        originalListIndex: i
+      });
+    } else if (giftInfo) {
       existingGiftsWithIndex.push({
         item: item,
         originalListIndex: i
@@ -1039,12 +1059,12 @@ export function processCartPromotion(list, evaluator, options) {
   var promotionProducts = [];
   var originalItemMap = new Map();
   var productsForStrategies = consolidatedMainProductsWithIndex.map(function (_ref16, i) {
-    var _item$product_id, _item$product_variant4, _item$metadata2, _item$num;
+    var _item$product_id, _item$product_variant5, _item$metadata2, _item$num;
     var item = _ref16.item;
     return {
       id: i,
       product_id: Number((_item$product_id = item === null || item === void 0 ? void 0 : item.product_id) !== null && _item$product_id !== void 0 ? _item$product_id : 0) || 0,
-      product_variant_id: Number((_item$product_variant4 = item === null || item === void 0 ? void 0 : item.product_variant_id) !== null && _item$product_variant4 !== void 0 ? _item$product_variant4 : 0) || 0,
+      product_variant_id: Number((_item$product_variant5 = item === null || item === void 0 ? void 0 : item.product_variant_id) !== null && _item$product_variant5 !== void 0 ? _item$product_variant5 : 0) || 0,
       name: (item === null || item === void 0 || (_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.product_name) || (item === null || item === void 0 ? void 0 : item.title) || '',
       price: getOrderProductBasePrice(item),
       quantity: Number((_item$num = item === null || item === void 0 ? void 0 : item.num) !== null && _item$num !== void 0 ? _item$num : 1) || 1,

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

package/dist/solution/BookingTicket/index.js

@@ -2,8 +2,6 @@ var _excluded = ["id"],
   _excluded2 = ["product_id"],
   _excluded3 = ["product_id"];
 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); }
-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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
@@ -27,6 +25,8 @@ function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) ===
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+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; }
 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); }
@@ -41,7 +41,19 @@ import { buildCartView } from "./utils/cartView";
 import { buildCacheItemFromCartDetail, buildCacheItemFromDetail, buildRequiresDetailPayload as _buildRequiresDetailPayload, decideAddProduct as decideAddProductUtil, decideAfterDetail as decideAfterDetailUtil, decideAutoClose as decideAutoCloseUtil, getIsEject as getIsEjectUtil, getIsOnlySession as getIsOnlySessionUtil, transformDetailToProductAndBooking as transformDetailToProductAndBookingUtil } from "./utils/addProductDecision";
 import { buildCacheItemFromOrderLine as buildCacheItemFromOrderLineUtil } from "../../modules/BookingContext/utils/buildCacheItemFromOrderLine";
 import { buildNormalProductCacheItemFromOrderLine as buildNormalProductCacheItemFromOrderLineUtil } from "../../modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine";
+import { buildProductOptionStringFromOrderLine } from "../../modules/BookingContext/utils/orderLineDisplay";
 import { applyBookingsStatus, resolveScheduleId, restoreBookingsStatus } from "./utils/bookingStatus";
+function withProductOptionString(cacheItem) {
+  var _cacheItem$_extend;
+  var productOptionString = buildProductOptionStringFromOrderLine(cacheItem);
+  if (!productOptionString) return cacheItem;
+  return _objectSpread(_objectSpread({}, cacheItem), {}, {
+    product_option_string: (cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.product_option_string) || productOptionString,
+    _extend: _objectSpread(_objectSpread({}, (cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem._extend) || {}), {}, {
+      product_option_string: (cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend = cacheItem._extend) === null || _cacheItem$_extend === void 0 ? void 0 : _cacheItem$_extend.product_option_string) || productOptionString
+    })
+  });
+}
 export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   _inherits(BookingTicketImpl, _BaseSalesImpl);
   var _super = _createSuper(BookingTicketImpl);
@@ -1579,10 +1591,12 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "getProductExtend",
     value: function getProductExtend(cacheItem, extra) {
-      return getProductExtendUtil({
-        cacheItem: cacheItem,
+      var preparedCacheItem = withProductOptionString(cacheItem);
+      var result = getProductExtendUtil({
+        cacheItem: preparedCacheItem,
         ctx: this.buildBookingCalcContext(extra)
       });
+      return result;
     }
 
     /**

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

@@ -1,49 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/model/strategy/adapter/promotion/index.ts
-var promotion_exports = {};
-__export(promotion_exports, {
-  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
-  PromotionAdapter: () => import_adapter.PromotionAdapter,
-  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
-  default: () => import_adapter2.default
-});
-module.exports = __toCommonJS(promotion_exports);
-var import_evaluator = require("./evaluator");
-var import_adapter = require("./adapter");
-var import_adapter2 = __toESM(require("./adapter"));
-var import_examples = require("./examples");
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  BUY_X_GET_Y_FREE_STRATEGY,
-  PromotionAdapter,
-  PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY
-});

package/lib/modules/BookingContext/utils/buildCacheItemFromOrderLine.js

@@ -34,6 +34,7 @@ __export(buildCacheItemFromOrderLine_exports, {
 module.exports = __toCommonJS(buildCacheItemFromOrderLine_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_manualProductDiscount = require("../../Order/utils/manualProductDiscount");
+var import_orderLineDisplay = require("./orderLineDisplay");
 function safeFormat(value, fmt) {
   if (value === void 0 || value === null)
     return void 0;
@@ -178,6 +179,7 @@ function buildCacheItemFromOrderLine(input) {
   const capacity = resolveCapacityFromBooking(booking);
   const holderId = ((_a = booking.metadata) == null ? void 0 : _a.holder_id) ?? booking.holder_id;
   const productTitle = resolveProductTitle(product, booking, sourceProduct);
+  const productOptionString = (0, import_orderLineDisplay.buildProductOptionStringFromOrderLine)(product);
   const other = {
     product_variant_id: product.product_variant_id ?? 0,
     option: Array.isArray(product.product_option_item) ? [...product.product_option_item] : [],
@@ -206,7 +208,8 @@ function buildCacheItemFromOrderLine(input) {
     discount_reason: (0, import_manualProductDiscount.resolveManualDiscountMessage)(
       product.discount_list,
       (_c = product.metadata) == null ? void 0 : _c.product_discount_reason
-    ) || void 0
+    ) || void 0,
+    ...productOptionString ? { product_option_string: productOptionString } : {}
   };
   const manualDiscount = (product.discount_list || []).find((d) => (d == null ? void 0 : d.type) === "product");
   if (manualDiscount && extend.origin_total === selling) {
@@ -233,6 +236,7 @@ function buildCacheItemFromOrderLine(input) {
     price: (sourceProduct == null ? void 0 : sourceProduct.price) ?? selling,
     selling_price: product.selling_price,
     original_price: product.original_price,
+    ...productOptionString ? { product_option_string: productOptionString } : {},
     _extend: extend,
     new: 0,
     autoClose: false,

package/lib/modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.js

@@ -22,6 +22,7 @@ __export(buildNormalProductCacheItemFromOrderLine_exports, {
   buildNormalProductCacheItemFromOrderLine: () => buildNormalProductCacheItemFromOrderLine
 });
 module.exports = __toCommonJS(buildNormalProductCacheItemFromOrderLine_exports);
+var import_orderLineDisplay = require("./orderLineDisplay");
 function resolveSourceProductPrice(product, sourceProduct) {
   var _a, _b, _c;
   const metadata = product.metadata || {};
@@ -85,6 +86,7 @@ function buildNormalProductCacheItemFromOrderLine(input) {
     Array.isArray(product.product_bundle) ? product.product_bundle : []
   );
   const originExtend = (_c = (_b = product.metadata) == null ? void 0 : _b.origin) == null ? void 0 : _c._extend;
+  const productOptionString = (0, import_orderLineDisplay.buildProductOptionStringFromOrderLine)(product);
   const other = {
     product_id: resolvedId,
     product_variant_id: product.product_variant_id ?? 0,
@@ -110,6 +112,7 @@ function buildNormalProductCacheItemFromOrderLine(input) {
     skuValue: JSON.parse(JSON.stringify(skuValue)),
     _skuValue: JSON.parse(JSON.stringify(skuValue)),
     isNormalProduct: true,
+    ...productOptionString ? { product_option_string: productOptionString } : {},
     ...(originExtend == null ? void 0 : originExtend.priceOverride) !== void 0 ? { priceOverride: originExtend.priceOverride } : {},
     ...(originExtend == null ? void 0 : originExtend.bundle_edit) !== void 0 ? { bundle_edit: originExtend.bundle_edit } : {}
   };
@@ -128,6 +131,7 @@ function buildNormalProductCacheItemFromOrderLine(input) {
     price: (sourceProduct == null ? void 0 : sourceProduct.price) ?? sourcePrice,
     selling_price: product.selling_price,
     original_price: product.original_price,
+    ...productOptionString ? { product_option_string: productOptionString } : {},
     note: product.note,
     order_detail_id: product.order_detail_id ?? null,
     new: 0,

package/lib/modules/BookingContext/utils/orderLineDisplay.d.ts

@@ -0,0 +1 @@
+export declare function buildProductOptionStringFromOrderLine(product: any): string;