@pisell/pisellos 2.3.6 → 2.3.8

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; }
@@ -32,12 +32,13 @@ 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, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, createUuidV4, formatDateTime, isTempOrder, normalizeBookingIsAll, normalizeBookingSubType, mapPaymentItemsToOrderPayments, normalizeOrderProductDiscountList, resolveEffectivePerUnitDiscount, ensureProductSku, getProductSkuOptions, normalizeProductSkuOptions, sumOptionUnitPrice, clearTempOrderHolderAssignments, getOrderProductLineUid, indexOrderProductsByUid, calculateOrderProductsDeposit, mergeOrderProductDisplayFields } from "./utils";
+import { composeLinePrice, generateDuration, getAllDiscountList, mergeRelationForms, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, createUuidV4, formatDateTime, isTempOrder, normalizeBookingIsAll, normalizeBookingSubType, mapPaymentItemsToOrderPayments, normalizeOrderProductDiscountList, resolveEffectivePerUnitDiscount, ensureProductSku, getProductSkuOptions, normalizeProductSkuOptions, sumOptionUnitPrice, clearTempOrderHolderAssignments, getOrderProductLineUid, indexOrderProductsByUid, calculateOrderProductsDeposit, mergeOrderProductDisplayFields, resolveIsFormSubject } from "./utils";
 import { isNormalProduct } from "../Product/utils";
 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,20 @@ 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;
+}
 export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(OrderModule, _BaseModule);
   var _super = _createSuper(OrderModule);
@@ -108,7 +123,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 +153,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: '',
@@ -224,6 +248,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           product.metadata.main_product_selling_price = newMainSellingPrice;
           product.metadata.price_schema_version = 2;
         }
