@pisell/pisellos 2.3.7 → 2.3.9

package/dist/modules/Order/index.js

@@ -3,15 +3,15 @@ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArra
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
@@ -38,6 +38,7 @@ import dayjs from 'dayjs';
 import { processCartPromotion, appendPromotionTags as _appendPromotionTags, getOrderProductUid as getPromotionUid } from "../../solution/BaseSales/utils/cartPromotion";
 import { buildProductLineFingerprint, getProductIdentityIndex, getSafeProductNum, isIdentityMatch, normalizeOrderProduct } from "../../solution/ScanOrder/utils";
 import { syncManualProductDiscountProductNum } from "./utils/manualProductDiscount";
+import { expandHydratedProductsForDiscountCollection, restoreHydratedBundleDiscounts } from "./utils/bundleDiscountHydration";
 import { DiscountModule } from "../Discount";
 import { RulesModule } from "../Rules";
 import { UnavailableReason } from "../Rules/types";
@@ -64,6 +65,23 @@ function isManualProductDiscountProduct(product) {
     return (item === null || item === void 0 ? void 0 : item.type) === 'product';
   });
 }
+var ORDER_PAYMENT_STATUS_PAID = 'paid';
+var ORDER_PAYMENT_STATUS_PENDING = 'payment_pending';
+function isVoucherPaymentRecord(payment) {
+  return (payment === null || payment === void 0 ? void 0 : payment.voucher_id) !== undefined && Number(payment.voucher_id) !== 0;
+}
+function hasSyncedOrderPaymentRecord(payment) {
+  return (payment === null || payment === void 0 ? void 0 : payment.order_payment_id) !== undefined && payment.order_payment_id !== null;
+}
+function isPendingVoucherPaymentRecord(payment) {
+  return isVoucherPaymentRecord(payment) && (payment === null || payment === void 0 ? void 0 : payment.status) === ORDER_PAYMENT_STATUS_PENDING;
+}
+function isPaidPaymentRecord(payment) {
+  return (payment === null || payment === void 0 ? void 0 : payment.status) === ORDER_PAYMENT_STATUS_PAID;
+}
+function isCommittedVoucherPaymentRecord(payment) {
+  return isVoucherPaymentRecord(payment) && (payment === null || payment === void 0 ? void 0 : payment.status) !== 'voided' && (hasSyncedOrderPaymentRecord(payment) || isPaidPaymentRecord(payment));
+}
 export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(OrderModule, _BaseModule);
   var _super = _createSuper(OrderModule);
