@pisell/pisellos 2.3.20 → 2.3.21

package/dist/solution/BaseSales/index.js

@@ -3,8 +3,6 @@ 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 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 _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); }); }; }
@@ -20,15 +18,17 @@ function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) ===
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 import { BaseModule } from "../../modules/BaseModule";
 import { BaseSalesHookNames } from "./types";
@@ -92,7 +92,24 @@ function getBaseSalesMetadataUid(item, metadataKey) {
   if (uid === undefined || uid === null || uid === '') return null;
   return String(uid);
 }
-function mergeBaseSalesUniqueArray(currentValue, loadedValue, metadataKey) {
+function isBaseSalesBlankValue(value) {
+  return value === undefined || value === null || value === '';
+}
+function mergeBaseSalesProductSnapshotFields(currentItem, loadedItem) {
+  var _currentItem$metadata, _mergedItem$metadata, _mergedItem$metadata2;
+  var mergedItem = cloneDeep(loadedItem);
+  if (isBaseSalesBlankValue(mergedItem.product_cover) && !isBaseSalesBlankValue(currentItem === null || currentItem === void 0 ? void 0 : currentItem.product_cover)) {
+    mergedItem.product_cover = currentItem.product_cover;
+  }
+  var currentHolderConfig = currentItem === null || currentItem === void 0 || (_currentItem$metadata = currentItem.metadata) === null || _currentItem$metadata === void 0 ? void 0 : _currentItem$metadata.holder_config;
+  if ((((_mergedItem$metadata = mergedItem.metadata) === null || _mergedItem$metadata === void 0 ? void 0 : _mergedItem$metadata.holder_config) === undefined || ((_mergedItem$metadata2 = mergedItem.metadata) === null || _mergedItem$metadata2 === void 0 ? void 0 : _mergedItem$metadata2.holder_config) === null) && currentHolderConfig !== undefined && currentHolderConfig !== null) {
+    mergedItem.metadata = _objectSpread(_objectSpread({}, mergedItem.metadata || {}), {}, {
+      holder_config: currentHolderConfig
+    });
+  }
+  return mergedItem;
+}
+function mergeBaseSalesUniqueArray(currentValue, loadedValue, metadataKey, arrayKey) {
   var result = [];
   var indexByUid = new Map();
   var appendOrReplaceByUid = function appendOrReplaceByUid(item) {
@@ -104,7 +121,7 @@ function mergeBaseSalesUniqueArray(currentValue, loadedValue, metadataKey) {
     }
     var existingIndex = indexByUid.get(uid);
     if (existingIndex !== undefined) {
-      result[existingIndex] = clonedItem;
+      result[existingIndex] = arrayKey === 'products' ? mergeBaseSalesProductSnapshotFields(result[existingIndex], clonedItem) : clonedItem;
       return;
     }
     indexByUid.set(uid, result.length);
@@ -120,7 +137,7 @@ function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord) {
     if (Array.isArray(currentValue) && Array.isArray(loadedValue)) {
       var metadataKey = getBaseSalesUniqueArrayMetadataKey(key);
       if (metadataKey) {
-        return mergeBaseSalesUniqueArray(currentValue, loadedValue, metadataKey);
+        return mergeBaseSalesUniqueArray(currentValue, loadedValue, metadataKey, key);
       }
       return [].concat(_toConsumableArray(cloneDeep(currentValue)), _toConsumableArray(cloneDeep(loadedValue)));
     }
@@ -291,22 +308,25 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               return _context2.abrupt("return");
             case 8:
               this.serverOrderChangeHydrateInFlight = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-                var sales;
+                var _getTempOrder, _ref2;
+                var currentTempOrder, record, sales;
                 return _regeneratorRuntime().wrap(function _callee$(_context) {
                   while (1) switch (_context.prev = _context.next) {
                     case 0:
-                      _context.next = 2;
-                      return _this2.store.order.hydrateTempOrderFromRecord(changedOrder, {
+                      currentTempOrder = (_getTempOrder = (_ref2 = _this2.store.order).getTempOrder) === null || _getTempOrder === void 0 ? void 0 : _getTempOrder.call(_ref2);
+                      record = mergeSalesDetailRecordWithTempOrder(currentTempOrder, changedOrder);
+                      _context.next = 4;
+                      return _this2.store.order.hydrateTempOrderFromRecord(record, {
                         recalcOnHydrate: false
                       });
-                    case 2:
+                    case 4:
                       sales = _context.sent;
                       _this2.currentSalesDetail = sales;
-                      _context.next = 6;
+                      _context.next = 8;
                       return _this2.core.effects.emit("".concat(_this2.name, ":onSalesOrderLoaded"), {
                         sales: sales
                       });
-                    case 6:
+                    case 8:
                     case "end":
                       return _context.stop();
                   }
@@ -411,10 +431,10 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
         });
       }
       quotation.setScheduleResolver(function (id) {
-        var _scheduleModule$getSc, _getScheduleByIds, _ref2;
+        var _scheduleModule$getSc, _getScheduleByIds, _ref3;
         var scheduleId = String(id);
         if (scheduleById.has(scheduleId)) return scheduleById.get(scheduleId);
-        var schedules = ((_scheduleModule$getSc = scheduleModule.getScheduleListByIds) === null || _scheduleModule$getSc === void 0 ? void 0 : _scheduleModule$getSc.call(scheduleModule, [id])) || ((_getScheduleByIds = (_ref2 = scheduleModule).getScheduleByIds) === null || _getScheduleByIds === void 0 ? void 0 : _getScheduleByIds.call(_ref2, [id])) || [];
+        var schedules = ((_scheduleModule$getSc = scheduleModule.getScheduleListByIds) === null || _scheduleModule$getSc === void 0 ? void 0 : _scheduleModule$getSc.call(scheduleModule, [id])) || ((_getScheduleByIds = (_ref3 = scheduleModule).getScheduleByIds) === null || _getScheduleByIds === void 0 ? void 0 : _getScheduleByIds.call(_ref3, [id])) || [];
         if (schedules[0]) scheduleById.set(scheduleId, schedules[0]);
         return schedules[0];
       });
@@ -601,10 +621,10 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
       return groups.flatMap(function (group) {
         var items = Array.isArray(group === null || group === void 0 ? void 0 : group.bundle_item) ? group.bundle_item : Array.isArray(group === null || group === void 0 ? void 0 : group.bundleItem) ? group.bundleItem : [];
         return items.map(function (item) {
-          var _item$group_id, _ref3, _item$bundle_group_id;
+          var _item$group_id, _ref4, _item$bundle_group_id;
           return _objectSpread(_objectSpread({}, item), {}, {
             group_id: (_item$group_id = item === null || item === void 0 ? void 0 : item.group_id) !== null && _item$group_id !== void 0 ? _item$group_id : group === null || group === void 0 ? void 0 : group.id,
-            bundle_group_id: (_ref3 = (_item$bundle_group_id = item === null || item === void 0 ? void 0 : item.bundle_group_id) !== null && _item$bundle_group_id !== void 0 ? _item$bundle_group_id : item === null || item === void 0 ? void 0 : item.group_id) !== null && _ref3 !== void 0 ? _ref3 : group === null || group === void 0 ? void 0 : group.id
+            bundle_group_id: (_ref4 = (_item$bundle_group_id = item === null || item === void 0 ? void 0 : item.bundle_group_id) !== null && _item$bundle_group_id !== void 0 ? _item$bundle_group_id : item === null || item === void 0 ? void 0 : item.group_id) !== null && _ref4 !== void 0 ? _ref4 : group === null || group === void 0 ? void 0 : group.id
           });
         });
       });
@@ -635,21 +655,21 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getAuthoritativeBundleUnitPrice",
     value: function getAuthoritativeBundleUnitPrice(bundle) {
-      var _ref4, _ref5, _ref6, _bundle$price;
-      return (_ref4 = (_ref5 = (_ref6 = (_bundle$price = bundle.price) !== null && _bundle$price !== void 0 ? _bundle$price : bundle.bundle_selling_price) !== null && _ref6 !== void 0 ? _ref6 : bundle.custom_price) !== null && _ref5 !== void 0 ? _ref5 : bundle.product_price) !== null && _ref4 !== void 0 ? _ref4 : bundle.base_price;
+      var _ref5, _ref6, _ref7, _bundle$price;
+      return (_ref5 = (_ref6 = (_ref7 = (_bundle$price = bundle.price) !== null && _bundle$price !== void 0 ? _bundle$price : bundle.bundle_selling_price) !== null && _ref7 !== void 0 ? _ref7 : bundle.custom_price) !== null && _ref6 !== void 0 ? _ref6 : bundle.product_price) !== null && _ref5 !== void 0 ? _ref5 : bundle.base_price;
     }
   }, {
     key: "mergeProductForPriceQuery",
     value: function mergeProductForPriceQuery(product, authoritativeProduct) {
       var _this4 = this,
         _product$id,
-        _ref7,
-        _product$product_id2,
         _ref8,
-        _product$product_vari,
+        _product$product_id2,
         _ref9,
-        _product$num,
+        _product$product_vari,
         _ref10,
+        _product$num,
+        _ref11,
         _product$quantity,
         _product$metadata4;
       if (!authoritativeProduct) return product;
@@ -669,10 +689,10 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
       });
       return _objectSpread(_objectSpread(_objectSpread({}, product), authoritativeProduct), {}, {
         id: (_product$id = product.id) !== null && _product$id !== void 0 ? _product$id : authoritativeProduct.id,
-        product_id: (_ref7 = (_product$product_id2 = product.product_id) !== null && _product$product_id2 !== void 0 ? _product$product_id2 : authoritativeProduct.product_id) !== null && _ref7 !== void 0 ? _ref7 : authoritativeProduct.id,
-        product_variant_id: (_ref8 = (_product$product_vari = product.product_variant_id) !== null && _product$product_vari !== void 0 ? _product$product_vari : authoritativeProduct.product_variant_id) !== null && _ref8 !== void 0 ? _ref8 : 0,
-        num: (_ref9 = (_product$num = product.num) !== null && _product$num !== void 0 ? _product$num : product.quantity) !== null && _ref9 !== void 0 ? _ref9 : authoritativeProduct.num,
-        quantity: (_ref10 = (_product$quantity = product.quantity) !== null && _product$quantity !== void 0 ? _product$quantity : product.num) !== null && _ref10 !== void 0 ? _ref10 : authoritativeProduct.quantity,
+        product_id: (_ref8 = (_product$product_id2 = product.product_id) !== null && _product$product_id2 !== void 0 ? _product$product_id2 : authoritativeProduct.product_id) !== null && _ref8 !== void 0 ? _ref8 : authoritativeProduct.id,
+        product_variant_id: (_ref9 = (_product$product_vari = product.product_variant_id) !== null && _product$product_vari !== void 0 ? _product$product_vari : authoritativeProduct.product_variant_id) !== null && _ref9 !== void 0 ? _ref9 : 0,
+        num: (_ref10 = (_product$num = product.num) !== null && _product$num !== void 0 ? _product$num : product.quantity) !== null && _ref10 !== void 0 ? _ref10 : authoritativeProduct.num,
+        quantity: (_ref11 = (_product$quantity = product.quantity) !== null && _product$quantity !== void 0 ? _product$quantity : product.num) !== null && _ref11 !== void 0 ? _ref11 : authoritativeProduct.quantity,
         product_sku: function () {
           var authoritativeSku = ensureProductSku(authoritativeProduct);
           var productSku = ensureProductSku(product);
@@ -748,24 +768,24 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _syncOtherParamsToSubModules = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(changedParams) {
         var _this5 = this;
-        var _ref11,
-          _ref11$cover,
+        var _ref12,
+          _ref12$cover,
           cover,
           nextSubModuleOtherParams,
           _args7 = arguments;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              _ref11 = _args7.length > 1 && _args7[1] !== undefined ? _args7[1] : {}, _ref11$cover = _ref11.cover, cover = _ref11$cover === void 0 ? false : _ref11$cover;
+              _ref12 = _args7.length > 1 && _args7[1] !== undefined ? _args7[1] : {}, _ref12$cover = _ref12.cover, cover = _ref12$cover === void 0 ? false : _ref12$cover;
               nextSubModuleOtherParams = this.buildSubModuleOtherParams();
               _context7.next = 4;
               return Promise.all(Object.entries(this.store).map( /*#__PURE__*/function () {
-                var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_ref12) {
-                  var _ref14, moduleName, subModule, targetModule;
+                var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_ref13) {
+                  var _ref15, moduleName, subModule, targetModule;
                   return _regeneratorRuntime().wrap(function _callee6$(_context6) {
                     while (1) switch (_context6.prev = _context6.next) {
                       case 0:
-                        _ref14 = _slicedToArray(_ref12, 2), moduleName = _ref14[0], subModule = _ref14[1];
+                        _ref15 = _slicedToArray(_ref13, 2), moduleName = _ref15[0], subModule = _ref15[1];
                         if (!_this5.reusedSharedSubModuleNames.has(moduleName)) {
                           _context6.next = 3;
                           break;
@@ -791,7 +811,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                   }, _callee6);
                 }));
                 return function (_x7) {
-                  return _ref13.apply(this, arguments);
+                  return _ref14.apply(this, arguments);
                 };
               }()));
             case 4:
@@ -1004,7 +1024,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadSalesDetail",
     value: (function () {
       var _loadSalesDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(orderIdOrParams) {
-        var _ref15, _ref16, _ref17, _ref18, _params$orderId, params, externalSaleNumber, preloadedSalesDetail, lookup, loadedRecord, message, remoteRecord, currentTempOrder, record, sales;
+        var _ref16, _ref17, _ref18, _ref19, _params$orderId, params, externalSaleNumber, preloadedSalesDetail, lookup, loadedRecord, message, remoteRecord, currentTempOrder, record, sales;
         return _regeneratorRuntime().wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
@@ -1021,7 +1041,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               };
               externalSaleNumber = params.externalSaleNumber || params.external_sale_number;
               preloadedSalesDetail = params.preloadedSalesDetail;
-              lookup = (_ref15 = (_ref16 = (_ref17 = (_ref18 = (_params$orderId = params.orderId) !== null && _params$orderId !== void 0 ? _params$orderId : externalSaleNumber) !== null && _ref18 !== void 0 ? _ref18 : params.orderNumber) !== null && _ref17 !== void 0 ? _ref17 : preloadedSalesDetail === null || preloadedSalesDetail === void 0 ? void 0 : preloadedSalesDetail.order_id) !== null && _ref16 !== void 0 ? _ref16 : preloadedSalesDetail === null || preloadedSalesDetail === void 0 ? void 0 : preloadedSalesDetail.external_sale_number) !== null && _ref15 !== void 0 ? _ref15 : preloadedSalesDetail === null || preloadedSalesDetail === void 0 ? void 0 : preloadedSalesDetail.order_number;
+              lookup = (_ref16 = (_ref17 = (_ref18 = (_ref19 = (_params$orderId = params.orderId) !== null && _params$orderId !== void 0 ? _params$orderId : externalSaleNumber) !== null && _ref19 !== void 0 ? _ref19 : params.orderNumber) !== null && _ref18 !== void 0 ? _ref18 : preloadedSalesDetail === null || preloadedSalesDetail === void 0 ? void 0 : preloadedSalesDetail.order_id) !== null && _ref17 !== void 0 ? _ref17 : preloadedSalesDetail === null || preloadedSalesDetail === void 0 ? void 0 : preloadedSalesDetail.external_sale_number) !== null && _ref16 !== void 0 ? _ref16 : preloadedSalesDetail === null || preloadedSalesDetail === void 0 ? void 0 : preloadedSalesDetail.order_number;
               if (!(!preloadedSalesDetail && (lookup === undefined || lookup === null || lookup === ''))) {
                 _context10.next = 10;
                 break;
@@ -1613,7 +1633,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _loadDiscountConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(params) {
         var _this$getOrderIdentit, _tempOrder$customer, _tempOrder$_extend, _tempOrder$_extend2, _discountModule$getDi, _discountModule$getOr, _discountModule$getDi2;
-        var tempOrder, orderStore, discountModule, rulesModule, orderId, customerId, currentDiscountList, originalDiscountList, hasManualDiscountSelection, discountAction, discountConfigCacheKey, preparedDiscountList, _discountModule$setOr, nextDiscountList, shouldSkipAutoApplyFetchedDiscounts, _summary, _tempOrder$holder, _orderStore$summary, holders, orderTotalAmount, result, _iterator, _step, _product$metadata5, _tempOrder$_extend3, _product$metadata$sou, _product$metadata6, _product$metadata7, _product$original_pri, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice, summary;
+        var tempOrder, orderStore, discountModule, rulesModule, orderId, customerId, currentDiscountList, originalDiscountList, hasManualDiscountSelection, discountAction, discountConfigCacheKey, preparedDiscountList, _discountModule$setOr, nextDiscountList, shouldSkipAutoApplyFetchedDiscounts, _summary, _orderStore$summary, orderTotalAmount, result, _iterator, _step, _product$metadata5, _tempOrder$_extend3, _product$metadata$sou, _product$metadata6, _product$metadata7, _product$original_pri, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice, summary;
         return _regeneratorRuntime().wrap(function _callee17$(_context17) {
           while (1) switch (_context17.prev = _context17.next) {
             case 0:
@@ -1707,16 +1727,15 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 40:
               if (!rulesModule) {
-                _context17.next = 78;
+                _context17.next = 77;
                 break;
               }
-              holders = ((_tempOrder$holder = tempOrder.holder) === null || _tempOrder$holder === void 0 ? void 0 : _tempOrder$holder.form_record) || [];
               orderTotalAmount = Number(((_orderStore$summary = orderStore.summary) === null || _orderStore$summary === void 0 ? void 0 : _orderStore$summary.total_amount) || 0);
               console.log('[BaseSales.applyDiscountConfig.calcDiscount]');
               result = rulesModule.calcDiscount({
                 productList: tempOrder.products,
                 discountList: nextDiscountList,
-                holders: holders,
+                holders: [],
                 isFormSubject: function isFormSubject(product) {
                   return resolveIsFormSubject(tempOrder, product);
                 },
@@ -1729,22 +1748,22 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 tempOrder.products = preserveManualProductDiscountProducts(tempOrder.products, result.productList);
               }
               _iterator = _createForOfIteratorHelper(tempOrder.products || []);
-              _context17.prev = 47;
+              _context17.prev = 46;
               _iterator.s();
-            case 49:
+            case 48:
               if ((_step = _iterator.n()).done) {
-                _context17.next = 64;
+                _context17.next = 63;
                 break;
               }
               product = _step.value;
               productUid = (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.unique_identification_number;
               runtimeOrigin = productUid ? (_tempOrder$_extend3 = tempOrder._extend) === null || _tempOrder$_extend3 === void 0 || (_tempOrder$_extend3 = _tempOrder$_extend3.productsByUid) === null || _tempOrder$_extend3 === void 0 || (_tempOrder$_extend3 = _tempOrder$_extend3[productUid]) === null || _tempOrder$_extend3 === void 0 ? void 0 : _tempOrder$_extend3.origin : undefined;
               if (!(runtimeOrigin !== null && runtimeOrigin !== void 0 && runtimeOrigin.isManualDiscount || isBaseSalesManualProductDiscountProduct(product))) {
-                _context17.next = 55;
+                _context17.next = 54;
                 break;
               }
-              return _context17.abrupt("continue", 62);
-            case 55:
+              return _context17.abrupt("continue", 61);
+            case 54:
               totalPerUnitDiscount = (product.discount_list || []).reduce(function (sum, pd) {
                 return sum + Number(pd.amount || 0);
               }, 0);
@@ -1760,58 +1779,58 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 mainPrice: newMainSellingPrice,
                 bundle: product.product_bundle
               });
-            case 62:
-              _context17.next = 49;
+            case 61:
+              _context17.next = 48;
               break;
-            case 64:
-              _context17.next = 69;
+            case 63:
+              _context17.next = 68;
               break;
-            case 66:
-              _context17.prev = 66;
-              _context17.t0 = _context17["catch"](47);
+            case 65:
+              _context17.prev = 65;
+              _context17.t0 = _context17["catch"](46);
               _iterator.e(_context17.t0);
-            case 69:
-              _context17.prev = 69;
+            case 68:
+              _context17.prev = 68;
               _iterator.f();
-              return _context17.finish(69);
-            case 72:
+              return _context17.finish(68);
+            case 71:
               if (!result.discountList) {
-                _context17.next = 78;
+                _context17.next = 77;
                 break;
               }
               nextDiscountList = this.mergeHistoricalDiscountList(result.discountList, tempOrder.products || []);
               OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
-              _context17.next = 77;
+              _context17.next = 76;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
-            case 77:
+            case 76:
               tempOrder.discount_list = nextDiscountList.filter(function (discount) {
                 return discount.isSelected;
               });
-            case 78:
-              _context17.next = 80;
+            case 77:
+              _context17.next = 79;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 80:
+            case 79:
               summary = _context17.sent;
               this.store.order.persistTempOrder();
-              _context17.next = 84;
+              _context17.next = 83;
               return this.effectsEmit('onDiscountApplied', {
                 productList: tempOrder.products || [],
                 discountList: nextDiscountList,
                 selectedDiscountList: tempOrder.discount_list || [],
                 tempOrder: tempOrder
               });
-            case 84:
+            case 83:
               return _context17.abrupt("return", {
                 productList: tempOrder.products || [],
                 discountList: nextDiscountList
               });
-            case 85:
+            case 84:
             case "end":
               return _context17.stop();
           }
-        }, _callee17, this, [[47, 66, 69, 72]]);
+        }, _callee17, this, [[46, 65, 68, 71]]);
       }));
       function loadDiscountConfig(_x11) {
         return _loadDiscountConfig.apply(this, arguments);
@@ -1823,7 +1842,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _bestDiscount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(cb) {
         var _discountModule$getOr2, _discountModule$getDi3;
-        var tempOrder, orderStore, discountModule, rulesModule, originalDiscountList, currentDiscountList, nextDiscountList, result, _tempOrder$holder2, _orderStore$summary2, holders, orderTotalAmount;
+        var tempOrder, orderStore, discountModule, rulesModule, originalDiscountList, currentDiscountList, nextDiscountList, result, _orderStore$summary2, orderTotalAmount;
         return _regeneratorRuntime().wrap(function _callee18$(_context18) {
           while (1) switch (_context18.prev = _context18.next) {
             case 0:
@@ -1848,16 +1867,15 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
             case 12:
               if (!rulesModule) {
-                _context18.next = 25;
+                _context18.next = 24;
                 break;
               }
-              holders = ((_tempOrder$holder2 = tempOrder.holder) === null || _tempOrder$holder2 === void 0 ? void 0 : _tempOrder$holder2.form_record) || [];
               orderTotalAmount = Number(((_orderStore$summary2 = orderStore.summary) === null || _orderStore$summary2 === void 0 ? void 0 : _orderStore$summary2.total_amount) || 0);
               console.log('[BaseSales.bestDiscount.calcDiscount]');
               result = rulesModule.calcDiscount({
                 productList: tempOrder.products,
                 discountList: nextDiscountList,
-                holders: holders,
+                holders: [],
                 isFormSubject: function isFormSubject(product) {
                   return resolveIsFormSubject(tempOrder, product);
                 },
@@ -1867,14 +1885,14 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 tempOrder.products = preserveManualProductDiscountProducts(tempOrder.products, result.productList);
               }
               if (!result.discountList) {
-                _context18.next = 25;
+                _context18.next = 24;
                 break;
               }
               nextDiscountList = this.mergeHistoricalDiscountList(result.discountList, tempOrder.products || []);
               OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
-              _context18.next = 23;
+              _context18.next = 22;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
-            case 23:
+            case 22:
               tempOrder.discount_list = nextDiscountList.filter(function (discount) {
                 return discount.isSelected;
               });
@@ -1882,16 +1900,16 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 productList: tempOrder.products,
                 discountList: nextDiscountList
               };
-            case 25:
-              _context18.next = 27;
+            case 24:
+              _context18.next = 26;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 27:
+            case 26:
               this.store.order.persistTempOrder();
               cb === null || cb === void 0 || cb(result);
               return _context18.abrupt("return", result);
-            case 30:
+            case 29:
             case "end":
               return _context18.stop();
           }
@@ -1962,7 +1980,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "setDiscountSelected",
     value: function () {
       var _setDiscountSelected = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(params) {
-        var _tempOrder$holder3, list, updated, tempOrder, orderStore, discountModule, rulesModule, holders, nextDiscountList, _orderStore$summary3, orderTotalAmount, result, beforeSelectedIds, _iterator2, _step2, d, selectedResourceIds, filterSelectedDiscountDetails, _iterator3, _step3, _product$metadata8, _tempOrder$_extend4, _product$metadata$sou2, _product$metadata9, _product$metadata10, _product$original_pri2, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice;
+        var list, updated, tempOrder, orderStore, discountModule, rulesModule, nextDiscountList, _orderStore$summary3, orderTotalAmount, result, beforeSelectedIds, _iterator2, _step2, d, selectedResourceIds, filterSelectedDiscountDetails, _iterator3, _step3, _product$metadata8, _tempOrder$_extend4, _product$metadata$sou2, _product$metadata9, _product$metadata10, _product$original_pri2, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice;
         return _regeneratorRuntime().wrap(function _callee20$(_context20) {
           while (1) switch (_context20.prev = _context20.next) {
             case 0:
@@ -1985,18 +2003,17 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               orderStore = this.store.order.store || {};
               discountModule = orderStore.discount;
               rulesModule = orderStore.rules;
-              holders = ((_tempOrder$holder3 = tempOrder.holder) === null || _tempOrder$holder3 === void 0 ? void 0 : _tempOrder$holder3.form_record) || [];
               nextDiscountList = updated;
-              _context20.next = 14;
+              _context20.next = 13;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(updated);
-            case 14:
+            case 13:
               if (rulesModule) {
                 orderTotalAmount = Number(((_orderStore$summary3 = orderStore.summary) === null || _orderStore$summary3 === void 0 ? void 0 : _orderStore$summary3.total_amount) || 0);
                 console.log('[BaseSales.setDiscountSelected.calcDiscount]');
                 result = rulesModule.calcDiscount({
                   productList: tempOrder.products,
                   discountList: updated,
-                  holders: holders,
+                  holders: [],
                   isFormSubject: function isFormSubject(product) {
                     return resolveIsFormSubject(tempOrder, product);
                   },
@@ -2050,29 +2067,29 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 });
               };
               _iterator3 = _createForOfIteratorHelper(tempOrder.products);
-              _context20.prev = 18;
+              _context20.prev = 17;
               _iterator3.s();
-            case 20:
+            case 19:
               if ((_step3 = _iterator3.n()).done) {
-                _context20.next = 37;
+                _context20.next = 36;
                 break;
               }
               product = _step3.value;
               productUid = (_product$metadata8 = product.metadata) === null || _product$metadata8 === void 0 ? void 0 : _product$metadata8.unique_identification_number;
               runtimeOrigin = productUid ? (_tempOrder$_extend4 = tempOrder._extend) === null || _tempOrder$_extend4 === void 0 || (_tempOrder$_extend4 = _tempOrder$_extend4.productsByUid) === null || _tempOrder$_extend4 === void 0 || (_tempOrder$_extend4 = _tempOrder$_extend4[productUid]) === null || _tempOrder$_extend4 === void 0 ? void 0 : _tempOrder$_extend4.origin : undefined;
               if (!(runtimeOrigin !== null && runtimeOrigin !== void 0 && runtimeOrigin.isManualDiscount || isBaseSalesManualProductDiscountProduct(product))) {
-                _context20.next = 26;
+                _context20.next = 25;
                 break;
               }
-              return _context20.abrupt("continue", 35);
-            case 26:
+              return _context20.abrupt("continue", 34);
+            case 25:
               product.discount_list = filterSelectedDiscountDetails(product.discount_list);
               if (Array.isArray(product.product_bundle)) {
                 product.product_bundle = product.product_bundle.map(function (bundle) {
-                  var _ref19, _bundle$original_pric;
+                  var _ref20, _bundle$original_pric;
                   var nextBundleDiscountList = filterSelectedDiscountDetails(bundle === null || bundle === void 0 ? void 0 : bundle.discount_list);
                   var shouldRestoreBundlePrice = nextBundleDiscountList.length === 0;
-                  var restoredBundlePrice = (_ref19 = (_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 && _ref19 !== void 0 ? _ref19 : bundle === null || bundle === void 0 ? void 0 : bundle.price;
+                  var restoredBundlePrice = (_ref20 = (_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 && _ref20 !== void 0 ? _ref20 : bundle === null || bundle === void 0 ? void 0 : bundle.price;
                   return _objectSpread(_objectSpread(_objectSpread({}, bundle), shouldRestoreBundlePrice ? {
                     price: restoredBundlePrice,
                     bundle_selling_price: restoredBundlePrice
@@ -2099,33 +2116,33 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 mainPrice: newMainSellingPrice,
                 bundle: product.product_bundle
               });
-            case 35:
-              _context20.next = 20;
+            case 34:
+              _context20.next = 19;
               break;
-            case 37:
-              _context20.next = 42;
+            case 36:
+              _context20.next = 41;
               break;
-            case 39:
-              _context20.prev = 39;
-              _context20.t0 = _context20["catch"](18);
+            case 38:
+              _context20.prev = 38;
+              _context20.t0 = _context20["catch"](17);
               _iterator3.e(_context20.t0);
-            case 42:
-              _context20.prev = 42;
+            case 41:
+              _context20.prev = 41;
               _iterator3.f();
-              return _context20.finish(42);
-            case 45:
+              return _context20.finish(41);
+            case 44:
               OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
-              _context20.next = 48;
+              _context20.next = 47;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
-            case 48:
+            case 47:
               tempOrder.discount_list = (nextDiscountList || []).filter(function (d) {
                 return d.isSelected;
               });
-              _context20.next = 51;
+              _context20.next = 50;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 51:
+            case 50:
               this.store.order.persistTempOrder();
               this.effectsEmit('onDiscountApplied', {
                 productList: tempOrder.products,
@@ -2133,17 +2150,17 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 selectedDiscountList: tempOrder.discount_list,
                 tempOrder: tempOrder
               });
-              _context20.next = 58;
+              _context20.next = 57;
               break;
-            case 55:
-              _context20.prev = 55;
+            case 54:
+              _context20.prev = 54;
               _context20.t1 = _context20["catch"](0);
               throw _context20.t1;
-            case 58:
+            case 57:
             case "end":
               return _context20.stop();
           }
-        }, _callee20, this, [[0, 55], [18, 39, 42, 45]]);
+        }, _callee20, this, [[0, 54], [17, 38, 41, 44]]);
       }));
       function setDiscountSelected(_x15) {
         return _setDiscountSelected.apply(this, arguments);
@@ -2413,7 +2430,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "syncPaymentsToOrder",
     value: function () {
       var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(params) {
-        var _ref20, _params$businessCode, _this$otherParams18, _this$otherParams19, _params$channel;
+        var _ref21, _params$businessCode, _this$otherParams18, _this$otherParams19, _params$channel;
         var businessCode, channel, syncParams, syncState, payments, syncResult, latestPayments, amountSnapshot, orderSnapshot, syncPayload;
         return _regeneratorRuntime().wrap(function _callee26$(_context26) {
           while (1) switch (_context26.prev = _context26.next) {
@@ -2424,7 +2441,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error('order 模块未初始化');
             case 2:
-              businessCode = (_ref20 = (_params$businessCode = params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams18 = this.otherParams) === null || _this$otherParams18 === void 0 ? void 0 : _this$otherParams18.businessCode) !== null && _ref20 !== void 0 ? _ref20 : (_this$otherParams19 = this.otherParams) === null || _this$otherParams19 === void 0 ? void 0 : _this$otherParams19.business_code;
+              businessCode = (_ref21 = (_params$businessCode = params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams18 = this.otherParams) === null || _this$otherParams18 === void 0 ? void 0 : _this$otherParams18.businessCode) !== null && _ref21 !== void 0 ? _ref21 : (_this$otherParams19 = this.otherParams) === null || _this$otherParams19 === void 0 ? void 0 : _this$otherParams19.business_code;
               channel = (_params$channel = params.channel) !== null && _params$channel !== void 0 ? _params$channel : this.getSubmitOrderSalesChannel();
               syncParams = _objectSpread(_objectSpread(_objectSpread({}, params), businessCode !== undefined ? {
                 businessCode: businessCode
@@ -2634,7 +2651,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
       var _this$otherParams20,
         _paymentRecord$paymen,
         _paymentRecord$create,
-        _ref21,
+        _ref22,
         _paymentRecord$origin,
         _this11 = this;
       if (!this.store.order) throw new Error('order 模块未初始化');
@@ -2658,7 +2675,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
       var paymentTime = (_paymentRecord$paymen = paymentRecord.payment_time) !== null && _paymentRecord$paymen !== void 0 ? _paymentRecord$paymen : paymentTimestamp;
       var createdAt = (_paymentRecord$create = paymentRecord.created_at) !== null && _paymentRecord$create !== void 0 ? _paymentRecord$create : paymentTimestamp;
       var serviceCharge = paymentRecord.service_charge && _typeof(paymentRecord.service_charge) === 'object' ? paymentRecord.service_charge : null;
-      var calculatedServiceFee = serviceCharge ? new Decimal((_ref21 = (_paymentRecord$origin = paymentRecord.origin_amount) !== null && _paymentRecord$origin !== void 0 ? _paymentRecord$origin : paymentRecord.amount) !== null && _ref21 !== void 0 ? _ref21 : 0).times(serviceCharge.percentage || 0).plus(serviceCharge.amount || 0).toDecimalPlaces(2).toFixed(2) : undefined;
+      var calculatedServiceFee = serviceCharge ? new Decimal((_ref22 = (_paymentRecord$origin = paymentRecord.origin_amount) !== null && _paymentRecord$origin !== void 0 ? _paymentRecord$origin : paymentRecord.amount) !== null && _ref22 !== void 0 ? _ref22 : 0).times(serviceCharge.percentage || 0).plus(serviceCharge.amount || 0).toDecimalPlaces(2).toFixed(2) : undefined;
       var payments = this.store.order.addOrderPayment(_objectSpread(_objectSpread(_objectSpread({}, paymentRecord), calculatedServiceFee !== undefined ? {
         service_fee: calculatedServiceFee
       } : {}), {}, {
@@ -2787,7 +2804,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "initWalletData",
     value: function () {
       var _initWalletData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(params) {
-        var _params$order_wait_pa, _ref22, _tempOrder$is_price_i;
+        var _params$order_wait_pa, _ref23, _tempOrder$is_price_i;
         var snapshot, tempOrder, amount, walletBusinessData, result;
         return _regeneratorRuntime().wrap(function _callee28$(_context28) {
           while (1) switch (_context28.prev = _context28.next) {
@@ -2830,7 +2847,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 },
                 products: this.getWalletProductList(),
                 order_wait_pay_amount: (_params$order_wait_pa = params === null || params === void 0 ? void 0 : params.order_wait_pay_amount) !== null && _params$order_wait_pa !== void 0 ? _params$order_wait_pa : Number(amount.amountGap || 0),
-                is_price_include_tax: (_ref22 = (_tempOrder$is_price_i = tempOrder.is_price_include_tax) !== null && _tempOrder$is_price_i !== void 0 ? _tempOrder$is_price_i : this.otherParams.is_price_include_tax) !== null && _ref22 !== void 0 ? _ref22 : 1
+                is_price_include_tax: (_ref23 = (_tempOrder$is_price_i = tempOrder.is_price_include_tax) !== null && _tempOrder$is_price_i !== void 0 ? _tempOrder$is_price_i : this.otherParams.is_price_include_tax) !== null && _ref23 !== void 0 ? _ref23 : 1
               }, snapshot.identity.orderId ? {
                 payment_order_id: String(snapshot.identity.orderId)
               } : {});
@@ -2961,7 +2978,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "sendCustomerPayLink",
     value: (function () {
       var _sendCustomerPayLink = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30(params) {
-        var orderIds, _ref23, _ref24, _submitResult$data$or, _submitResult$data, _submitResult$data2, submitResult, orderId;
+        var orderIds, _ref24, _ref25, _submitResult$data$or, _submitResult$data, _submitResult$data2, submitResult, orderId;
         return _regeneratorRuntime().wrap(function _callee30$(_context30) {
           while (1) switch (_context30.prev = _context30.next) {
             case 0:
@@ -2982,7 +2999,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 6:
               submitResult = _context30.sent;
-              orderId = (_ref23 = (_ref24 = (_submitResult$data$or = submitResult === null || submitResult === void 0 || (_submitResult$data = submitResult.data) === null || _submitResult$data === void 0 ? void 0 : _submitResult$data.order_id) !== null && _submitResult$data$or !== void 0 ? _submitResult$data$or : submitResult === null || submitResult === void 0 ? void 0 : submitResult.order_id) !== null && _ref24 !== void 0 ? _ref24 : submitResult === null || submitResult === void 0 || (_submitResult$data2 = submitResult.data) === null || _submitResult$data2 === void 0 ? void 0 : _submitResult$data2.id) !== null && _ref23 !== void 0 ? _ref23 : submitResult === null || submitResult === void 0 ? void 0 : submitResult.id;
+              orderId = (_ref24 = (_ref25 = (_submitResult$data$or = submitResult === null || submitResult === void 0 || (_submitResult$data = submitResult.data) === null || _submitResult$data === void 0 ? void 0 : _submitResult$data.order_id) !== null && _submitResult$data$or !== void 0 ? _submitResult$data$or : submitResult === null || submitResult === void 0 ? void 0 : submitResult.order_id) !== null && _ref25 !== void 0 ? _ref25 : submitResult === null || submitResult === void 0 || (_submitResult$data2 = submitResult.data) === null || _submitResult$data2 === void 0 ? void 0 : _submitResult$data2.id) !== null && _ref24 !== void 0 ? _ref24 : submitResult === null || submitResult === void 0 ? void 0 : submitResult.id;
               if (orderId) {
                 _context30.next = 10;
                 break;
@@ -3154,12 +3171,12 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               });
               _context33.next = 9;
               return Promise.all(Array.from(groups.entries()).map( /*#__PURE__*/function () {
-                var _ref26 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee32(_ref25) {
-                  var _ref27, groupKey, group, productsById;
+                var _ref27 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee32(_ref26) {
+                  var _ref28, groupKey, group, productsById;
                   return _regeneratorRuntime().wrap(function _callee32$(_context32) {
                     while (1) switch (_context32.prev = _context32.next) {
                       case 0:
-                        _ref27 = _slicedToArray(_ref25, 2), groupKey = _ref27[0], group = _ref27[1];
+                        _ref28 = _slicedToArray(_ref26, 2), groupKey = _ref28[0], group = _ref28[1];
                         _context32.next = 3;
                         return _this13.loadProductsForPriceQuery({
                           ids: Array.from(group.ids),
@@ -3177,7 +3194,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                   }, _callee32);
                 }));
                 return function (_x26) {
-                  return _ref26.apply(this, arguments);
+                  return _ref27.apply(this, arguments);
                 };
               }()));
             case 9:
@@ -3606,14 +3623,14 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee43(params) {
         var _this$otherParams22;
-        var _ref28,
-          _ref28$cover,
+        var _ref29,
+          _ref29$cover,
           cover,
           _args43 = arguments;
         return _regeneratorRuntime().wrap(function _callee43$(_context43) {
           while (1) switch (_context43.prev = _context43.next) {
             case 0:
-              _ref28 = _args43.length > 1 && _args43[1] !== undefined ? _args43[1] : {}, _ref28$cover = _ref28.cover, cover = _ref28$cover === void 0 ? false : _ref28$cover;
+              _ref29 = _args43.length > 1 && _args43[1] !== undefined ? _args43[1] : {}, _ref29$cover = _ref29.cover, cover = _ref29$cover === void 0 ? false : _ref29$cover;
               if (cover) {
                 this.otherParams = _objectSpread({}, params);
               } else {