@pisell/pisellos 0.10.50 → 0.10.52

package/dist/modules/Order/index.js

@@ -32,8 +32,9 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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); }
 import { BaseModule } from "../BaseModule";
 import { OrderHooks } from "./types";
-import { composeLinePrice, generateDuration, getAllDiscountList, mergeRelationForms, ensureCartItemOriginHolder, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, createUuidV4, formatDateTime, isTempOrder, normalizeOrderMetaList, normalizeBookingIsAll, normalizeBookingSubType, mapPaymentItemsToOrderPayments, normalizeOrderProductDiscountList, resolveEffectivePerUnitDiscount, ensureProductSku, getProductSkuOptions, normalizeProductSkuOptions, sumOptionUnitPrice, clearTempOrderHolderAssignments, getOrderProductLineUid, indexOrderProductsByUid, calculateOrderProductsDeposit, buildPointCardSnapshotFromWalletPassList, buildVirtualCurrencySnapshotFromList, mergeOrderProductDisplayFields, resolveIsFormSubject, isMarkdownBundle } from "./utils";
+import { composeLinePrice, generateDuration, getAllDiscountList, mergeRelationForms, ensureCartItemOriginHolder, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, createUuidV4, formatDateTime, isTempOrder, normalizeOrderMetaList, normalizeBookingIsAll, normalizeBookingSubType, mapPaymentItemsToOrderPayments, normalizeOrderProductDiscountList, resolveEffectivePerUnitDiscount, ensureProductSku, getProductSkuOptions, normalizeProductSkuOptions, sumOptionUnitPrice, clearTempOrderHolderAssignments, getOrderProductLineUid, indexOrderProductsByUid, calculateOrderProductsDeposit, collectPointCardSnapshotCodeCandidates, mergePointCardSnapshotCodes as _mergePointCardSnapshotCodes, buildVirtualCurrencySnapshotFromList, mergeOrderProductDisplayFields, resolveIsFormSubject, isMarkdownBundle } from "./utils";
 import { isNormalProduct } from "../Product/utils";
+import { buildPickupTimingBooking, isFulfillmentTimingBooking } from "./pickupTiming";
 import dayjs from 'dayjs';
 import { getDiscountLifecycleReason } from "../Discount/availability";
 import { stripOsPrivatePayloadFields } from "../../utils/os-private-payload";
@@ -170,6 +171,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "sessionStorageRestoreRecord", null);
     /** 只允许当前订单最新的 prepare/config 请求回写客户资产态。 */
     _defineProperty(_assertThisInitialized(_this), "customerWalletPrepareConfigEpoch", 0);
+    /** Payment 可能早于 prepare/config 返回；先按实例 ID 暂存卡号等待 Snapshot。 */
+    _defineProperty(_assertThisInitialized(_this), "pointCardSnapshotCodeCandidates", new Map());
     _defineProperty(_assertThisInitialized(_this), "salesSummaryModuleName", void 0);
     _defineProperty(_assertThisInitialized(_this), "rulesHooksOverride", void 0);
     _defineProperty(_assertThisInitialized(_this), "moduleHooksOverride", void 0);
@@ -1716,9 +1719,59 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "clearCustomerWalletRuntimeState",
     value: function clearCustomerWalletRuntimeState() {
       this.customerWalletPrepareConfigEpoch += 1;
+      this.pointCardSnapshotCodeCandidates.clear();
       this.store.availableWalletIds = [];
       this.store.virtualCurrencyList = [];
     }