@@ -108,7 +126,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "collectHydratedEditDiscounts",
     value: function collectHydratedEditDiscounts(products) {
       var discountMap = new Map();
-      var _iterator = _createForOfIteratorHelper(products || []),
+      var _iterator = _createForOfIteratorHelper(expandHydratedProductsForDiscountCollection(products)),
         _step;
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -138,6 +156,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 discount: item === null || item === void 0 ? void 0 : item.discount,
                 _num: Number((_ref6 = (_ref7 = (_item$metadata$num2 = item === null || item === void 0 || (_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.num) !== null && _item$metadata$num2 !== void 0 ? _item$metadata$num2 : product === null || product === void 0 ? void 0 : product.num) !== null && _ref7 !== void 0 ? _ref7 : product === null || product === void 0 ? void 0 : product.product_quantity) !== null && _ref6 !== void 0 ? _ref6 : 1) || 1
               };
+              var existed = discountMap.get(key);
+              if (existed) {
+                existed.amount = Number(existed.amount || 0) + amount;
+                existed.used_par_value = String(Number(existed.used_par_value || 0) + amount);
+                existed.balance = String(Number(existed.balance || 0) + amount);
+                existed.applicableProductDetails = [].concat(_toConsumableArray(existed.applicableProductDetails || []), [detail]);
+                existed.appliedProductDetails = [].concat(_toConsumableArray(existed.appliedProductDetails || []), [detail]);
+                continue;
+              }
               discountMap.set(key, {
                 id: key,
                 product_name: '',
@@ -1253,6 +1280,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       return mapPaymentItemsToOrderPayments(payments, {
         includeVoided: false
       }).reduce(function (sum, payment) {
+        if (!isPaidPaymentRecord(payment)) return sum;
         return sum.plus(_this4.calculatePaymentEffectiveAmount(payment));
       }, new Decimal(0));
     }
@@ -1381,7 +1409,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var _this5 = this;
       return (payments || []).reduce(function (sum, payment) {
         var paymentRecord = payment;
-        if ((paymentRecord === null || paymentRecord === void 0 ? void 0 : paymentRecord.status) !== 'paid') return sum;
+        if (!isPaidPaymentRecord(paymentRecord)) return sum;
         var isDepositPayment = paymentRecord.type === 'deposit' || paymentRecord.order_payment_type === 'deposit';
         if (!isDepositPayment) return sum;
         if (paymentRecord.origin_amount !== undefined && paymentRecord.origin_amount !== null && paymentRecord.origin_amount !== '') {
@@ -1532,7 +1560,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var _this6 = this;
       return (payments || []).reduce(function (summary, payment) {
         var paymentRecord = payment;
-        if ((paymentRecord === null || paymentRecord === void 0 ? void 0 : paymentRecord.status) !== 'paid') return summary;
+        if (!isPaidPaymentRecord(paymentRecord)) return summary;
         return {
           customerPaidAmount: summary.customerPaidAmount.plus(paymentRecord.amount || 0),
           orderPaidAmount: summary.orderPaidAmount.plus(paymentRecord.origin_amount || 0),
@@ -2101,6 +2129,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "restoreOrder",
     value: function restoreOrder() {
       var _this$store$discount11, _this$store$discount12;
+      this.logInfo('restoreOrder start', {});
       var freshTempOrder = this.createDefaultTempOrderInstance();
       this.ensureExternalSaleNumber(freshTempOrder);
       this.store.tempOrder = freshTempOrder;
@@ -3172,6 +3201,77 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       this.persistTempOrder();
       return tempOrder.payments;
     }
+  }, {
+    key: "confirmPendingVoucherPaymentsInList",
+    value: function confirmPendingVoucherPaymentsInList(payments) {
+      return (payments || []).map(function (payment) {
+        if (!isPendingVoucherPaymentRecord(payment)) return payment;
+        return _objectSpread(_objectSpread({}, payment), {}, {
+          status: ORDER_PAYMENT_STATUS_PAID
+        });
+      });
+    }
+  }, {
+    key: "discardPendingVoucherPaymentsFromList",
+    value: function discardPendingVoucherPaymentsFromList(payments) {
+      return (payments || []).filter(function (payment) {
+        return !isPendingVoucherPaymentRecord(payment);
+      });
+    }
+  }, {
+    key: "prepareVoucherPaymentsForSubmit",
+    value: function prepareVoucherPaymentsForSubmit(payments) {
+      var confirmPendingVoucherPayments = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+      var mappedPayments = mapPaymentItemsToOrderPayments(payments || []);
+      return confirmPendingVoucherPayments ? this.confirmPendingVoucherPaymentsInList(mappedPayments) : this.discardPendingVoucherPaymentsFromList(mappedPayments);
+    }
+  }, {
+    key: "applyPaymentLifecycleChange",
+    value: function applyPaymentLifecycleChange(tempOrder, options) {
+      var _this19 = this;
+      this.updateTempOrderPaymentStatus(tempOrder);
+      if ((options === null || options === void 0 ? void 0 : options.persist) !== false) {
+        this.persistTempOrder();
+      }
+      if ((options === null || options === void 0 ? void 0 : options.recalculateSummary) === false) return;
+      var logContext = (options === null || options === void 0 ? void 0 : options.logContext) || 'payment lifecycle change';
+      void this.recalculateSummary({
+        createIfMissing: true
+      }).catch(function (error) {
+        _this19.logError("recalculate summary after ".concat(logContext, " failed"), {
+          error: error instanceof Error ? error.message : String(error)
+        });
+      });
+    }
+  }, {
+    key: "confirmPendingVoucherPayments",
+    value: function confirmPendingVoucherPayments(options) {
+      var tempOrder = this.ensureTempOrder();
+      var payments = tempOrder.payments || [];
+      var hasPendingVoucher = payments.some(function (payment) {
+        return isPendingVoucherPaymentRecord(payment);
+      });
+      if (!hasPendingVoucher) return payments;
+      tempOrder.payments = this.confirmPendingVoucherPaymentsInList(payments);
+      this.applyPaymentLifecycleChange(tempOrder, _objectSpread(_objectSpread({}, options), {}, {
+        logContext: 'confirmPendingVoucherPayments'
+      }));
+      // this.recalculateSummary();
+      return tempOrder.payments;
+    }
+  }, {
+    key: "discardPendingVoucherPayments",
+    value: function discardPendingVoucherPayments(options) {
+      var tempOrder = this.ensureTempOrder();
+      var payments = tempOrder.payments || [];
+      var nextPayments = this.discardPendingVoucherPaymentsFromList(payments);
+      if (nextPayments.length === payments.length) return payments;
+      tempOrder.payments = nextPayments;
+      this.applyPaymentLifecycleChange(tempOrder, _objectSpread(_objectSpread({}, options), {}, {
+        logContext: 'discardPendingVoucherPayments'
+      }));
+      return tempOrder.payments;
+    }
 
     /**
      * 覆盖当前订单中的 wallet pass 支付项。
@@ -3181,22 +3281,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
      */
   }, {
     key: "updateVoucherOrderPayments",
-    value: function updateVoucherOrderPayments(payments) {
-      var _this19 = this;
+    value: function updateVoucherOrderPayments(payments, options) {
+      var _this20 = this;
       var tempOrder = this.ensureTempOrder();
-      var isVoucherPayment = function isVoucherPayment(payment) {
-        return payment.voucher_id !== undefined && Number(payment.voucher_id) !== 0;
-      };
-      var hasSyncedOrderPayment = function hasSyncedOrderPayment(payment) {
-        return payment.order_payment_id !== undefined && payment.order_payment_id !== null;
-      };
       var isOrderPaymentType = function isOrderPaymentType(value) {
         return value === 'normal' || value === 'deposit';
       };
       var voucherOrderPaymentType = this.resolveNextOrderPaymentType(tempOrder);
       var withVoucherPaymentType = function withVoucherPaymentType(payment) {
         var paymentRecord = payment;
-        if (!isVoucherPayment(paymentRecord)) return payment;
+        if (!isVoucherPaymentRecord(paymentRecord)) return payment;
         var explicitPaymentType = isOrderPaymentType(paymentRecord.order_payment_type) ? paymentRecord.order_payment_type : isOrderPaymentType(paymentRecord.type) ? paymentRecord.type : undefined;
         var nextPaymentType = explicitPaymentType || voucherOrderPaymentType;
         var shouldPreserveCustomPaymentType = paymentRecord.custom_payment_type === undefined && paymentRecord.type !== undefined && !isOrderPaymentType(paymentRecord.type);
@@ -3207,49 +3301,72 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           order_payment_type: nextPaymentType
         });
       };
-      // const normalizeVoucherPaymentStatus = (payment: OrderPaymentSource): OrderPaymentSource => {
-      //   const paymentRecord = payment as Record<string, any>;
-      //   // if (paymentRecord.status !== 'active') return payment;
-      //   // return {
-      //   //   ...paymentRecord,
-      //   //   status: 'paid',
-      //   // };
-      //   if (paymentRecord.status === 'active') {
-      //     paymentRecord.status = 'paid'
-      //   }
-      //   return paymentRecord
-      // };
+      var normalizeVoucherPaymentStatus = function normalizeVoucherPaymentStatus(payment) {
+        var paymentRecord = payment;
+        if (!isVoucherPaymentRecord(paymentRecord)) return payment;
+        if (hasSyncedOrderPaymentRecord(paymentRecord) && (paymentRecord.status === undefined || paymentRecord.status === 'active')) {
+          return _objectSpread(_objectSpread({}, paymentRecord), {}, {
+            status: ORDER_PAYMENT_STATUS_PAID
+          });
+        }
+        if (paymentRecord.status !== undefined && paymentRecord.status !== 'active') {
+          return payment;
+        }
+        return _objectSpread(_objectSpread({}, paymentRecord), {}, {
+          status: (options === null || options === void 0 ? void 0 : options.status) || ORDER_PAYMENT_STATUS_PENDING
+        });
+      };
       var mappedVouchers = mapPaymentItemsToOrderPayments(payments.map(function (payment) {
-        return _this19.normalizePaymentSource(withVoucherPaymentType(payment), {
-          defaultPaid: true
+        return _this20.normalizePaymentSource(normalizeVoucherPaymentStatus(withVoucherPaymentType(payment)), {
+          defaultPaid: false
         });
       })).filter(function (payment) {
-        return isVoucherPayment(payment);
+        return isVoucherPaymentRecord(payment);
       });
       var nonVoucherPayments = (tempOrder.payments || []).filter(function (payment) {
-        return !isVoucherPayment(payment);
+        return !isVoucherPaymentRecord(payment);
       });
-      var syncedVoucherPayments = (tempOrder.payments || []).filter(function (payment) {
-        return isVoucherPayment(payment) && hasSyncedOrderPayment(payment);
+      var normalizeCommittedVoucherPayment = function normalizeCommittedVoucherPayment(payment) {
+        if (hasSyncedOrderPaymentRecord(payment) && (payment.status === undefined || payment.status === 'active')) {
+          return _objectSpread(_objectSpread({}, payment), {}, {
+            status: ORDER_PAYMENT_STATUS_PAID
+          });
+        }
+        return payment;
+      };
+      var committedVoucherPayments = (tempOrder.payments || []).filter(function (payment) {
+        return isCommittedVoucherPaymentRecord(payment);
+      }).map(function (payment) {
+        return normalizeCommittedVoucherPayment(payment);
       });
-      var syncedVoucherPaymentIds = new Set(syncedVoucherPayments.map(function (payment) {
+      var committedVoucherPaymentIds = new Set(committedVoucherPayments.filter(function (payment) {
+        return hasSyncedOrderPaymentRecord(payment);
+      }).map(function (payment) {
         return String(payment.order_payment_id);
       }));
+      var committedVoucherIds = new Set(committedVoucherPayments.map(function (payment) {
+        return String(payment.voucher_id);
+      }));
       var replaceableVouchers = mappedVouchers.filter(function (payment) {
-        if (!hasSyncedOrderPayment(payment)) return true;
-        return !syncedVoucherPaymentIds.has(String(payment.order_payment_id));
+        if (hasSyncedOrderPaymentRecord(payment) && committedVoucherPaymentIds.has(String(payment.order_payment_id))) {
+          return false;
+        }
+        if (payment.voucher_id !== undefined && committedVoucherIds.has(String(payment.voucher_id))) {
+          return false;
+        }
+        return true;
       });
       var cappedVouchers = this.capVoucherPaymentsByRemainingAmount({
         vouchers: replaceableVouchers,
-        nonVoucherPayments: [].concat(_toConsumableArray(nonVoucherPayments), _toConsumableArray(syncedVoucherPayments))
+        nonVoucherPayments: [].concat(_toConsumableArray(nonVoucherPayments), _toConsumableArray(committedVoucherPayments))
       });
-      tempOrder.payments = [].concat(_toConsumableArray(nonVoucherPayments), _toConsumableArray(syncedVoucherPayments), _toConsumableArray(cappedVouchers));
+      tempOrder.payments = [].concat(_toConsumableArray(nonVoucherPayments), _toConsumableArray(committedVoucherPayments), _toConsumableArray(cappedVouchers));
       this.updateTempOrderPaymentStatus(tempOrder);
       this.persistTempOrder();
       void this.recalculateSummary({
         createIfMissing: true
       }).catch(function (error) {
-        _this19.logError('recalculate summary after updateVoucherOrderPayments failed', {
+        _this20.logError('recalculate summary after updateVoucherOrderPayments failed', {
           error: error instanceof Error ? error.message : String(error)
         });
       });
@@ -3385,7 +3502,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var _appendProductLineToTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(tempOrder, product, booking) {
         var _booking_uid,
           _metadata,
-          _this20 = this;
+          _this21 = this;
         var linked, productToAdd, incomingFingerprint, normalizedIncoming, incomingBookingUid, hasIncomingGoodPass, hasIncomingProductNote, hasIncomingBookingUid, shouldForceNewLine, matchedIndex, matchedProduct, existedFingerprint, shouldMerge, _targetProduct$metada, targetProduct, targetUid, normalizedProduct, nextNum, targetIsManualProductDiscount, nextDiscountList;
         return _regeneratorRuntime().wrap(function _callee16$(_context18) {
           while (1) switch (_context18.prev = _context18.next) {
@@ -3410,8 +3527,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               hasIncomingBookingUid = this.hasLinkedBookingUid(productToAdd) || this.hasLinkedBookingUid(normalizedIncoming);
               shouldForceNewLine = !!booking || hasIncomingProductNote || hasIncomingBookingUid;
               matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex(function (item) {
-                if (_this20.hasGoodPassDiscount(item)) return false;
-                if (_this20.hasOrderProductLineNote(item)) return false;
+                if (_this21.hasGoodPassDiscount(item)) return false;
+                if (_this21.hasOrderProductLineNote(item)) return false;
                 if (item.order_detail_id !== undefined && item.order_detail_id !== null) return false;
                 if (item.product_id !== productToAdd.product_id) return false;
                 if (item.product_variant_id !== productToAdd.product_variant_id) return false;
@@ -3559,8 +3676,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               _context19.next = 22;
               return this.finalizeProductOrderMutation(tempOrder);
             case 22:
+              this.logInfo('addProductToOrder success', {
+                product_id: product.product_id,
+                with_booking: !!booking
+              });
               return _context19.abrupt("return", tempOrder.products);
-            case 23:
+            case 24:
             case "end":
               return _context19.stop();
           }
@@ -3660,8 +3781,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               _context20.next = 40;
               return this.finalizeProductOrderMutation(tempOrder, options);
             case 40:
+              this.logInfo('addProductsToOrder success', {
+                itemsCount: items.length
+              });
               return _context20.abrupt("return", tempOrder.products);
-            case 41:
+            case 42:
             case "end":
               return _context20.stop();
           }
@@ -3701,17 +3825,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "preservePersistedBundlePriceFields",
     value: function preservePersistedBundlePriceFields(previousBundles, nextBundles) {
-      var _this21 = this;
+      var _this22 = 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 = _this21.getBundleRuntimeIdentity(bundle);
+        var identity = _this22.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(_this21.getBundleRuntimeIdentity(bundle)) || previousBundles[index];
+        var previous = previousByIdentity.get(_this22.getBundleRuntimeIdentity(bundle)) || previousBundles[index];
         if (!previous || _typeof(previous) !== 'object') return bundle;
         return _objectSpread(_objectSpread({}, bundle), {}, {
           price: previous.price,
@@ -3879,8 +4003,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
             case 8:
               this.persistTempOrder();
+              this.logInfo('updateOrderProduct success', {
+                params: params
+              });
               return _context21.abrupt("return", tempOrder.products);
-            case 10:
+            case 11:
             case "end":
               return _context21.stop();
           }
@@ -3895,7 +4022,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "updateOrderProducts",
     value: function () {
       var _updateOrderProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(paramsList) {
-        var _this22 = this;
+        var _this23 = this;
         var tempOrder;
         return _regeneratorRuntime().wrap(function _callee20$(_context22) {
           while (1) switch (_context22.prev = _context22.next) {
@@ -3908,13 +4035,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               return _context22.abrupt("return", tempOrder.products);
             case 3:
               paramsList.forEach(function (params) {
-                _this22.applyOrderProductUpdateToTempOrder(tempOrder, params);
+                _this23.applyOrderProductUpdateToTempOrder(tempOrder, params);
               });
               _context22.next = 6;
               return this.finalizeAfterProductsMutation(tempOrder);
             case 6:
+              this.logInfo('updateOrderProduct success', {
+                paramsList: paramsList
+              });
               return _context22.abrupt("return", tempOrder.products);
-            case 7:
+            case 8:
             case "end":
               return _context22.stop();
           }
@@ -3986,8 +4116,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
             case 22:
               this.persistTempOrder();
+              this.logInfo('updateOrderProductQuantity success', {
+                params: params
+              });
               return _context23.abrupt("return", tempOrder.products);
-            case 24:
+            case 25:
             case "end":
               return _context23.stop();
           }
@@ -4072,7 +4205,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "removeProductsFromOrder",
     value: (function () {
       var _removeProductsFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(identities) {
-        var _this23 = this;
+        var _this24 = this;
         var tempOrder, productsBeforeRemove, bookingsBeforeRemove, matchedProducts, removedProducts, _i2, _removedProducts, product, linkedBookingUidsToRemove, _iterator21, _step21, _loop3;
         return _regeneratorRuntime().wrap(function _callee23$(_context26) {
           while (1) switch (_context26.prev = _context26.next) {
@@ -4127,7 +4260,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       }
                       if (productUid !== undefined && productUid !== null && productUid !== '') {
                         bookingsBeforeRemove.forEach(function (booking) {
-                          var bookingUid = _this23.getBookingUniqueIdentificationNumber(booking);
+                          var bookingUid = _this24.getBookingUniqueIdentificationNumber(booking);
                           if (bookingUid && String((booking === null || booking === void 0 ? void 0 : booking.product_uid) || '') === String(productUid)) {
                             linkedBookingUidsToRemove.add(bookingUid);
                           }
@@ -4179,8 +4312,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               _context26.next = 31;
               return this.finalizeAfterProductsMutation(tempOrder);
             case 31:
+              this.logInfo('removeProductsFromOrder success', {
+                identities: identities
+              });
               return _context26.abrupt("return", tempOrder.products);
-            case 32:
+            case 33:
             case "end":
               return _context26.stop();
           }
@@ -4242,8 +4378,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
             case 11:
               this.persistTempOrder();
+              this.logInfo('clearOrderCartLines success', {});
               return _context28.abrupt("return", tempOrder);
-            case 13:
+            case 14:
             case "end":
               return _context28.stop();
           }
@@ -4372,40 +4509,55 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _runSubmitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(params) {
         var _params$cacheId2, _this$otherParams5, _ref72, _ref73, _submitSnapshot$busin, _this$otherParams6, _this$otherParams7, _submitSnapshot$type;
-        var tempOrder, latestSummary, effectiveCacheId, hasPaymentOverride, hasPaymentStatusOverride, hasSmallTicketDataFlagOverride, enhancePayload, submitSnapshot, payload, result, _payload$payments, _payload$payments2, backendErrorResponse, submittedOrderId, resultRecord;
+        var tempOrder, shouldConfirmPendingVoucherPayments, hasPaymentOverride, preparedPaymentOverride, latestSummary, effectiveCacheId, hasPaymentStatusOverride, hasSmallTicketDataFlagOverride, enhancePayload, submitSnapshot, payload, result, _payload$payments, _payload$payments2, backendErrorResponse, submittedOrderId, resultRecord;
         return _regeneratorRuntime().wrap(function _callee29$(_context32) {
           while (1) switch (_context32.prev = _context32.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
+              shouldConfirmPendingVoucherPayments = (params === null || params === void 0 ? void 0 : params.confirmPendingVoucherPayments) !== false;
+              hasPaymentOverride = (params === null || params === void 0 ? void 0 : params.payments) !== undefined;
+              preparedPaymentOverride = hasPaymentOverride ? this.prepareVoucherPaymentsForSubmit((params === null || params === void 0 ? void 0 : params.payments) || [], shouldConfirmPendingVoucherPayments) : undefined;
+              if (!hasPaymentOverride) {
+                if (shouldConfirmPendingVoucherPayments) {
+                  this.confirmPendingVoucherPayments({
+                    persist: false,
+                    recalculateSummary: false
+                  });
+                } else {
+                  this.discardPendingVoucherPayments({
+                    persist: false,
+                    recalculateSummary: false
+                  });
+                }
+              }
               this.persistTempOrder();
-              _context32.next = 4;
+              _context32.next = 8;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 4:
+            case 8:
               _context32.t1 = _context32.sent;
               if (_context32.t1) {
-                _context32.next = 7;
+                _context32.next = 11;
                 break;
               }
               _context32.t1 = this.store.summary;
-            case 7:
+            case 11:
               _context32.t0 = _context32.t1;
               if (_context32.t0) {
-                _context32.next = 10;
+                _context32.next = 14;
                 break;
               }
               _context32.t0 = createEmptySummary();
-            case 10:
+            case 14:
               latestSummary = _context32.t0;
               effectiveCacheId = (_params$cacheId2 = params === null || params === void 0 ? void 0 : params.cacheId) !== null && _params$cacheId2 !== void 0 ? _params$cacheId2 : this.cacheId;
-              hasPaymentOverride = (params === null || params === void 0 ? void 0 : params.payments) !== undefined;
               hasPaymentStatusOverride = (params === null || params === void 0 ? void 0 : params.paymentStatus) !== undefined;
               hasSmallTicketDataFlagOverride = (params === null || params === void 0 ? void 0 : params.smallTicketDataFlag) !== undefined;
               enhancePayload = hasPaymentOverride || hasPaymentStatusOverride || hasSmallTicketDataFlagOverride || params !== null && params !== void 0 && params.enhancePayload ? function (payload, ctx) {
                 var nextPayload = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, payload), hasPaymentOverride ? {
-                  payments: mapPaymentItemsToOrderPayments((params === null || params === void 0 ? void 0 : params.payments) || [])
-                } : {}), hasPaymentStatusOverride ? {
+                  payments: preparedPaymentOverride || []
+                } : {}), hasPaymentStatusOverride && !shouldConfirmPendingVoucherPayments ? {
                   payment_status: params === null || params === void 0 ? void 0 : params.paymentStatus
                 } : {}), hasSmallTicketDataFlagOverride ? {
                   small_ticket_data_flag: params === null || params === void 0 ? void 0 : params.smallTicketDataFlag
@@ -4425,6 +4577,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 request_unique_idempotency_token: params === null || params === void 0 ? void 0 : params.request_unique_idempotency_token,
                 enhance: enhancePayload
               });
+              console.log('[Order.runSubmitTempOrder.payload]', payload);
               if (params !== null && params !== void 0 && params.syncMode) {
                 payload.sync_mode = true;
               }
@@ -4432,10 +4585,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (!payload.created_at) {
                 payload.created_at = dayjs().format('YYYY-MM-DD HH:mm:ss');
               }
-              _context32.next = 22;
+              _context32.next = 26;
               return this.saveDraft();
-            case 22:
-              _context32.prev = 22;
+            case 26:
+              _context32.prev = 26;
               this.logInfo('submitTempOrder calling sales checkout', {
                 orderId: payload.order_id,
                 externalSaleNumber: payload.external_sale_number,
@@ -4445,26 +4598,26 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 smallTicketDataFlag: payload.small_ticket_data_flag,
                 syncMode: payload.sync_mode
               });
-              _context32.next = 26;
+              _context32.next = 30;
               return this.submitSalesOrder({
                 query: payload
               });
-            case 26:
+            case 30:
               result = _context32.sent;
-              _context32.next = 39;
+              _context32.next = 43;
               break;
-            case 29:
-              _context32.prev = 29;
-              _context32.t2 = _context32["catch"](22);
+            case 33:
+              _context32.prev = 33;
+              _context32.t2 = _context32["catch"](26);
               backendErrorResponse = this.extractSubmitErrorResponse(_context32.t2);
               if (!backendErrorResponse) {
-                _context32.next = 36;
+                _context32.next = 40;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(backendErrorResponse, payload);
               return _context32.abrupt("return", backendErrorResponse);
-            case 36:
+            case 40:
               this.store.syncState = 'failed';
               this.logError('submitTempOrder failed', {
                 error: _context32.t2 instanceof Error ? _context32.t2.message : String(_context32.t2),
@@ -4474,15 +4627,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 paymentsCount: ((_payload$payments2 = payload.payments) === null || _payload$payments2 === void 0 ? void 0 : _payload$payments2.length) || 0
               });
               throw _context32.t2;
-            case 39:
+            case 43:
               if (!this.isSubmitResponseRejected(result)) {
-                _context32.next = 43;
+                _context32.next = 47;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(result, payload);
               return _context32.abrupt("return", result);
-            case 43:
+            case 47:
               submittedOrderId = this.extractOrderIdFromSubmitResult(result);
               this.logInfo('runSubmitTempOrder: 提交成功', {
                 submittedOrderId: submittedOrderId,
@@ -4490,29 +4643,29 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 tempOrder: tempOrder
               });
               if (!(submittedOrderId !== null && submittedOrderId !== undefined)) {
-                _context32.next = 52;
+                _context32.next = 56;
                 break;
               }
               tempOrder.order_id = submittedOrderId;
               resultRecord = result;
-              _context32.next = 50;
+              _context32.next = 54;
               return this.markLocalOrderSynced(submittedOrderId, (resultRecord === null || resultRecord === void 0 ? void 0 : resultRecord.data) || resultRecord || {});
-            case 50:
-              _context32.next = 53;
+            case 54:
+              _context32.next = 57;
               break;
-            case 52:
+            case 56:
               if (this.isLocalPendingSubmitResult(result)) {
                 this.store.syncState = 'local';
               } else {
                 this.store.syncState = 'submitted';
               }
-            case 53:
+            case 57:
               return _context32.abrupt("return", result);
-            case 54:
+            case 58:
             case "end":
               return _context32.stop();
           }
-        }, _callee29, this, [[22, 29]]);
+        }, _callee29, this, [[26, 33]]);
       }));
       function runSubmitTempOrder(_x32) {
         return _runSubmitTempOrder.apply(this, arguments);
@@ -4584,10 +4737,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function extractSubmitErrorResponse(error) {
       var _error$response,
         _error$response2,
-        _this24 = this;
+        _this25 = 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 _this24.isSubmitErrorResponse(candidate);
+        return _this25.isSubmitErrorResponse(candidate);
       }) || null;
     }
   }, {
@@ -4615,41 +4768,46 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "syncPaymentsToOrder",
     value: function () {
       var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31(params) {
-        var tempOrder, mappedPayments, completion, paymentStatus, paymentSyncIdempotencyToken, submitResult;
+        var _params$confirmPendin;
+        var tempOrder, mappedPayments, shouldConfirmPendingVoucherPayments, effectivePayments, completion, paidPaymentTotal, paymentStatus, paymentSyncIdempotencyToken, submitResult;
         return _regeneratorRuntime().wrap(function _callee31$(_context34) {
           while (1) switch (_context34.prev = _context34.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               mappedPayments = mapPaymentItemsToOrderPayments(params.payments || []);
-              completion = this.getPaymentCompletion(mappedPayments);
-              paymentStatus = completion.isOrderFullyPaid ? params.paymentStatus || 'paid' : 'partially_paid';
-              tempOrder.payments = mappedPayments;
+              shouldConfirmPendingVoucherPayments = (_params$confirmPendin = params.confirmPendingVoucherPayments) !== null && _params$confirmPendin !== void 0 ? _params$confirmPendin : params.submitWhenPaid === true;
+              effectivePayments = shouldConfirmPendingVoucherPayments ? this.confirmPendingVoucherPaymentsInList(mappedPayments) : params.confirmPendingVoucherPayments === false ? this.discardPendingVoucherPaymentsFromList(mappedPayments) : mappedPayments;
+              completion = this.getPaymentCompletion(effectivePayments);
+              paidPaymentTotal = this.calculatePaymentTotal(effectivePayments);
+              paymentStatus = completion.isOrderFullyPaid ? params.paymentStatus || 'paid' : paidPaymentTotal.gt(0) ? 'partially_paid' : 'payment_processing';
+              tempOrder.payments = effectivePayments;
               tempOrder.payment_status = paymentStatus;
               this.persistTempOrder();
-              _context34.next = 9;
+              _context34.next = 12;
               return this.saveDraft();
-            case 9:
+            case 12:
               if (params.submitWhenPaid) {
-                _context34.next = 11;
+                _context34.next = 14;
                 break;
               }
               return _context34.abrupt("return", completion);
-            case 11:
+            case 14:
               if (!(this.store.syncState === 'submitting')) {
-                _context34.next = 13;
+                _context34.next = 16;
                 break;
               }
               return _context34.abrupt("return", completion);
-            case 13:
+            case 16:
               this.store.syncState = 'submitting';
-              paymentSyncIdempotencyToken = this.buildPaymentSyncIdempotencyToken(tempOrder, mappedPayments);
-              _context34.next = 17;
+              paymentSyncIdempotencyToken = this.buildPaymentSyncIdempotencyToken(tempOrder, effectivePayments);
+              _context34.next = 20;
               return this.submitTempOrder({
-                payments: mappedPayments,
+                payments: effectivePayments,
                 paymentStatus: paymentStatus,
                 smallTicketDataFlag: params.smallTicketDataFlag,
                 businessCode: params.businessCode,
                 channel: params.channel,
+                confirmPendingVoucherPayments: true,
                 enhancePayload: function enhancePayload(payload) {
                   var nextPayload = _objectSpread(_objectSpread({}, payload), {}, {
                     request_unique_idempotency_token: paymentSyncIdempotencyToken
@@ -4657,12 +4815,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   return nextPayload;
                 }
               });
-            case 17:
+            case 20:
               submitResult = _context34.sent;
               return _context34.abrupt("return", _objectSpread(_objectSpread({}, completion), {}, {
                 submitResult: submitResult
               }));
-            case 19:
+            case 22:
             case "end":
               return _context34.stop();
           }
@@ -5175,27 +5333,28 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               currentDiscounts = typeof ((_this$store$discount15 = this.store.discount) === null || _this$store$discount15 === void 0 ? void 0 : _this$store$discount15.getDiscountList) === 'function' ? this.store.discount.getDiscountList() || [] : [];
               shouldSkipEmptyDiscountSync = hydratedEditDiscounts.length === 0 && currentDiscounts.length === 0;
               if (shouldSkipEmptyDiscountSync) {
-                _context42.next = 16;
+                _context42.next = 17;
                 break;
               }
-              _context42.next = 14;
+              OrderModule.populateSavedAmounts(nextTempOrder.products, hydratedEditDiscounts);
+              _context42.next = 15;
               return (_this$store$discount16 = this.store.discount) === null || _this$store$discount16 === void 0 ? void 0 : _this$store$discount16.setOriginalDiscountList(hydratedEditDiscounts);
-            case 14:
-              _context42.next = 16;
+            case 15:
+              _context42.next = 17;
               return (_this$store$discount17 = this.store.discount) === null || _this$store$discount17 === void 0 ? void 0 : _this$store$discount17.setDiscountList(hydratedEditDiscounts);
-            case 16:
+            case 17:
               if (!(options !== null && options !== void 0 && options.recalcOnHydrate)) {
-                _context42.next = 19;
+                _context42.next = 20;
                 break;
               }
-              _context42.next = 19;
+              _context42.next = 20;
               return this.recalculateSummary({
                 createIfMissing: false
               });
-            case 19:
+            case 20:
               this.persistTempOrder();
               return _context42.abrupt("return", nextTempOrder);
-            case 21:
+            case 22:
             case "end":
               return _context42.stop();
           }
@@ -5242,7 +5401,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeTempOrderForRuntime",
     value: function normalizeTempOrderForRuntime(raw, options) {
-      var _this25 = this;
+      var _this26 = this;
       var nextTempOrder = _objectSpread(_objectSpread({}, this.createDefaultTempOrderInstance()), raw || {});
       // ES 列表详情使用 id 表示订单主键；OS 详情态统一依赖 order_id 驱动操作按钮。
       if ((nextTempOrder.order_id === undefined || nextTempOrder.order_id === null) && (raw === null || raw === void 0 ? void 0 : raw.id) !== undefined && (raw === null || raw === void 0 ? void 0 : raw.id) !== null) {
@@ -5265,10 +5424,10 @@ 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 _this25.normalizeHydratedOrderProduct(p);
+        return _this26.normalizeHydratedOrderProduct(p);
       }) : [];
       nextTempOrder.bookings = Array.isArray(raw.bookings) ? raw.bookings.map(function (b) {
-        var booking = _this25.normalizeHydratedBookingHolder(b || {});
+        var booking = _this26.normalizeHydratedBookingHolder(b || {});
         return _objectSpread(_objectSpread({}, booking), {}, {
           is_all: normalizeBookingIsAll(booking),
           sub_type: normalizeBookingSubType(booking)
@@ -5436,7 +5595,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeHydratedOrderProduct",
     value: function normalizeHydratedOrderProduct(product) {
-      var _this26 = this;
+      var _this27 = this;
       var row = _objectSpread({}, product || {});
       if (row.num === undefined && row.product_quantity !== undefined) {
         row.num = row.product_quantity;
@@ -5444,7 +5603,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 _this26.normalizeHydratedProductOptionItem(optionItem || {});
+          return _this27.normalizeHydratedProductOptionItem(optionItem || {});
         }))
       });
       delete row["product_".concat('option', "_item")];
@@ -5453,6 +5612,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (row.booking_uid && !row.metadata.booking_uid) {
         row.metadata.booking_uid = row.booking_uid;
       }
+      row = restoreHydratedBundleDiscounts(row, normalizeOrderProductDiscountList);
       var existingIdentity = row.metadata.unique_identification_number || row.unique_identification_number;
       if (!existingIdentity) {
         row.metadata.unique_identification_number = createUuidV4();
@@ -5464,7 +5624,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         metadata: _objectSpread(_objectSpread({}, row.metadata), normalized.metadata)
       });
       if (result.metadata) delete result.metadata.price_schema_version;
-      return this.sanitizeOrderProductForTempOrder(result);
+      var restored = restoreHydratedBundleDiscounts(result, normalizeOrderProductDiscountList);
+      return this.sanitizeOrderProductForTempOrder(restored);
     }
   }, {
     key: "getLastOrderInfo",