@pisell/pisellos 2.2.196 → 2.2.198

package/dist/modules/SalesSummary/utils.js

@@ -1,16 +1,20 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+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 _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 _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 _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _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 _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; }
 import Decimal from 'decimal.js';
 import { getSurcharge, getSurchargeAmount } from "../Summary/utils";
 import { getProductSkuOptions } from "../Order/utils";
@@ -89,6 +93,7 @@ function buildSurchargeServiceItems(products) {
     var quantity = getSafeNum(product.num);
     var unitTotal = getUnitPaymentTotal(product);
     var options = getProductSkuOptions(product);
+    var persistedSurchargeFee = getPersistedMainSurchargeFee(product);
     return {
       id: product.product_id,
       num: quantity,
@@ -109,19 +114,20 @@ function buildSurchargeServiceItems(products) {
       option: options,
       options: options,
       relation_details: [],
-      metadata: product.metadata || {},
+      metadata: _objectSpread(_objectSpread({}, product.metadata || {}), {}, {
+        __persisted_surcharge_fee: persistedSurchargeFee === null || persistedSurchargeFee === void 0 ? void 0 : persistedSurchargeFee.toFixed(2)
+      }),
       start_date: ((_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.start_date) || '',
       start_time: ((_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.start_time) || ''
     };
   });
 }
 function getRelationSurchargeIds(item) {
-  var _item$relation_surcha, _item$metadata;
-  var ids = (_item$relation_surcha = item === null || item === void 0 ? void 0 : item.relation_surcharge_ids) !== null && _item$relation_surcha !== void 0 ? _item$relation_surcha : item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.relation_surcharge_ids;
-  if (!Array.isArray(ids)) return [];
-  return ids.filter(function (id) {
+  var _item$metadata;
+  var ids = [].concat(_toConsumableArray(Array.isArray(item === null || item === void 0 ? void 0 : item.relation_surcharge_ids) ? item.relation_surcharge_ids : []), _toConsumableArray(Array.isArray(item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.relation_surcharge_ids) ? item.metadata.relation_surcharge_ids : []));
+  return _toConsumableArray(new Set(ids.filter(function (id) {
     return id !== undefined && id !== null && id !== '';
-  });
+  })));
 }
 function getSurchargeConfigId(config) {
   var _config$id;
@@ -161,15 +167,51 @@ function getBundleProductId(bundle) {
   if (!Number.isFinite(parsed)) return null;
   return parsed;
 }
+function getPersistedMainSurchargeFee(product) {
+  var _ref7, _product$surcharge_fe, _product$metadata7;
+  if ((product === null || product === void 0 ? void 0 : product.order_detail_id) === undefined || (product === null || product === void 0 ? void 0 : product.order_detail_id) === null) return null;
+  var value = (_ref7 = (_product$surcharge_fe = product === null || product === void 0 ? void 0 : product.surcharge_fee) !== null && _product$surcharge_fe !== void 0 ? _product$surcharge_fe : product === null || product === void 0 ? void 0 : product.main_product_attached_bundle_surcharge_fee) !== null && _ref7 !== void 0 ? _ref7 : product === null || product === void 0 || (_product$metadata7 = product.metadata) === null || _product$metadata7 === void 0 ? void 0 : _product$metadata7.main_product_attached_bundle_surcharge_fee;
+  if (value === undefined || value === null || value === '') return null;
+  return toDecimal(value);
+}
+function getPersistedSourceSurchargeFee(sourceItem) {
+  var _sourceItem$metadata;
+  var value = sourceItem === null || sourceItem === void 0 || (_sourceItem$metadata = sourceItem.metadata) === null || _sourceItem$metadata === void 0 ? void 0 : _sourceItem$metadata.__persisted_surcharge_fee;
+  if (value === undefined || value === null || value === '') return null;
+  return toDecimal(value);
+}
+function getPersistedSurchargeRemainder(item, sourceItem) {
+  var _ref8, _sourceItem$metadata$, _sourceItem$metadata2, _item$metadata2;
+  var value = (_ref8 = (_sourceItem$metadata$ = sourceItem === null || sourceItem === void 0 || (_sourceItem$metadata2 = sourceItem.metadata) === null || _sourceItem$metadata2 === void 0 ? void 0 : _sourceItem$metadata2.surcharge_rounding_remainder) !== null && _sourceItem$metadata$ !== void 0 ? _sourceItem$metadata$ : item === null || item === void 0 ? void 0 : item.surcharge_rounding_remainder) !== null && _ref8 !== void 0 ? _ref8 : item === null || item === void 0 || (_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.surcharge_rounding_remainder;
+  if (value === undefined || value === null || value === '') return null;
+  return toDecimal(value);
+}
+function getPersistedQuantity(item, fallbackQuantity) {
+  var _item$product_quantit;
+  var isPersistedLine = (item === null || item === void 0 ? void 0 : item.order_detail_id) !== undefined && (item === null || item === void 0 ? void 0 : item.order_detail_id) !== null;
+  if (!isPersistedLine) return new Decimal(0);
+  var value = (_item$product_quantit = item === null || item === void 0 ? void 0 : item.product_quantity) !== null && _item$product_quantit !== void 0 ? _item$product_quantit : item === null || item === void 0 ? void 0 : item.quantity;
+  var parsed = new Decimal(value || 0);
+  if (parsed.lte(0)) return Decimal.min(fallbackQuantity, 1);
+  return Decimal.min(fallbackQuantity, parsed);
+}
+function getPersistedBundleSurchargeFee(bundle, product) {
+  var _bundle$surcharge_fee, _bundle$metadata;
+  if ((bundle === null || bundle === void 0 ? void 0 : bundle.order_detail_id) === undefined && (product === null || product === void 0 ? void 0 : product.order_detail_id) === undefined) return null;
+  if ((bundle === null || bundle === void 0 ? void 0 : bundle.order_detail_id) === null && (product === null || product === void 0 ? void 0 : product.order_detail_id) === null) return null;
+  var value = (_bundle$surcharge_fee = bundle === null || bundle === void 0 ? void 0 : bundle.surcharge_fee) !== null && _bundle$surcharge_fee !== void 0 ? _bundle$surcharge_fee : bundle === null || bundle === void 0 || (_bundle$metadata = bundle.metadata) === null || _bundle$metadata === void 0 ? void 0 : _bundle$metadata.surcharge_fee;
+  if (value === undefined || value === null || value === '') return null;
+  return toDecimal(value);
+}
 function createSurchargeAllocationNodes(products, sourceItems) {
   var nodes = [];
   for (var productIndex = 0; productIndex < products.length; productIndex++) {
-    var _product$product_id;
+    var _product$product_id, _getPersistedSourceSu;
     var product = products[productIndex];
     var sourceItem = sourceItems[productIndex] || {};
     var productQuantity = new Decimal(getSafeNum(product.num));
     for (var bundleIndex = 0; bundleIndex < (product.product_bundle || []).length; bundleIndex++) {
-      var _sourceItem$bundle, _bundle$num;
+      var _sourceItem$bundle, _bundle$num, _bundle$num2;
       var bundle = product.product_bundle[bundleIndex];
       if (!isBundleOriginalPrice(bundle)) continue;
       var sourceBundle = (sourceItem === null || sourceItem === void 0 || (_sourceItem$bundle = sourceItem.bundle) === null || _sourceItem$bundle === void 0 ? void 0 : _sourceItem$bundle[bundleIndex]) || {};
@@ -180,7 +222,10 @@ function createSurchargeAllocationNodes(products, sourceItems) {
         productId: getBundleProductId(bundle),
         unitAmount: getBundleSurchargeUnitAmount(bundle),
         quantity: new Decimal(getSafeNum((_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)).times(productQuantity),
-        relationSurchargeIds: getRelationSurchargeIds(sourceBundle)
+        persistedQuantity: getPersistedQuantity(bundle, new Decimal(getSafeNum((_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)).times(productQuantity)),
+        relationSurchargeIds: getRelationSurchargeIds(sourceBundle).length ? getRelationSurchargeIds(sourceBundle) : getRelationSurchargeIds(bundle),
+        persistedUnitSurchargeFee: getPersistedBundleSurchargeFee(bundle, product),
+        persistedSurchargeRemainder: getPersistedSurchargeRemainder(bundle, sourceBundle)
       });
     }
     nodes.push({
@@ -190,7 +235,10 @@ function createSurchargeAllocationNodes(products, sourceItems) {
       productId: (_product$product_id = product.product_id) !== null && _product$product_id !== void 0 ? _product$product_id : null,
       unitAmount: getMainSurchargeUnitAmount(product),
       quantity: productQuantity,
-      relationSurchargeIds: getRelationSurchargeIds(sourceItem)
+      persistedQuantity: getPersistedQuantity(product, productQuantity),
+      relationSurchargeIds: getRelationSurchargeIds(sourceItem).length ? getRelationSurchargeIds(sourceItem) : getRelationSurchargeIds(product),
+      persistedUnitSurchargeFee: (_getPersistedSourceSu = getPersistedSourceSurchargeFee(sourceItem)) !== null && _getPersistedSourceSu !== void 0 ? _getPersistedSourceSu : getPersistedMainSurchargeFee(product),
+      persistedSurchargeRemainder: getPersistedSurchargeRemainder(product, sourceItem)
     });
   }
   return nodes;
@@ -222,19 +270,20 @@ function resetProductSurchargeFields(products) {
     }
   }
 }
-function buildSurchargeQuantityTotals(nodes) {
-  var totals = new Map();
+function getPersistedSurchargeIds(nodes) {
+  var ids = new Set();
   var _iterator3 = _createForOfIteratorHelper(nodes),
     _step3;
   try {
     for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
       var node = _step3.value;
+      if (!node.persistedUnitSurchargeFee || node.persistedUnitSurchargeFee.lte(0)) continue;
       var _iterator4 = _createForOfIteratorHelper(node.relationSurchargeIds),
         _step4;
       try {
         for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
           var surchargeId = _step4.value;
-          totals.set(surchargeId, (totals.get(surchargeId) || new Decimal(0)).plus(node.quantity));
+          ids.add(surchargeId);
         }
       } catch (err) {
         _iterator4.e(err);
@@ -247,6 +296,33 @@ function buildSurchargeQuantityTotals(nodes) {
   } finally {
     _iterator3.f();
   }
+  return ids;
+}
+function buildSurchargeQuantityTotals(nodes) {
+  var totals = new Map();
+  var _iterator5 = _createForOfIteratorHelper(nodes),
+    _step5;
+  try {
+    for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+      var node = _step5.value;
+      var _iterator6 = _createForOfIteratorHelper(node.relationSurchargeIds),
+        _step6;
+      try {
+        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+          var surchargeId = _step6.value;
+          totals.set(surchargeId, (totals.get(surchargeId) || new Decimal(0)).plus(node.quantity));
+        }
+      } catch (err) {
+        _iterator6.e(err);
+      } finally {
+        _iterator6.f();
+      }
+    }
+  } catch (err) {
+    _iterator5.e(err);
+  } finally {
+    _iterator5.f();
+  }
   return totals;
 }
 function getFallbackAllProductSurchargeIds(surchargeList) {
@@ -275,6 +351,24 @@ function getBackendSurchargeState(stateMap, surchargeId, config) {
   }
   return state;
 }
+function buildSurchargeResultItem(config, surchargeId, amount, index) {
+  var name = (config === null || config === void 0 ? void 0 : config.name) || (config === null || config === void 0 ? void 0 : config.label) || {};
+  return {
+    key: "custom_surcharge_".concat(index),
+    label: name,
+    name: name,
+    value: amount.toNumber(),
+    surcharge_id: surchargeId,
+    description: config === null || config === void 0 ? void 0 : config.description,
+    type: 'default',
+    fixed: config === null || config === void 0 ? void 0 : config.fixed,
+    amount: amount.toNumber(),
+    percentage: config === null || config === void 0 ? void 0 : config.percentage,
+    metadata: {
+      open_product: config === null || config === void 0 ? void 0 : config.open_product
+    }
+  };
+}
 function applySurchargeNodeResult(node, params) {
   var unitSurchargeFee = params.unitSurchargeFee,
     roundingRemainder = params.roundingRemainder,
@@ -302,45 +396,77 @@ function calculateBackendProductSurcharges(params) {
   var configById = getSurchargeConfigById(surchargeList);
   var nodes = createSurchargeAllocationNodes(products, sourceItems);
   var fallbackAllProductSurchargeIds = getFallbackAllProductSurchargeIds(surchargeList);
-  var _iterator5 = _createForOfIteratorHelper(nodes),
-    _step5;
+  var _iterator7 = _createForOfIteratorHelper(nodes),
+    _step7;
   try {
-    for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-      var node = _step5.value;
+    for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+      var node = _step7.value;
       if (node.relationSurchargeIds.length === 0) {
         node.relationSurchargeIds = fallbackAllProductSurchargeIds;
       }
     }
   } catch (err) {
-    _iterator5.e(err);
+    _iterator7.e(err);
   } finally {
-    _iterator5.f();
+    _iterator7.f();
   }
+  var persistedSurchargeIds = getPersistedSurchargeIds(nodes);
   var quantityTotals = buildSurchargeQuantityTotals(nodes);
   var stateMap = new Map();
-  var _iterator6 = _createForOfIteratorHelper(nodes),
-    _step6;
+  var _iterator8 = _createForOfIteratorHelper(nodes),
+    _step8;
   try {
-    for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-      var _node = _step6.value;
+    for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+      var _node = _step8.value;
       var unitSurchargeFee = new Decimal(0);
       var roundingRemainder = new Decimal(0);
       var appliedSurchargeIds = [];
-      var _iterator7 = _createForOfIteratorHelper(_node.relationSurchargeIds),
-        _step7;
+      var persistedRemainderApplied = false;
+      var _iterator10 = _createForOfIteratorHelper(_node.relationSurchargeIds),
+        _step10;
       try {
-        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-          var surchargeId = _step7.value;
+        for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+          var surchargeId = _step10.value;
           var config = configById.get(surchargeId);
           var totalQuantity = quantityTotals.get(surchargeId) || new Decimal(0);
-          if (!config || totalQuantity.lte(0)) continue;
+          if (totalQuantity.lte(0)) continue;
+          var persistedUnitSurchargeFee = _node.persistedUnitSurchargeFee;
+          if (persistedUnitSurchargeFee && persistedUnitSurchargeFee.gt(0)) {
+            var persistedQuantity = Decimal.min(_node.persistedQuantity, _node.quantity);
+            var deltaQuantity = Decimal.max(_node.quantity.minus(persistedQuantity), 0);
+            var _state = getBackendSurchargeState(stateMap, surchargeId, config || {
+              surcharge_id: surchargeId
+            });
+            var persistedSurchargeRemainder = !persistedRemainderApplied && _node.persistedSurchargeRemainder ? _node.persistedSurchargeRemainder : new Decimal(0);
+            _state.amount = bcAdd(bcAdd(_state.amount, bcMul(persistedUnitSurchargeFee, persistedQuantity, 2), 2), persistedSurchargeRemainder, 2);
+            var _fixed = new Decimal((config === null || config === void 0 ? void 0 : config.fixed) || 0);
+            if (_fixed.gt(0)) _state.fixedIncluded = true;
+            var nodeTotalSurcharge = bcAdd(bcMul(persistedUnitSurchargeFee, persistedQuantity, 2), persistedSurchargeRemainder, 2);
+            if (config && deltaQuantity.gt(0)) {
+              var _percentage = new Decimal(config.percentage || 0);
+              var deltaUnitPercentageFee = Decimal.max(0, bcMul(_node.unitAmount, _percentage, 2));
+              var deltaSurcharge = bcMul(deltaQuantity, deltaUnitPercentageFee, 2);
+              _state.amount = bcAdd(_state.amount, deltaSurcharge, 2);
+              nodeTotalSurcharge = bcAdd(nodeTotalSurcharge, deltaSurcharge, 2);
+            }
+            if (_node.quantity.gt(0)) {
+              unitSurchargeFee = bcAdd(unitSurchargeFee, bcDiv(nodeTotalSurcharge, _node.quantity, 2), 2);
+            }
+            if (!persistedSurchargeRemainder.eq(0)) {
+              roundingRemainder = bcAdd(roundingRemainder, persistedSurchargeRemainder, 2);
+              persistedRemainderApplied = true;
+            }
+            appliedSurchargeIds.push(surchargeId);
+            continue;
+          }
+          if (!config) continue;
           var percentage = new Decimal(config.percentage || 0);
           var fixed = new Decimal(config.fixed || 0);
           var unitPercentageFee = Decimal.max(0, bcMul(_node.unitAmount, percentage, 2));
           var percentageTotalFee = bcMul(_node.quantity, unitPercentageFee, 2);
           var unitFixedFee = new Decimal(0);
           var fixedRemainder = new Decimal(0);
-          if (fixed.gt(0)) {
+          if (fixed.gt(0) && !persistedSurchargeIds.has(surchargeId)) {
             unitFixedFee = bcDiv(fixed, totalQuantity, 2);
             var distributedFixed = bcMul(unitFixedFee, totalQuantity, 2);
             fixedRemainder = bcSub(fixed, distributedFixed, 2);
@@ -353,7 +479,7 @@ function calculateBackendProductSurcharges(params) {
           var offsetBaseFee = Decimal.max(0, bcSub(precisePercentage, unitPercentageFee, 6));
           state.totalOffsetFee = bcAdd(state.totalOffsetFee, bcMul(offsetBaseFee, _node.quantity, 6), 6);
           state.calculatedQuantity = bcAdd(state.calculatedQuantity, _node.quantity, 6);
-          if (!state.fixedIncluded && fixed.gt(0)) {
+          if (!state.fixedIncluded && fixed.gt(0) && !persistedSurchargeIds.has(surchargeId)) {
             state.amount = bcAdd(state.amount, fixed, 2);
             state.fixedIncluded = true;
           }
@@ -371,9 +497,9 @@ function calculateBackendProductSurcharges(params) {
           appliedSurchargeIds.push(surchargeId);
         }
       } catch (err) {
-        _iterator7.e(err);
+        _iterator10.e(err);
       } finally {
-        _iterator7.f();
+        _iterator10.f();
       }
       applySurchargeNodeResult(_node, {
         unitSurchargeFee: unitSurchargeFee,
@@ -382,33 +508,39 @@ function calculateBackendProductSurcharges(params) {
       });
     }
   } catch (err) {
-    _iterator6.e(err);
+    _iterator8.e(err);
   } finally {
-    _iterator6.f();
+    _iterator8.f();
   }
-  return (surchargeList || []).reduce(function (result, config, index) {
+  var result = (surchargeList || []).reduce(function (items, config, index) {
     var surchargeId = getSurchargeConfigId(config);
-    if (surchargeId === undefined) return result;
+    if (surchargeId === undefined) return items;
     var state = stateMap.get(surchargeId);
-    if (!state || state.amount.lte(0)) return result;
-    var name = config.name || config.label || {};
-    result.push({
-      key: "custom_surcharge_".concat(index),
-      label: name,
-      name: name,
-      value: state.amount.toNumber(),
-      surcharge_id: surchargeId,
-      description: config.description,
-      type: 'default',
-      fixed: config.fixed,
-      amount: state.amount.toNumber(),
-      percentage: config.percentage,
-      metadata: {
-        open_product: config.open_product
-      }
-    });
-    return result;
+    if (!state || state.amount.lte(0)) return items;
+    items.push(buildSurchargeResultItem(config, surchargeId, state.amount, index));
+    return items;
   }, []);
+  var includedIds = new Set(result.map(function (item) {
+    return item === null || item === void 0 ? void 0 : item.surcharge_id;
+  }).filter(function (id) {
+    return id !== undefined;
+  }));
+  var _iterator9 = _createForOfIteratorHelper(stateMap.entries()),
+    _step9;
+  try {
+    for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+      var _step9$value = _slicedToArray(_step9.value, 2),
+        _surchargeId = _step9$value[0],
+        _state2 = _step9$value[1];
+      if (includedIds.has(_surchargeId) || _state2.amount.lte(0)) continue;
+      result.push(buildSurchargeResultItem(_state2.config, _surchargeId, _state2.amount, result.length));
+    }
+  } catch (err) {
+    _iterator9.e(err);
+  } finally {
+    _iterator9.f();
+  }
+  return result;
 }
 function getProductDepositData(product) {
   var _product$_origin, _product$_origin2;
@@ -444,11 +576,11 @@ function calculateProductsDeposit(products) {
   var hasDeposit = false;
   var policyIds = new Set();
   var policyDataMap = new Map();
-  var _iterator8 = _createForOfIteratorHelper(products),
-    _step8;
+  var _iterator11 = _createForOfIteratorHelper(products),
+    _step11;
   try {
-    for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-      var product = _step8.value;
+    for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+      var product = _step11.value;
       var depositData = getProductDepositData(product);
       if (!depositData || depositData.has_deposit != 1) continue;
       var num = getSafeNum(product.num);
@@ -461,45 +593,45 @@ function calculateProductsDeposit(products) {
       var itemDeposit = fixed.plus(percentage.times(productTotal));
       totalDeposit = totalDeposit.plus(itemDeposit);
       hasDeposit = true;
-      var _iterator10 = _createForOfIteratorHelper(collectDepositPolicyIds(depositData)),
-        _step10;
+      var _iterator13 = _createForOfIteratorHelper(collectDepositPolicyIds(depositData)),
+        _step13;
       try {
-        for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-          var id = _step10.value;
+        for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
+          var id = _step13.value;
           policyIds.add(id);
         }
       } catch (err) {
-        _iterator10.e(err);
+        _iterator13.e(err);
       } finally {
-        _iterator10.f();
+        _iterator13.f();
       }
-      var _iterator11 = _createForOfIteratorHelper(collectDepositPolicyData(depositData)),
-        _step11;
+      var _iterator14 = _createForOfIteratorHelper(collectDepositPolicyData(depositData)),
+        _step14;
       try {
-        for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
-          var policy = _step11.value;
+        for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
+          var policy = _step14.value;
           if (!policyDataMap.has(policy.id)) {
             policyDataMap.set(policy.id, policy);
           }
           policyIds.add(policy.id);
         }
       } catch (err) {
-        _iterator11.e(err);
+        _iterator14.e(err);
       } finally {
-        _iterator11.f();
+        _iterator14.f();
       }
     }
   } catch (err) {
-    _iterator8.e(err);
+    _iterator11.e(err);
   } finally {
-    _iterator8.f();
+    _iterator11.f();
   }
   if (!hasDeposit) return undefined;
-  var _iterator9 = _createForOfIteratorHelper(policyIds),
-    _step9;
+  var _iterator12 = _createForOfIteratorHelper(policyIds),
+    _step12;
   try {
-    for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-      var _id = _step9.value;
+    for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
+      var _id = _step12.value;
       if (!policyDataMap.has(_id)) {
         policyDataMap.set(_id, {
           id: _id,
@@ -508,9 +640,9 @@ function calculateProductsDeposit(products) {
       }
     }
   } catch (err) {
-    _iterator9.e(err);
+    _iterator12.e(err);
   } finally {
-    _iterator9.f();
+    _iterator12.f();
   }
   return {
     total: totalDeposit.toFixed(2),
@@ -559,32 +691,32 @@ function calculateSingleItemTax(params) {
  * - 仅需叠加 `markup` / `markdown` 类 bundle（原价 bundle 已由 `calculateProductsTax` 独立处理）。
  */
 function getMainProductPaymentTotal(product) {
-  var _ref7, _product$metadata$mai, _product$metadata7, _product$metadata8;
-  var mainSelling = (_ref7 = (_product$metadata$mai = (_product$metadata7 = product.metadata) === null || _product$metadata7 === void 0 ? void 0 : _product$metadata7.main_product_selling_price) !== null && _product$metadata$mai !== void 0 ? _product$metadata$mai : (_product$metadata8 = product.metadata) === null || _product$metadata8 === void 0 ? void 0 : _product$metadata8.main_product_original_price) !== null && _ref7 !== void 0 ? _ref7 : 0;
+  var _ref9, _product$metadata$mai, _product$metadata8, _product$metadata9;
+  var mainSelling = (_ref9 = (_product$metadata$mai = (_product$metadata8 = product.metadata) === null || _product$metadata8 === void 0 ? void 0 : _product$metadata8.main_product_selling_price) !== null && _product$metadata$mai !== void 0 ? _product$metadata$mai : (_product$metadata9 = product.metadata) === null || _product$metadata9 === void 0 ? void 0 : _product$metadata9.main_product_original_price) !== null && _ref9 !== void 0 ? _ref9 : 0;
   var total = toDecimal(mainSelling);
   var bundleItems = product.product_bundle || [];
-  var _iterator12 = _createForOfIteratorHelper(bundleItems),
-    _step12;
+  var _iterator15 = _createForOfIteratorHelper(bundleItems),
+    _step15;
   try {
-    for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
-      var bundleItem = _step12.value;
+    for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
+      var bundleItem = _step15.value;
       if (isBundleMarkupOrDiscount(bundleItem)) {
-        var _ref8, _bundleItem$bundle_se, _bundleItem$num;
-        var unit = toDecimal((_ref8 = (_bundleItem$bundle_se = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se !== void 0 ? _bundleItem$bundle_se : bundleItem.price) !== null && _ref8 !== void 0 ? _ref8 : 0);
+        var _ref10, _bundleItem$bundle_se, _bundleItem$num;
+        var unit = toDecimal((_ref10 = (_bundleItem$bundle_se = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se !== void 0 ? _bundleItem$bundle_se : bundleItem.price) !== null && _ref10 !== void 0 ? _ref10 : 0);
         var qty = getSafeNum((_bundleItem$num = bundleItem.num) !== null && _bundleItem$num !== void 0 ? _bundleItem$num : bundleItem.quantity);
         total = total.plus(unit.times(qty));
       }
     }
   } catch (err) {
-    _iterator12.e(err);
+    _iterator15.e(err);
   } finally {
-    _iterator12.f();
+    _iterator15.f();
   }
   return Decimal.max(total, 0);
 }
 function getExplicitTaxRemainder(item) {
-  var _item$tax_fee_roundin, _item$metadata2;
-  var value = (_item$tax_fee_roundin = item === null || item === void 0 ? void 0 : item.tax_fee_rounding_remainder) !== null && _item$tax_fee_roundin !== void 0 ? _item$tax_fee_roundin : item === null || item === void 0 || (_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.tax_fee_rounding_remainder;
+  var _item$tax_fee_roundin, _item$metadata3;
+  var value = (_item$tax_fee_roundin = item === null || item === void 0 ? void 0 : item.tax_fee_rounding_remainder) !== null && _item$tax_fee_roundin !== void 0 ? _item$tax_fee_roundin : item === null || item === void 0 || (_item$metadata3 = item.metadata) === null || _item$metadata3 === void 0 ? void 0 : _item$metadata3.tax_fee_rounding_remainder;
   if (value === undefined || value === null || value === '') return null;
   return new Decimal(value || 0);
 }
@@ -593,6 +725,13 @@ function getPersistedTaxRemainder(item, parentProduct) {
   if (!isPersistedLine) return null;
   return getExplicitTaxRemainder(item);
 }
+function getPersistedMainTaxFee(product) {
+  var _ref11, _product$metadata$mai2, _product$metadata10;
+  if ((product === null || product === void 0 ? void 0 : product.order_detail_id) === undefined || (product === null || product === void 0 ? void 0 : product.order_detail_id) === null) return null;
+  var value = (_ref11 = (_product$metadata$mai2 = product === null || product === void 0 || (_product$metadata10 = product.metadata) === null || _product$metadata10 === void 0 ? void 0 : _product$metadata10.main_product_attached_bundle_tax_fee) !== null && _product$metadata$mai2 !== void 0 ? _product$metadata$mai2 : product === null || product === void 0 ? void 0 : product.main_product_attached_bundle_tax_fee) !== null && _ref11 !== void 0 ? _ref11 : product === null || product === void 0 ? void 0 : product.tax_fee;
+  if (value === undefined || value === null || value === '') return null;
+  return toDecimal(value);
+}
 function writeTaxRemainder(item, roundingRemainder) {
   item.tax_fee_rounding_remainder = roundingRemainder.toNumber();
   if (item.metadata && _typeof(item.metadata) === 'object') {
@@ -601,35 +740,41 @@ function writeTaxRemainder(item, roundingRemainder) {
 }
 function resetTaxRemainderFields(products) {
   for (var _i2 = 0, _arr2 = products; _i2 < _arr2.length; _i2++) {
-    var _productRemainder$toN;
     var product = _arr2[_i2];
     var productRemainder = getPersistedTaxRemainder(product);
-    product.tax_fee_rounding_remainder = (_productRemainder$toN = productRemainder === null || productRemainder === void 0 ? void 0 : productRemainder.toNumber()) !== null && _productRemainder$toN !== void 0 ? _productRemainder$toN : 0;
+    if (productRemainder !== null) {
+      product.tax_fee_rounding_remainder = productRemainder.toNumber();
+    } else {
+      delete product.tax_fee_rounding_remainder;
+    }
     product.original_tax_fee_rounding_remainder = 0;
-    var _iterator13 = _createForOfIteratorHelper(product.product_bundle || []),
-      _step13;
+    var _iterator16 = _createForOfIteratorHelper(product.product_bundle || []),
+      _step16;
     try {
-      for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
-        var _bundleRemainder$toFi, _bundleRemainder$toNu;
-        var bundle = _step13.value;
+      for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
+        var bundle = _step16.value;
         var bundleRemainder = getPersistedTaxRemainder(bundle, product);
-        bundle.metadata = _objectSpread(_objectSpread({}, bundle.metadata || {}), {}, {
-          tax_fee_rounding_remainder: (_bundleRemainder$toFi = bundleRemainder === null || bundleRemainder === void 0 ? void 0 : bundleRemainder.toFixed(2)) !== null && _bundleRemainder$toFi !== void 0 ? _bundleRemainder$toFi : '0.00'
-        });
-        bundle.tax_fee_rounding_remainder = (_bundleRemainder$toNu = bundleRemainder === null || bundleRemainder === void 0 ? void 0 : bundleRemainder.toNumber()) !== null && _bundleRemainder$toNu !== void 0 ? _bundleRemainder$toNu : 0;
+        bundle.metadata = _objectSpread({}, bundle.metadata || {});
+        if (bundleRemainder !== null) {
+          bundle.metadata.tax_fee_rounding_remainder = bundleRemainder.toFixed(2);
+          bundle.tax_fee_rounding_remainder = bundleRemainder.toNumber();
+        } else {
+          delete bundle.metadata.tax_fee_rounding_remainder;
+          delete bundle.tax_fee_rounding_remainder;
+        }
         bundle.original_tax_fee_rounding_remainder = 0;
       }
     } catch (err) {
-      _iterator13.e(err);
+      _iterator16.e(err);
     } finally {
-      _iterator13.f();
+      _iterator16.f();
     }
   }
 }
 function getBundlePaymentPrice(bundle, product) {
-  var _ref9, _ref10, _bundle$bundle_sellin2, _metadata$average_dis, _metadata;
+  var _ref12, _ref13, _bundle$bundle_sellin2, _metadata$average_dis, _metadata;
   if ((bundle === null || bundle === void 0 ? void 0 : bundle.bundle_payment_price) !== undefined) return toDecimal(bundle.bundle_payment_price);
-  var basePrice = toDecimal((_ref9 = (_ref10 = (_bundle$bundle_sellin2 = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_selling_price) !== null && _bundle$bundle_sellin2 !== void 0 ? _bundle$bundle_sellin2 : bundle === null || bundle === void 0 ? void 0 : bundle.bundle_sum_price) !== null && _ref10 !== void 0 ? _ref10 : bundle === null || bundle === void 0 ? void 0 : bundle.price) !== null && _ref9 !== void 0 ? _ref9 : 0);
+  var basePrice = toDecimal((_ref12 = (_ref13 = (_bundle$bundle_sellin2 = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_selling_price) !== null && _bundle$bundle_sellin2 !== void 0 ? _bundle$bundle_sellin2 : bundle === null || bundle === void 0 ? void 0 : bundle.bundle_sum_price) !== null && _ref13 !== void 0 ? _ref13 : bundle === null || bundle === void 0 ? void 0 : bundle.price) !== null && _ref12 !== void 0 ? _ref12 : 0);
   if (!isBundleOriginalPrice(bundle)) return basePrice;
   var averageDiscountRate = toDecimal((_metadata$average_dis = (_metadata = product.metadata) === null || _metadata === void 0 ? void 0 : _metadata.average_discount_amount_rate) !== null && _metadata$average_dis !== void 0 ? _metadata$average_dis : 1);
   return toAmountFormat(bcMul(basePrice, averageDiscountRate, 6));
@@ -661,33 +806,33 @@ function calculateProductsTax(products, taxRate, isPriceIncludeTax) {
   var totalTax = new Decimal(0);
   var totalOriginTax = new Decimal(0);
   resetTaxRemainderFields(products);
-  var _iterator14 = _createForOfIteratorHelper(products),
-    _step14;
+  var _iterator17 = _createForOfIteratorHelper(products),
+    _step17;
   try {
-    for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
+    for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
       var _product$is_charge_ta2, _product$is_charge_ta3;
-      var product = _step14.value;
+      var product = _step17.value;
       var quantity = new Decimal(getSafeNum(product.num));
       var productUnitTax = new Decimal(0);
       var productUnitOriginTax = new Decimal(0);
       var bundleItems = product.product_bundle || [];
-      var _iterator15 = _createForOfIteratorHelper(bundleItems),
-        _step15;
+      var _iterator18 = _createForOfIteratorHelper(bundleItems),
+        _step18;
       try {
-        for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
-          var _bundleItem$num2, _ref11, _ref12, _bundleItem$original_, _ref13, _bundleItem$is_charge, _ref14, _bundleItem$is_charge2;
-          var bundleItem = _step15.value;
+        for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
+          var _bundleItem$num2, _ref14, _ref15, _bundleItem$original_, _ref16, _bundleItem$is_charge, _ref17, _bundleItem$is_charge2;
+          var bundleItem = _step18.value;
           if (!isBundleOriginalPrice(bundleItem)) continue;
           var bundleQuantity = new Decimal(getSafeNum((_bundleItem$num2 = bundleItem.num) !== null && _bundleItem$num2 !== void 0 ? _bundleItem$num2 : bundleItem.quantity));
           var totalBundleQuantity = bundleQuantity.times(quantity);
           var bundlePrice = getBundlePaymentPrice(bundleItem, product);
-          var bundleOriginalPrice = toDecimal((_ref11 = (_ref12 = (_bundleItem$original_ = bundleItem.original_price) !== null && _bundleItem$original_ !== void 0 ? _bundleItem$original_ : bundleItem.product_price) !== null && _ref12 !== void 0 ? _ref12 : bundleItem.price) !== null && _ref11 !== void 0 ? _ref11 : 0);
+          var bundleOriginalPrice = toDecimal((_ref14 = (_ref15 = (_bundleItem$original_ = bundleItem.original_price) !== null && _bundleItem$original_ !== void 0 ? _bundleItem$original_ : bundleItem.product_price) !== null && _ref15 !== void 0 ? _ref15 : bundleItem.price) !== null && _ref14 !== void 0 ? _ref14 : 0);
           var bundleSurchargeFee = toDecimal(bundleItem.surcharge_fee);
           var bundleTaxPrecise = calculateSingleItemTax({
             price: bundlePrice.plus(bundleSurchargeFee),
             taxRate: rate,
             isPriceIncludeTax: isPriceIncludeTax,
-            isChargeTax: (_ref13 = (_bundleItem$is_charge = bundleItem.is_charge_tax) !== null && _bundleItem$is_charge !== void 0 ? _bundleItem$is_charge : product.is_charge_tax) !== null && _ref13 !== void 0 ? _ref13 : 0
+            isChargeTax: (_ref16 = (_bundleItem$is_charge = bundleItem.is_charge_tax) !== null && _bundleItem$is_charge !== void 0 ? _bundleItem$is_charge : product.is_charge_tax) !== null && _ref16 !== void 0 ? _ref16 : 0
           });
           var bundleTaxRounded = toBackendTaxFee(bundleTaxPrecise);
           bundleItem.tax_fee = bundleTaxRounded.toNumber();
@@ -704,7 +849,7 @@ function calculateProductsTax(products, taxRate, isPriceIncludeTax) {
             price: bundleOriginalPrice.plus(bundleSurchargeFee),
             taxRate: rate,
             isPriceIncludeTax: isPriceIncludeTax,
-            isChargeTax: (_ref14 = (_bundleItem$is_charge2 = bundleItem.is_charge_tax) !== null && _bundleItem$is_charge2 !== void 0 ? _bundleItem$is_charge2 : product.is_charge_tax) !== null && _ref14 !== void 0 ? _ref14 : 0
+            isChargeTax: (_ref17 = (_bundleItem$is_charge2 = bundleItem.is_charge_tax) !== null && _bundleItem$is_charge2 !== void 0 ? _bundleItem$is_charge2 : product.is_charge_tax) !== null && _ref17 !== void 0 ? _ref17 : 0
           });
           var bundleOrigTaxRounded = toAmountFormat(bundleOrigTaxPrecise);
           bundleItem.original_tax_fee = bundleOrigTaxRounded.toNumber();
@@ -714,9 +859,9 @@ function calculateProductsTax(products, taxRate, isPriceIncludeTax) {
           totalOriginTax = totalOriginTax.plus(bundleOrigTaxRounded.times(totalBundleQuantity));
         }
       } catch (err) {
-        _iterator15.e(err);
+        _iterator18.e(err);
       } finally {
-        _iterator15.f();
+        _iterator18.f();
       }
       var mainTotal = getMainProductPaymentTotal(product);
       var surchargeFee = toDecimal(product.surcharge_fee);
@@ -728,16 +873,22 @@ function calculateProductsTax(products, taxRate, isPriceIncludeTax) {
         isChargeTax: (_product$is_charge_ta2 = product.is_charge_tax) !== null && _product$is_charge_ta2 !== void 0 ? _product$is_charge_ta2 : 0
       });
       var mainTaxRounded = toBackendTaxFee(mainTaxPrecise);
-      product.main_product_attached_bundle_tax_fee = mainTaxRounded.toFixed(2);
       var persistedMainRemainder = getPersistedTaxRemainder(product);
-      var mainRemainder = persistedMainRemainder !== null && persistedMainRemainder !== void 0 ? persistedMainRemainder : applyBackendTaxRemainder({
+      var persistedMainTaxFee = getPersistedMainTaxFee(product);
+      var persistedQuantity = getPersistedQuantity(product, quantity);
+      var deltaQuantity = Decimal.max(quantity.minus(persistedQuantity), 0);
+      var shouldUsePersistedMainTax = persistedMainTaxFee && persistedMainTaxFee.gt(0) && persistedQuantity.gte(quantity);
+      var shouldSplitPersistedMainTax = persistedMainTaxFee && persistedMainTaxFee.gt(0) && persistedQuantity.gt(0) && deltaQuantity.gt(0);
+      var mainRemainder = shouldUsePersistedMainTax || shouldSplitPersistedMainTax ? new Decimal(0) : persistedMainRemainder !== null && persistedMainRemainder !== void 0 ? persistedMainRemainder : applyBackendTaxRemainder({
         target: product,
         rawTax: mainTaxPrecise,
         formattedTax: mainTaxRounded,
         quantity: quantity,
         state: taxRemainderState
       });
-      if (persistedMainRemainder) writeTaxRemainder(product, persistedMainRemainder);
+      if (persistedMainRemainder && !shouldSplitPersistedMainTax) {
+        writeTaxRemainder(product, persistedMainRemainder);
+      }
       var originalTotal = getUnitOriginalTotal(product);
       var originalTaxableBase = originalTotal.lte(0) ? surchargeFee : originalTotal.plus(surchargeFee);
       var originalTaxPrecise = calculateSingleItemTax({
@@ -747,23 +898,77 @@ function calculateProductsTax(products, taxRate, isPriceIncludeTax) {
         isChargeTax: (_product$is_charge_ta3 = product.is_charge_tax) !== null && _product$is_charge_ta3 !== void 0 ? _product$is_charge_ta3 : 0
       });
       var originalTaxRounded = toAmountFormat(originalTaxPrecise);
-      productUnitTax = productUnitTax.plus(mainTaxRounded);
+      var effectiveMainUnitTax = shouldUsePersistedMainTax ? persistedMainTaxFee : shouldSplitPersistedMainTax ? persistedMainTaxFee.times(persistedQuantity).plus(mainTaxRounded.times(deltaQuantity)).div(quantity).toDecimalPlaces(2, Decimal.ROUND_HALF_UP) : mainTaxRounded;
+      productUnitTax = productUnitTax.plus(effectiveMainUnitTax);
       productUnitOriginTax = productUnitOriginTax.plus(originalTaxRounded);
+      product.main_product_attached_bundle_tax_fee = effectiveMainUnitTax.toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toFixed(2);
       product.tax_fee = productUnitTax.toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toFixed(2);
       product.original_tax_fee = productUnitOriginTax.toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber();
-      totalTax = totalTax.plus(mainTaxRounded.times(quantity)).plus(mainRemainder);
+      totalTax = totalTax.plus(shouldUsePersistedMainTax ? persistedMainTaxFee.times(quantity).plus(persistedMainRemainder || 0) : shouldSplitPersistedMainTax ? persistedMainTaxFee.times(persistedQuantity).plus(mainTaxRounded.times(deltaQuantity)) : mainTaxRounded.times(quantity).plus(mainRemainder));
       totalOriginTax = totalOriginTax.plus(originalTaxRounded.times(quantity));
+      if (product.tax_fee_rounding_remainder === undefined) {
+        product.tax_fee_rounding_remainder = 0;
+      }
     }
   } catch (err) {
-    _iterator14.e(err);
+    _iterator17.e(err);
   } finally {
-    _iterator14.f();
+    _iterator17.f();
   }
   return {
     tax: totalTax.toDecimalPlaces(2, Decimal.ROUND_HALF_UP),
     originTax: totalOriginTax.toDecimalPlaces(2, Decimal.ROUND_HALF_UP)
   };
 }
+function applyShopDiscountToSurchargeBase(products, productAmount, shopDiscountAmount) {
+  if (productAmount.lte(0) || shopDiscountAmount.lte(0)) return function () {};
+  var effectiveDiscount = Decimal.min(productAmount, shopDiscountAmount);
+  if (effectiveDiscount.lte(0)) return function () {};
+  var snapshots = products.map(function (product) {
+    var _product$metadata11;
+    return {
+      product: product,
+      metadata: product.metadata,
+      attachedBundleSellingPrice: (_product$metadata11 = product.metadata) === null || _product$metadata11 === void 0 ? void 0 : _product$metadata11.main_product_attached_bundle_selling_price
+    };
+  });
+  var allocatedDiscount = new Decimal(0);
+  products.forEach(function (product, index) {
+    var quantity = new Decimal(getSafeNum(product.num));
+    var lineAmount = getUnitPaymentTotal(product).times(quantity);
+    var lineDiscount = index === products.length - 1 ? effectiveDiscount.minus(allocatedDiscount) : toAmountFormat(lineAmount.div(productAmount).times(effectiveDiscount));
+    allocatedDiscount = allocatedDiscount.plus(lineDiscount);
+    var unitDiscount = quantity.lte(0) ? new Decimal(0) : lineDiscount.div(quantity);
+    var currentBase = getMainSurchargeUnitAmount(product);
+    var adjustedBase = Decimal.max(currentBase.minus(unitDiscount), 0);
+    product.metadata = _objectSpread(_objectSpread({}, product.metadata || {}), {}, {
+      main_product_attached_bundle_selling_price: adjustedBase.toFixed(2)
+    });
+  });
+  return function () {
+    var _iterator19 = _createForOfIteratorHelper(snapshots),
+      _step19;
+    try {
+      for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
+        var snapshot = _step19.value;
+        if (!snapshot.metadata) {
+          delete snapshot.product.metadata;
+          continue;
+        }
+        snapshot.product.metadata = _objectSpread(_objectSpread({}, snapshot.product.metadata), {}, {
+          main_product_attached_bundle_selling_price: snapshot.attachedBundleSellingPrice
+        });
+        if (snapshot.attachedBundleSellingPrice === undefined) {
+          delete snapshot.product.metadata.main_product_attached_bundle_selling_price;
+        }
+      }
+    } catch (err) {
+      _iterator19.e(err);
+    } finally {
+      _iterator19.f();
+    }
+  };
+}
 export function createEmptySalesSummary() {
   return {
     product_quantity: 0,
@@ -811,6 +1016,12 @@ export function calculateSalesSummary(params) {
   var productAmount = summaryProducts.reduce(function (sum, item) {
     return sum.plus(getUnitPaymentTotal(item).times(getSafeNum(item.num)));
   }, new Decimal(0));
+  var shopDiscountAmount = Decimal.max(new Decimal(Number(shopDiscount) || 0), 0);
+  var hasPersistedSurchargeSnapshot = summaryProducts.some(function (product) {
+    var _getPersistedMainSurc;
+    return (_getPersistedMainSurc = getPersistedMainSurchargeFee(product)) === null || _getPersistedMainSurc === void 0 ? void 0 : _getPersistedMainSurc.gt(0);
+  });
+  var restoreSurchargeBase = hasPersistedSurchargeSnapshot ? function () {} : applyShopDiscountToSurchargeBase(summaryProducts, productAmount, shopDiscountAmount);
   var surchargeServiceItems = buildSurchargeServiceItems(summaryProducts);
   getSurcharge({
     service: surchargeServiceItems,
@@ -828,6 +1039,7 @@ export function calculateSalesSummary(params) {
     sourceItems: surchargeServiceItems,
     surchargeList: surchargeList
   });
+  restoreSurchargeBase();
   var surchargeAmount = new Decimal(getSurchargeAmount({
     bookingDetail: null,
     bookingId: undefined
@@ -844,9 +1056,8 @@ export function calculateSalesSummary(params) {
       return sum.plus(toDecimal(item.tax_fee).times(getSafeNum(item.num)));
     }, new Decimal(0));
   }
-  var shopDiscountAmount = Decimal.max(new Decimal(Number(shopDiscount) || 0), 0);
-  var preTaxExpectAmount = Decimal.max(0, productAmount.plus(surchargeAmount).minus(shopDiscountAmount));
-  var totalAmount = isPriceIncludeTax === 1 ? preTaxExpectAmount : preTaxExpectAmount.plus(productTaxFee);
+  var orderAmountBeforeDiscount = productAmount.plus(surchargeAmount).plus(isPriceIncludeTax === 1 ? 0 : productTaxFee);
+  var totalAmount = Decimal.max(0, orderAmountBeforeDiscount.minus(shopDiscountAmount));
   var deposit = calculateProductsDeposit(summaryProducts);
   return {
     product_quantity: productQuantity,