+  }, {
+    key: "rememberPointCardSnapshotCodeCandidates",
+    value: function rememberPointCardSnapshotCodeCandidates(value) {
+      var _this6 = this;
+      collectPointCardSnapshotCodeCandidates(value).forEach(function (_ref18) {
+        var id = _ref18.id,
+          code = _ref18.code;
+        if (!_this6.pointCardSnapshotCodeCandidates.has(id)) {
+          _this6.pointCardSnapshotCodeCandidates.set(id, code);
+        }
+      });
+    }
+  }, {
+    key: "getRememberedPointCardSnapshotCodeCandidates",
+    value: function getRememberedPointCardSnapshotCodeCandidates() {
+      return _toConsumableArray(this.pointCardSnapshotCodeCandidates).map(function (_ref19) {
+        var _ref20 = _slicedToArray(_ref19, 2),
+          id = _ref20[0],
+          code = _ref20[1];
+        return {
+          id: id,
+          code: code
+        };
+      });
+    }
+  }, {
+    key: "getPointCardSnapshotOrderIdentityKey",
+    value: function getPointCardSnapshotOrderIdentityKey(identity) {
+      if (identity !== null && identity !== void 0 && identity.externalSaleNumber) {
+        return "external:".concat(identity.externalSaleNumber);
+      }
+      if ((identity === null || identity === void 0 ? void 0 : identity.orderId) !== undefined && identity.orderId !== null) {
+        return "order:".concat(identity.orderId);
+      }
+      if (identity !== null && identity !== void 0 && identity.localId) return "local:".concat(identity.localId);
+      if (identity !== null && identity !== void 0 && identity.orderNumber) return "number:".concat(identity.orderNumber);
+      return '';
+    }
+  }, {
+    key: "isPointCardSnapshotMergeContextCurrent",
+    value: function isPointCardSnapshotMergeContextCurrent(context) {
+      var _context$customerId, _this$store$tempOrder4, _this$store$tempOrder5;
+      if (!context) return true;
+      if (context.customerId !== undefined && String((_context$customerId = context.customerId) !== null && _context$customerId !== void 0 ? _context$customerId : '') !== String((_this$store$tempOrder4 = (_this$store$tempOrder5 = this.store.tempOrder) === null || _this$store$tempOrder5 === void 0 ? void 0 : _this$store$tempOrder5.customer_id) !== null && _this$store$tempOrder4 !== void 0 ? _this$store$tempOrder4 : '')) {
+        return false;
+      }
+      var expectedOrderKey = this.getPointCardSnapshotOrderIdentityKey(context.orderIdentity);
+      return !expectedOrderKey || expectedOrderKey === this.getPointCardSnapshotOrderIdentityKey(this.getOrderIdentity());
+    }
   }, {
     key: "writeCustomerWalletSnapshotsFromPrepareConfig",
     value: function writeCustomerWalletSnapshotsFromPrepareConfig(params) {
@@ -1726,9 +1779,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var tempOrder = this.store.tempOrder;
       if (!tempOrder) return;
       if (String((_tempOrder$customer_i = tempOrder.customer_id) !== null && _tempOrder$customer_i !== void 0 ? _tempOrder$customer_i : '') !== String(params.customerId)) return;
+      var currentOrderMetaList = normalizeOrderMetaList(tempOrder.order_meta_list);
       var virtualCurrencyList = Array.isArray(params.virtualCurrencyList) ? params.virtualCurrencyList : [];
-      tempOrder.order_meta_list = _objectSpread(_objectSpread({}, normalizeOrderMetaList(tempOrder.order_meta_list) || {}), {}, {
-        point_cards_snapshot: buildPointCardSnapshotFromWalletPassList(params.availableWalletPassList),
+      var snapshotsWithExistingCodes = _mergePointCardSnapshotCodes(params.availableWalletPassList, currentOrderMetaList === null || currentOrderMetaList === void 0 ? void 0 : currentOrderMetaList.point_cards_snapshot);
+      tempOrder.order_meta_list = _objectSpread(_objectSpread({}, currentOrderMetaList || {}), {}, {
+        point_cards_snapshot: _mergePointCardSnapshotCodes(snapshotsWithExistingCodes, this.getRememberedPointCardSnapshotCodeCandidates()),
         virtual_currency_snapshot: buildVirtualCurrencySnapshotFromList(virtualCurrencyList)
       });
       this.store.availableWalletIds = _toConsumableArray(params.availableWalletIds);
@@ -1736,6 +1791,35 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       this.persistTempOrder();
       this.saveDraftInBackground();
     }
+
+    /**
+     * 将 Payment WalletPass 返回的实例 code 回填到当前订单 Snapshot。
+     * 这里只按资产 ID 补空值，不新增卡、不覆盖 prepare/config 冻结的余额。
+     */
+  }, {
+    key: "mergePointCardSnapshotCodes",
+    value: function mergePointCardSnapshotCodes(walletPassList, context) {
+      var tempOrder = this.store.tempOrder;
+      var currentOrderMetaList = normalizeOrderMetaList(tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.order_meta_list);
+      var currentSnapshots = (currentOrderMetaList === null || currentOrderMetaList === void 0 ? void 0 : currentOrderMetaList.point_cards_snapshot) || [];
+      if (!tempOrder || !this.isPointCardSnapshotMergeContextCurrent(context)) {
+        return currentSnapshots;
+      }
+      this.rememberPointCardSnapshotCodeCandidates(walletPassList);
+      if (!currentSnapshots.length) return currentSnapshots;
+      var nextSnapshots = _mergePointCardSnapshotCodes(currentSnapshots, this.getRememberedPointCardSnapshotCodeCandidates());
+      var hasChanged = nextSnapshots.some(function (snapshot, index) {
+        var _currentSnapshots$ind;
+        return snapshot.code !== ((_currentSnapshots$ind = currentSnapshots[index]) === null || _currentSnapshots$ind === void 0 ? void 0 : _currentSnapshots$ind.code);
+      });
+      if (!hasChanged) return currentSnapshots;
+      tempOrder.order_meta_list = _objectSpread(_objectSpread({}, currentOrderMetaList || {}), {}, {
+        point_cards_snapshot: nextSnapshots
+      });
+      this.persistTempOrder();
+      this.saveDraftInBackground();
+      return nextSnapshots;
+    }
   }, {
     key: "createExternalSaleNumber",
     value: function createExternalSaleNumber() {
@@ -1836,15 +1920,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "extractOrderIdFromSubmitResult",
     value: function extractOrderIdFromSubmitResult(result) {
-      var _ref18, _ref19, _ref20, _result$data$order_id, _result$data, _result$data2;
-      return (_ref18 = (_ref19 = (_ref20 = (_result$data$order_id = result === null || result === void 0 || (_result$data = result.data) === null || _result$data === void 0 ? void 0 : _result$data.order_id) !== null && _result$data$order_id !== void 0 ? _result$data$order_id : result === null || result === void 0 ? void 0 : result.order_id) !== null && _ref20 !== void 0 ? _ref20 : result === null || result === void 0 || (_result$data2 = result.data) === null || _result$data2 === void 0 ? void 0 : _result$data2.id) !== null && _ref19 !== void 0 ? _ref19 : result === null || result === void 0 ? void 0 : result.id) !== null && _ref18 !== void 0 ? _ref18 : null;
+      var _ref21, _ref22, _ref23, _result$data$order_id, _result$data, _result$data2;
+      return (_ref21 = (_ref22 = (_ref23 = (_result$data$order_id = result === null || result === void 0 || (_result$data = result.data) === null || _result$data === void 0 ? void 0 : _result$data.order_id) !== null && _result$data$order_id !== void 0 ? _result$data$order_id : result === null || result === void 0 ? void 0 : result.order_id) !== null && _ref23 !== void 0 ? _ref23 : result === null || result === void 0 || (_result$data2 = result.data) === null || _result$data2 === void 0 ? void 0 : _result$data2.id) !== null && _ref22 !== void 0 ? _ref22 : result === null || result === void 0 ? void 0 : result.id) !== null && _ref21 !== void 0 ? _ref21 : null;
     }
   }, {
     key: "calculatePaymentEffectiveAmount",
     value: function calculatePaymentEffectiveAmount(payment) {
-      var _ref21, _payment$origin_amoun;
+      var _ref24, _payment$origin_amoun;
       var amount = new Decimal(payment.amount || 0);
-      var originAmount = new Decimal((_ref21 = (_payment$origin_amoun = payment.origin_amount) !== null && _payment$origin_amoun !== void 0 ? _payment$origin_amoun : payment.amount) !== null && _ref21 !== void 0 ? _ref21 : 0);
+      var originAmount = new Decimal((_ref24 = (_payment$origin_amoun = payment.origin_amount) !== null && _payment$origin_amoun !== void 0 ? _payment$origin_amoun : payment.amount) !== null && _ref24 !== void 0 ? _ref24 : 0);
       var serviceFee = new Decimal(payment.service_fee || 0);
       // TODO: 后端允许 amount 表示顾客实际支付总额后，移除这个兼容分支。
       var effectiveAmount = serviceFee.gt(0) && amount.eq(originAmount) ? amount.plus(serviceFee) : amount;
@@ -1854,23 +1938,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "calculatePaymentTotal",
     value: function calculatePaymentTotal(payments) {
-      var _this6 = this;
+      var _this7 = this;
       return mapPaymentItemsToOrderPayments(payments, {
         includeVoided: false
       }).reduce(function (sum, payment) {
         if (!isPaidPaymentRecord(payment)) return sum;
-        return sum.plus(_this6.calculatePaymentEffectiveAmount(payment));
+        return sum.plus(_this7.calculatePaymentEffectiveAmount(payment));
       }, new Decimal(0));
     }
   }, {
     key: "calculateOrderPaidPaymentTotal",
     value: function calculateOrderPaidPaymentTotal(payments) {
-      var _this7 = this;
+      var _this8 = this;
       return mapPaymentItemsToOrderPayments(payments, {
         includeVoided: false
       }).reduce(function (sum, payment) {
         if (!isPaidPaymentRecord(payment)) return sum;
-        return sum.plus(_this7.calculatePaymentGapAmount(payment));
+        return sum.plus(_this8.calculatePaymentGapAmount(payment));
       }, new Decimal(0));
     }
   }, {
@@ -2006,13 +2090,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "calculateDepositPaidAmount",
     value: function calculateDepositPaidAmount(payments) {
-      var _this8 = this;
+      var _this9 = this;
       return (payments || []).reduce(function (sum, payment) {
         var paymentRecord = payment;
         if (!isPaidPaymentRecord(paymentRecord)) return sum;
         var isDepositPayment = paymentRecord.type === 'deposit' || paymentRecord.order_payment_type === 'deposit';
         if (!isDepositPayment) return sum;
-        return sum.plus(_this8.calculatePaymentGapAmount(paymentRecord));
+        return sum.plus(_this9.calculatePaymentGapAmount(paymentRecord));
       }, new Decimal(0));
     }
   }, {
@@ -2049,28 +2133,28 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getPaymentNumberDevicePrefixSync",
     value: function getPaymentNumberDevicePrefixSync() {
-      var _this9 = this;
+      var _this10 = this;
       return resolvePaymentNumberDevicePrefixFromDeviceId(function (key) {
-        return _this9.getPaymentNumberAppData(key);
+        return _this10.getPaymentNumberAppData(key);
       });
     }
   }, {
     key: "getPaymentNumberDevicePrefixAsync",
     value: function getPaymentNumberDevicePrefixAsync() {
-      var _this10 = this;
+      var _this11 = this;
       return resolvePaymentNumberDevicePrefix(function (key) {
-        return _this10.getPaymentNumberAppData(key);
+        return _this11.getPaymentNumberAppData(key);
       });
     }
   }, {
     key: "normalizePaymentSource",
     value: function normalizePaymentSource(payment, options) {
-      var _ref22, _paymentRecord$origin;
+      var _ref25, _paymentRecord$origin;
       var paymentRecord = payment;
       var metadata = paymentRecord.metadata && _typeof(paymentRecord.metadata) === 'object' ? _objectSpread({}, paymentRecord.metadata) : {};
       var normalized = ensureOrderPaymentNumber(_objectSpread(_objectSpread({}, paymentRecord), {}, {
         metadata: metadata,
-        origin_amount: (_ref22 = (_paymentRecord$origin = paymentRecord.origin_amount) !== null && _paymentRecord$origin !== void 0 ? _paymentRecord$origin : paymentRecord.amount) !== null && _ref22 !== void 0 ? _ref22 : '0.00'
+        origin_amount: (_ref25 = (_paymentRecord$origin = paymentRecord.origin_amount) !== null && _paymentRecord$origin !== void 0 ? _paymentRecord$origin : paymentRecord.amount) !== null && _ref25 !== void 0 ? _ref25 : '0.00'
       }), (options === null || options === void 0 ? void 0 : options.devicePrefix) || this.getPaymentNumberDevicePrefixSync(), createUuidV4);
       if (paymentRecord.status !== undefined) {
         normalized.status = paymentRecord.status;
@@ -2189,16 +2273,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "calculatePaidPaymentSummary",
     value: function calculatePaidPaymentSummary(payments) {
-      var _this11 = this;
+      var _this12 = this;
       return (payments || []).reduce(function (summary, payment) {
         var paymentRecord = payment;
         if (!isPaidPaymentRecord(paymentRecord)) return summary;
         return {
           customerPaidAmount: summary.customerPaidAmount.plus(paymentRecord.amount || 0),
-          orderPaidAmount: summary.orderPaidAmount.plus(_this11.calculatePaymentOrderAmount(paymentRecord)),
-          gapPaidAmount: summary.gapPaidAmount.plus(_this11.calculatePaymentGapAmount(paymentRecord)),
-          payServiceChargeAmount: summary.payServiceChargeAmount.plus(_this11.calculatePaymentServiceFee(paymentRecord)),
-          roundingAmount: summary.roundingAmount.plus(_this11.calculatePaymentRoundingAmount(paymentRecord))
+          orderPaidAmount: summary.orderPaidAmount.plus(_this12.calculatePaymentOrderAmount(paymentRecord)),
+          gapPaidAmount: summary.gapPaidAmount.plus(_this12.calculatePaymentGapAmount(paymentRecord)),
+          payServiceChargeAmount: summary.payServiceChargeAmount.plus(_this12.calculatePaymentServiceFee(paymentRecord)),
+          roundingAmount: summary.roundingAmount.plus(_this12.calculatePaymentRoundingAmount(paymentRecord))
         };
       }, {
         customerPaidAmount: new Decimal(0),
@@ -2405,15 +2489,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeFingerprintValue",
     value: function normalizeFingerprintValue(value) {
-      var _this12 = this;
+      var _this13 = this;
       if (Array.isArray(value)) {
         return value.map(function (item) {
-          return _this12.normalizeFingerprintValue(item);
+          return _this13.normalizeFingerprintValue(item);
         });
       }
       if (!value || _typeof(value) !== 'object') return value !== null && value !== void 0 ? value : '';
       return Object.keys(value).sort().reduce(function (result, key) {
-        result[key] = _this12.normalizeFingerprintValue(value[key]);
+        result[key] = _this13.normalizeFingerprintValue(value[key]);
         return result;
       }, {});
     }
@@ -2426,9 +2510,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _product$payment_pric,
         _sku$code,
         _sku$barcode,
-        _ref23,
+        _ref26,
         _sku$variant_id,
-        _this13 = this;
+        _this14 = this;
       var sku = (product === null || product === void 0 ? void 0 : product.product_sku) || {};
       var metadata = (product === null || product === void 0 ? void 0 : product.metadata) || {};
       var discountTypes = ((product === null || product === void 0 ? void 0 : product.discount_list) || []).map(function (discount) {
@@ -2456,37 +2540,37 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         product_sku: this.normalizeFingerprintValue({
           code: (_sku$code = sku.code) !== null && _sku$code !== void 0 ? _sku$code : '',
           barcode: (_sku$barcode = sku.barcode) !== null && _sku$barcode !== void 0 ? _sku$barcode : '',
-          variant_id: (_ref23 = (_sku$variant_id = sku.variant_id) !== null && _sku$variant_id !== void 0 ? _sku$variant_id : product === null || product === void 0 ? void 0 : product.product_variant_id) !== null && _ref23 !== void 0 ? _ref23 : 0,
+          variant_id: (_ref26 = (_sku$variant_id = sku.variant_id) !== null && _sku$variant_id !== void 0 ? _sku$variant_id : product === null || product === void 0 ? void 0 : product.product_variant_id) !== null && _ref26 !== void 0 ? _ref26 : 0,
           variant: sku.variant || [],
           option: getProductSkuOptions(product || {}).map(function (option) {
-            var _ref24, _option$id, _option$option_group_, _ref25, _option$option_group_2, _option$num, _option$add_price;
+            var _ref27, _option$id, _option$option_group_, _ref28, _option$option_group_2, _option$num, _option$add_price;
             return {
-              id: (_ref24 = (_option$id = option === null || option === void 0 ? void 0 : option.id) !== null && _option$id !== void 0 ? _option$id : option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _ref24 !== void 0 ? _ref24 : null,
+              id: (_ref27 = (_option$id = option === null || option === void 0 ? void 0 : option.id) !== null && _option$id !== void 0 ? _option$id : option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _ref27 !== void 0 ? _ref27 : null,
               option_group_id: (_option$option_group_ = option === null || option === void 0 ? void 0 : option.option_group_id) !== null && _option$option_group_ !== void 0 ? _option$option_group_ : null,
-              option_group_item_id: (_ref25 = (_option$option_group_2 = option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _option$option_group_2 !== void 0 ? _option$option_group_2 : option === null || option === void 0 ? void 0 : option.id) !== null && _ref25 !== void 0 ? _ref25 : null,
+              option_group_item_id: (_ref28 = (_option$option_group_2 = option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _option$option_group_2 !== void 0 ? _option$option_group_2 : option === null || option === void 0 ? void 0 : option.id) !== null && _ref28 !== void 0 ? _ref28 : null,
               num: Number((_option$num = option === null || option === void 0 ? void 0 : option.num) !== null && _option$num !== void 0 ? _option$num : 1) || 1,
-              add_price: _this13.normalizeFingerprintMoney((_option$add_price = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price !== void 0 ? _option$add_price : option === null || option === void 0 ? void 0 : option.price)
+              add_price: _this14.normalizeFingerprintMoney((_option$add_price = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price !== void 0 ? _option$add_price : option === null || option === void 0 ? void 0 : option.price)
             };
           })
         }),
         product_bundle: this.normalizeFingerprintValue(((product === null || product === void 0 ? void 0 : product.product_bundle) || []).map(function (bundle) {
-          var _ref26, _ref27, _bundle$bundle_produc, _ref28, _bundle$bundle_varian, _bundle$num, _bundle$price_type, _bundle$price_type_ex;
+          var _ref29, _ref30, _bundle$bundle_produc, _ref31, _bundle$bundle_varian, _bundle$num, _bundle$price_type, _bundle$price_type_ex;
           return {
-            bundle_product_id: (_ref26 = (_ref27 = (_bundle$bundle_produc = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle === null || bundle === void 0 ? void 0 : bundle._bundle_product_id) !== null && _ref27 !== void 0 ? _ref27 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id) !== null && _ref26 !== void 0 ? _ref26 : null,
-            bundle_variant_id: (_ref28 = (_bundle$bundle_varian = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle === null || bundle === void 0 ? void 0 : bundle.product_variant_id) !== null && _ref28 !== void 0 ? _ref28 : 0,
+            bundle_product_id: (_ref29 = (_ref30 = (_bundle$bundle_produc = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle === null || bundle === void 0 ? void 0 : bundle._bundle_product_id) !== null && _ref30 !== void 0 ? _ref30 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id) !== null && _ref29 !== void 0 ? _ref29 : null,
+            bundle_variant_id: (_ref31 = (_bundle$bundle_varian = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle === null || bundle === void 0 ? void 0 : bundle.product_variant_id) !== null && _ref31 !== void 0 ? _ref31 : 0,
             num: getSafeProductNum((_bundle$num = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle === null || bundle === void 0 ? void 0 : bundle.quantity),
-            price: _this13.normalizeFingerprintMoney(bundle === null || bundle === void 0 ? void 0 : bundle.price),
-            bundle_selling_price: _this13.normalizeFingerprintMoney(bundle === null || bundle === void 0 ? void 0 : bundle.bundle_selling_price),
+            price: _this14.normalizeFingerprintMoney(bundle === null || bundle === void 0 ? void 0 : bundle.price),
+            bundle_selling_price: _this14.normalizeFingerprintMoney(bundle === null || bundle === void 0 ? void 0 : bundle.bundle_selling_price),
             price_type: (_bundle$price_type = bundle === null || bundle === void 0 ? void 0 : bundle.price_type) !== null && _bundle$price_type !== void 0 ? _bundle$price_type : '',
             price_type_ext: (_bundle$price_type_ex = bundle === null || bundle === void 0 ? void 0 : bundle.price_type_ext) !== null && _bundle$price_type_ex !== void 0 ? _bundle$price_type_ex : ''
           };
         })),
         discount_list: this.normalizeFingerprintValue(((product === null || product === void 0 ? void 0 : product.discount_list) || []).map(function (discount) {
-          var _ref29, _discount$type2, _ref30, _ref31, _discount$discount_id, _discount$discount;
+          var _ref32, _discount$type2, _ref33, _ref34, _discount$discount_id, _discount$discount;
           return {
-            type: (_ref29 = (_discount$type2 = discount === null || discount === void 0 ? void 0 : discount.type) !== null && _discount$type2 !== void 0 ? _discount$type2 : discount === null || discount === void 0 ? void 0 : discount.tag) !== null && _ref29 !== void 0 ? _ref29 : '',
-            discount_id: (_ref30 = (_ref31 = (_discount$discount_id = discount === null || discount === void 0 ? void 0 : discount.discount_id) !== null && _discount$discount_id !== void 0 ? _discount$discount_id : discount === null || discount === void 0 ? void 0 : discount.order_discount_id) !== null && _ref31 !== void 0 ? _ref31 : discount === null || discount === void 0 || (_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) !== null && _ref30 !== void 0 ? _ref30 : null,
-            amount: _this13.normalizeFingerprintMoney(discount === null || discount === void 0 ? void 0 : discount.amount)
+            type: (_ref32 = (_discount$type2 = discount === null || discount === void 0 ? void 0 : discount.type) !== null && _discount$type2 !== void 0 ? _discount$type2 : discount === null || discount === void 0 ? void 0 : discount.tag) !== null && _ref32 !== void 0 ? _ref32 : '',
+            discount_id: (_ref33 = (_ref34 = (_discount$discount_id = discount === null || discount === void 0 ? void 0 : discount.discount_id) !== null && _discount$discount_id !== void 0 ? _discount$discount_id : discount === null || discount === void 0 ? void 0 : discount.order_discount_id) !== null && _ref34 !== void 0 ? _ref34 : discount === null || discount === void 0 || (_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) !== null && _ref33 !== void 0 ? _ref33 : null,
+            amount: _this14.normalizeFingerprintMoney(discount === null || discount === void 0 ? void 0 : discount.amount)
           };
         }))
       };
@@ -2494,9 +2578,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildOrderProductsFingerprint",
     value: function buildOrderProductsFingerprint(products) {
-      var _this14 = this;
+      var _this15 = this;
       var items = (products || []).map(function (product) {
-        return _this14.buildProductFingerprintItem(product);
+        return _this15.buildProductFingerprintItem(product);
       });
       items.sort(function (left, right) {
         return JSON.stringify(left).localeCompare(JSON.stringify(right));
@@ -2509,16 +2593,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var _product$product_id3,
         _product$product_vari2,
         _product$num2,
-        _ref32,
+        _ref35,
         _metadata$unique_iden,
         _metadata$price_overr,
         _metadata$is_manual_d,
         _metadata$product_dis,
         _sku$code2,
         _sku$barcode2,
-        _ref33,
+        _ref36,
         _sku$variant_id2,
-        _this15 = this;
+        _this16 = this;
       var sku = (product === null || product === void 0 ? void 0 : product.product_sku) || {};
       var metadata = (product === null || product === void 0 ? void 0 : product.metadata) || {};
       var discountTypes = ((product === null || product === void 0 ? void 0 : product.discount_list) || []).map(function (discount) {
@@ -2535,7 +2619,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         extension_type: extensionType,
         num: getSafeProductNum((_product$num2 = product === null || product === void 0 ? void 0 : product.num) !== null && _product$num2 !== void 0 ? _product$num2 : product === null || product === void 0 ? void 0 : product.product_quantity),
         metadata: {
-          unique_identification_number: (_ref32 = (_metadata$unique_iden = metadata.unique_identification_number) !== null && _metadata$unique_iden !== void 0 ? _metadata$unique_iden : product === null || product === void 0 ? void 0 : product.unique_identification_number) !== null && _ref32 !== void 0 ? _ref32 : '',
+          unique_identification_number: (_ref35 = (_metadata$unique_iden = metadata.unique_identification_number) !== null && _metadata$unique_iden !== void 0 ? _metadata$unique_iden : product === null || product === void 0 ? void 0 : product.unique_identification_number) !== null && _ref35 !== void 0 ? _ref35 : '',
           price_override: (_metadata$price_overr = metadata.price_override) !== null && _metadata$price_overr !== void 0 ? _metadata$price_overr : '',
           is_manual_discount: (_metadata$is_manual_d = metadata.is_manual_discount) !== null && _metadata$is_manual_d !== void 0 ? _metadata$is_manual_d : '',
           product_discount_reason: (_metadata$product_dis = metadata.product_discount_reason) !== null && _metadata$product_dis !== void 0 ? _metadata$product_dis : ''
@@ -2543,47 +2627,47 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         product_sku: this.normalizeFingerprintValue({
           code: (_sku$code2 = sku.code) !== null && _sku$code2 !== void 0 ? _sku$code2 : '',
           barcode: (_sku$barcode2 = sku.barcode) !== null && _sku$barcode2 !== void 0 ? _sku$barcode2 : '',
-          variant_id: (_ref33 = (_sku$variant_id2 = sku.variant_id) !== null && _sku$variant_id2 !== void 0 ? _sku$variant_id2 : product === null || product === void 0 ? void 0 : product.product_variant_id) !== null && _ref33 !== void 0 ? _ref33 : 0,
+          variant_id: (_ref36 = (_sku$variant_id2 = sku.variant_id) !== null && _sku$variant_id2 !== void 0 ? _sku$variant_id2 : product === null || product === void 0 ? void 0 : product.product_variant_id) !== null && _ref36 !== void 0 ? _ref36 : 0,
           variant: sku.variant || [],
           option: getProductSkuOptions(product || {}).map(function (option) {
-            var _ref34, _option$id2, _option$option_group_3, _ref35, _option$option_group_4, _option$num2, _option$add_price2;
+            var _ref37, _option$id2, _option$option_group_3, _ref38, _option$option_group_4, _option$num2, _option$add_price2;
             return {
-              id: (_ref34 = (_option$id2 = option === null || option === void 0 ? void 0 : option.id) !== null && _option$id2 !== void 0 ? _option$id2 : option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _ref34 !== void 0 ? _ref34 : null,
+              id: (_ref37 = (_option$id2 = option === null || option === void 0 ? void 0 : option.id) !== null && _option$id2 !== void 0 ? _option$id2 : option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _ref37 !== void 0 ? _ref37 : null,
               option_group_id: (_option$option_group_3 = option === null || option === void 0 ? void 0 : option.option_group_id) !== null && _option$option_group_3 !== void 0 ? _option$option_group_3 : null,
-              option_group_item_id: (_ref35 = (_option$option_group_4 = option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _option$option_group_4 !== void 0 ? _option$option_group_4 : option === null || option === void 0 ? void 0 : option.id) !== null && _ref35 !== void 0 ? _ref35 : null,
+              option_group_item_id: (_ref38 = (_option$option_group_4 = option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _option$option_group_4 !== void 0 ? _option$option_group_4 : option === null || option === void 0 ? void 0 : option.id) !== null && _ref38 !== void 0 ? _ref38 : null,
               num: Number((_option$num2 = option === null || option === void 0 ? void 0 : option.num) !== null && _option$num2 !== void 0 ? _option$num2 : 1) || 1,
-              add_price: _this15.normalizeFingerprintMoney((_option$add_price2 = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price2 !== void 0 ? _option$add_price2 : option === null || option === void 0 ? void 0 : option.price)
+              add_price: _this16.normalizeFingerprintMoney((_option$add_price2 = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price2 !== void 0 ? _option$add_price2 : option === null || option === void 0 ? void 0 : option.price)
             };
           })
         }),
         product_bundle: this.normalizeFingerprintValue(((product === null || product === void 0 ? void 0 : product.product_bundle) || []).map(function (bundle) {
-          var _ref36, _bundle$bundle_id, _ref37, _bundle$bundle_group_, _ref38, _ref39, _bundle$bundle_produc2, _ref40, _bundle$bundle_varian2, _bundle$num2, _bundle$price_type2, _bundle$price_type_ex2;
+          var _ref39, _bundle$bundle_id, _ref40, _bundle$bundle_group_, _ref41, _ref42, _bundle$bundle_produc2, _ref43, _bundle$bundle_varian2, _bundle$num2, _bundle$price_type2, _bundle$price_type_ex2;
           return {
-            bundle_id: (_ref36 = (_bundle$bundle_id = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_id) !== null && _bundle$bundle_id !== void 0 ? _bundle$bundle_id : bundle === null || bundle === void 0 ? void 0 : bundle.id) !== null && _ref36 !== void 0 ? _ref36 : null,
-            bundle_group_id: (_ref37 = (_bundle$bundle_group_ = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_group_id) !== null && _bundle$bundle_group_ !== void 0 ? _bundle$bundle_group_ : bundle === null || bundle === void 0 ? void 0 : bundle.group_id) !== null && _ref37 !== void 0 ? _ref37 : null,
-            bundle_product_id: (_ref38 = (_ref39 = (_bundle$bundle_produc2 = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_product_id) !== null && _bundle$bundle_produc2 !== void 0 ? _bundle$bundle_produc2 : bundle === null || bundle === void 0 ? void 0 : bundle._bundle_product_id) !== null && _ref39 !== void 0 ? _ref39 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id) !== null && _ref38 !== void 0 ? _ref38 : null,
-            bundle_variant_id: (_ref40 = (_bundle$bundle_varian2 = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_variant_id) !== null && _bundle$bundle_varian2 !== void 0 ? _bundle$bundle_varian2 : bundle === null || bundle === void 0 ? void 0 : bundle.product_variant_id) !== null && _ref40 !== void 0 ? _ref40 : 0,
+            bundle_id: (_ref39 = (_bundle$bundle_id = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_id) !== null && _bundle$bundle_id !== void 0 ? _bundle$bundle_id : bundle === null || bundle === void 0 ? void 0 : bundle.id) !== null && _ref39 !== void 0 ? _ref39 : null,
+            bundle_group_id: (_ref40 = (_bundle$bundle_group_ = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_group_id) !== null && _bundle$bundle_group_ !== void 0 ? _bundle$bundle_group_ : bundle === null || bundle === void 0 ? void 0 : bundle.group_id) !== null && _ref40 !== void 0 ? _ref40 : null,
+            bundle_product_id: (_ref41 = (_ref42 = (_bundle$bundle_produc2 = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_product_id) !== null && _bundle$bundle_produc2 !== void 0 ? _bundle$bundle_produc2 : bundle === null || bundle === void 0 ? void 0 : bundle._bundle_product_id) !== null && _ref42 !== void 0 ? _ref42 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id) !== null && _ref41 !== void 0 ? _ref41 : null,
+            bundle_variant_id: (_ref43 = (_bundle$bundle_varian2 = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_variant_id) !== null && _bundle$bundle_varian2 !== void 0 ? _bundle$bundle_varian2 : bundle === null || bundle === void 0 ? void 0 : bundle.product_variant_id) !== null && _ref43 !== void 0 ? _ref43 : 0,
             num: getSafeProductNum((_bundle$num2 = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num2 !== void 0 ? _bundle$num2 : bundle === null || bundle === void 0 ? void 0 : bundle.quantity),
             price_type: (_bundle$price_type2 = bundle === null || bundle === void 0 ? void 0 : bundle.price_type) !== null && _bundle$price_type2 !== void 0 ? _bundle$price_type2 : '',
             price_type_ext: (_bundle$price_type_ex2 = bundle === null || bundle === void 0 ? void 0 : bundle.price_type_ext) !== null && _bundle$price_type_ex2 !== void 0 ? _bundle$price_type_ex2 : '',
-            option: _this15.normalizeFingerprintValue(((bundle === null || bundle === void 0 ? void 0 : bundle.option) || []).map(function (option) {
-              var _ref41, _option$id3, _option$option_group_5, _ref42, _option$option_group_6, _option$num3, _option$add_price3;
+            option: _this16.normalizeFingerprintValue(((bundle === null || bundle === void 0 ? void 0 : bundle.option) || []).map(function (option) {
+              var _ref44, _option$id3, _option$option_group_5, _ref45, _option$option_group_6, _option$num3, _option$add_price3;
               return {
-                id: (_ref41 = (_option$id3 = option === null || option === void 0 ? void 0 : option.id) !== null && _option$id3 !== void 0 ? _option$id3 : option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _ref41 !== void 0 ? _ref41 : null,
+                id: (_ref44 = (_option$id3 = option === null || option === void 0 ? void 0 : option.id) !== null && _option$id3 !== void 0 ? _option$id3 : option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _ref44 !== void 0 ? _ref44 : null,
                 option_group_id: (_option$option_group_5 = option === null || option === void 0 ? void 0 : option.option_group_id) !== null && _option$option_group_5 !== void 0 ? _option$option_group_5 : null,
-                option_group_item_id: (_ref42 = (_option$option_group_6 = option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _option$option_group_6 !== void 0 ? _option$option_group_6 : option === null || option === void 0 ? void 0 : option.id) !== null && _ref42 !== void 0 ? _ref42 : null,
+                option_group_item_id: (_ref45 = (_option$option_group_6 = option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _option$option_group_6 !== void 0 ? _option$option_group_6 : option === null || option === void 0 ? void 0 : option.id) !== null && _ref45 !== void 0 ? _ref45 : null,
                 num: Number((_option$num3 = option === null || option === void 0 ? void 0 : option.num) !== null && _option$num3 !== void 0 ? _option$num3 : 1) || 1,
-                add_price: _this15.normalizeFingerprintMoney((_option$add_price3 = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price3 !== void 0 ? _option$add_price3 : option === null || option === void 0 ? void 0 : option.price)
+                add_price: _this16.normalizeFingerprintMoney((_option$add_price3 = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price3 !== void 0 ? _option$add_price3 : option === null || option === void 0 ? void 0 : option.price)
               };
             }))
           };
         })),
         discount_list: this.normalizeFingerprintValue(((product === null || product === void 0 ? void 0 : product.discount_list) || []).map(function (discount) {
-          var _ref43, _discount$type4, _ref44, _ref45, _discount$discount_id2, _discount$discount2;
+          var _ref46, _discount$type4, _ref47, _ref48, _discount$discount_id2, _discount$discount2;
           return {
-            type: (_ref43 = (_discount$type4 = discount === null || discount === void 0 ? void 0 : discount.type) !== null && _discount$type4 !== void 0 ? _discount$type4 : discount === null || discount === void 0 ? void 0 : discount.tag) !== null && _ref43 !== void 0 ? _ref43 : '',
-            discount_id: (_ref44 = (_ref45 = (_discount$discount_id2 = discount === null || discount === void 0 ? void 0 : discount.discount_id) !== null && _discount$discount_id2 !== void 0 ? _discount$discount_id2 : discount === null || discount === void 0 ? void 0 : discount.order_discount_id) !== null && _ref45 !== void 0 ? _ref45 : discount === null || discount === void 0 || (_discount$discount2 = discount.discount) === null || _discount$discount2 === void 0 ? void 0 : _discount$discount2.resource_id) !== null && _ref44 !== void 0 ? _ref44 : null,
-            amount: _this15.normalizeFingerprintMoney(discount === null || discount === void 0 ? void 0 : discount.amount)
+            type: (_ref46 = (_discount$type4 = discount === null || discount === void 0 ? void 0 : discount.type) !== null && _discount$type4 !== void 0 ? _discount$type4 : discount === null || discount === void 0 ? void 0 : discount.tag) !== null && _ref46 !== void 0 ? _ref46 : '',
+            discount_id: (_ref47 = (_ref48 = (_discount$discount_id2 = discount === null || discount === void 0 ? void 0 : discount.discount_id) !== null && _discount$discount_id2 !== void 0 ? _discount$discount_id2 : discount === null || discount === void 0 ? void 0 : discount.order_discount_id) !== null && _ref48 !== void 0 ? _ref48 : discount === null || discount === void 0 || (_discount$discount2 = discount.discount) === null || _discount$discount2 === void 0 ? void 0 : _discount$discount2.resource_id) !== null && _ref47 !== void 0 ? _ref47 : null,
+            amount: _this16.normalizeFingerprintMoney(discount === null || discount === void 0 ? void 0 : discount.amount)
           };
         }))
       };
@@ -2591,9 +2675,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildOrderProductsStructuralFingerprint",
     value: function buildOrderProductsStructuralFingerprint(products) {
-      var _this16 = this;
+      var _this17 = this;
       var items = (products || []).map(function (product) {
-        return _this16.buildProductStructuralFingerprintItem(product);
+        return _this17.buildProductStructuralFingerprintItem(product);
       });
       items.sort(function (left, right) {
         return JSON.stringify(left).localeCompare(JSON.stringify(right));
@@ -2909,11 +2993,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderIdentity",
     value: function getOrderIdentity() {
-      var _ref46, _ref47, _tempOrder$order_id, _tempOrder$_extend7;
+      var _ref49, _ref50, _tempOrder$order_id, _tempOrder$_extend7;
       var tempOrder = this.store.tempOrder;
       if (!tempOrder) return null;
       var lastOrderInfo = this.store.lastOrderInfo || {};
-      var orderId = (_ref46 = (_ref47 = (_tempOrder$order_id = tempOrder.order_id) !== null && _tempOrder$order_id !== void 0 ? _tempOrder$order_id : lastOrderInfo.order_id) !== null && _ref47 !== void 0 ? _ref47 : lastOrderInfo.id) !== null && _ref46 !== void 0 ? _ref46 : null;
+      var orderId = (_ref49 = (_ref50 = (_tempOrder$order_id = tempOrder.order_id) !== null && _tempOrder$order_id !== void 0 ? _tempOrder$order_id : lastOrderInfo.order_id) !== null && _ref50 !== void 0 ? _ref50 : lastOrderInfo.id) !== null && _ref49 !== void 0 ? _ref49 : null;
       return {
         localId: this.cacheId || ((_tempOrder$_extend7 = tempOrder._extend) === null || _tempOrder$_extend7 === void 0 ? void 0 : _tempOrder$_extend7.localId),
         orderId: orderId,
@@ -3045,9 +3129,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "sanitizeTempOrderProducts",
     value: function sanitizeTempOrderProducts(tempOrder) {
-      var _this17 = this;
+      var _this18 = this;
       tempOrder.products = (tempOrder.products || []).map(function (product) {
-        return _this17.sanitizeOrderProductForTempOrder(_this17.normalizeVirtualSettlementProductIfEnabled(product));
+        return _this18.sanitizeOrderProductForTempOrder(_this18.normalizeVirtualSettlementProductIfEnabled(product));
       });
       this.syncTempOrderSettlementState(tempOrder);
       ensureUniqueProductLineUids(tempOrder);
@@ -3083,11 +3167,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "captureProductRuntime",
     value: function captureProductRuntime(tempOrder, rawProduct, normalizedProduct, existedUid) {
-      var _extend$productsByUid, _ref48, _rawProduct$_origin;
+      var _extend$productsByUid, _ref51, _rawProduct$_origin;
       var uid = existedUid || this.getProductUid(normalizedProduct);
       var extend = this.ensureExtend(tempOrder);
       var existed = ((_extend$productsByUid = extend.productsByUid) === null || _extend$productsByUid === void 0 ? void 0 : _extend$productsByUid[uid]) || {};
-      var origin = (_ref48 = (_rawProduct$_origin = rawProduct._origin) !== null && _rawProduct$_origin !== void 0 ? _rawProduct$_origin : normalizedProduct._origin) !== null && _ref48 !== void 0 ? _ref48 : existed.origin;
+      var origin = (_ref51 = (_rawProduct$_origin = rawProduct._origin) !== null && _rawProduct$_origin !== void 0 ? _rawProduct$_origin : normalizedProduct._origin) !== null && _ref51 !== void 0 ? _ref51 : existed.origin;
       extend.productsByUid[uid] = _objectSpread(_objectSpread({}, existed), origin !== undefined ? {
         origin: origin
       } : {});
@@ -3167,7 +3251,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "syncLinkedBookingHoldersToProducts",
     value: function syncLinkedBookingHoldersToProducts(tempOrder) {
-      var _this18 = this;
+      var _this19 = this;
       var bookings = tempOrder.bookings || [];
       var products = tempOrder.products || [];
       if (!bookings.length || !products.length) return;
@@ -3176,6 +3260,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       bookings.forEach(function (booking) {
         var _booking$metadata2, _booking$metadata3;
         if (!booking || _typeof(booking) !== 'object') return;
+        if (isFulfillmentTimingBooking(booking)) return;
         var productUid = booking.product_uid || ((_booking$metadata2 = booking.metadata) === null || _booking$metadata2 === void 0 ? void 0 : _booking$metadata2.product_uid);
         if (productUid !== undefined && productUid !== null && String(productUid) !== '') {
           bookingByProductUid.set(String(productUid), booking);
@@ -3192,7 +3277,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         var bookingUid = product.booking_uid || ((_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.booking_uid);
         var linkedBooking = (productUid !== undefined && productUid !== null && String(productUid) !== '' ? bookingByProductUid.get(String(productUid)) : undefined) || (bookingUid !== undefined && bookingUid !== null && String(bookingUid) !== '' ? bookingByBookingUid.get(String(bookingUid)) : undefined);
         if (linkedBooking) {
-          _this18.setProductHolderFromBooking(product, linkedBooking);
+          _this19.setProductHolderFromBooking(product, linkedBooking);
         }
       });
     }
@@ -3230,7 +3315,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildTempOrderHolderFromBookings",
     value: function buildTempOrderHolderFromBookings(tempOrder) {
-      var _baseHolder$customer_, _baseHolder, _ref49, _baseHolder$form_id, _baseHolder2, _tempOrder$holder2, _baseHolder3, _this$otherParams2;
+      var _baseHolder$customer_, _baseHolder, _ref52, _baseHolder$form_id, _baseHolder2, _tempOrder$holder2, _baseHolder3, _this$otherParams2;
       var holderRecords = [];
       var holderNames = [];
       var baseHolder = null;
@@ -3240,6 +3325,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       try {
         for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
           var booking = _step18.value;
+          if (isFulfillmentTimingBooking(booking)) continue;
           var holder = booking !== null && booking !== void 0 && booking.holder && _typeof(booking.holder) === 'object' ? booking.holder : null;
           if (!baseHolder && holder) {
             baseHolder = holder;
@@ -3277,7 +3363,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       var nextHolder = {
         customer_id: (_baseHolder$customer_ = (_baseHolder = baseHolder) === null || _baseHolder === void 0 ? void 0 : _baseHolder.customer_id) !== null && _baseHolder$customer_ !== void 0 ? _baseHolder$customer_ : tempOrder.customer_id,
-        form_id: (_ref49 = (_baseHolder$form_id = (_baseHolder2 = baseHolder) === null || _baseHolder2 === void 0 ? void 0 : _baseHolder2.form_id) !== null && _baseHolder$form_id !== void 0 ? _baseHolder$form_id : (_tempOrder$holder2 = tempOrder.holder) === null || _tempOrder$holder2 === void 0 ? void 0 : _tempOrder$holder2.form_id) !== null && _ref49 !== void 0 ? _ref49 : 0,
+        form_id: (_ref52 = (_baseHolder$form_id = (_baseHolder2 = baseHolder) === null || _baseHolder2 === void 0 ? void 0 : _baseHolder2.form_id) !== null && _baseHolder$form_id !== void 0 ? _baseHolder$form_id : (_tempOrder$holder2 = tempOrder.holder) === null || _tempOrder$holder2 === void 0 ? void 0 : _tempOrder$holder2.form_id) !== null && _ref52 !== void 0 ? _ref52 : 0,
         form_record: holderRecords
       };
       if (holderNames.length) {
@@ -3298,7 +3384,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "syncTempOrderHolderFromBookings",
     value: function syncTempOrderHolderFromBookings(tempOrder) {
-      var bookings = tempOrder.bookings || [];
+      var bookings = (tempOrder.bookings || []).filter(function (booking) {
+        return !isFulfillmentTimingBooking(booking);
+      });
       var hasHolderSource = bookings.some(function (booking) {
         var _booking$metadata4;
         return (booking === null || booking === void 0 ? void 0 : booking.holder) !== undefined || (booking === null || booking === void 0 || (_booking$metadata4 = booking.metadata) === null || _booking$metadata4 === void 0 ? void 0 : _booking$metadata4.holder_id) !== undefined;
@@ -3320,9 +3408,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "findBookingIndexByUniqueIdentificationNumber",
     value: function findBookingIndexByUniqueIdentificationNumber(tempOrder, uniqueIdentificationNumber) {
-      var _this19 = this;
+      var _this20 = this;
       return (tempOrder.bookings || []).findIndex(function (booking) {
-        return _this19.getBookingUniqueIdentificationNumber(booking) === uniqueIdentificationNumber;
+        return _this20.getBookingUniqueIdentificationNumber(booking) === uniqueIdentificationNumber;
       });
     }
   }, {
@@ -3330,12 +3418,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function removeLinkedBookingsForProduct(tempOrder, product) {
       var _product$metadata5,
         _product$metadata6,
-        _this20 = this;
+        _this21 = this;
       var productUid = (product === null || product === void 0 || (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
       var bookingUid = (product === null || product === void 0 ? void 0 : product.booking_uid) || (product === null || product === void 0 || (_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.booking_uid);
       if (!productUid && !bookingUid) return;
       tempOrder.bookings = (tempOrder.bookings || []).filter(function (booking) {
-        var currentBookingUid = _this20.getBookingUniqueIdentificationNumber(booking);
+        if (isFulfillmentTimingBooking(booking)) return true;
+        var currentBookingUid = _this21.getBookingUniqueIdentificationNumber(booking);
         if (bookingUid && currentBookingUid === String(bookingUid)) return false;
         if (productUid && String((booking === null || booking === void 0 ? void 0 : booking.product_uid) || '') === String(productUid)) return false;
         return true;
@@ -3382,7 +3471,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "recalculateSummary",
     value: function () {
       var _recalculateSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(options) {
-        var _this$otherParams3, _ref50, _salesSummaryResult$e;
+        var _this$otherParams3, _ref53, _salesSummaryResult$e;
         var tempOrder, originalSnapshot, hasShopDiscountChanged, shouldReuseOriginalSnapshot, snapshotSummary, shouldFullRecalculateFromSnapshot, summaryProducts, salesSummary, existedSummary, totalRefundAmount, paidPaymentSummary, emptyBaseSummary, emptySummaryBase, emptySummaryWithDeposit, emptySummary, salesSummaryResult, roundingAmount, payServiceChargeAmount, hasSalesSummaryAmount, expectAmount, amountPaymentPatch, normalizedExpectAmountPatch, summaryForGap, summary;
         return _regeneratorRuntime().wrap(function _callee13$(_context15) {
           while (1) switch (_context15.prev = _context15.next) {
@@ -3461,7 +3550,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               roundingAmount = paidPaymentSummary.roundingAmount;
               payServiceChargeAmount = paidPaymentSummary.payServiceChargeAmount;
               hasSalesSummaryAmount = salesSummaryResult.expect_amount !== undefined || salesSummaryResult.total_amount !== undefined;
-              expectAmount = hasSalesSummaryAmount ? new Decimal((_ref50 = (_salesSummaryResult$e = salesSummaryResult.expect_amount) !== null && _salesSummaryResult$e !== void 0 ? _salesSummaryResult$e : salesSummaryResult.total_amount) !== null && _ref50 !== void 0 ? _ref50 : 0) : null;
+              expectAmount = hasSalesSummaryAmount ? new Decimal((_ref53 = (_salesSummaryResult$e = salesSummaryResult.expect_amount) !== null && _salesSummaryResult$e !== void 0 ? _salesSummaryResult$e : salesSummaryResult.total_amount) !== null && _ref53 !== void 0 ? _ref53 : 0) : null;
               amountPaymentPatch = hasSalesSummaryAmount || !roundingAmount.eq(0) || !payServiceChargeAmount.eq(0) ? _objectSpread({
                 rounding_amount: roundingAmount.toFixed(2)
               }, expectAmount ? {
@@ -3584,8 +3673,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getTempOrderNote",
     value: function getTempOrderNote() {
-      var _this$store$tempOrder4;
-      return ((_this$store$tempOrder4 = this.store.tempOrder) === null || _this$store$tempOrder4 === void 0 ? void 0 : _this$store$tempOrder4.note) || '';
+      var _this$store$tempOrder6;
+      return ((_this$store$tempOrder6 = this.store.tempOrder) === null || _this$store$tempOrder6 === void 0 ? void 0 : _this$store$tempOrder6.note) || '';
     }
   }, {
     key: "ensureSalesNotesRuntimeState",
@@ -3637,7 +3726,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "removeSalesNotesForMissingProductLines",
     value: function removeSalesNotesForMissingProductLines(tempOrder) {
-      var _this21 = this;
+      var _this22 = this;
       var state = this.ensureSalesNotesRuntimeState(tempOrder);
       if (!state.loaded || !Array.isArray(tempOrder.notes) || tempOrder.notes.length === 0) {
         return;
@@ -3649,7 +3738,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         return typeof uid === 'string' && uid.length > 0;
       }));
       var nextNotes = tempOrder.notes.filter(function (note) {
-        var primary = _this21.getSalesNotePrimaryRelation(note);
+        var primary = _this22.getSalesNotePrimaryRelation(note);
         if (!primary || primary.target_type !== 'order_detail') return true;
         return remainingProductUids.has(primary.target_uuid);
       });
@@ -3661,7 +3750,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "setSalesNoteOnTempOrder",
     value: function setSalesNoteOnTempOrder(tempOrder, input) {
       var _input$target,
-        _this22 = this,
+        _this23 = this,
         _tempOrder$shop_order;
       this.ensureSalesNotesLoadedForMutation(tempOrder);
       var note_type = String(input.note_type || '').trim();
@@ -3685,7 +3774,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var notes = tempOrder.notes || [];
       // 当前 allergy policy 固定同一商品行只保留一条；业务调用方不参与去重规则。
       var existingIndex = policy.uniquePerPrimaryTarget ? notes.findIndex(function (note) {
-        var primary = _this22.getSalesNotePrimaryRelation(note);
+        var primary = _this23.getSalesNotePrimaryRelation(note);
         return note.note_type === note_type && (primary === null || primary === void 0 ? void 0 : primary.target_type) === 'order_detail' && primary.target_uuid === target_uuid;
       }) : -1;
       var existing = existingIndex >= 0 ? notes[existingIndex] : null;
@@ -3922,10 +4011,47 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateTempOrderServiceType",
     value: function updateTempOrderServiceType(serviceType) {
+      if (serviceType !== 'pick_up') {
+        var tempOrder = this.ensureTempOrder();
+        tempOrder.bookings = (tempOrder.bookings || []).filter(function (booking) {
+          return !isFulfillmentTimingBooking(booking);
+        });
+      }
       return this.updateTempOrderShopServiceData({
         service_type: serviceType
       });
     }
+  }, {
+    key: "getPickupTimingBooking",
+    value: function getPickupTimingBooking() {
+      var _this$store$tempOrder7;
+      return (((_this$store$tempOrder7 = this.store.tempOrder) === null || _this$store$tempOrder7 === void 0 ? void 0 : _this$store$tempOrder7.bookings) || []).find(isFulfillmentTimingBooking) || null;
+    }
+  }, {
+    key: "setPickupTimingBooking",
+    value: function setPickupTimingBooking(input) {
+      var tempOrder = this.ensureTempOrder();
+      var bookings = tempOrder.bookings || [];
+      var firstIndex = bookings.findIndex(isFulfillmentTimingBooking);
+      var nextBooking = buildPickupTimingBooking(input, bookings[firstIndex]);
+      // Keep the first row's identity and position; repair duplicate marked rows only.
+      tempOrder.bookings = firstIndex === -1 ? [].concat(_toConsumableArray(bookings), [nextBooking]) : bookings.flatMap(function (booking, index) {
+        return index === firstIndex ? [nextBooking] : isFulfillmentTimingBooking(booking) ? [] : [booking];
+      });
+      this.notifyTempOrderChanged();
+      return nextBooking;
+    }
+  }, {
+    key: "clearPickupTimingBooking",
+    value: function clearPickupTimingBooking() {
+      var _tempOrder$bookings;
+      var tempOrder = this.store.tempOrder;
+      if (!(tempOrder !== null && tempOrder !== void 0 && (_tempOrder$bookings = tempOrder.bookings) !== null && _tempOrder$bookings !== void 0 && _tempOrder$bookings.some(isFulfillmentTimingBooking))) return;
+      tempOrder.bookings = tempOrder.bookings.filter(function (booking) {
+        return !isFulfillmentTimingBooking(booking);
+      });
+      this.notifyTempOrderChanged();
+    }
   }, {
     key: "updateTempOrderContactsInfo",
     value: function updateTempOrderContactsInfo(contactsInfo) {
@@ -3937,17 +4063,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildTempOrderCustomer",
     value: function buildTempOrderCustomer(params) {
-      var _ref51, _ref52, _ref53, _source$name, _ref54, _ref55, _ref56, _source$customer_name, _source$id, _source$customer_id, _ref57, _source$country_calli, _source$phone, _source$email;
+      var _ref54, _ref55, _ref56, _source$name, _ref57, _ref58, _ref59, _source$customer_name, _source$id, _source$customer_id, _ref60, _source$country_calli, _source$phone, _source$email;
       if (!params.customerId) return null;
       var source = params.source ? cloneDeep(params.source) : {};
-      var name = (_ref51 = (_ref52 = (_ref53 = (_source$name = source.name) !== null && _source$name !== void 0 ? _source$name : source.display_name) !== null && _ref53 !== void 0 ? _ref53 : source.customerName) !== null && _ref52 !== void 0 ? _ref52 : source.customer_name) !== null && _ref51 !== void 0 ? _ref51 : params.customerName;
-      var customerName = (_ref54 = (_ref55 = (_ref56 = (_source$customer_name = source.customer_name) !== null && _source$customer_name !== void 0 ? _source$customer_name : source.customerName) !== null && _ref56 !== void 0 ? _ref56 : source.display_name) !== null && _ref55 !== void 0 ? _ref55 : source.name) !== null && _ref54 !== void 0 ? _ref54 : params.customerName;
+      var name = (_ref54 = (_ref55 = (_ref56 = (_source$name = source.name) !== null && _source$name !== void 0 ? _source$name : source.display_name) !== null && _ref56 !== void 0 ? _ref56 : source.customerName) !== null && _ref55 !== void 0 ? _ref55 : source.customer_name) !== null && _ref54 !== void 0 ? _ref54 : params.customerName;
+      var customerName = (_ref57 = (_ref58 = (_ref59 = (_source$customer_name = source.customer_name) !== null && _source$customer_name !== void 0 ? _source$customer_name : source.customerName) !== null && _ref59 !== void 0 ? _ref59 : source.display_name) !== null && _ref58 !== void 0 ? _ref58 : source.name) !== null && _ref57 !== void 0 ? _ref57 : params.customerName;
       return _objectSpread(_objectSpread({}, source), {}, {
         id: (_source$id = source.id) !== null && _source$id !== void 0 ? _source$id : params.customerId,
         customer_id: (_source$customer_id = source.customer_id) !== null && _source$customer_id !== void 0 ? _source$customer_id : params.customerId,
         name: String(name || ''),
         customer_name: String(customerName || ''),
-        country_calling_code: String((_ref57 = (_source$country_calli = source.country_calling_code) !== null && _source$country_calli !== void 0 ? _source$country_calli : source.countryCallingCode) !== null && _ref57 !== void 0 ? _ref57 : params.countryCallingCode),
+        country_calling_code: String((_ref60 = (_source$country_calli = source.country_calling_code) !== null && _source$country_calli !== void 0 ? _source$country_calli : source.countryCallingCode) !== null && _ref60 !== void 0 ? _ref60 : params.countryCallingCode),
         phone: String((_source$phone = source.phone) !== null && _source$phone !== void 0 ? _source$phone : params.phone),
         email: String((_source$email = source.email) !== null && _source$email !== void 0 ? _source$email : params.email)
       });
@@ -3967,15 +4093,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "productHasCustomerBoundDiscount",
     value: function productHasCustomerBoundDiscount(product) {
-      var _this23 = this;
+      var _this24 = this;
       if (((product === null || product === void 0 ? void 0 : product.discount_list) || []).some(function (discount) {
-        return _this23.isCustomerBoundDiscount(discount);
+        return _this24.isCustomerBoundDiscount(discount);
       })) {
         return true;
       }
       return ((product === null || product === void 0 ? void 0 : product.product_bundle) || []).some(function (bundle) {
         return ((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []).some(function (discount) {
-          return _this23.isCustomerBoundDiscount(discount);
+          return _this24.isCustomerBoundDiscount(discount);
         });
       });
     }
@@ -3984,18 +4110,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function shouldSkipDiscountCalculation(tempOrder) {
       var _this$store$discount20,
         _this$store$discount21,
-        _this24 = this;
+        _this25 = this;
       if (this.hasActiveCustomerBoundDiscount) return false;
       var discountList = ((_this$store$discount20 = this.store.discount) === null || _this$store$discount20 === void 0 || (_this$store$discount21 = _this$store$discount20.getDiscountList) === null || _this$store$discount21 === void 0 ? void 0 : _this$store$discount21.call(_this$store$discount20)) || [];
       if (discountList.length > 0) return false;
       return !(tempOrder.products || []).some(function (product) {
-        return _this24.productHasCustomerBoundDiscount(product);
+        return _this25.productHasCustomerBoundDiscount(product);
       });
     }
   }, {
     key: "clearCustomerBoundDiscounts",
     value: function clearCustomerBoundDiscounts(tempOrder) {
-      var _this25 = this,
+      var _this26 = this,
         _discountModule$getDi,
         _discountModule$getOr,
         _discountModule$setDi,
@@ -4004,7 +4130,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var filterDiscountList = function filterDiscountList(discountList) {
         if (!Array.isArray(discountList)) return [];
         return discountList.filter(function (discount) {
-          var shouldRemove = _this25.isCustomerBoundDiscount(discount);
+          var shouldRemove = _this26.isCustomerBoundDiscount(discount);
           if (shouldRemove) didRemoveCustomerBoundDiscount = true;
           return !shouldRemove;
         });
@@ -4031,12 +4157,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var currentDiscounts = ((_discountModule$getDi = discountModule.getDiscountList) === null || _discountModule$getDi === void 0 ? void 0 : _discountModule$getDi.call(discountModule)) || [];
       var currentOriginalDiscounts = ((_discountModule$getOr = discountModule.getOriginalDiscountList) === null || _discountModule$getOr === void 0 ? void 0 : _discountModule$getOr.call(discountModule)) || [];
       var nextDiscounts = currentDiscounts.filter(function (discount) {
-        if (_this25.shouldKeepCustomerBoundDiscountAfterCustomerChange(discount)) return true;
-        return !_this25.isCustomerBoundDiscount(discount);
+        if (_this26.shouldKeepCustomerBoundDiscountAfterCustomerChange(discount)) return true;
+        return !_this26.isCustomerBoundDiscount(discount);
       });
       var nextOriginalDiscounts = currentOriginalDiscounts.filter(function (discount) {
-        if (_this25.shouldKeepCustomerBoundDiscountAfterCustomerChange(discount)) return true;
-        return !_this25.isCustomerBoundDiscount(discount);
+        if (_this26.shouldKeepCustomerBoundDiscountAfterCustomerChange(discount)) return true;
+        return !_this26.isCustomerBoundDiscount(discount);
       });
       void ((_discountModule$setDi = discountModule.setDiscountList) === null || _discountModule$setDi === void 0 ? void 0 : _discountModule$setDi.call(discountModule, nextDiscounts));
       void ((_discountModule$setOr = discountModule.setOriginalDiscountList) === null || _discountModule$setOr === void 0 ? void 0 : _discountModule$setOr.call(discountModule, nextOriginalDiscounts));
@@ -4051,14 +4177,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateTempOrderCustomer",
     value: function updateTempOrderCustomer(customer) {
-      var _tempOrder$customer_i3, _ref58, _ref59, _customer$customer_id, _ref60, _ref61, _ref62, _customer$customer_na, _ref63, _customer$country_cal, _tempOrder$customer_i4;
+      var _tempOrder$customer_i3, _ref61, _ref62, _customer$customer_id, _ref63, _ref64, _ref65, _customer$customer_na, _ref66, _customer$country_cal, _tempOrder$customer_i4;
       var tempOrder = this.ensureTempOrder();
       var previousCustomerId = (_tempOrder$customer_i3 = tempOrder.customer_id) !== null && _tempOrder$customer_i3 !== void 0 ? _tempOrder$customer_i3 : null;
-      var customerId = (_ref58 = (_ref59 = (_customer$customer_id = customer.customer_id) !== null && _customer$customer_id !== void 0 ? _customer$customer_id : customer.customerId) !== null && _ref59 !== void 0 ? _ref59 : customer.id) !== null && _ref58 !== void 0 ? _ref58 : null;
-      var customerName = (_ref60 = (_ref61 = (_ref62 = (_customer$customer_na = customer.customer_name) !== null && _customer$customer_na !== void 0 ? _customer$customer_na : customer.customerName) !== null && _ref62 !== void 0 ? _ref62 : customer.display_name) !== null && _ref61 !== void 0 ? _ref61 : customer.name) !== null && _ref60 !== void 0 ? _ref60 : '';
+      var customerId = (_ref61 = (_ref62 = (_customer$customer_id = customer.customer_id) !== null && _customer$customer_id !== void 0 ? _customer$customer_id : customer.customerId) !== null && _ref62 !== void 0 ? _ref62 : customer.id) !== null && _ref61 !== void 0 ? _ref61 : null;
+      var customerName = (_ref63 = (_ref64 = (_ref65 = (_customer$customer_na = customer.customer_name) !== null && _customer$customer_na !== void 0 ? _customer$customer_na : customer.customerName) !== null && _ref65 !== void 0 ? _ref65 : customer.display_name) !== null && _ref64 !== void 0 ? _ref64 : customer.name) !== null && _ref63 !== void 0 ? _ref63 : '';
       tempOrder.customer_id = customerId === null || customerId === undefined || customerId === '' ? null : Number(customerId);
       tempOrder.customer_name = String(customerName || '');
-      tempOrder.country_calling_code = String((_ref63 = (_customer$country_cal = customer.country_calling_code) !== null && _customer$country_cal !== void 0 ? _customer$country_cal : customer.countryCallingCode) !== null && _ref63 !== void 0 ? _ref63 : '');
+      tempOrder.country_calling_code = String((_ref66 = (_customer$country_cal = customer.country_calling_code) !== null && _customer$country_cal !== void 0 ? _customer$country_cal : customer.countryCallingCode) !== null && _ref66 !== void 0 ? _ref66 : '');
       tempOrder.phone = String(customer.phone || '');
       tempOrder.email = String(customer.email || '');
       tempOrder.customer = this.buildTempOrderCustomer({
@@ -4139,8 +4265,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderCustomerSnapshot",
     value: function getOrderCustomerSnapshot() {
-      var _this$store$tempOrder5;
-      var snapshot = (_this$store$tempOrder5 = this.store.tempOrder) === null || _this$store$tempOrder5 === void 0 || (_this$store$tempOrder5 = _this$store$tempOrder5._extend) === null || _this$store$tempOrder5 === void 0 ? void 0 : _this$store$tempOrder5.customerSnapshot;
+      var _this$store$tempOrder8;
+      var snapshot = (_this$store$tempOrder8 = this.store.tempOrder) === null || _this$store$tempOrder8 === void 0 || (_this$store$tempOrder8 = _this$store$tempOrder8._extend) === null || _this$store$tempOrder8 === void 0 ? void 0 : _this$store$tempOrder8.customerSnapshot;
       return snapshot ? cloneDeep(snapshot) : null;
     }
   }, {
@@ -4200,10 +4326,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setOrderPayments",
     value: function setOrderPayments(payments) {
-      var _this26 = this;
+      var _this27 = this;
       var tempOrder = this.ensureTempOrder();
       tempOrder.payments = mapPaymentItemsToOrderPayments((payments || []).map(function (payment) {
-        return _this26.normalizePaymentSource(payment, {
+        return _this27.normalizePaymentSource(payment, {
           defaultPaid: false
         });
       }));
@@ -4258,7 +4384,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addOrderPaymentWithDevicePrefix",
     value: function addOrderPaymentWithDevicePrefix(payment, devicePrefix) {
-      var _this27 = this;
+      var _this28 = this;
       this.logInfo('addOrderPayment', {
         payment: payment
       });
@@ -4276,7 +4402,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       void this.recalculateSummary({
         createIfMissing: true
       }).catch(function (error) {
-        _this27.logError('recalculate summary after addOrderPayment failed', {
+        _this28.logError('recalculate summary after addOrderPayment failed', {
           error: error instanceof Error ? error.message : String(error)
         });
       });
@@ -4389,7 +4515,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "applyPaymentLifecycleChange",
     value: function applyPaymentLifecycleChange(tempOrder, options) {
-      var _this28 = this;
+      var _this29 = this;
       this.updateTempOrderPaymentStatus(tempOrder);
       if ((options === null || options === void 0 ? void 0 : options.persist) !== false) {
         this.persistTempOrder();
@@ -4399,7 +4525,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       void this.recalculateSummary({
         createIfMissing: true
       }).catch(function (error) {
-        _this28.logError("recalculate summary after ".concat(logContext, " failed"), {
+        _this29.logError("recalculate summary after ".concat(logContext, " failed"), {
           error: error instanceof Error ? error.message : String(error)
         });
       });
@@ -4443,7 +4569,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateVoucherOrderPayments",
     value: function updateVoucherOrderPayments(payments, options) {
-      var _this29 = this;
+      var _this30 = this;
       var tempOrder = this.ensureTempOrder();
       var isOrderPaymentType = function isOrderPaymentType(value) {
         return value === 'normal' || value === 'deposit';
@@ -4478,7 +4604,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         });
       };
       var mappedVouchers = mapPaymentItemsToOrderPayments(payments.map(function (payment) {
-        return _this29.normalizePaymentSource(normalizeVoucherPaymentStatus(withVoucherPaymentType(payment)), {
+        return _this30.normalizePaymentSource(normalizeVoucherPaymentStatus(withVoucherPaymentType(payment)), {
           defaultPaid: false,
           devicePrefix: options === null || options === void 0 ? void 0 : options.devicePrefix
         });
@@ -4531,7 +4657,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       void this.recalculateSummary({
         createIfMissing: true
       }).catch(function (error) {
-        _this29.logError('recalculate summary after updateVoucherOrderPayments failed', {
+        _this30.logError('recalculate summary after updateVoucherOrderPayments failed', {
           error: error instanceof Error ? error.message : String(error)
         });
       });
@@ -4589,7 +4715,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "shouldMergeProductToOrder",
     value: function shouldMergeProductToOrder(params) {
       var _this$orderHooks,
-        _this30 = this;
+        _this31 = this;
       var onBeforeMergeProductToOrder = (_this$orderHooks = this.orderHooks) === null || _this$orderHooks === void 0 ? void 0 : _this$orderHooks.onBeforeMergeProductToOrder;
       if (!onBeforeMergeProductToOrder) return true;
       var result = onBeforeMergeProductToOrder(_objectSpread(_objectSpread({}, params), {}, {
@@ -4597,7 +4723,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }));
       if (result && _typeof(result) === 'object' && typeof result.then === 'function') {
         return Promise.resolve(result).then(function (resolved) {
-          return _this30.normalizeShouldMergeProductResult(resolved);
+          return _this31.normalizeShouldMergeProductResult(resolved);
         });
       }
       return this.normalizeShouldMergeProductResult(result);
@@ -4646,7 +4772,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "assertAndLockProductSettlement",
     value: function assertAndLockProductSettlement(tempOrder, product) {
-      var _ref64, _ref65, _product$selling_pric;
+      var _ref67, _ref68, _product$selling_pric;
       if (!this.isMultiCurrencySettlementEnabled()) return;
       var currentKey = getTempOrderSettlementKey(tempOrder);
       var incomingKey = getSettlementKey(getSelectedSettlementSnapshot(product)) || 'legal_currency';
@@ -4673,7 +4799,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       applyTempOrderSettlementState(tempOrder, snapshot || {
         settlement_type: 'legal_currency',
-        price: (_ref64 = (_ref65 = (_product$selling_pric = product.selling_price) !== null && _product$selling_pric !== void 0 ? _product$selling_pric : product.original_price) !== null && _ref65 !== void 0 ? _ref65 : product.payment_price) !== null && _ref64 !== void 0 ? _ref64 : 0,
+        price: (_ref67 = (_ref68 = (_product$selling_pric = product.selling_price) !== null && _product$selling_pric !== void 0 ? _product$selling_pric : product.original_price) !== null && _ref68 !== void 0 ? _ref68 : product.payment_price) !== null && _ref67 !== void 0 ? _ref67 : 0,
         unit_label: tempOrder.currency_code,
         symbol: tempOrder.currency_symbol,
         amount_format: tempOrder.currency_format
@@ -4798,7 +4924,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _metadata,
         _productToAdd$metadat,
         _origin,
-        _this31 = this;
+        _this32 = this;
       var linked = booking ? this.createLinkedProductAndBooking({
         product: product,
         booking: booking
@@ -4834,26 +4960,26 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var isIncomingCustomItem = ((_productToAdd$metadat = productToAdd.metadata) === null || _productToAdd$metadat === void 0 || (_productToAdd$metadat = _productToAdd$metadat.origin) === null || _productToAdd$metadat === void 0 ? void 0 : _productToAdd$metadat.isCustomItem) === true || ((_origin = productToAdd._origin) === null || _origin === void 0 ? void 0 : _origin.isCustomItem) === true;
       var shouldForceNewLine = disableMerge || !!booking || hasIncomingGoodPass || isIncomingPersistedEntitlementPass || hasIncomingBookingUid || isIncomingCustomItem || isWeighingProduct;
       var matchedIndex = shouldForceNewLine ? -1 : tempOrder.products.findIndex(function (item) {
-        if (_this31.hasGoodPassDiscount(item)) return false;
-        var isRuntimeEntitlementPass = _this31.isRuntimeEntitlementAppend(item, tempOrder);
+        if (_this32.hasGoodPassDiscount(item)) return false;
+        var isRuntimeEntitlementPass = _this32.isRuntimeEntitlementAppend(item, tempOrder);
         if (isIncomingEntitlementAppend !== isRuntimeEntitlementPass) {
           return false;
         }
-        if (isIncomingEntitlementAppend && _this31.isPersistedProductLine(item)) {
+        if (isIncomingEntitlementAppend && _this32.isPersistedProductLine(item)) {
           return false;
         }
-        var hasExistingProductNote = _this31.hasOrderProductLineNote(item);
+        var hasExistingProductNote = _this32.hasOrderProductLineNote(item);
         if ((hasIncomingProductNote || hasExistingProductNote) && (!isRuntimeEntitlementPass || String(normalizedIncoming.note || '').trim() !== String(item.note || '').trim())) {
           return false;
         }
         var hasExistingManualProductDiscount = isManualProductDiscountProduct(item);
-        if (isRuntimeEntitlementPass && !_this31.hasSameEntitlementMergePriceConfig(normalizedIncoming, item)) {
+        if (isRuntimeEntitlementPass && !_this32.hasSameEntitlementMergePriceConfig(normalizedIncoming, item)) {
           return false;
         }
         if ((hasIncomingManualProductDiscount || hasExistingManualProductDiscount) && !isRuntimeEntitlementPass) {
           return false;
         }
-        if (_this31.isPersistedProductLine(item)) return false;
+        if (_this32.isPersistedProductLine(item)) return false;
         if (item.product_id !== productToAdd.product_id) return false;
         if (item.product_variant_id !== productToAdd.product_variant_id) return false;
         var existedFingerprint = buildProductLineFingerprint(getProductSkuOptions(item), item.product_bundle);
@@ -4864,7 +4990,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var commitProductLine = function commitProductLine(shouldMerge) {
         var committedProduct;
         if (matchedIndex === -1 || !matchedProduct || !shouldMerge) {
-          _this31.captureProductRuntime(tempOrder, productToAdd, normalizedIncoming);
+          _this32.captureProductRuntime(tempOrder, productToAdd, normalizedIncoming);
           if (linked) {
             normalizedIncoming.booking_uid = linked.bookingUid;
             normalizedIncoming.metadata = _objectSpread(_objectSpread({}, normalizedIncoming.metadata || {}), {}, {
@@ -4882,7 +5008,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           var _targetProduct$metada;
           var targetProduct = matchedProduct;
           var targetUid = (_targetProduct$metada = targetProduct.metadata) === null || _targetProduct$metada === void 0 ? void 0 : _targetProduct$metada.unique_identification_number;
-          var normalizedProduct = _this31.normalizeVirtualSettlementProductIfEnabled(mergeOrderProductDisplayFields(targetProduct, normalizeOrderProduct(_objectSpread(_objectSpread({}, productToAdd), {}, {
+          var normalizedProduct = _this32.normalizeVirtualSettlementProductIfEnabled(mergeOrderProductDisplayFields(targetProduct, normalizeOrderProduct(_objectSpread(_objectSpread({}, productToAdd), {}, {
             metadata: _objectSpread(_objectSpread({}, productToAdd.metadata || {}), {}, {
               unique_identification_number: targetUid
             })
@@ -4905,7 +5031,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             order_detail_id: targetProduct.order_detail_id,
             num: nextNum
           });
-          _this31.captureProductRuntime(tempOrder, productToAdd, tempOrder.products[matchedIndex], targetUid);
+          _this32.captureProductRuntime(tempOrder, productToAdd, tempOrder.products[matchedIndex], targetUid);
           committedProduct = tempOrder.products[matchedIndex];
           if (matchedIndex !== tempOrder.products.length - 1) {
             var mergedProduct = tempOrder.products[matchedIndex];
@@ -4943,14 +5069,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "createSplitBookingLine",
     value: function createSplitBookingLine(product, booking, index, splitCount) {
-      var _booking$metadata6, _ref66, _ref67, _bookingHolder$form_r, _booking$metadata7, _product$metadata10, _bookingHolder$name, _singleBooking$metada;
+      var _booking$metadata6, _ref69, _ref70, _bookingHolder$form_r, _booking$metadata7, _product$metadata10, _bookingHolder$name, _singleBooking$metada;
       var singleLine = cloneDeep(product);
       singleLine.num = 1;
       delete singleLine.product_quantity;
       var singleBooking = cloneDeep(booking);
       var bookingHolder = booking !== null && booking !== void 0 && booking.holder && _typeof(booking.holder) === 'object' ? booking.holder : null;
       var metadataHolder = booking !== null && booking !== void 0 && (_booking$metadata6 = booking.metadata) !== null && _booking$metadata6 !== void 0 && _booking$metadata6.holder && _typeof(booking.metadata.holder) === 'object' ? booking.metadata.holder : null;
-      var rawHolderIds = (_ref66 = (_ref67 = (_bookingHolder$form_r = bookingHolder === null || bookingHolder === void 0 ? void 0 : bookingHolder.form_record) !== null && _bookingHolder$form_r !== void 0 ? _bookingHolder$form_r : booking === null || booking === void 0 || (_booking$metadata7 = booking.metadata) === null || _booking$metadata7 === void 0 ? void 0 : _booking$metadata7.holder_id) !== null && _ref67 !== void 0 ? _ref67 : metadataHolder === null || metadataHolder === void 0 ? void 0 : metadataHolder.form_record) !== null && _ref66 !== void 0 ? _ref66 : product === null || product === void 0 || (_product$metadata10 = product.metadata) === null || _product$metadata10 === void 0 ? void 0 : _product$metadata10.holder_id;
+      var rawHolderIds = (_ref69 = (_ref70 = (_bookingHolder$form_r = bookingHolder === null || bookingHolder === void 0 ? void 0 : bookingHolder.form_record) !== null && _bookingHolder$form_r !== void 0 ? _bookingHolder$form_r : booking === null || booking === void 0 || (_booking$metadata7 = booking.metadata) === null || _booking$metadata7 === void 0 ? void 0 : _booking$metadata7.holder_id) !== null && _ref70 !== void 0 ? _ref70 : metadataHolder === null || metadataHolder === void 0 ? void 0 : metadataHolder.form_record) !== null && _ref69 !== void 0 ? _ref69 : product === null || product === void 0 || (_product$metadata10 = product.metadata) === null || _product$metadata10 === void 0 ? void 0 : _product$metadata10.holder_id;
       var holderIds = (Array.isArray(rawHolderIds) ? rawHolderIds : [rawHolderIds]).map(function (holderId) {
         return holderId && _typeof(holderId) === 'object' ? holderId.form_record_id : holderId;
       }).filter(function (holderId) {
@@ -5015,8 +5141,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "addProductToOrder",
     value: (function () {
       var _addProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(product, booking, options) {
-        var _this32 = this;
-        var tempOrder, salesNoteDrafts, mutationSnapshot, attachSalesNoteDrafts, rollbackProductAndNotesMutation, insertAfterProductUid, anchorIndex, insertAtIndex, _ref68, _productRecord$num, productRecord, splitCount, i, splitLine, committedProduct, _committedProduct, _committedProduct2;
+        var _this33 = this;
+        var tempOrder, salesNoteDrafts, mutationSnapshot, attachSalesNoteDrafts, rollbackProductAndNotesMutation, insertAfterProductUid, anchorIndex, insertAtIndex, _ref71, _productRecord$num, productRecord, splitCount, i, splitLine, committedProduct, _committedProduct, _committedProduct2;
         return _regeneratorRuntime().wrap(function _callee23$(_context25) {
           while (1) switch (_context25.prev = _context25.next) {
             case 0:
@@ -5044,7 +5170,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   throw new Error('[Order Notes] 商品行缺少 unique_identification_number');
                 }
                 salesNoteDrafts.forEach(function (draft) {
-                  _this32.setSalesNoteOnTempOrder(tempOrder, {
+                  _this33.setSalesNoteOnTempOrder(tempOrder, {
                     note_type: draft.note_type,
                     target: {
                       target_type: 'order_detail',
@@ -5074,7 +5200,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 break;
               }
               productRecord = product;
-              splitCount = getSafeProductNum((_ref68 = (_productRecord$num = productRecord.num) !== null && _productRecord$num !== void 0 ? _productRecord$num : productRecord.product_quantity) !== null && _ref68 !== void 0 ? _ref68 : 1);
+              splitCount = getSafeProductNum((_ref71 = (_productRecord$num = productRecord.num) !== null && _productRecord$num !== void 0 ? _productRecord$num : productRecord.product_quantity) !== null && _ref71 !== void 0 ? _ref71 : 1);
               if (!(splitCount > 1)) {
                 _context25.next = 27;
                 break;
@@ -5179,7 +5305,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "addProductsToOrder",
     value: (function () {
       var _addProductsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(items, options) {
-        var tempOrder, _iterator20, _step20, item, product, booking, _ref69, _productRecord$num2, productRecord, splitCount, i, splitLine, _appendResult, appendResult;
+        var tempOrder, _iterator20, _step20, item, product, booking, _ref72, _productRecord$num2, productRecord, splitCount, i, splitLine, _appendResult, appendResult;
         return _regeneratorRuntime().wrap(function _callee24$(_context26) {
           while (1) switch (_context26.prev = _context26.next) {
             case 0:
@@ -5211,7 +5337,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 break;
               }
               productRecord = product;
-              splitCount = getSafeProductNum((_ref69 = (_productRecord$num2 = productRecord.num) !== null && _productRecord$num2 !== void 0 ? _productRecord$num2 : productRecord.product_quantity) !== null && _ref69 !== void 0 ? _ref69 : 1);
+              splitCount = getSafeProductNum((_ref72 = (_productRecord$num2 = productRecord.num) !== null && _productRecord$num2 !== void 0 ? _productRecord$num2 : productRecord.product_quantity) !== null && _ref72 !== void 0 ? _ref72 : 1);
               if (!(splitCount > 1)) {
                 _context26.next = 26;
                 break;
@@ -5324,26 +5450,26 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "hasSameEntitlementMergePriceConfig",
     value: function hasSameEntitlementMergePriceConfig(incoming, existing) {
-      var _this33 = this;
+      var _this34 = this;
       var buildPriceConfig = function buildPriceConfig(product) {
         var metadata = product.metadata || {};
         var bundle = (product.product_bundle || []).map(function (item) {
-          var _ref70, _item$bundle_id, _ref71, _ref72, _item$bundle_product_, _ref73, _item$bundle_variant_, _ref74, _item$price_type, _ref75, _item$price_type_ext;
+          var _ref73, _item$bundle_id, _ref74, _ref75, _item$bundle_product_, _ref76, _item$bundle_variant_, _ref77, _item$price_type, _ref78, _item$price_type_ext;
           return {
-            bundle_id: (_ref70 = (_item$bundle_id = item.bundle_id) !== null && _item$bundle_id !== void 0 ? _item$bundle_id : item.id) !== null && _ref70 !== void 0 ? _ref70 : null,
-            bundle_product_id: (_ref71 = (_ref72 = (_item$bundle_product_ = item.bundle_product_id) !== null && _item$bundle_product_ !== void 0 ? _item$bundle_product_ : item._bundle_product_id) !== null && _ref72 !== void 0 ? _ref72 : item.product_id) !== null && _ref71 !== void 0 ? _ref71 : null,
-            bundle_variant_id: (_ref73 = (_item$bundle_variant_ = item.bundle_variant_id) !== null && _item$bundle_variant_ !== void 0 ? _item$bundle_variant_ : item.product_variant_id) !== null && _ref73 !== void 0 ? _ref73 : 0,
-            price_type: (_ref74 = (_item$price_type = item.price_type) !== null && _item$price_type !== void 0 ? _item$price_type : item.custom_price_type) !== null && _ref74 !== void 0 ? _ref74 : '',
-            price_type_ext: (_ref75 = (_item$price_type_ext = item.price_type_ext) !== null && _item$price_type_ext !== void 0 ? _item$price_type_ext : item.custom_price_type_ext) !== null && _ref75 !== void 0 ? _ref75 : ''
+            bundle_id: (_ref73 = (_item$bundle_id = item.bundle_id) !== null && _item$bundle_id !== void 0 ? _item$bundle_id : item.id) !== null && _ref73 !== void 0 ? _ref73 : null,
+            bundle_product_id: (_ref74 = (_ref75 = (_item$bundle_product_ = item.bundle_product_id) !== null && _item$bundle_product_ !== void 0 ? _item$bundle_product_ : item._bundle_product_id) !== null && _ref75 !== void 0 ? _ref75 : item.product_id) !== null && _ref74 !== void 0 ? _ref74 : null,
+            bundle_variant_id: (_ref76 = (_item$bundle_variant_ = item.bundle_variant_id) !== null && _item$bundle_variant_ !== void 0 ? _item$bundle_variant_ : item.product_variant_id) !== null && _ref76 !== void 0 ? _ref76 : 0,
+            price_type: (_ref77 = (_item$price_type = item.price_type) !== null && _item$price_type !== void 0 ? _item$price_type : item.custom_price_type) !== null && _ref77 !== void 0 ? _ref77 : '',
+            price_type_ext: (_ref78 = (_item$price_type_ext = item.price_type_ext) !== null && _item$price_type_ext !== void 0 ? _item$price_type_ext : item.custom_price_type_ext) !== null && _ref78 !== void 0 ? _ref78 : ''
           };
         }).sort(function (left, right) {
           return JSON.stringify(left).localeCompare(JSON.stringify(right));
         });
         return JSON.stringify({
-          original_price: _this33.normalizeFingerprintMoney(product.original_price),
-          source_product_price: _this33.normalizeFingerprintMoney(metadata.source_product_price),
-          main_product_original_price: _this33.normalizeFingerprintMoney(metadata.main_product_original_price),
-          price_override: _this33.normalizeFingerprintMoney(metadata.price_override),
+          original_price: _this34.normalizeFingerprintMoney(product.original_price),
+          source_product_price: _this34.normalizeFingerprintMoney(metadata.source_product_price),
+          main_product_original_price: _this34.normalizeFingerprintMoney(metadata.main_product_original_price),
+          price_override: _this34.normalizeFingerprintMoney(metadata.price_override),
           is_manual_discount: Boolean(metadata.is_manual_discount),
           bundle: bundle
         });
@@ -5353,24 +5479,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getBundleRuntimeIdentity",
     value: function getBundleRuntimeIdentity(bundle) {
-      var _ref76, _bundle$bundle_id2, _ref77, _bundle$bundle_group_2, _ref78, _ref79, _bundle$bundle_produc3, _ref80, _bundle$bundle_varian3;
+      var _ref79, _bundle$bundle_id2, _ref80, _bundle$bundle_group_2, _ref81, _ref82, _bundle$bundle_produc3, _ref83, _bundle$bundle_varian3;
       if (!bundle || _typeof(bundle) !== 'object') return '';
-      return [(_ref76 = (_bundle$bundle_id2 = bundle.bundle_id) !== null && _bundle$bundle_id2 !== void 0 ? _bundle$bundle_id2 : bundle.id) !== null && _ref76 !== void 0 ? _ref76 : '', (_ref77 = (_bundle$bundle_group_2 = bundle.bundle_group_id) !== null && _bundle$bundle_group_2 !== void 0 ? _bundle$bundle_group_2 : bundle.group_id) !== null && _ref77 !== void 0 ? _ref77 : '', (_ref78 = (_ref79 = (_bundle$bundle_produc3 = bundle.bundle_product_id) !== null && _bundle$bundle_produc3 !== void 0 ? _bundle$bundle_produc3 : bundle._bundle_product_id) !== null && _ref79 !== void 0 ? _ref79 : bundle.product_id) !== null && _ref78 !== void 0 ? _ref78 : '', (_ref80 = (_bundle$bundle_varian3 = bundle.bundle_variant_id) !== null && _bundle$bundle_varian3 !== void 0 ? _bundle$bundle_varian3 : bundle.product_variant_id) !== null && _ref80 !== void 0 ? _ref80 : 0].join('|');
+      return [(_ref79 = (_bundle$bundle_id2 = bundle.bundle_id) !== null && _bundle$bundle_id2 !== void 0 ? _bundle$bundle_id2 : bundle.id) !== null && _ref79 !== void 0 ? _ref79 : '', (_ref80 = (_bundle$bundle_group_2 = bundle.bundle_group_id) !== null && _bundle$bundle_group_2 !== void 0 ? _bundle$bundle_group_2 : bundle.group_id) !== null && _ref80 !== void 0 ? _ref80 : '', (_ref81 = (_ref82 = (_bundle$bundle_produc3 = bundle.bundle_product_id) !== null && _bundle$bundle_produc3 !== void 0 ? _bundle$bundle_produc3 : bundle._bundle_product_id) !== null && _ref82 !== void 0 ? _ref82 : bundle.product_id) !== null && _ref81 !== void 0 ? _ref81 : '', (_ref83 = (_bundle$bundle_varian3 = bundle.bundle_variant_id) !== null && _bundle$bundle_varian3 !== void 0 ? _bundle$bundle_varian3 : bundle.product_variant_id) !== null && _ref83 !== void 0 ? _ref83 : 0].join('|');
     }
   }, {
     key: "preservePersistedBundlePriceFields",
     value: function preservePersistedBundlePriceFields(previousBundles, nextBundles) {
-      var _this34 = this;
+      var _this35 = this;
       if (!Array.isArray(nextBundles)) return nextBundles;
       if (!Array.isArray(previousBundles) || previousBundles.length === 0) return nextBundles;
       var previousByIdentity = new Map();
       previousBundles.forEach(function (bundle) {
-        var identity = _this34.getBundleRuntimeIdentity(bundle);
+        var identity = _this35.getBundleRuntimeIdentity(bundle);
         if (identity) previousByIdentity.set(identity, bundle);
       });
       return nextBundles.map(function (bundle, index) {
         if (!bundle || _typeof(bundle) !== 'object') return bundle;
-        var previous = previousByIdentity.get(_this34.getBundleRuntimeIdentity(bundle)) || previousBundles[index];
+        var previous = previousByIdentity.get(_this35.getBundleRuntimeIdentity(bundle)) || previousBundles[index];
         if (!previous || _typeof(previous) !== 'object') return bundle;
         return _objectSpread(_objectSpread(_objectSpread({}, bundle), (bundle.cover === undefined || bundle.cover === null || bundle.cover === '') && previous.cover !== undefined && previous.cover !== null && previous.cover !== '' ? {
           cover: previous.cover
@@ -5506,13 +5632,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         delete nextProduct.metadata.main_product_original_price;
         delete nextProduct.metadata.price_schema_version;
       } else if (callerChangesLineConfiguration && !callerUpdatesTopPrice && !callerUpdatesMainMeta) {
-        var _ref81, _targetProduct$metada10, _targetProduct$metada11, _ref82, _targetProduct$metada12, _targetProduct$metada13, _targetProduct$metada14;
+        var _ref84, _targetProduct$metada10, _targetProduct$metada11, _ref85, _targetProduct$metada12, _targetProduct$metada13, _targetProduct$metada14;
         // 仅 option / bundle 变化时，保留历史 source 和主商品折扣金额，
         // 但必须让 original 与 selling 一起随新的 option 金额移动。
         var previousOptionSum = sumOptionUnitPrice(getProductSkuOptions(targetProduct));
         var nextOptionSum = sumOptionUnitPrice(getProductSkuOptions(nextProduct));
-        var _previousMainOriginal = new Decimal(Number((_ref81 = (_targetProduct$metada10 = (_targetProduct$metada11 = targetProduct.metadata) === null || _targetProduct$metada11 === void 0 ? void 0 : _targetProduct$metada11.main_product_original_price) !== null && _targetProduct$metada10 !== void 0 ? _targetProduct$metada10 : targetProduct.original_price) !== null && _ref81 !== void 0 ? _ref81 : 0) || 0);
-        var _previousMainSelling = new Decimal(Number((_ref82 = (_targetProduct$metada12 = (_targetProduct$metada13 = targetProduct.metadata) === null || _targetProduct$metada13 === void 0 ? void 0 : _targetProduct$metada13.main_product_selling_price) !== null && _targetProduct$metada12 !== void 0 ? _targetProduct$metada12 : targetProduct.selling_price) !== null && _ref82 !== void 0 ? _ref82 : _previousMainOriginal.toNumber()) || 0);
+        var _previousMainOriginal = new Decimal(Number((_ref84 = (_targetProduct$metada10 = (_targetProduct$metada11 = targetProduct.metadata) === null || _targetProduct$metada11 === void 0 ? void 0 : _targetProduct$metada11.main_product_original_price) !== null && _targetProduct$metada10 !== void 0 ? _targetProduct$metada10 : targetProduct.original_price) !== null && _ref84 !== void 0 ? _ref84 : 0) || 0);
+        var _previousMainSelling = new Decimal(Number((_ref85 = (_targetProduct$metada12 = (_targetProduct$metada13 = targetProduct.metadata) === null || _targetProduct$metada13 === void 0 ? void 0 : _targetProduct$metada13.main_product_selling_price) !== null && _targetProduct$metada12 !== void 0 ? _targetProduct$metada12 : targetProduct.selling_price) !== null && _ref85 !== void 0 ? _ref85 : _previousMainOriginal.toNumber()) || 0);
         var _preservedDiscount = _previousMainOriginal.minus(_previousMainSelling);
         var previousSource = ((_targetProduct$metada14 = targetProduct.metadata) === null || _targetProduct$metada14 === void 0 ? void 0 : _targetProduct$metada14.source_product_price) != null ? new Decimal(Number(targetProduct.metadata.source_product_price) || 0) : _previousMainOriginal.minus(previousOptionSum);
         var _nextMainOriginal = previousSource.plus(nextOptionSum);
@@ -5612,7 +5738,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "updateOrderProducts",
     value: function () {
       var _updateOrderProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(paramsList) {
-        var _this35 = this;
+        var _this36 = this;
         var tempOrder, reapplyBookingDiscountProductUids;
         return _regeneratorRuntime().wrap(function _callee26$(_context28) {
           while (1) switch (_context28.prev = _context28.next) {
@@ -5625,7 +5751,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               return _context28.abrupt("return", tempOrder.products);
             case 3:
               reapplyBookingDiscountProductUids = paramsList.reduce(function (acc, params) {
-                var updatedProductUid = _this35.applyOrderProductUpdateToTempOrder(tempOrder, params);
+                var updatedProductUid = _this36.applyOrderProductUpdateToTempOrder(tempOrder, params);
                 // 批量改预约时间时，延迟到最后一次折扣计算里统一恢复已选预约折扣卡。
                 if (params.allow_booking_discount_reapply && updatedProductUid) {
                   acc.push(String(updatedProductUid));
@@ -5852,7 +5978,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "removeProductsFromOrder",
     value: (function () {
       var _removeProductsFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(identities, options) {
-        var _this36 = this;
+        var _this37 = this;
         var tempOrder, productsBeforeRemove, bookingsBeforeRemove, preserveDisplayPosition, anchorIndex, productsAfterAnchor, matchedProducts, removedProducts, _i2, _removedProducts, product, linkedBookingUidsToRemove, _iterator21, _step21, _loop3, remainingProductIndex, remainingProduct, nextProduct, productsWithoutRemaining, nextProductIndex;
         return _regeneratorRuntime().wrap(function _callee29$(_context32) {
           while (1) switch (_context32.prev = _context32.next) {
@@ -5917,7 +6043,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       }
                       if (productUid !== undefined && productUid !== null && productUid !== '') {
                         bookingsBeforeRemove.forEach(function (booking) {
-                          var bookingUid = _this36.getBookingUniqueIdentificationNumber(booking);
+                          var bookingUid = _this37.getBookingUniqueIdentificationNumber(booking);
                           if (bookingUid && String((booking === null || booking === void 0 ? void 0 : booking.product_uid) || '') === String(productUid)) {
                             linkedBookingUidsToRemove.add(bookingUid);
                           }
@@ -6132,23 +6258,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildCurrentSubmitPayloadForLocalPrint",
     value: function buildCurrentSubmitPayloadForLocalPrint(params) {
-      var _params$cacheId, _this$otherParams5, _ref83, _params$businessCode, _this$otherParams6, _this$otherParams7;
+      var _params$cacheId, _this$otherParams5, _ref86, _params$businessCode, _this$otherParams6, _this$otherParams7;
       var tempOrder = this.ensureTempOrder();
       this.persistTempOrder();
       var payload = buildSubmitPayload({
         tempOrder: tempOrder,
         cacheId: (_params$cacheId = params === null || params === void 0 ? void 0 : params.cacheId) !== null && _params$cacheId !== void 0 ? _params$cacheId : this.cacheId,
         platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams5 = this.otherParams) === null || _this$otherParams5 === void 0 ? void 0 : _this$otherParams5.platform),
-        businessCode: (_ref83 = (_params$businessCode = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams6 = this.otherParams) === null || _this$otherParams6 === void 0 ? void 0 : _this$otherParams6.businessCode) !== null && _ref83 !== void 0 ? _ref83 : (_this$otherParams7 = this.otherParams) === null || _this$otherParams7 === void 0 ? void 0 : _this$otherParams7.business_code,
+        businessCode: (_ref86 = (_params$businessCode = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams6 = this.otherParams) === null || _this$otherParams6 === void 0 ? void 0 : _this$otherParams6.businessCode) !== null && _ref86 !== void 0 ? _ref86 : (_this$otherParams7 = this.otherParams) === null || _this$otherParams7 === void 0 ? void 0 : _this$otherParams7.business_code,
         channel: params === null || params === void 0 ? void 0 : params.channel,
         type: params === null || params === void 0 ? void 0 : params.type,
         summary: this.store.summary || createEmptySummary(),
         enhance: function enhance(nextPayload) {
-          var _ref84, _tempOrder$order_numb, _ref85, _tempOrder$shop_order2, _ref86, _tempOrder$shop_full_;
+          var _ref87, _tempOrder$order_numb, _ref88, _tempOrder$shop_order2, _ref89, _tempOrder$shop_full_;
           return _objectSpread(_objectSpread({}, nextPayload), {}, {
-            order_number: (_ref84 = (_tempOrder$order_numb = tempOrder.order_number) !== null && _tempOrder$order_numb !== void 0 ? _tempOrder$order_numb : nextPayload.order_number) !== null && _ref84 !== void 0 ? _ref84 : null,
-            shop_order_number: (_ref85 = (_tempOrder$shop_order2 = tempOrder.shop_order_number) !== null && _tempOrder$shop_order2 !== void 0 ? _tempOrder$shop_order2 : nextPayload.shop_order_number) !== null && _ref85 !== void 0 ? _ref85 : null,
-            shop_full_order_number: (_ref86 = (_tempOrder$shop_full_ = tempOrder.shop_full_order_number) !== null && _tempOrder$shop_full_ !== void 0 ? _tempOrder$shop_full_ : nextPayload.shop_full_order_number) !== null && _ref86 !== void 0 ? _ref86 : null,
+            order_number: (_ref87 = (_tempOrder$order_numb = tempOrder.order_number) !== null && _tempOrder$order_numb !== void 0 ? _tempOrder$order_numb : nextPayload.order_number) !== null && _ref87 !== void 0 ? _ref87 : null,
+            shop_order_number: (_ref88 = (_tempOrder$shop_order2 = tempOrder.shop_order_number) !== null && _tempOrder$shop_order2 !== void 0 ? _tempOrder$shop_order2 : nextPayload.shop_order_number) !== null && _ref88 !== void 0 ? _ref88 : null,
+            shop_full_order_number: (_ref89 = (_tempOrder$shop_full_ = tempOrder.shop_full_order_number) !== null && _tempOrder$shop_full_ !== void 0 ? _tempOrder$shop_full_ : nextPayload.shop_full_order_number) !== null && _ref89 !== void 0 ? _ref89 : null,
             small_ticket_data_flag: 1
           });
         }
@@ -6312,7 +6438,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "runSubmitTempOrder",
     value: function () {
       var _runSubmitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee37(params) {
-        var _params$cacheId3, _this$otherParams12, _ref87, _ref88, _submitSnapshot$busin, _this$otherParams13, _this$otherParams14, _submitSnapshot$type;
+        var _params$cacheId3, _this$otherParams12, _ref90, _ref91, _submitSnapshot$busin, _this$otherParams13, _this$otherParams14, _submitSnapshot$type;
         var tempOrder, isOnlineStorePlatform, shouldConfirmPendingVoucherPayments, hasPaymentOverride, preparedPaymentOverride, latestSummary, effectiveCacheId, hasPaymentStatusOverride, shouldOverridePaymentStatus, hasSmallTicketDataFlagOverride, enhancePayload, submitSnapshot, payload, result, _payload$payments, _payload$payments2, backendErrorResponse, isLocalPendingSubmit, salesNotesState, submittedOrderId, resultRecord;
         return _regeneratorRuntime().wrap(function _callee37$(_context40) {
           while (1) switch (_context40.prev = _context40.next) {
@@ -6379,7 +6505,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 tempOrder: tempOrder,
                 cacheId: effectiveCacheId,
                 platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams12 = this.otherParams) === null || _this$otherParams12 === void 0 ? void 0 : _this$otherParams12.platform),
-                businessCode: (_ref87 = (_ref88 = (_submitSnapshot$busin = submitSnapshot.businessCode) !== null && _submitSnapshot$busin !== void 0 ? _submitSnapshot$busin : params === null || params === void 0 ? void 0 : params.businessCode) !== null && _ref88 !== void 0 ? _ref88 : (_this$otherParams13 = this.otherParams) === null || _this$otherParams13 === void 0 ? void 0 : _this$otherParams13.businessCode) !== null && _ref87 !== void 0 ? _ref87 : (_this$otherParams14 = this.otherParams) === null || _this$otherParams14 === void 0 ? void 0 : _this$otherParams14.business_code,
+                businessCode: (_ref90 = (_ref91 = (_submitSnapshot$busin = submitSnapshot.businessCode) !== null && _submitSnapshot$busin !== void 0 ? _submitSnapshot$busin : params === null || params === void 0 ? void 0 : params.businessCode) !== null && _ref91 !== void 0 ? _ref91 : (_this$otherParams13 = this.otherParams) === null || _this$otherParams13 === void 0 ? void 0 : _this$otherParams13.businessCode) !== null && _ref90 !== void 0 ? _ref90 : (_this$otherParams14 = this.otherParams) === null || _this$otherParams14 === void 0 ? void 0 : _this$otherParams14.business_code,
                 channel: params === null || params === void 0 ? void 0 : params.channel,
                 type: (_submitSnapshot$type = submitSnapshot.type) !== null && _submitSnapshot$type !== void 0 ? _submitSnapshot$type : params === null || params === void 0 ? void 0 : params.type,
                 summary: latestSummary,
@@ -6549,10 +6675,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function extractSubmitErrorResponse(error) {
       var _error$response,
         _error$response2,
-        _this37 = this;
+        _this38 = this;
       var candidates = [error === null || error === void 0 || (_error$response = error.response) === null || _error$response === void 0 ? void 0 : _error$response.data, error === null || error === void 0 ? void 0 : error.data, error === null || error === void 0 || (_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : _error$response2.body, error === null || error === void 0 ? void 0 : error.body];
       return candidates.find(function (candidate) {
-        return _this37.isSubmitErrorResponse(candidate);
+        return _this38.isSubmitErrorResponse(candidate);
       }) || null;
     }
   }, {
@@ -6580,7 +6706,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "syncPaymentsToOrder",
     value: function () {
       var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee39(params) {
-        var _this38 = this,
+        var _this39 = this,
           _params$confirmPendin;
         var tempOrder, needsPaymentNumber, devicePrefix, mappedPayments, shouldConfirmPendingVoucherPayments, effectivePayments, completion, orderPaidPaymentTotal, paymentStatus, paymentSyncIdempotencyToken, enhancePayload, submitParams, submitResult;
         return _regeneratorRuntime().wrap(function _callee39$(_context42) {
@@ -6605,7 +6731,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 9:
               devicePrefix = _context42.t0;
               mappedPayments = mapPaymentItemsToOrderPayments((params.payments || []).map(function (payment) {
-                return _this38.normalizePaymentSource(payment, {
+                return _this39.normalizePaymentSource(payment, {
                   defaultPaid: false,
                   devicePrefix: devicePrefix
                 });
@@ -6684,7 +6810,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "createOrder",
     value: function createOrder(params) {
-      var _this39 = this;
+      var _this40 = this;
       var order = _objectSpread({
         type: (params === null || params === void 0 ? void 0 : params.type) || 'appointment_booking',
         // 要从外面拿，virtual
@@ -6716,7 +6842,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
 
           // 为预约补齐 holder 信息
           if (params !== null && params !== void 0 && (_params$extraData = params.extraData) !== null && _params$extraData !== void 0 && _params$extraData.is_add_holder_info) {
-            ensureCartItemOriginHolder(item, _this39.window);
+            ensureCartItemOriginHolder(item, _this40.window);
           }
 
           // 购物车是否为普通商品
@@ -7419,7 +7545,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeTempOrderForRuntime",
     value: function normalizeTempOrderForRuntime(raw, options) {
-      var _this40 = this,
+      var _this41 = this,
         _raw$_extend;
       var runtimeRaw = this.withoutSyntheticDraftOrderIdForRuntime(raw);
       var nextTempOrder = _objectSpread(_objectSpread({}, this.createDefaultTempOrderInstance()), runtimeRaw || {});
@@ -7444,12 +7570,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       nextTempOrder.holder = raw.holder && _typeof(raw.holder) === 'object' ? _objectSpread({}, raw.holder) : null;
       var rawProducts = Array.isArray(raw.products) ? raw.products : [];
       nextTempOrder.products = rawProducts.length > 0 ? rawProducts.map(function (p) {
-        return _this40.normalizeHydratedOrderProduct(p, {
+        return _this41.normalizeHydratedOrderProduct(p, {
           makeEditMark: options === null || options === void 0 ? void 0 : options.makeEditMark
         });
       }) : [];
       nextTempOrder.bookings = Array.isArray(raw.bookings) ? raw.bookings.map(function (b) {
-        var booking = _this40.normalizeHydratedBookingHolder(b || {});
+        var booking = _this41.normalizeHydratedBookingHolder(b || {});
         return _objectSpread(_objectSpread({}, booking), {}, {
           is_all: normalizeBookingIsAll(booking),
           sub_type: normalizeBookingSubType(booking)
@@ -7499,7 +7625,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _step24;
       try {
         for (_iterator24.s(); !(_step24 = _iterator24.n()).done;) {
-          var _product$metadata14, _ref89, _ref90, _existed$origin, _rawProduct$metadata;
+          var _product$metadata14, _ref92, _ref93, _existed$origin, _rawProduct$metadata;
           var _step24$value = _slicedToArray(_step24.value, 2),
             index = _step24$value[0],
             product = _step24$value[1];
@@ -7507,7 +7633,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           if (!uid) continue;
           var existed = productsByUid[uid] && _typeof(productsByUid[uid]) === 'object' ? productsByUid[uid] : {};
           var rawProduct = rawProducts[index] && _typeof(rawProducts[index]) === 'object' ? rawProducts[index] : product;
-          var origin = (_ref89 = (_ref90 = (_existed$origin = existed.origin) !== null && _existed$origin !== void 0 ? _existed$origin : rawProduct._origin) !== null && _ref90 !== void 0 ? _ref90 : (_rawProduct$metadata = rawProduct.metadata) === null || _rawProduct$metadata === void 0 ? void 0 : _rawProduct$metadata.origin) !== null && _ref89 !== void 0 ? _ref89 : rawProduct;
+          var origin = (_ref92 = (_ref93 = (_existed$origin = existed.origin) !== null && _existed$origin !== void 0 ? _existed$origin : rawProduct._origin) !== null && _ref93 !== void 0 ? _ref93 : (_rawProduct$metadata = rawProduct.metadata) === null || _rawProduct$metadata === void 0 ? void 0 : _rawProduct$metadata.origin) !== null && _ref92 !== void 0 ? _ref92 : rawProduct;
           var originSnapshot = cloneDeep(origin);
           var productOptionString = this.buildHydratedProductOptionString(rawProduct) || this.buildHydratedProductOptionString(product);
           if (productOptionString && originSnapshot && _typeof(originSnapshot) === 'object') {
@@ -7636,10 +7762,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeHydratedProductOptionItem",
     value: function normalizeHydratedProductOptionItem(optionItem) {
-      var _ref91, _optionItem$num, _ref92, _optionItem$add_price;
-      var rawNum = (_ref91 = (_optionItem$num = optionItem === null || optionItem === void 0 ? void 0 : optionItem.num) !== null && _optionItem$num !== void 0 ? _optionItem$num : optionItem === null || optionItem === void 0 ? void 0 : optionItem.quantity) !== null && _ref91 !== void 0 ? _ref91 : 1;
+      var _ref94, _optionItem$num, _ref95, _optionItem$add_price;
+      var rawNum = (_ref94 = (_optionItem$num = optionItem === null || optionItem === void 0 ? void 0 : optionItem.num) !== null && _optionItem$num !== void 0 ? _optionItem$num : optionItem === null || optionItem === void 0 ? void 0 : optionItem.quantity) !== null && _ref94 !== void 0 ? _ref94 : 1;
       var parsedNum = Number(rawNum);
-      var rawPrice = (_ref92 = (_optionItem$add_price = optionItem === null || optionItem === void 0 ? void 0 : optionItem.add_price) !== null && _optionItem$add_price !== void 0 ? _optionItem$add_price : optionItem === null || optionItem === void 0 ? void 0 : optionItem.price) !== null && _ref92 !== void 0 ? _ref92 : 0;
+      var rawPrice = (_ref95 = (_optionItem$add_price = optionItem === null || optionItem === void 0 ? void 0 : optionItem.add_price) !== null && _optionItem$add_price !== void 0 ? _optionItem$add_price : optionItem === null || optionItem === void 0 ? void 0 : optionItem.price) !== null && _ref95 !== void 0 ? _ref95 : 0;
       var parsedPrice = Number(rawPrice);
       var normalized = _objectSpread(_objectSpread({}, optionItem), {}, {
         option_group_item_id: optionItem === null || optionItem === void 0 ? void 0 : optionItem.option_group_item_id,
@@ -7656,7 +7782,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeHydratedOrderProduct",
     value: function normalizeHydratedOrderProduct(product, options) {
-      var _this41 = this;
+      var _this42 = this;
       var row = _objectSpread({}, product || {});
       if (row.num === undefined && row.product_quantity !== undefined) {
         row.num = row.product_quantity;
@@ -7664,7 +7790,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var productSku = ensureProductSku(row);
       row.product_sku = _objectSpread(_objectSpread({}, productSku), {}, {
         option: normalizeProductSkuOptions(productSku.option.map(function (optionItem) {
-          return _this41.normalizeHydratedProductOptionItem(optionItem || {});
+          return _this42.normalizeHydratedProductOptionItem(optionItem || {});
         }))
       });
       delete row["product_".concat('option', "_item")];
@@ -7752,8 +7878,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getVouchers",
     value: function getVouchers() {
-      var _this$store$tempOrder6;
-      return ((_this$store$tempOrder6 = this.store.tempOrder) === null || _this$store$tempOrder6 === void 0 ? void 0 : _this$store$tempOrder6.vouchers) || [];
+      var _this$store$tempOrder9;
+      return ((_this$store$tempOrder9 = this.store.tempOrder) === null || _this$store$tempOrder9 === void 0 ? void 0 : _this$store$tempOrder9.vouchers) || [];
     }
   }], [{
     key: "populateSavedAmounts",
@@ -7847,4 +7973,5 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     }
   }]);
   return OrderModule;
-}(BaseModule);
+}(BaseModule);
+export { isFulfillmentTimingBooking } from "./pickupTiming";