+        if (Array.isArray(product.product_bundle)) {
+          product.product_bundle = product.product_bundle.map(function (bundle) {
+            var _ref12, _bundle$original_pric;
+            var hasBundleDiscount = Array.isArray(bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) && bundle.discount_list.length > 0;
+            if (hasBundleDiscount) return bundle;
+            var restoredPrice = (_ref12 = (_bundle$original_pric = bundle === null || bundle === void 0 ? void 0 : bundle.original_price) !== null && _bundle$original_pric !== void 0 ? _bundle$original_pric : bundle === null || bundle === void 0 ? void 0 : bundle.product_price) !== null && _ref12 !== void 0 ? _ref12 : bundle === null || bundle === void 0 ? void 0 : bundle.price;
+            if (restoredPrice === undefined || restoredPrice === null || restoredPrice === '') return bundle;
+            return _objectSpread(_objectSpread({}, bundle), {}, {
+              price: restoredPrice,
+              bundle_selling_price: restoredPrice
+            });
+          });
+        }
         product.selling_price = composeLinePrice({
           mainPrice: newMainSellingPrice,
           bundle: product.product_bundle
@@ -553,8 +590,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "scanCode",
     value: function () {
       var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(code, customerId) {
-        var _this$store$discount7, _tempOrder$holder, _this$store$summary, _tempOrder$holder2;
-        var resultDiscountWithReason, resultDiscountList, unavailableReasonKey, rulesModule, withScanList, currentSelected, tempOrder, holders, _ref12, isAvailable, newDiscountList, unavailableReason, _this$store$discount8;
+        var _this$store$discount7, _tempOrder$holder, _this$store$summary;
+        var resultDiscountWithReason, resultDiscountList, unavailableReasonKey, rulesModule, withScanList, currentSelected, tempOrder, holders, _ref13, isAvailable, newDiscountList, unavailableReason, _this$store$discount8;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -624,20 +661,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
             case 16:
               tempOrder = this.store.tempOrder;
-              holders = tempOrder !== null && tempOrder !== void 0 && (_tempOrder$holder = tempOrder.holder) !== null && _tempOrder$holder !== void 0 && _tempOrder$holder.form_record_id ? [{
-                form_record_id: tempOrder.holder.form_record_id
-              }] : [];
-              _ref12 = rulesModule.isDiscountListAvailable({
+              holders = (tempOrder === null || tempOrder === void 0 || (_tempOrder$holder = tempOrder.holder) === null || _tempOrder$holder === void 0 ? void 0 : _tempOrder$holder.form_record) || [];
+              _ref13 = rulesModule.isDiscountListAvailable({
                 productList: (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.products) || [],
                 oldDiscountList: this.getDiscountList(),
                 newDiscountList: withScanList,
                 orderTotalAmount: Number(((_this$store$summary = this.store.summary) === null || _this$store$summary === void 0 ? void 0 : _this$store$summary.total_amount) || 0),
                 holders: holders,
-                isFormSubject: !!(tempOrder !== null && tempOrder !== void 0 && (_tempOrder$holder2 = tempOrder.holder) !== null && _tempOrder$holder2 !== void 0 && _tempOrder$holder2.type) && tempOrder.holder.type === 'form'
+                isFormSubject: function isFormSubject(product) {
+                  return resolveIsFormSubject(tempOrder, product);
+                }
               }) || {
                 isAvailable: false,
                 discountList: this.getDiscountList()
-              }, isAvailable = _ref12.isAvailable, newDiscountList = _ref12.discountList, unavailableReason = _ref12.unavailableReason;
+              }, isAvailable = _ref13.isAvailable, newDiscountList = _ref13.discountList, unavailableReason = _ref13.unavailableReason;
               if (isAvailable && newDiscountList) {
                 (_this$store$discount8 = this.store.discount) === null || _this$store$discount8 === void 0 || _this$store$discount8.setDiscountList(newDiscountList);
                 this.applyDiscount();
@@ -664,8 +701,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "applyDiscount",
     value: function applyDiscount() {
       var _this$store$discount9,
-        _tempOrder$holder3,
-        _tempOrder$holder4,
+        _tempOrder$holder2,
         _this$store$summary2,
         _this2 = this;
       var tempOrder = this.store.tempOrder;
@@ -674,26 +710,27 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       // appliedProductDetails / savedAmount 复位。
       if (!tempOrder) return;
       delete tempOrder.discount_list;
-      if (this.shouldSkipDiscountCalculation(tempOrder)) return;
+      var discountList = ((_this$store$discount9 = this.store.discount) === null || _this$store$discount9 === void 0 ? void 0 : _this$store$discount9.getDiscountList()) || [];
+      var shouldSkipDiscountCalculation = this.shouldSkipDiscountCalculation(tempOrder);
+      if (shouldSkipDiscountCalculation) return;
       var rulesModule = this.store.rules;
       if (!rulesModule) return;
-      var discountList = ((_this$store$discount9 = this.store.discount) === null || _this$store$discount9 === void 0 ? void 0 : _this$store$discount9.getDiscountList()) || [];
-      var holders = (_tempOrder$holder3 = tempOrder.holder) !== null && _tempOrder$holder3 !== void 0 && _tempOrder$holder3.form_record_id ? [{
-        form_record_id: tempOrder.holder.form_record_id
-      }] : [];
+      var holders = ((_tempOrder$holder2 = tempOrder.holder) === null || _tempOrder$holder2 === void 0 ? void 0 : _tempOrder$holder2.form_record) || [];
       var result = rulesModule.calcDiscount({
         productList: tempOrder.products,
         discountList: discountList,
         holders: holders,
-        isFormSubject: !!((_tempOrder$holder4 = tempOrder.holder) !== null && _tempOrder$holder4 !== void 0 && _tempOrder$holder4.type) && tempOrder.holder.type === 'form',
+        isFormSubject: function isFormSubject(product) {
+          return resolveIsFormSubject(tempOrder, product);
+        },
         orderTotalAmount: Number(((_this$store$summary2 = this.store.summary) === null || _this$store$summary2 === void 0 ? void 0 : _this$store$summary2.total_amount) || 0)
       });
       if (result !== null && result !== void 0 && result.productList) {
         var previousProductsByUid = indexOrderProductsByUid(tempOrder.products);
         tempOrder.products = this.applyProductDiscountPrices((result.productList || []).map(function (product, index) {
-          var _ref13;
+          var _ref14;
           var uid = getOrderProductLineUid(product);
-          var previous = (_ref13 = uid ? previousProductsByUid.get(uid) : undefined) !== null && _ref13 !== void 0 ? _ref13 : previousProductsByUid.get("__index__:".concat(index));
+          var previous = (_ref14 = uid ? previousProductsByUid.get(uid) : undefined) !== null && _ref14 !== void 0 ? _ref14 : previousProductsByUid.get("__index__:".concat(index));
           if (isManualProductDiscountProduct(previous)) {
             return previous;
           }
@@ -1218,15 +1255,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "extractOrderIdFromSubmitResult",
     value: function extractOrderIdFromSubmitResult(result) {
-      var _ref14, _ref15, _ref16, _result$data$order_id, _result$data, _result$data2;
-      return (_ref14 = (_ref15 = (_ref16 = (_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 && _ref16 !== void 0 ? _ref16 : result === null || result === void 0 || (_result$data2 = result.data) === null || _result$data2 === void 0 ? void 0 : _result$data2.id) !== null && _ref15 !== void 0 ? _ref15 : result === null || result === void 0 ? void 0 : result.id) !== null && _ref14 !== void 0 ? _ref14 : null;
+      var _ref15, _ref16, _ref17, _result$data$order_id, _result$data, _result$data2;
+      return (_ref15 = (_ref16 = (_ref17 = (_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 && _ref17 !== void 0 ? _ref17 : result === null || result === void 0 || (_result$data2 = result.data) === null || _result$data2 === void 0 ? void 0 : _result$data2.id) !== null && _ref16 !== void 0 ? _ref16 : result === null || result === void 0 ? void 0 : result.id) !== null && _ref15 !== void 0 ? _ref15 : null;
     }
   }, {
     key: "calculatePaymentEffectiveAmount",
     value: function calculatePaymentEffectiveAmount(payment) {
-      var _ref17, _payment$origin_amoun;
+      var _ref18, _payment$origin_amoun;
       var amount = new Decimal(payment.amount || 0);
-      var originAmount = new Decimal((_ref17 = (_payment$origin_amoun = payment.origin_amount) !== null && _payment$origin_amoun !== void 0 ? _payment$origin_amoun : payment.amount) !== null && _ref17 !== void 0 ? _ref17 : 0);
+      var originAmount = new Decimal((_ref18 = (_payment$origin_amoun = payment.origin_amount) !== null && _payment$origin_amoun !== void 0 ? _payment$origin_amoun : payment.amount) !== null && _ref18 !== void 0 ? _ref18 : 0);
       var serviceFee = new Decimal(payment.service_fee || 0);
       // TODO: 后端允许 amount 表示顾客实际支付总额后，移除这个兼容分支。
       var effectiveAmount = serviceFee.gt(0) && amount.eq(originAmount) ? amount.plus(serviceFee) : amount;
@@ -1240,6 +1277,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));
     }
@@ -1315,13 +1353,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         })
       });
       tempOrder.deposit_amount = snapshot.depositAmount;
-      tempOrder.is_deposit = snapshot.isDeposit;
+      tempOrder.is_deposit = tempOrder.is_deposit === 0 && new Decimal(tempOrder.deposit_amount || 0).gt(0) ? 0 : snapshot.isDeposit;
       return nextSummary;
     }
   }, {
     key: "isDepositOrder",
     value: function isDepositOrder(tempOrder, depositAmount) {
-      return tempOrder.is_deposit === 1 || depositAmount.gt(0);
+      return tempOrder.is_deposit === 1 && depositAmount.gt(0);
     }
   }, {
     key: "getOrderExpectedAmount",
@@ -1368,7 +1406,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 !== '') {
@@ -1390,7 +1428,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizePaymentSource",
     value: function normalizePaymentSource(payment, options) {
-      var _ref18, _paymentRecord$origin;
+      var _ref19, _paymentRecord$origin;
       var paymentRecord = payment;
       var metadata = paymentRecord.metadata && _typeof(paymentRecord.metadata) === 'object' ? _objectSpread({}, paymentRecord.metadata) : {};
       if (!metadata.unique_payment_number) {
@@ -1398,7 +1436,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       var normalized = _objectSpread(_objectSpread({}, paymentRecord), {}, {
         metadata: metadata,
-        origin_amount: (_ref18 = (_paymentRecord$origin = paymentRecord.origin_amount) !== null && _paymentRecord$origin !== void 0 ? _paymentRecord$origin : paymentRecord.amount) !== null && _ref18 !== void 0 ? _ref18 : '0.00'
+        origin_amount: (_ref19 = (_paymentRecord$origin = paymentRecord.origin_amount) !== null && _paymentRecord$origin !== void 0 ? _paymentRecord$origin : paymentRecord.amount) !== null && _ref19 !== void 0 ? _ref19 : '0.00'
       });
       if (paymentRecord.status !== undefined) {
         normalized.status = paymentRecord.status;
@@ -1519,7 +1557,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),
@@ -1731,7 +1769,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _product$payment_pric,
         _sku$code,
         _sku$barcode,
-        _ref19,
+        _ref20,
         _sku$variant_id,
         _this8 = this;
       var sku = (product === null || product === void 0 ? void 0 : product.product_sku) || {};
@@ -1758,24 +1796,24 @@ 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: (_ref19 = (_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 && _ref19 !== void 0 ? _ref19 : 0,
+          variant_id: (_ref20 = (_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 && _ref20 !== void 0 ? _ref20 : 0,
           variant: sku.variant || [],
           option: getProductSkuOptions(product || {}).map(function (option) {
-            var _ref20, _option$id, _option$option_group_, _ref21, _option$option_group_2, _option$num, _option$add_price;
+            var _ref21, _option$id, _option$option_group_, _ref22, _option$option_group_2, _option$num, _option$add_price;
             return {
-              id: (_ref20 = (_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 && _ref20 !== void 0 ? _ref20 : null,
+              id: (_ref21 = (_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 && _ref21 !== void 0 ? _ref21 : 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: (_ref21 = (_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 && _ref21 !== void 0 ? _ref21 : null,
+              option_group_item_id: (_ref22 = (_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 && _ref22 !== void 0 ? _ref22 : 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: _this8.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 _ref22, _ref23, _bundle$bundle_produc, _ref24, _bundle$bundle_varian, _bundle$num, _bundle$price_type, _bundle$price_type_ex;
+          var _ref23, _ref24, _bundle$bundle_produc, _ref25, _bundle$bundle_varian, _bundle$num, _bundle$price_type, _bundle$price_type_ex;
           return {
-            bundle_product_id: (_ref22 = (_ref23 = (_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 && _ref23 !== void 0 ? _ref23 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id) !== null && _ref22 !== void 0 ? _ref22 : null,
-            bundle_variant_id: (_ref24 = (_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 && _ref24 !== void 0 ? _ref24 : 0,
+            bundle_product_id: (_ref23 = (_ref24 = (_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 && _ref24 !== void 0 ? _ref24 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id) !== null && _ref23 !== void 0 ? _ref23 : null,
+            bundle_variant_id: (_ref25 = (_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 && _ref25 !== void 0 ? _ref25 : 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: _this8.normalizeFingerprintMoney(bundle === null || bundle === void 0 ? void 0 : bundle.price),
             bundle_selling_price: _this8.normalizeFingerprintMoney(bundle === null || bundle === void 0 ? void 0 : bundle.bundle_selling_price),
@@ -1784,10 +1822,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           };
         })),
         discount_list: this.normalizeFingerprintValue(((product === null || product === void 0 ? void 0 : product.discount_list) || []).map(function (discount) {
-          var _ref25, _discount$type2, _ref26, _ref27, _discount$discount_id, _discount$discount;
+          var _ref26, _discount$type2, _ref27, _ref28, _discount$discount_id, _discount$discount;
           return {
-            type: (_ref25 = (_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 && _ref25 !== void 0 ? _ref25 : '',
-            discount_id: (_ref26 = (_ref27 = (_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 && _ref27 !== void 0 ? _ref27 : discount === null || discount === void 0 || (_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) !== null && _ref26 !== void 0 ? _ref26 : null,
+            type: (_ref26 = (_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 && _ref26 !== void 0 ? _ref26 : '',
+            discount_id: (_ref27 = (_ref28 = (_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 && _ref28 !== void 0 ? _ref28 : discount === null || discount === void 0 || (_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) !== null && _ref27 !== void 0 ? _ref27 : null,
             amount: _this8.normalizeFingerprintMoney(discount === null || discount === void 0 ? void 0 : discount.amount)
           };
         }))
@@ -1811,14 +1849,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var _product$product_id3,
         _product$product_vari2,
         _product$num2,
-        _ref28,
+        _ref29,
         _metadata$unique_iden,
         _metadata$price_overr,
         _metadata$is_manual_d,
         _metadata$product_dis,
         _sku$code2,
         _sku$barcode2,
-        _ref29,
+        _ref30,
         _sku$variant_id2,
         _this10 = this;
       var sku = (product === null || product === void 0 ? void 0 : product.product_sku) || {};
@@ -1834,7 +1872,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: (_ref28 = (_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 && _ref28 !== void 0 ? _ref28 : '',
+          unique_identification_number: (_ref29 = (_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 && _ref29 !== void 0 ? _ref29 : '',
           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 : ''
@@ -1842,35 +1880,35 @@ 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: (_ref29 = (_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 && _ref29 !== void 0 ? _ref29 : 0,
+          variant_id: (_ref30 = (_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 && _ref30 !== void 0 ? _ref30 : 0,
           variant: sku.variant || [],
           option: getProductSkuOptions(product || {}).map(function (option) {
-            var _ref30, _option$id2, _option$option_group_3, _ref31, _option$option_group_4, _option$num2, _option$add_price2;
+            var _ref31, _option$id2, _option$option_group_3, _ref32, _option$option_group_4, _option$num2, _option$add_price2;
             return {
-              id: (_ref30 = (_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 && _ref30 !== void 0 ? _ref30 : null,
+              id: (_ref31 = (_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 && _ref31 !== void 0 ? _ref31 : 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: (_ref31 = (_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 && _ref31 !== void 0 ? _ref31 : null,
+              option_group_item_id: (_ref32 = (_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 && _ref32 !== void 0 ? _ref32 : 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: _this10.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 _ref32, _bundle$bundle_id, _ref33, _bundle$bundle_group_, _ref34, _ref35, _bundle$bundle_produc2, _ref36, _bundle$bundle_varian2, _bundle$num2, _bundle$price_type2, _bundle$price_type_ex2;
+          var _ref33, _bundle$bundle_id, _ref34, _bundle$bundle_group_, _ref35, _ref36, _bundle$bundle_produc2, _ref37, _bundle$bundle_varian2, _bundle$num2, _bundle$price_type2, _bundle$price_type_ex2;
           return {
-            bundle_id: (_ref32 = (_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 && _ref32 !== void 0 ? _ref32 : null,
-            bundle_group_id: (_ref33 = (_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 && _ref33 !== void 0 ? _ref33 : null,
-            bundle_product_id: (_ref34 = (_ref35 = (_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 && _ref35 !== void 0 ? _ref35 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id) !== null && _ref34 !== void 0 ? _ref34 : null,
-            bundle_variant_id: (_ref36 = (_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 && _ref36 !== void 0 ? _ref36 : 0,
+            bundle_id: (_ref33 = (_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 && _ref33 !== void 0 ? _ref33 : null,
+            bundle_group_id: (_ref34 = (_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 && _ref34 !== void 0 ? _ref34 : null,
+            bundle_product_id: (_ref35 = (_ref36 = (_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 && _ref36 !== void 0 ? _ref36 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id) !== null && _ref35 !== void 0 ? _ref35 : null,
+            bundle_variant_id: (_ref37 = (_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 && _ref37 !== void 0 ? _ref37 : 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: _this10.normalizeFingerprintValue(((bundle === null || bundle === void 0 ? void 0 : bundle.option) || []).map(function (option) {
-              var _ref37, _option$id3, _option$option_group_5, _ref38, _option$option_group_6, _option$num3, _option$add_price3;
+              var _ref38, _option$id3, _option$option_group_5, _ref39, _option$option_group_6, _option$num3, _option$add_price3;
               return {
-                id: (_ref37 = (_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 && _ref37 !== void 0 ? _ref37 : null,
+                id: (_ref38 = (_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 && _ref38 !== void 0 ? _ref38 : 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: (_ref38 = (_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 && _ref38 !== void 0 ? _ref38 : null,
+                option_group_item_id: (_ref39 = (_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 && _ref39 !== void 0 ? _ref39 : 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: _this10.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)
               };
@@ -1878,10 +1916,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           };
         })),
         discount_list: this.normalizeFingerprintValue(((product === null || product === void 0 ? void 0 : product.discount_list) || []).map(function (discount) {
-          var _ref39, _discount$type4, _ref40, _ref41, _discount$discount_id2, _discount$discount2;
+          var _ref40, _discount$type4, _ref41, _ref42, _discount$discount_id2, _discount$discount2;
           return {
-            type: (_ref39 = (_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 && _ref39 !== void 0 ? _ref39 : '',
-            discount_id: (_ref40 = (_ref41 = (_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 && _ref41 !== void 0 ? _ref41 : discount === null || discount === void 0 || (_discount$discount2 = discount.discount) === null || _discount$discount2 === void 0 ? void 0 : _discount$discount2.resource_id) !== null && _ref40 !== void 0 ? _ref40 : null,
+            type: (_ref40 = (_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 && _ref40 !== void 0 ? _ref40 : '',
+            discount_id: (_ref41 = (_ref42 = (_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 && _ref42 !== void 0 ? _ref42 : discount === null || discount === void 0 || (_discount$discount2 = discount.discount) === null || _discount$discount2 === void 0 ? void 0 : _discount$discount2.resource_id) !== null && _ref41 !== void 0 ? _ref41 : null,
             amount: _this10.normalizeFingerprintMoney(discount === null || discount === void 0 ? void 0 : discount.amount)
           };
         }))
@@ -2088,6 +2126,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;
@@ -2161,11 +2200,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderIdentity",
     value: function getOrderIdentity() {
-      var _ref42, _ref43, _tempOrder$order_id, _tempOrder$_extend6;
+      var _ref43, _ref44, _tempOrder$order_id, _tempOrder$_extend6;
       var tempOrder = this.store.tempOrder;
       if (!tempOrder) return null;
       var lastOrderInfo = this.store.lastOrderInfo || {};
-      var orderId = (_ref42 = (_ref43 = (_tempOrder$order_id = tempOrder.order_id) !== null && _tempOrder$order_id !== void 0 ? _tempOrder$order_id : lastOrderInfo.order_id) !== null && _ref43 !== void 0 ? _ref43 : lastOrderInfo.id) !== null && _ref42 !== void 0 ? _ref42 : null;
+      var orderId = (_ref43 = (_ref44 = (_tempOrder$order_id = tempOrder.order_id) !== null && _tempOrder$order_id !== void 0 ? _tempOrder$order_id : lastOrderInfo.order_id) !== null && _ref44 !== void 0 ? _ref44 : lastOrderInfo.id) !== null && _ref43 !== void 0 ? _ref43 : null;
       return {
         localId: this.cacheId || ((_tempOrder$_extend6 = tempOrder._extend) === null || _tempOrder$_extend6 === void 0 ? void 0 : _tempOrder$_extend6.localId),
         orderId: orderId,
@@ -2200,7 +2239,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         orderPaidAmount: paidPaymentSummary.gapPaidAmount
       });
       return {
-        isDeposit: tempOrder.is_deposit === 1 || depositAmount !== '0.00',
+        isDeposit: tempOrder.is_deposit === 1,
         depositAmount: depositAmount,
         expectAmount: summary.expect_amount || '0.00',
         totalAmount: summary.total_amount || '0.00',
@@ -2318,11 +2357,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "captureProductRuntime",
     value: function captureProductRuntime(tempOrder, rawProduct, normalizedProduct, existedUid) {
-      var _extend$productsByUid, _ref44, _rawProduct$_origin;
+      var _extend$productsByUid, _ref45, _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 = (_ref44 = (_rawProduct$_origin = rawProduct._origin) !== null && _rawProduct$_origin !== void 0 ? _rawProduct$_origin : normalizedProduct._origin) !== null && _ref44 !== void 0 ? _ref44 : existed.origin;
+      var origin = (_ref45 = (_rawProduct$_origin = rawProduct._origin) !== null && _rawProduct$_origin !== void 0 ? _rawProduct$_origin : normalizedProduct._origin) !== null && _ref45 !== void 0 ? _ref45 : existed.origin;
       extend.productsByUid[uid] = _objectSpread(_objectSpread({}, existed), origin !== undefined ? {
         origin: origin
       } : {});
@@ -2423,7 +2462,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildTempOrderHolderFromBookings",
     value: function buildTempOrderHolderFromBookings(tempOrder) {
-      var _baseHolder$customer_, _baseHolder, _ref45, _baseHolder$form_id, _baseHolder2, _tempOrder$holder5, _baseHolder3, _this$otherParams;
+      var _baseHolder$customer_, _baseHolder, _ref46, _baseHolder$form_id, _baseHolder2, _tempOrder$holder3, _baseHolder3, _this$otherParams;
       var holderRecords = [];
       var holderNames = [];
       var baseHolder = null;
@@ -2470,7 +2509,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: (_ref45 = (_baseHolder$form_id = (_baseHolder2 = baseHolder) === null || _baseHolder2 === void 0 ? void 0 : _baseHolder2.form_id) !== null && _baseHolder$form_id !== void 0 ? _baseHolder$form_id : (_tempOrder$holder5 = tempOrder.holder) === null || _tempOrder$holder5 === void 0 ? void 0 : _tempOrder$holder5.form_id) !== null && _ref45 !== void 0 ? _ref45 : 0,
+        form_id: (_ref46 = (_baseHolder$form_id = (_baseHolder2 = baseHolder) === null || _baseHolder2 === void 0 ? void 0 : _baseHolder2.form_id) !== null && _baseHolder$form_id !== void 0 ? _baseHolder$form_id : (_tempOrder$holder3 = tempOrder.holder) === null || _tempOrder$holder3 === void 0 ? void 0 : _tempOrder$holder3.form_id) !== null && _ref46 !== void 0 ? _ref46 : 0,
         form_record: holderRecords
       };
       if (holderNames.length) {
@@ -2565,15 +2604,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           hasDeposit: true
         } : undefined
       });
+      var isExistingDepositDisabled = tempOrder.is_deposit === 0 && new Decimal(tempOrder.deposit_amount || 0).gt(0);
       tempOrder.deposit_amount = depositAmount;
-      tempOrder.is_deposit = hasDepositAmount ? 1 : 0;
+      tempOrder.is_deposit = hasDepositAmount && !isExistingDepositDisabled ? 1 : 0;
       return this.applyLastOrderDepositSnapshot(tempOrder, nextSummary);
     }
   }, {
     key: "recalculateSummary",
     value: function () {
       var _recalculateSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(options) {
-        var _ref46, _salesSummaryResult$e;
+        var _ref47, _salesSummaryResult$e;
         var tempOrder, snapshotSummary, shouldFullRecalculateFromSnapshot, summaryProducts, salesSummary, existedSummary, totalRefundAmount, paidPaymentSummary, emptyBaseSummary, emptySummaryBase, emptySummaryWithDeposit, emptySummary, salesSummaryResult, roundingAmount, payServiceChargeAmount, hasSalesSummaryAmount, expectAmount, amountPaymentPatch, normalizedExpectAmountPatch, summaryForGap, summary;
         return _regeneratorRuntime().wrap(function _callee11$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
@@ -2646,7 +2686,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((_ref46 = (_salesSummaryResult$e = salesSummaryResult.expect_amount) !== null && _salesSummaryResult$e !== void 0 ? _salesSummaryResult$e : salesSummaryResult.total_amount) !== null && _ref46 !== void 0 ? _ref46 : 0) : null;
+              expectAmount = hasSalesSummaryAmount ? new Decimal((_ref47 = (_salesSummaryResult$e = salesSummaryResult.expect_amount) !== null && _salesSummaryResult$e !== void 0 ? _salesSummaryResult$e : salesSummaryResult.total_amount) !== null && _ref47 !== void 0 ? _ref47 : 0) : null;
               amountPaymentPatch = hasSalesSummaryAmount || !roundingAmount.eq(0) || !payServiceChargeAmount.eq(0) ? _objectSpread({
                 rounding_amount: roundingAmount.toFixed(2)
               }, expectAmount ? {
@@ -2824,17 +2864,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildTempOrderCustomer",
     value: function buildTempOrderCustomer(params) {
-      var _ref47, _ref48, _ref49, _source$name, _ref50, _ref51, _ref52, _source$customer_name, _source$id, _source$customer_id, _ref53, _source$country_calli, _source$phone, _source$email;
+      var _ref48, _ref49, _ref50, _source$name, _ref51, _ref52, _ref53, _source$customer_name, _source$id, _source$customer_id, _ref54, _source$country_calli, _source$phone, _source$email;
       if (!params.customerId) return null;
       var source = params.source ? cloneDeep(params.source) : {};
-      var name = (_ref47 = (_ref48 = (_ref49 = (_source$name = source.name) !== null && _source$name !== void 0 ? _source$name : source.display_name) !== null && _ref49 !== void 0 ? _ref49 : source.customerName) !== null && _ref48 !== void 0 ? _ref48 : source.customer_name) !== null && _ref47 !== void 0 ? _ref47 : params.customerName;
-      var customerName = (_ref50 = (_ref51 = (_ref52 = (_source$customer_name = source.customer_name) !== null && _source$customer_name !== void 0 ? _source$customer_name : source.customerName) !== null && _ref52 !== void 0 ? _ref52 : source.display_name) !== null && _ref51 !== void 0 ? _ref51 : source.name) !== null && _ref50 !== void 0 ? _ref50 : params.customerName;
+      var name = (_ref48 = (_ref49 = (_ref50 = (_source$name = source.name) !== null && _source$name !== void 0 ? _source$name : source.display_name) !== null && _ref50 !== void 0 ? _ref50 : source.customerName) !== null && _ref49 !== void 0 ? _ref49 : source.customer_name) !== null && _ref48 !== void 0 ? _ref48 : params.customerName;
+      var customerName = (_ref51 = (_ref52 = (_ref53 = (_source$customer_name = source.customer_name) !== null && _source$customer_name !== void 0 ? _source$customer_name : source.customerName) !== null && _ref53 !== void 0 ? _ref53 : source.display_name) !== null && _ref52 !== void 0 ? _ref52 : source.name) !== null && _ref51 !== void 0 ? _ref51 : 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((_ref53 = (_source$country_calli = source.country_calling_code) !== null && _source$country_calli !== void 0 ? _source$country_calli : source.countryCallingCode) !== null && _ref53 !== void 0 ? _ref53 : params.countryCallingCode),
+        country_calling_code: String((_ref54 = (_source$country_calli = source.country_calling_code) !== null && _source$country_calli !== void 0 ? _source$country_calli : source.countryCallingCode) !== null && _ref54 !== void 0 ? _ref54 : 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)
       });
@@ -2933,14 +2973,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateTempOrderCustomer",
     value: function updateTempOrderCustomer(customer) {
-      var _tempOrder$customer_i2, _ref54, _ref55, _customer$customer_id, _ref56, _ref57, _ref58, _customer$customer_na, _ref59, _customer$country_cal, _tempOrder$customer_i3;
+      var _tempOrder$customer_i2, _ref55, _ref56, _customer$customer_id, _ref57, _ref58, _ref59, _customer$customer_na, _ref60, _customer$country_cal, _tempOrder$customer_i3;
       var tempOrder = this.ensureTempOrder();
       var previousCustomerId = (_tempOrder$customer_i2 = tempOrder.customer_id) !== null && _tempOrder$customer_i2 !== void 0 ? _tempOrder$customer_i2 : null;
-      var customerId = (_ref54 = (_ref55 = (_customer$customer_id = customer.customer_id) !== null && _customer$customer_id !== void 0 ? _customer$customer_id : customer.customerId) !== null && _ref55 !== void 0 ? _ref55 : customer.id) !== null && _ref54 !== void 0 ? _ref54 : null;
-      var customerName = (_ref56 = (_ref57 = (_ref58 = (_customer$customer_na = customer.customer_name) !== null && _customer$customer_na !== void 0 ? _customer$customer_na : customer.customerName) !== null && _ref58 !== void 0 ? _ref58 : customer.display_name) !== null && _ref57 !== void 0 ? _ref57 : customer.name) !== null && _ref56 !== void 0 ? _ref56 : '';
+      var customerId = (_ref55 = (_ref56 = (_customer$customer_id = customer.customer_id) !== null && _customer$customer_id !== void 0 ? _customer$customer_id : customer.customerId) !== null && _ref56 !== void 0 ? _ref56 : customer.id) !== null && _ref55 !== void 0 ? _ref55 : null;
+      var customerName = (_ref57 = (_ref58 = (_ref59 = (_customer$customer_na = customer.customer_name) !== null && _customer$customer_na !== void 0 ? _customer$customer_na : customer.customerName) !== null && _ref59 !== void 0 ? _ref59 : customer.display_name) !== null && _ref58 !== void 0 ? _ref58 : customer.name) !== null && _ref57 !== void 0 ? _ref57 : '';
       tempOrder.customer_id = customerId === null || customerId === undefined || customerId === '' ? null : Number(customerId);
       tempOrder.customer_name = String(customerName || '');
-      tempOrder.country_calling_code = String((_ref59 = (_customer$country_cal = customer.country_calling_code) !== null && _customer$country_cal !== void 0 ? _customer$country_cal : customer.countryCallingCode) !== null && _ref59 !== void 0 ? _ref59 : '');
+      tempOrder.country_calling_code = String((_ref60 = (_customer$country_cal = customer.country_calling_code) !== null && _customer$country_cal !== void 0 ? _customer$country_cal : customer.countryCallingCode) !== null && _ref60 !== void 0 ? _ref60 : '');
       tempOrder.phone = String(customer.phone || '');
       tempOrder.email = String(customer.email || '');
       tempOrder.customer = this.buildTempOrderCustomer({
@@ -2991,6 +3031,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (String(previousCustomerId !== null && previousCustomerId !== void 0 ? previousCustomerId : '') !== String(nextCustomerId !== null && nextCustomerId !== void 0 ? nextCustomerId : '')) {
         clearTempOrderHolderAssignments(tempOrder);
         this.clearCustomerBoundDiscounts(tempOrder);
+        this.applyDiscount();
       }
       this.persistTempOrder();
       this.saveDraftInBackground();
@@ -3157,6 +3198,76 @@ 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'
+      }));
+      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 支付项。
@@ -3166,45 +3277,59 @@ 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 isOrderPaymentType = function isOrderPaymentType(value) {
+        return value === 'normal' || value === 'deposit';
       };
-      var hasSyncedOrderPayment = function hasSyncedOrderPayment(payment) {
-        return payment.order_payment_id !== undefined && payment.order_payment_id !== null;
+      var voucherOrderPaymentType = this.resolveNextOrderPaymentType(tempOrder);
+      var withVoucherPaymentType = function withVoucherPaymentType(payment) {
+        var paymentRecord = 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);
+        return _objectSpread(_objectSpread(_objectSpread({}, paymentRecord), shouldPreserveCustomPaymentType ? {
+          custom_payment_type: paymentRecord.type
+        } : {}), {}, {
+          type: nextPaymentType,
+          order_payment_type: nextPaymentType
+        });
+      };
+      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
+        });
       };
-      // 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 mappedVouchers = mapPaymentItemsToOrderPayments(payments.map(function (payment) {
-        return _this19.normalizePaymentSource(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);
+        return isVoucherPaymentRecord(payment) && hasSyncedOrderPaymentRecord(payment);
       });
       var syncedVoucherPaymentIds = new Set(syncedVoucherPayments.map(function (payment) {
         return String(payment.order_payment_id);
       }));
       var replaceableVouchers = mappedVouchers.filter(function (payment) {
-        if (!hasSyncedOrderPayment(payment)) return true;
+        if (!hasSyncedOrderPaymentRecord(payment)) return true;
         return !syncedVoucherPaymentIds.has(String(payment.order_payment_id));
       });
       var cappedVouchers = this.capVoucherPaymentsByRemainingAmount({
@@ -3217,7 +3342,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       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)
         });
       });
@@ -3353,7 +3478,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) {
@@ -3378,8 +3503,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;
@@ -3485,49 +3610,52 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "addProductToOrder",
     value: (function () {
       var _addProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(product, booking) {
-        var tempOrder, _ref60, _productRecord$num, productRecord, splitCount, i, singleLine;
+        var tempOrder, _ref61, _productRecord$num, productRecord, splitCount, i, singleLine;
         return _regeneratorRuntime().wrap(function _callee17$(_context19) {
           while (1) switch (_context19.prev = _context19.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
-              debugger;
               if (!booking) {
-                _context19.next = 19;
+                _context19.next = 18;
                 break;
               }
               productRecord = product;
-              splitCount = getSafeProductNum((_ref60 = (_productRecord$num = productRecord.num) !== null && _productRecord$num !== void 0 ? _productRecord$num : productRecord.product_quantity) !== null && _ref60 !== void 0 ? _ref60 : 1);
+              splitCount = getSafeProductNum((_ref61 = (_productRecord$num = productRecord.num) !== null && _productRecord$num !== void 0 ? _productRecord$num : productRecord.product_quantity) !== null && _ref61 !== void 0 ? _ref61 : 1);
               if (!(splitCount > 1)) {
-                _context19.next = 19;
+                _context19.next = 18;
                 break;
               }
               i = 0;
-            case 7:
+            case 6:
               if (!(i < splitCount)) {
-                _context19.next = 16;
+                _context19.next = 15;
                 break;
               }
               singleLine = cloneDeep(productRecord);
               singleLine.num = 1;
               delete singleLine.product_quantity;
-              _context19.next = 13;
+              _context19.next = 12;
               return this.appendProductLineToTempOrder(tempOrder, singleLine, cloneDeep(booking));
-            case 13:
+            case 12:
               i += 1;
-              _context19.next = 7;
+              _context19.next = 6;
               break;
-            case 16:
-              _context19.next = 18;
+            case 15:
+              _context19.next = 17;
               return this.finalizeProductOrderMutation(tempOrder);
-            case 18:
+            case 17:
               return _context19.abrupt("return", tempOrder.products);
-            case 19:
-              _context19.next = 21;
+            case 18:
+              _context19.next = 20;
               return this.appendProductLineToTempOrder(tempOrder, product, booking);
-            case 21:
-              _context19.next = 23;
+            case 20:
+              _context19.next = 22;
               return this.finalizeProductOrderMutation(tempOrder);
-            case 23:
+            case 22:
+              this.logInfo('addProductToOrder success', {
+                product_id: product.product_id,
+                with_booking: !!booking
+              });
               return _context19.abrupt("return", tempOrder.products);
             case 24:
             case "end":
@@ -3554,7 +3682,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "addProductsToOrder",
     value: (function () {
       var _addProductsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(items, options) {
-        var tempOrder, _iterator20, _step20, item, product, booking, _ref61, _productRecord$num2, productRecord, splitCount, i, singleLine;
+        var tempOrder, _iterator20, _step20, item, product, booking, _ref62, _productRecord$num2, productRecord, splitCount, i, singleLine;
         return _regeneratorRuntime().wrap(function _callee18$(_context20) {
           while (1) switch (_context20.prev = _context20.next) {
             case 0:
@@ -3586,7 +3714,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 break;
               }
               productRecord = product;
-              splitCount = getSafeProductNum((_ref61 = (_productRecord$num2 = productRecord.num) !== null && _productRecord$num2 !== void 0 ? _productRecord$num2 : productRecord.product_quantity) !== null && _ref61 !== void 0 ? _ref61 : 1);
+              splitCount = getSafeProductNum((_ref62 = (_productRecord$num2 = productRecord.num) !== null && _productRecord$num2 !== void 0 ? _productRecord$num2 : productRecord.product_quantity) !== null && _ref62 !== void 0 ? _ref62 : 1);
               if (!(splitCount > 1)) {
                 _context20.next = 26;
                 break;
@@ -3629,8 +3757,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();
           }
@@ -3663,24 +3794,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getBundleRuntimeIdentity",
     value: function getBundleRuntimeIdentity(bundle) {
-      var _ref62, _bundle$bundle_id2, _ref63, _bundle$bundle_group_2, _ref64, _ref65, _bundle$bundle_produc3, _ref66, _bundle$bundle_varian3;
+      var _ref63, _bundle$bundle_id2, _ref64, _bundle$bundle_group_2, _ref65, _ref66, _bundle$bundle_produc3, _ref67, _bundle$bundle_varian3;
       if (!bundle || _typeof(bundle) !== 'object') return '';
-      return [(_ref62 = (_bundle$bundle_id2 = bundle.bundle_id) !== null && _bundle$bundle_id2 !== void 0 ? _bundle$bundle_id2 : bundle.id) !== null && _ref62 !== void 0 ? _ref62 : '', (_ref63 = (_bundle$bundle_group_2 = bundle.bundle_group_id) !== null && _bundle$bundle_group_2 !== void 0 ? _bundle$bundle_group_2 : bundle.group_id) !== null && _ref63 !== void 0 ? _ref63 : '', (_ref64 = (_ref65 = (_bundle$bundle_produc3 = bundle.bundle_product_id) !== null && _bundle$bundle_produc3 !== void 0 ? _bundle$bundle_produc3 : bundle._bundle_product_id) !== null && _ref65 !== void 0 ? _ref65 : bundle.product_id) !== null && _ref64 !== void 0 ? _ref64 : '', (_ref66 = (_bundle$bundle_varian3 = bundle.bundle_variant_id) !== null && _bundle$bundle_varian3 !== void 0 ? _bundle$bundle_varian3 : bundle.product_variant_id) !== null && _ref66 !== void 0 ? _ref66 : 0].join('|');
+      return [(_ref63 = (_bundle$bundle_id2 = bundle.bundle_id) !== null && _bundle$bundle_id2 !== void 0 ? _bundle$bundle_id2 : bundle.id) !== null && _ref63 !== void 0 ? _ref63 : '', (_ref64 = (_bundle$bundle_group_2 = bundle.bundle_group_id) !== null && _bundle$bundle_group_2 !== void 0 ? _bundle$bundle_group_2 : bundle.group_id) !== null && _ref64 !== void 0 ? _ref64 : '', (_ref65 = (_ref66 = (_bundle$bundle_produc3 = bundle.bundle_product_id) !== null && _bundle$bundle_produc3 !== void 0 ? _bundle$bundle_produc3 : bundle._bundle_product_id) !== null && _ref66 !== void 0 ? _ref66 : bundle.product_id) !== null && _ref65 !== void 0 ? _ref65 : '', (_ref67 = (_bundle$bundle_varian3 = bundle.bundle_variant_id) !== null && _bundle$bundle_varian3 !== void 0 ? _bundle$bundle_varian3 : bundle.product_variant_id) !== null && _ref67 !== void 0 ? _ref67 : 0].join('|');
     }
   }, {
     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,
@@ -3848,8 +3979,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();
           }
@@ -3864,7 +3998,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) {
@@ -3877,13 +4011,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();
           }
@@ -3955,8 +4092,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();
           }
@@ -4041,7 +4181,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) {
@@ -4096,7 +4236,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);
                           }
@@ -4148,8 +4288,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();
           }
@@ -4211,8 +4354,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();
           }
@@ -4227,23 +4371,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildCurrentSubmitPayloadForLocalPrint",
     value: function buildCurrentSubmitPayloadForLocalPrint(params) {
-      var _params$cacheId, _this$otherParams2, _ref67, _params$businessCode, _this$otherParams3, _this$otherParams4;
+      var _params$cacheId, _this$otherParams2, _ref68, _params$businessCode, _this$otherParams3, _this$otherParams4;
       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$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2.platform),
-        businessCode: (_ref67 = (_params$businessCode = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams3 = this.otherParams) === null || _this$otherParams3 === void 0 ? void 0 : _this$otherParams3.businessCode) !== null && _ref67 !== void 0 ? _ref67 : (_this$otherParams4 = this.otherParams) === null || _this$otherParams4 === void 0 ? void 0 : _this$otherParams4.business_code,
+        businessCode: (_ref68 = (_params$businessCode = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams3 = this.otherParams) === null || _this$otherParams3 === void 0 ? void 0 : _this$otherParams3.businessCode) !== null && _ref68 !== void 0 ? _ref68 : (_this$otherParams4 = this.otherParams) === null || _this$otherParams4 === void 0 ? void 0 : _this$otherParams4.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 _ref68, _tempOrder$order_numb, _ref69, _tempOrder$shop_order, _ref70, _tempOrder$shop_full_;
+          var _ref69, _tempOrder$order_numb, _ref70, _tempOrder$shop_order, _ref71, _tempOrder$shop_full_;
           return _objectSpread(_objectSpread({}, nextPayload), {}, {
-            order_number: (_ref68 = (_tempOrder$order_numb = tempOrder.order_number) !== null && _tempOrder$order_numb !== void 0 ? _tempOrder$order_numb : nextPayload.order_number) !== null && _ref68 !== void 0 ? _ref68 : null,
-            shop_order_number: (_ref69 = (_tempOrder$shop_order = tempOrder.shop_order_number) !== null && _tempOrder$shop_order !== void 0 ? _tempOrder$shop_order : nextPayload.shop_order_number) !== null && _ref69 !== void 0 ? _ref69 : null,
-            shop_full_order_number: (_ref70 = (_tempOrder$shop_full_ = tempOrder.shop_full_order_number) !== null && _tempOrder$shop_full_ !== void 0 ? _tempOrder$shop_full_ : nextPayload.shop_full_order_number) !== null && _ref70 !== void 0 ? _ref70 : null,
+            order_number: (_ref69 = (_tempOrder$order_numb = tempOrder.order_number) !== null && _tempOrder$order_numb !== void 0 ? _tempOrder$order_numb : nextPayload.order_number) !== null && _ref69 !== void 0 ? _ref69 : null,
+            shop_order_number: (_ref70 = (_tempOrder$shop_order = tempOrder.shop_order_number) !== null && _tempOrder$shop_order !== void 0 ? _tempOrder$shop_order : nextPayload.shop_order_number) !== null && _ref70 !== void 0 ? _ref70 : null,
+            shop_full_order_number: (_ref71 = (_tempOrder$shop_full_ = tempOrder.shop_full_order_number) !== null && _tempOrder$shop_full_ !== void 0 ? _tempOrder$shop_full_ : nextPayload.shop_full_order_number) !== null && _ref71 !== void 0 ? _ref71 : null,
             small_ticket_data_flag: 1
           });
         }
@@ -4340,40 +4484,55 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "runSubmitTempOrder",
     value: function () {
       var _runSubmitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(params) {
-        var _params$cacheId2, _this$otherParams5, _ref71, _ref72, _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 _params$cacheId2, _this$otherParams5, _ref72, _ref73, _submitSnapshot$busin, _this$otherParams6, _this$otherParams7, _submitSnapshot$type;
+        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) || [])
+                  payments: preparedPaymentOverride || []
                 } : {}), hasPaymentStatusOverride ? {
                   payment_status: params === null || params === void 0 ? void 0 : params.paymentStatus
                 } : {}), hasSmallTicketDataFlagOverride ? {
@@ -4387,13 +4546,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 tempOrder: tempOrder,
                 cacheId: effectiveCacheId,
                 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: (_ref71 = (_ref72 = (_submitSnapshot$busin = submitSnapshot.businessCode) !== null && _submitSnapshot$busin !== void 0 ? _submitSnapshot$busin : params === null || params === void 0 ? void 0 : params.businessCode) !== null && _ref72 !== void 0 ? _ref72 : (_this$otherParams6 = this.otherParams) === null || _this$otherParams6 === void 0 ? void 0 : _this$otherParams6.businessCode) !== null && _ref71 !== void 0 ? _ref71 : (_this$otherParams7 = this.otherParams) === null || _this$otherParams7 === void 0 ? void 0 : _this$otherParams7.business_code,
+                businessCode: (_ref72 = (_ref73 = (_submitSnapshot$busin = submitSnapshot.businessCode) !== null && _submitSnapshot$busin !== void 0 ? _submitSnapshot$busin : params === null || params === void 0 ? void 0 : params.businessCode) !== null && _ref73 !== void 0 ? _ref73 : (_this$otherParams6 = this.otherParams) === null || _this$otherParams6 === void 0 ? void 0 : _this$otherParams6.businessCode) !== null && _ref72 !== void 0 ? _ref72 : (_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: (_submitSnapshot$type = submitSnapshot.type) !== null && _submitSnapshot$type !== void 0 ? _submitSnapshot$type : params === null || params === void 0 ? void 0 : params.type,
                 summary: latestSummary,
                 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;
               }
@@ -4401,10 +4561,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,
@@ -4414,26 +4574,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),
@@ -4443,15 +4603,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,
@@ -4459,29 +4619,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);
@@ -4553,10 +4713,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;
     }
   }, {
@@ -4584,41 +4744,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
@@ -4626,12 +4791,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();
           }
@@ -5144,27 +5309,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();
           }
@@ -5211,7 +5377,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) {
@@ -5234,10 +5400,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)
@@ -5267,7 +5433,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _step22;
       try {
         for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
-          var _product$metadata8, _ref73, _ref74, _existed$origin, _rawProduct$metadata;
+          var _product$metadata8, _ref74, _ref75, _existed$origin, _rawProduct$metadata;
           var _step22$value = _slicedToArray(_step22.value, 2),
             index = _step22$value[0],
             product = _step22$value[1];
@@ -5275,7 +5441,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 = (_ref73 = (_ref74 = (_existed$origin = existed.origin) !== null && _existed$origin !== void 0 ? _existed$origin : rawProduct._origin) !== null && _ref74 !== void 0 ? _ref74 : (_rawProduct$metadata = rawProduct.metadata) === null || _rawProduct$metadata === void 0 ? void 0 : _rawProduct$metadata.origin) !== null && _ref73 !== void 0 ? _ref73 : rawProduct;
+          var origin = (_ref74 = (_ref75 = (_existed$origin = existed.origin) !== null && _existed$origin !== void 0 ? _existed$origin : rawProduct._origin) !== null && _ref75 !== void 0 ? _ref75 : (_rawProduct$metadata = rawProduct.metadata) === null || _rawProduct$metadata === void 0 ? void 0 : _rawProduct$metadata.origin) !== null && _ref74 !== void 0 ? _ref74 : rawProduct;
           var originSnapshot = cloneDeep(origin);
           var productOptionString = this.buildHydratedProductOptionString(rawProduct) || this.buildHydratedProductOptionString(product);
           if (productOptionString && originSnapshot && _typeof(originSnapshot) === 'object') {
@@ -5385,10 +5551,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeHydratedProductOptionItem",
     value: function normalizeHydratedProductOptionItem(optionItem) {
-      var _ref75, _optionItem$num, _ref76, _optionItem$add_price;
-      var rawNum = (_ref75 = (_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 && _ref75 !== void 0 ? _ref75 : 1;
+      var _ref76, _optionItem$num, _ref77, _optionItem$add_price;
+      var rawNum = (_ref76 = (_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 && _ref76 !== void 0 ? _ref76 : 1;
       var parsedNum = Number(rawNum);
-      var rawPrice = (_ref76 = (_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 && _ref76 !== void 0 ? _ref76 : 0;
+      var rawPrice = (_ref77 = (_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 && _ref77 !== void 0 ? _ref77 : 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,
@@ -5405,7 +5571,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;
@@ -5413,7 +5579,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")];
@@ -5422,6 +5588,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();
@@ -5433,7 +5600,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",
@@ -5452,6 +5620,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               _context43.next = 2;
               return this.request.get("/order/sales/".concat(order_id), {
                 with: ['products', 'bookings']
+              }, {
+                osServer: true
               });
             case 2:
               res = _context43.sent;
@@ -5515,10 +5685,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             _step27;
           try {
             for (_iterator27.s(); !(_step27 = _iterator27.n()).done;) {
-              var _ref77, _bundle$num3;
+              var _ref78, _bundle$num3;
               var bundle = _step27.value;
               var isPersistedBundleProduct = isPersistedProduct || Boolean((bundle === null || bundle === void 0 ? void 0 : bundle.order_detail_id) || (bundle === null || bundle === void 0 ? void 0 : bundle.orderDetailId) || (bundle === null || bundle === void 0 ? void 0 : bundle.booking_id));
-              var bundleQty = new Decimal(Number(qty) || 1).times(Number((_ref77 = (_bundle$num3 = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num3 !== void 0 ? _bundle$num3 : bundle === null || bundle === void 0 ? void 0 : bundle.quantity) !== null && _ref77 !== void 0 ? _ref77 : 1) || 1).toNumber();
+              var bundleQty = new Decimal(Number(qty) || 1).times(Number((_ref78 = (_bundle$num3 = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num3 !== void 0 ? _bundle$num3 : bundle === null || bundle === void 0 ? void 0 : bundle.quantity) !== null && _ref78 !== void 0 ? _ref78 : 1) || 1).toNumber();
               var _iterator28 = _createForOfIteratorHelper((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []),
                 _step28;
               try {