@pisell/pisellos 2.2.247 → 2.2.248

package/dist/model/strategy/adapter/promotion/index.js

@@ -0,0 +1,9 @@
+// 导出评估器
+export { PromotionEvaluator } from "./evaluator";
+
+// 导出适配器
+export { PromotionAdapter } from "./adapter";
+export { default } from "./adapter";
+
+// 导出策略配置示例常量
+export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY } from "./examples";

package/dist/modules/Order/index.d.ts

@@ -480,6 +480,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         recalcOnHydrate?: boolean;
     }): Promise<OrderTempOrder>;
     private normalizeTempOrderForRuntime;
+    private hydrateLinkedBookingIdentity;
     private pickHydratedDisplayText;
     private formatHydratedNamePair;
     private buildHydratedProductOptionString;

package/dist/modules/Order/index.js

@@ -445,7 +445,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _loadDiscountConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
         var _this$store$tempOrder, _this$store$discount, _this$store$tempOrder2;
-        var orderId, discountList, _this$store$discount2, _this$store$discount3, _this$store$discount4, currentEditDiscounts, currentEditDiscountIds, mergedDiscountList;
+        var orderId, discountList, _this$store$discount2, _this$store$discount3, _this$store$discount4, currentEditDiscounts, runtimeDiscountIds, runtimeDiscounts, mergedDiscountList;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -464,29 +464,30 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 3:
               discountList = _context3.sent;
               if (!discountList) {
-                _context3.next = 12;
+                _context3.next = 13;
                 break;
               }
               currentEditDiscounts = (((_this$store$discount2 = this.store.discount) === null || _this$store$discount2 === void 0 ? void 0 : _this$store$discount2.getDiscountList()) || []).filter(function (discount) {
                 return discount === null || discount === void 0 ? void 0 : discount.isEditMode;
               });
-              currentEditDiscountIds = new Set(currentEditDiscounts.map(function (discount) {
-                return discount === null || discount === void 0 ? void 0 : discount.id;
-              }));
-              mergedDiscountList = [].concat(_toConsumableArray(currentEditDiscounts), _toConsumableArray(discountList.filter(function (discount) {
-                return !currentEditDiscountIds.has(discount === null || discount === void 0 ? void 0 : discount.id);
-              })));
-              _context3.next = 10;
+              runtimeDiscountIds = new Set();
+              runtimeDiscounts = discountList.filter(function (discount) {
+                if (runtimeDiscountIds.has(discount === null || discount === void 0 ? void 0 : discount.id)) return false;
+                runtimeDiscountIds.add(discount === null || discount === void 0 ? void 0 : discount.id);
+                return true;
+              });
+              mergedDiscountList = [].concat(_toConsumableArray(currentEditDiscounts), _toConsumableArray(runtimeDiscounts));
+              _context3.next = 11;
               return (_this$store$discount3 = this.store.discount) === null || _this$store$discount3 === void 0 ? void 0 : _this$store$discount3.setOriginalDiscountList(mergedDiscountList);
-            case 10:
-              _context3.next = 12;
+            case 11:
+              _context3.next = 13;
               return (_this$store$discount4 = this.store.discount) === null || _this$store$discount4 === void 0 ? void 0 : _this$store$discount4.setDiscountList(mergedDiscountList);
-            case 12:
+            case 13:
               if (params.apply !== false && (_this$store$tempOrder2 = this.store.tempOrder) !== null && _this$store$tempOrder2 !== void 0 && (_this$store$tempOrder2 = _this$store$tempOrder2.products) !== null && _this$store$tempOrder2 !== void 0 && _this$store$tempOrder2.length) {
                 this.applyDiscount();
               }
               return _context3.abrupt("return", this.getDiscountList());
-            case 14:
+            case 15:
             case "end":
               return _context3.stop();
           }
@@ -5140,12 +5141,54 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _iterator22.f();
       }
       tempOrderExtend.productsByUid = productsByUid;
+      this.hydrateLinkedBookingIdentity(nextTempOrder);
       if ((options === null || options === void 0 ? void 0 : options.ensureIdentity) !== false) {
         this.ensureExternalSaleNumber(nextTempOrder);
       }
       nextTempOrder.vouchers = raw.vouchers || [];
       return nextTempOrder;
     }
+  }, {
+    key: "hydrateLinkedBookingIdentity",
+    value: function hydrateLinkedBookingIdentity(tempOrder) {
+      var bookingUidByProductUid = new Map();
+      var productByUid = new Map();
+      (tempOrder.products || []).forEach(function (product) {
+        var _product$metadata9;
+        var productUid = (product === null || product === void 0 || (_product$metadata9 = product.metadata) === null || _product$metadata9 === void 0 ? void 0 : _product$metadata9.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
+        if (productUid !== undefined && productUid !== null && String(productUid) !== '') {
+          productByUid.set(String(productUid), product);
+        }
+      });
+      (tempOrder.bookings || []).forEach(function (booking) {
+        var _matchedProduct$metad;
+        if (!booking || _typeof(booking) !== 'object') return;
+        if (!booking.metadata || _typeof(booking.metadata) !== 'object') {
+          booking.metadata = {};
+        }
+        var productUid = booking.product_uid || booking.metadata.product_uid;
+        if (productUid === undefined || productUid === null || String(productUid) === '') return;
+        var matchedProduct = productByUid.get(String(productUid));
+        var existedProductBookingUid = (matchedProduct === null || matchedProduct === void 0 ? void 0 : matchedProduct.booking_uid) || (matchedProduct === null || matchedProduct === void 0 || (_matchedProduct$metad = matchedProduct.metadata) === null || _matchedProduct$metad === void 0 ? void 0 : _matchedProduct$metad.booking_uid);
+        // 客户端订单详情可能缺少 booking 自身 uid，这里补齐后才能反写到商品行。
+        var bookingUid = String(booking.metadata.unique_identification_number || existedProductBookingUid || createUuidV4());
+        booking.metadata.unique_identification_number = bookingUid;
+        bookingUidByProductUid.set(String(productUid), bookingUid);
+      });
+      (tempOrder.products || []).forEach(function (product) {
+        var _product$metadata10;
+        var productUid = (product === null || product === void 0 || (_product$metadata10 = product.metadata) === null || _product$metadata10 === void 0 ? void 0 : _product$metadata10.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
+        if (productUid === undefined || productUid === null || String(productUid) === '') return;
+        var bookingUid = bookingUidByProductUid.get(String(productUid));
+        if (!bookingUid) return;
+        if (!product.metadata || _typeof(product.metadata) !== 'object') {
+          product.metadata = {};
+        }
+        var linkedBookingUid = String(product.booking_uid || product.metadata.booking_uid || bookingUid);
+        product.booking_uid = linkedBookingUid;
+        product.metadata.booking_uid = linkedBookingUid;
+      });
+    }
   }, {
     key: "pickHydratedDisplayText",
     value: function pickHydratedDisplayText(value) {
@@ -5273,13 +5316,26 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "populateSavedAmounts",
     value: function populateSavedAmounts(productList, discountList) {
       var savedMap = new Map();
-      var addDiscountAmount = function addDiscountAmount(discount, quantity) {
+      var editModeSavedMap = new Map();
+      var runtimeSavedMap = new Map();
+      var editModeDiscountKeys = new Set((discountList || []).filter(function (discount) {
+        return discount === null || discount === void 0 ? void 0 : discount.isEditMode;
+      }).map(function (discount) {
+        return discount === null || discount === void 0 ? void 0 : discount.id;
+      }).filter(function (id) {
+        return id !== undefined && id !== null;
+      }));
+      var addDiscountAmount = function addDiscountAmount(targetMap, discountKey, amount) {
+        targetMap.set(discountKey, (targetMap.get(discountKey) || new Decimal(0)).plus(amount));
+      };
+      var addProductDiscountAmount = function addProductDiscountAmount(discount, quantity, isPersistedProduct) {
         var _discount$discount3, _discount$metadata;
         var discountKey = ((_discount$discount3 = discount.discount) === null || _discount$discount3 === void 0 ? void 0 : _discount$discount3.resource_id) || discount.id;
         if (discountKey == null) return;
         var qty = Number(quantity) || 1;
         var amount = new Decimal(discount.amount || 0).times(qty).plus(((_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.product_discount_difference) || 0);
-        savedMap.set(discountKey, (savedMap.get(discountKey) || new Decimal(0)).plus(amount));
+        addDiscountAmount(savedMap, discountKey, amount);
+        addDiscountAmount(isPersistedProduct || discount.order_discount_id != null ? editModeSavedMap : runtimeSavedMap, discountKey, amount);
       };
       var _iterator24 = _createForOfIteratorHelper(productList),
         _step24;
@@ -5287,12 +5343,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         for (_iterator24.s(); !(_step24 = _iterator24.n()).done;) {
           var product = _step24.value;
           var qty = product.num || 1;
+          var isPersistedProduct = Boolean(product.order_detail_id || product.orderDetailId || product.booking_id);
           var _iterator26 = _createForOfIteratorHelper(product.discount_list || []),
             _step26;
           try {
             for (_iterator26.s(); !(_step26 = _iterator26.n()).done;) {
               var pd = _step26.value;
-              addDiscountAmount(pd, qty);
+              addProductDiscountAmount(pd, qty, isPersistedProduct);
             }
           } catch (err) {
             _iterator26.e(err);
@@ -5305,13 +5362,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             for (_iterator27.s(); !(_step27 = _iterator27.n()).done;) {
               var _ref75, _bundle$num3;
               var bundle = _step27.value;
+              var isPersistedBundleProduct = isPersistedProduct || Boolean((bundle === null || bundle === void 0 ? void 0 : bundle.order_detail_id) || (bundle === null || bundle === void 0 ? void 0 : bundle.orderDetailId) || (bundle === null || bundle === void 0 ? void 0 : bundle.booking_id));
               var bundleQty = new Decimal(Number(qty) || 1).times(Number((_ref75 = (_bundle$num3 = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num3 !== void 0 ? _bundle$num3 : bundle === null || bundle === void 0 ? void 0 : bundle.quantity) !== null && _ref75 !== void 0 ? _ref75 : 1) || 1).toNumber();
               var _iterator28 = _createForOfIteratorHelper((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []),
                 _step28;
               try {
                 for (_iterator28.s(); !(_step28 = _iterator28.n()).done;) {
                   var _pd = _step28.value;
-                  addDiscountAmount(_pd, bundleQty);
+                  addProductDiscountAmount(_pd, bundleQty, isPersistedBundleProduct);
                 }
               } catch (err) {
                 _iterator28.e(err);
@@ -5336,7 +5394,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         for (_iterator25.s(); !(_step25 = _iterator25.n()).done;) {
           var d = _step25.value;
           var key = d.id;
-          d.savedAmount = d.isSelected && key != null && savedMap.has(key) ? savedMap.get(key).toNumber() : 0;
+          var sourceMap = d.isEditMode ? editModeSavedMap : editModeDiscountKeys.has(key) ? runtimeSavedMap : savedMap;
+          d.savedAmount = d.isSelected && key != null && sourceMap.has(key) ? sourceMap.get(key).toNumber() : 0;
         }
       } catch (err) {
         _iterator25.e(err);

package/dist/server/utils/small-ticket.js

@@ -1,13 +1,13 @@
+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 _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 _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 _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; }
-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 _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; }
@@ -40,7 +40,9 @@ var LABELS = {
     orderDiscount: 'Order discount',
     manualDiscount: 'Manual discount',
     payProcessingFee: 'Pay processing fee',
-    rounding: 'Rounding'
+    rounding: 'Rounding',
+    gross: 'Gross',
+    tare: 'Tare'
   },
   zh_CN: {
     contactName: '联系人姓名',
@@ -64,7 +66,9 @@ var LABELS = {
     orderDiscount: '整单折扣',
     manualDiscount: '手动折扣',
     payProcessingFee: '支付手续费',
-    rounding: '抹零'
+    rounding: '抹零',
+    gross: '重量',
+    tare: '去皮'
   },
   zh_HK: {
     contactName: '聯絡人姓名',
@@ -88,7 +92,9 @@ var LABELS = {
     orderDiscount: '整單折扣',
     manualDiscount: '手動折扣',
     payProcessingFee: '支付手續費',
-    rounding: '抹零'
+    rounding: '抹零',
+    gross: '重量',
+    tare: '去皮'
   }
 };
 export function buildSmallTicketData(params) {
@@ -200,10 +206,18 @@ function buildProducts(order, locale, productMap) {
       parentProduct: parentProduct,
       locale: locale
     });
+    var extensionList = buildProductExtensionList({
+      product: product,
+      locale: locale,
+      currencySymbol: currencySymbol,
+      quantity: quantity,
+      originalPrice: originalPrice
+    });
     var discountList = normalizeProductDiscounts({
       product: product,
       locale: locale,
-      currencySymbol: currencySymbol
+      currencySymbol: currencySymbol,
+      quantity: quantity
     });
     return _objectSpread(_objectSpread(_objectSpread(_objectSpread({
       product_title: productTitle,
@@ -211,7 +225,7 @@ function buildProducts(order, locale, productMap) {
       selling_price: formatMoney(sellingPrice, currencySymbol),
       original_price: formatMoney(originalPrice, currencySymbol),
       total_original_price: formatMoney(new Decimal(toMoneyNumber(originalPrice)).mul(quantity), currencySymbol),
-      extension_list: Array.isArray(product.extension_list) ? product.extension_list : []
+      extension_list: extensionList
     }, discountList.length ? {
       discount_list: discountList
     } : {}), options.length ? {
@@ -228,12 +242,13 @@ function buildProducts(order, locale, productMap) {
 function normalizeProductDiscounts(params) {
   var product = params.product,
     locale = params.locale,
-    currencySymbol = params.currencySymbol;
+    currencySymbol = params.currencySymbol,
+    quantity = params.quantity;
   return normalizeArray(product.discount_list).map(function (discount) {
     var _ref8, _discount$amount;
-    var title = resolveDiscountTitle(discount, locale);
+    var title = resolveDiscountTitleWithPercent(discount, locale);
     var amount = (_ref8 = (_discount$amount = discount.amount) !== null && _discount$amount !== void 0 ? _discount$amount : discount.value) !== null && _ref8 !== void 0 ? _ref8 : discount.discount_amount;
-    var formattedAmount = formatNegativeMoney(amount, currencySymbol);
+    var formattedAmount = formatNegativeMoney(new Decimal(toMoneyNumber(amount)).mul(quantity), currencySymbol);
     return _objectSpread(_objectSpread({}, discount), {}, {
       item: title,
       name: title,
@@ -242,9 +257,77 @@ function normalizeProductDiscounts(params) {
     });
   });
 }
+function buildProductExtensionList(params) {
+  var product = params.product,
+    locale = params.locale,
+    currencySymbol = params.currencySymbol,
+    quantity = params.quantity,
+    originalPrice = params.originalPrice;
+  var extensionList = [].concat(_toConsumableArray(buildProductOpenWeightRows({
+    product: product,
+    locale: locale,
+    currencySymbol: currencySymbol
+  })), _toConsumableArray(quantity > 1 ? [{
+    item: buildProductQuantityPriceText({
+      quantity: quantity,
+      currencySymbol: currencySymbol,
+      price: originalPrice
+    }),
+    value: ''
+  }] : []));
+  return extensionList.length ? extensionList : normalizeArray(product.extension_list);
+}
+function buildProductOpenWeightRows(params) {
+  var _productSku$unit, _productSku$net_weigh, _productSku$unit_pric;
+  var product = params.product,
+    locale = params.locale,
+    currencySymbol = params.currencySymbol;
+  var productSku = product.product_sku || {};
+  if (productSku.open_sold_weight != 1) return [];
+  var unit = (_productSku$unit = productSku.unit) !== null && _productSku$unit !== void 0 ? _productSku$unit : '';
+  var manualFlag = productSku.weight_source === 'manual' ? '(M) ' : '';
+  var hasTare = toNumber(productSku.tare_weight, 0) > 0;
+  var rows = [];
+  if (hasTare) {
+    var _productSku$weight;
+    rows.push({
+      item: "".concat(manualFlag).concat(label(locale, 'gross'), ": ").concat((_productSku$weight = productSku.weight) !== null && _productSku$weight !== void 0 ? _productSku$weight : 0).concat(unit),
+      value: ''
+    });
+    rows.push({
+      item: "".concat(label(locale, 'tare'), ": ").concat(productSku.tare_weight).concat(unit),
+      value: ''
+    });
+  }
+  var netWeight = (_productSku$net_weigh = productSku.net_weight) !== null && _productSku$net_weigh !== void 0 ? _productSku$net_weigh : 0;
+  var unitPrice = (_productSku$unit_pric = productSku.unit_price) !== null && _productSku$unit_pric !== void 0 ? _productSku$unit_pric : 0;
+  var netItem = "".concat(netWeight, " ").concat(unit, " NET @ ").concat(currencySymbol).concat(unitPrice, "/").concat(unit);
+  rows.push({
+    item: hasTare ? netItem : "".concat(manualFlag).concat(netItem),
+    value: ''
+  });
+  return rows;
+}
+function buildProductQuantityPriceText(params) {
+  var quantity = params.quantity,
+    currencySymbol = params.currencySymbol,
+    price = params.price;
+  return "".concat(quantity, " @ ").concat(currencySymbol).concat(stringify(price), " EACH");
+}
+function resolveDiscountTitleWithPercent(discount, locale) {
+  var _discount$discount, _discount$discount$di, _discount$discount2;
+  var title = resolveDiscountTitle(discount, locale);
+  var percentRaw = (_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.percent;
+  var cardType = (_discount$discount$di = (_discount$discount2 = discount.discount) === null || _discount$discount2 === void 0 ? void 0 : _discount$discount2.discount_card_type) !== null && _discount$discount$di !== void 0 ? _discount$discount$di : 'percent';
+  var percent = percentRaw !== undefined && percentRaw !== null ? Math.trunc(Number(percentRaw)) : NaN;
+  if (percentRaw === undefined || percentRaw === null) return title;
+  if (cardType !== 'percent') return title;
+  if (Number.isNaN(percent)) return title;
+  return "".concat(title, " (").concat(percent, "%)");
+}
 function resolveDiscountTitle(discount, locale) {
-  var _ref9, _ref10, _ref11, _ref12, _discount$discount$na, _discount$discount, _discount$discount2, _discount$discount3;
-  var title = getLocalizedValue((_ref9 = (_ref10 = (_ref11 = (_ref12 = (_discount$discount$na = (_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.name) !== null && _discount$discount$na !== void 0 ? _discount$discount$na : (_discount$discount2 = discount.discount) === null || _discount$discount2 === void 0 ? void 0 : _discount$discount2.title) !== null && _ref12 !== void 0 ? _ref12 : (_discount$discount3 = discount.discount) === null || _discount$discount3 === void 0 ? void 0 : _discount$discount3.message) !== null && _ref11 !== void 0 ? _ref11 : discount.name) !== null && _ref10 !== void 0 ? _ref10 : discount.title) !== null && _ref9 !== void 0 ? _ref9 : discount.message, locale);
+  var _ref9, _ref10, _ref11, _ref12, _discount$discount$na, _discount$discount3, _discount$discount4, _discount$discount5;
+  var title = getLocalizedValue((_ref9 = (_ref10 = (_ref11 = (_ref12 = (_discount$discount$na = (_discount$discount3 = discount.discount) === null || _discount$discount3 === void 0 ? void 0 : _discount$discount3.name) !== null && _discount$discount$na !== void 0 ? _discount$discount$na : (_discount$discount4 = discount.discount) === null || _discount$discount4 === void 0 ? void 0 : _discount$discount4.title) !== null && _ref12 !== void 0 ? _ref12 : (_discount$discount5 = discount.discount) === null || _discount$discount5 === void 0 ? void 0 : _discount$discount5.message) !== null && _ref11 !== void 0 ? _ref11 : discount.name) !== null && _ref10 !== void 0 ? _ref10 : discount.title) !== null && _ref9 !== void 0 ? _ref9 : discount.message, locale);
   if (title) return title;
   if (discount.type === 'product') return label(locale, 'manualDiscount');
   return '';
@@ -544,7 +627,7 @@ function formatBundlePrice(bundle, currencySymbol) {
   return formatMoney(amount, currencySymbol);
 }
 function buildFees(params) {
-  var _ref36, _order$shop_discount;
+  var _ref36, _order$shop_discount, _ref37, _summary$product_orig;
   var order = params.order,
     shopInfo = params.shopInfo,
     locale = params.locale,
@@ -590,11 +673,14 @@ function buildFees(params) {
       value: formatMoney(payProcessingFee, currencySymbol)
     });
   }
+  var productExpectAmount = summary.product_expect_amount || summary.product_amount || order.product_expect_amount;
+  var productOriginalAmount = (_ref37 = (_summary$product_orig = summary.product_original_amount) !== null && _summary$product_orig !== void 0 ? _summary$product_orig : order.product_original_amount) !== null && _ref37 !== void 0 ? _ref37 : productExpectAmount;
+  var totalSavingsAmount = new Decimal(toMoneyNumber(productOriginalAmount)).minus(toMoneyNumber(productExpectAmount)).plus(toMoneyNumber(discountAmount));
   return {
     fees: fees,
     countFee: _objectSpread(_objectSpread(_objectSpread(_objectSpread({
       total_amount: formatMoney(summary.total_amount || order.total_amount, currencySymbol),
-      product_expect_amount: formatMoney(summary.product_expect_amount || summary.product_amount || order.product_expect_amount, currencySymbol),
+      product_expect_amount: formatMoney(productExpectAmount, currencySymbol),
       expect_amount: formatMoney(summary.expect_amount || order.expect_amount || summary.total_amount || order.total_amount, currencySymbol),
       product_quantity: toNumber(summary.product_quantity || products.reduce(function (sum, product) {
         return sum + product.product_quantity;
@@ -605,8 +691,8 @@ function buildFees(params) {
       total_refund_amount: formatMoney(summary.total_refund_amount || order.total_refund_amount, currencySymbol)
     }, isNonZero(roundingAmount) ? {
       rounding_amount: formatMoney(roundingAmount, currencySymbol)
-    } : {}), isNonZero(discountAmount) ? {
-      order_total_discount: formatMoney(discountAmount, currencySymbol)
+    } : {}), isNonZero(totalSavingsAmount) ? {
+      order_total_discount: formatMoney(totalSavingsAmount, currencySymbol)
     } : {}), isNonZero(payProcessingFee) ? {
       pay_processing_fee: formatMoney(payProcessingFee, currencySymbol)
     } : {}), isNonZero(taxFee) ? {
@@ -690,8 +776,8 @@ function buildPaymentData(params) {
         currencySymbol: params.currencySymbol
       })));
     } else {
-      var _ref37, _payment$remaining_am, _payment$metadata;
-      var remainingAmount = (_ref37 = (_payment$remaining_am = payment.remaining_amount) !== null && _payment$remaining_am !== void 0 ? _payment$remaining_am : payment.balance) !== null && _ref37 !== void 0 ? _ref37 : (_payment$metadata = payment.metadata) === null || _payment$metadata === void 0 ? void 0 : _payment$metadata.remaining_amount;
+      var _ref38, _payment$remaining_am, _payment$metadata;
+      var remainingAmount = (_ref38 = (_payment$remaining_am = payment.remaining_amount) !== null && _payment$remaining_am !== void 0 ? _payment$remaining_am : payment.balance) !== null && _ref38 !== void 0 ? _ref38 : (_payment$metadata = payment.metadata) === null || _payment$metadata === void 0 ? void 0 : _payment$metadata.remaining_amount;
       if (remainingAmount !== undefined && remainingAmount !== null) {
         items.push({
           item: label(params.locale, 'remainingAmount'),
@@ -799,12 +885,12 @@ function label(locale, key) {
   return ((_LABELS$locale = LABELS[locale]) === null || _LABELS$locale === void 0 ? void 0 : _LABELS$locale[key]) || LABELS.en[key] || key;
 }
 function getLocalizedValue(value, locale) {
-  var _ref38, _ref39, _ref40, _ref41, _ref42, _ref43, _value$locale2;
+  var _ref39, _ref40, _ref41, _ref42, _ref43, _ref44, _value$locale2;
   if (value === undefined || value === null) return '';
   if (_typeof(value) !== 'object') return stringify(value);
   var dashedLocale = locale.replace('_', '-');
   var underscoredLocale = locale.replace('-', '_');
-  return stringify((_ref38 = (_ref39 = (_ref40 = (_ref41 = (_ref42 = (_ref43 = (_value$locale2 = value[locale]) !== null && _value$locale2 !== void 0 ? _value$locale2 : value[dashedLocale]) !== null && _ref43 !== void 0 ? _ref43 : value[underscoredLocale]) !== null && _ref42 !== void 0 ? _ref42 : value.original) !== null && _ref41 !== void 0 ? _ref41 : value.auto) !== null && _ref40 !== void 0 ? _ref40 : value.default) !== null && _ref39 !== void 0 ? _ref39 : value.en) !== null && _ref38 !== void 0 ? _ref38 : '');
+  return stringify((_ref39 = (_ref40 = (_ref41 = (_ref42 = (_ref43 = (_ref44 = (_value$locale2 = value[locale]) !== null && _value$locale2 !== void 0 ? _value$locale2 : value[dashedLocale]) !== null && _ref44 !== void 0 ? _ref44 : value[underscoredLocale]) !== null && _ref43 !== void 0 ? _ref43 : value.original) !== null && _ref42 !== void 0 ? _ref42 : value.auto) !== null && _ref41 !== void 0 ? _ref41 : value.default) !== null && _ref40 !== void 0 ? _ref40 : value.en) !== null && _ref39 !== void 0 ? _ref39 : '');
 }
 function serviceTypeToLabelKey(serviceType) {
   var normalized = serviceType.toLowerCase();

package/dist/solution/BaseSales/index.js

@@ -63,6 +63,9 @@ function preserveManualProductDiscountProducts(previousProducts, nextProducts) {
     return previous && isBaseSalesManualProductDiscountProduct(previous) ? previous : product;
   });
 }
+function isBaseSalesHistoricalDiscountEntry(discount) {
+  return Boolean((discount === null || discount === void 0 ? void 0 : discount.isEditMode) || (discount === null || discount === void 0 ? void 0 : discount.isDisabled) || (discount === null || discount === void 0 ? void 0 : discount.order_discount_id) != null);
+}
 function getBaseSalesUniqueArrayMetadataKey(key) {
   if (key === 'products' || key === 'bookings') return 'unique_identification_number';
   if (key === 'payments' || key === 'payment') return 'unique_payment_number';
@@ -1322,7 +1325,8 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
         return discount.id;
       }));
       return [].concat(_toConsumableArray(historyDiscountList), _toConsumableArray((discountList || []).filter(function (discount) {
-        return !historyIds.has(discount.id);
+        if (!historyIds.has(discount.id)) return true;
+        return !isBaseSalesHistoricalDiscountEntry(discount);
       })));
     }
   }, {
@@ -1347,11 +1351,12 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "mergeCurrentDiscountSelectionState",
     value: function mergeCurrentDiscountSelectionState(discountList, currentDiscountList) {
       if (!currentDiscountList.length) return discountList;
-      var currentDiscountMap = new Map(currentDiscountList.map(function (discount) {
-        return [discount.id, discount];
-      }));
+      var currentDiscountMap = new Map();
+      currentDiscountList.forEach(function (discount) {
+        currentDiscountMap.set("".concat(discount.id, ":").concat(isBaseSalesHistoricalDiscountEntry(discount) ? 'historical' : 'runtime'), discount);
+      });
       return discountList.map(function (discount) {
-        var currentDiscount = currentDiscountMap.get(discount.id);
+        var currentDiscount = currentDiscountMap.get("".concat(discount.id, ":").concat(isBaseSalesHistoricalDiscountEntry(discount) ? 'historical' : 'runtime'));
         if (!currentDiscount) return discount;
         if (currentDiscount.isManualSelect) {
           return _objectSpread(_objectSpread({}, discount), {}, {
@@ -1731,7 +1736,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
             case 3:
               list = this.store.order.getDiscountList();
               updated = list.map(function (d) {
-                return d.id === params.discountId ? _objectSpread(_objectSpread({}, d), {}, {
+                return d.id === params.discountId && !isBaseSalesHistoricalDiscountEntry(d) ? _objectSpread(_objectSpread({}, d), {}, {
                   isSelected: params.isSelected,
                   isManualSelect: !params.isSelected
                 }) : d;

package/dist/solution/BookingByStep/index.d.ts

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 5 | 1 | 4 | 2 | 3 | 6;
+        weekNum: 0 | 2 | 1 | 6 | 3 | 4 | 5;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/modules/Order/index.d.ts

@@ -480,6 +480,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         recalcOnHydrate?: boolean;
     }): Promise<OrderTempOrder>;
     private normalizeTempOrderForRuntime;
+    private hydrateLinkedBookingIdentity;
     private pickHydratedDisplayText;
     private formatHydratedNamePair;
     private buildHydratedProductOptionString;

package/lib/modules/Order/index.js

@@ -168,33 +168,53 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    */
   static populateSavedAmounts(productList, discountList) {
     const savedMap = /* @__PURE__ */ new Map();
-    const addDiscountAmount = (discount, quantity) => {
+    const editModeSavedMap = /* @__PURE__ */ new Map();
+    const runtimeSavedMap = /* @__PURE__ */ new Map();
+    const editModeDiscountKeys = new Set(
+      (discountList || []).filter((discount) => discount == null ? void 0 : discount.isEditMode).map((discount) => discount == null ? void 0 : discount.id).filter((id) => id !== void 0 && id !== null)
+    );
+    const addDiscountAmount = (targetMap, discountKey, amount) => {
+      targetMap.set(
+        discountKey,
+        (targetMap.get(discountKey) || new import_decimal.default(0)).plus(amount)
+      );
+    };
+    const addProductDiscountAmount = (discount, quantity, isPersistedProduct) => {
       var _a, _b;
       const discountKey = ((_a = discount.discount) == null ? void 0 : _a.resource_id) || discount.id;
       if (discountKey == null)
         return;
       const qty = Number(quantity) || 1;
       const amount = new import_decimal.default(discount.amount || 0).times(qty).plus(((_b = discount.metadata) == null ? void 0 : _b.product_discount_difference) || 0);
-      savedMap.set(
+      addDiscountAmount(savedMap, discountKey, amount);
+      addDiscountAmount(
+        isPersistedProduct || discount.order_discount_id != null ? editModeSavedMap : runtimeSavedMap,
         discountKey,
-        (savedMap.get(discountKey) || new import_decimal.default(0)).plus(amount)
+        amount
       );
     };
     for (const product of productList) {
       const qty = product.num || 1;
+      const isPersistedProduct = Boolean(
+        product.order_detail_id || product.orderDetailId || product.booking_id
+      );
       for (const pd of product.discount_list || []) {
-        addDiscountAmount(pd, qty);
+        addProductDiscountAmount(pd, qty, isPersistedProduct);
       }
       for (const bundle of product.product_bundle || []) {
+        const isPersistedBundleProduct = isPersistedProduct || Boolean(
+          (bundle == null ? void 0 : bundle.order_detail_id) || (bundle == null ? void 0 : bundle.orderDetailId) || (bundle == null ? void 0 : bundle.booking_id)
+        );
         const bundleQty = new import_decimal.default(Number(qty) || 1).times(Number((bundle == null ? void 0 : bundle.num) ?? (bundle == null ? void 0 : bundle.quantity) ?? 1) || 1).toNumber();
         for (const pd of (bundle == null ? void 0 : bundle.discount_list) || []) {
-          addDiscountAmount(pd, bundleQty);
+          addProductDiscountAmount(pd, bundleQty, isPersistedBundleProduct);
         }
       }
     }
     for (const d of discountList) {
       const key = d.id;
-      d.savedAmount = d.isSelected && key != null && savedMap.has(key) ? savedMap.get(key).toNumber() : 0;
+      const sourceMap = d.isEditMode ? editModeSavedMap : editModeDiscountKeys.has(key) ? runtimeSavedMap : savedMap;
+      d.savedAmount = d.isSelected && key != null && sourceMap.has(key) ? sourceMap.get(key).toNumber() : 0;
     }
   }
   applyProductDiscountPrices(products) {
@@ -371,12 +391,16 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }));
     if (discountList) {
       const currentEditDiscounts = (((_c = this.store.discount) == null ? void 0 : _c.getDiscountList()) || []).filter((discount) => discount == null ? void 0 : discount.isEditMode);
-      const currentEditDiscountIds = new Set(
-        currentEditDiscounts.map((discount) => discount == null ? void 0 : discount.id)
-      );
+      const runtimeDiscountIds = /* @__PURE__ */ new Set();
+      const runtimeDiscounts = discountList.filter((discount) => {
+        if (runtimeDiscountIds.has(discount == null ? void 0 : discount.id))
+          return false;
+        runtimeDiscountIds.add(discount == null ? void 0 : discount.id);
+        return true;
+      });
       const mergedDiscountList = [
         ...currentEditDiscounts,
-        ...discountList.filter((discount) => !currentEditDiscountIds.has(discount == null ? void 0 : discount.id))
+        ...runtimeDiscounts
       ];
       await ((_d = this.store.discount) == null ? void 0 : _d.setOriginalDiscountList(mergedDiscountList));
       await ((_e = this.store.discount) == null ? void 0 : _e.setDiscountList(mergedDiscountList));
@@ -3670,12 +3694,59 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       };
     }
     tempOrderExtend.productsByUid = productsByUid;
+    this.hydrateLinkedBookingIdentity(nextTempOrder);
     if ((options == null ? void 0 : options.ensureIdentity) !== false) {
       this.ensureExternalSaleNumber(nextTempOrder);
     }
     nextTempOrder.vouchers = raw.vouchers || [];
     return nextTempOrder;
   }
+  hydrateLinkedBookingIdentity(tempOrder) {
+    const bookingUidByProductUid = /* @__PURE__ */ new Map();
+    const productByUid = /* @__PURE__ */ new Map();
+    (tempOrder.products || []).forEach((product) => {
+      var _a;
+      const productUid = ((_a = product == null ? void 0 : product.metadata) == null ? void 0 : _a.unique_identification_number) || (product == null ? void 0 : product.unique_identification_number);
+      if (productUid !== void 0 && productUid !== null && String(productUid) !== "") {
+        productByUid.set(String(productUid), product);
+      }
+    });
+    (tempOrder.bookings || []).forEach((booking) => {
+      var _a;
+      if (!booking || typeof booking !== "object")
+        return;
+      if (!booking.metadata || typeof booking.metadata !== "object") {
+        booking.metadata = {};
+      }
+      const productUid = booking.product_uid || booking.metadata.product_uid;
+      if (productUid === void 0 || productUid === null || String(productUid) === "")
+        return;
+      const matchedProduct = productByUid.get(String(productUid));
+      const existedProductBookingUid = (matchedProduct == null ? void 0 : matchedProduct.booking_uid) || ((_a = matchedProduct == null ? void 0 : matchedProduct.metadata) == null ? void 0 : _a.booking_uid);
+      const bookingUid = String(
+        booking.metadata.unique_identification_number || existedProductBookingUid || (0, import_utils.createUuidV4)()
+      );
+      booking.metadata.unique_identification_number = bookingUid;
+      bookingUidByProductUid.set(String(productUid), bookingUid);
+    });
+    (tempOrder.products || []).forEach((product) => {
+      var _a;
+      const productUid = ((_a = product == null ? void 0 : product.metadata) == null ? void 0 : _a.unique_identification_number) || (product == null ? void 0 : product.unique_identification_number);
+      if (productUid === void 0 || productUid === null || String(productUid) === "")
+        return;
+      const bookingUid = bookingUidByProductUid.get(String(productUid));
+      if (!bookingUid)
+        return;
+      if (!product.metadata || typeof product.metadata !== "object") {
+        product.metadata = {};
+      }
+      const linkedBookingUid = String(
+        product.booking_uid || product.metadata.booking_uid || bookingUid
+      );
+      product.booking_uid = linkedBookingUid;
+      product.metadata.booking_uid = linkedBookingUid;
+    });
+  }
   pickHydratedDisplayText(value) {
     if (value === void 0 || value === null)
       return "";

package/lib/server/utils/small-ticket.js

@@ -59,7 +59,9 @@ var LABELS = {
     orderDiscount: "Order discount",
     manualDiscount: "Manual discount",
     payProcessingFee: "Pay processing fee",
-    rounding: "Rounding"
+    rounding: "Rounding",
+    gross: "Gross",
+    tare: "Tare"
   },
   zh_CN: {
     contactName: "联系人姓名",
@@ -83,7 +85,9 @@ var LABELS = {
     orderDiscount: "整单折扣",
     manualDiscount: "手动折扣",
     payProcessingFee: "支付手续费",
-    rounding: "抹零"
+    rounding: "抹零",
+    gross: "重量",
+    tare: "去皮"
   },
   zh_HK: {
     contactName: "聯絡人姓名",
@@ -107,7 +111,9 @@ var LABELS = {
     orderDiscount: "整單折扣",
     manualDiscount: "手動折扣",
     payProcessingFee: "支付手續費",
-    rounding: "抹零"
+    rounding: "抹零",
+    gross: "重量",
+    tare: "去皮"
   }
 };
 function buildSmallTicketData(params) {
@@ -187,14 +193,21 @@ function buildProducts(order, locale, productMap) {
       parentProduct
     });
     const resolvedVariant = resolveProductVariantText({ product, parentProduct, locale });
-    const discountList = normalizeProductDiscounts({ product, locale, currencySymbol });
+    const extensionList = buildProductExtensionList({
+      product,
+      locale,
+      currencySymbol,
+      quantity,
+      originalPrice
+    });
+    const discountList = normalizeProductDiscounts({ product, locale, currencySymbol, quantity });
     return {
       product_title: productTitle,
       product_quantity: quantity,
       selling_price: formatMoney(sellingPrice, currencySymbol),
       original_price: formatMoney(originalPrice, currencySymbol),
       total_original_price: formatMoney(new import_decimal.default(toMoneyNumber(originalPrice)).mul(quantity), currencySymbol),
-      extension_list: Array.isArray(product.extension_list) ? product.extension_list : [],
+      extension_list: extensionList,
       ...discountList.length ? { discount_list: discountList } : {},
       ...options.length ? { options } : {},
       ...resolvedVariant ? { variant: resolvedVariant } : {},
@@ -203,11 +216,11 @@ function buildProducts(order, locale, productMap) {
   });
 }
 function normalizeProductDiscounts(params) {
-  const { product, locale, currencySymbol } = params;
+  const { product, locale, currencySymbol, quantity } = params;
   return normalizeArray(product.discount_list).map((discount) => {
-    const title = resolveDiscountTitle(discount, locale);
+    const title = resolveDiscountTitleWithPercent(discount, locale);
     const amount = discount.amount ?? discount.value ?? discount.discount_amount;
-    const formattedAmount = formatNegativeMoney(amount, currencySymbol);
+    const formattedAmount = formatNegativeMoney(new import_decimal.default(toMoneyNumber(amount)).mul(quantity), currencySymbol);
     return {
       ...discount,
       item: title,
@@ -217,6 +230,63 @@ function normalizeProductDiscounts(params) {
     };
   });
 }
+function buildProductExtensionList(params) {
+  const { product, locale, currencySymbol, quantity, originalPrice } = params;
+  const extensionList = [
+    ...buildProductOpenWeightRows({ product, locale, currencySymbol }),
+    ...quantity > 1 ? [{
+      item: buildProductQuantityPriceText({ quantity, currencySymbol, price: originalPrice }),
+      value: ""
+    }] : []
+  ];
+  return extensionList.length ? extensionList : normalizeArray(product.extension_list);
+}
+function buildProductOpenWeightRows(params) {
+  const { product, locale, currencySymbol } = params;
+  const productSku = product.product_sku || {};
+  if (productSku.open_sold_weight != 1)
+    return [];
+  const unit = productSku.unit ?? "";
+  const manualFlag = productSku.weight_source === "manual" ? "(M) " : "";
+  const hasTare = toNumber(productSku.tare_weight, 0) > 0;
+  const rows = [];
+  if (hasTare) {
+    rows.push({
+      item: `${manualFlag}${label(locale, "gross")}: ${productSku.weight ?? 0}${unit}`,
+      value: ""
+    });
+    rows.push({
+      item: `${label(locale, "tare")}: ${productSku.tare_weight}${unit}`,
+      value: ""
+    });
+  }
+  const netWeight = productSku.net_weight ?? 0;
+  const unitPrice = productSku.unit_price ?? 0;
+  const netItem = `${netWeight} ${unit} NET @ ${currencySymbol}${unitPrice}/${unit}`;
+  rows.push({
+    item: hasTare ? netItem : `${manualFlag}${netItem}`,
+    value: ""
+  });
+  return rows;
+}
+function buildProductQuantityPriceText(params) {
+  const { quantity, currencySymbol, price } = params;
+  return `${quantity} @ ${currencySymbol}${stringify(price)} EACH`;
+}
+function resolveDiscountTitleWithPercent(discount, locale) {
+  var _a, _b;
+  const title = resolveDiscountTitle(discount, locale);
+  const percentRaw = (_a = discount.discount) == null ? void 0 : _a.percent;
+  const cardType = ((_b = discount.discount) == null ? void 0 : _b.discount_card_type) ?? "percent";
+  const percent = percentRaw !== void 0 && percentRaw !== null ? Math.trunc(Number(percentRaw)) : NaN;
+  if (percentRaw === void 0 || percentRaw === null)
+    return title;
+  if (cardType !== "percent")
+    return title;
+  if (Number.isNaN(percent))
+    return title;
+  return `${title} (${percent}%)`;
+}
 function resolveDiscountTitle(discount, locale) {
   var _a, _b, _c;
   const title = getLocalizedValue(
@@ -540,14 +610,14 @@ function buildFees(params) {
       value: formatMoney(payProcessingFee, currencySymbol)
     });
   }
+  const productExpectAmount = summary.product_expect_amount || summary.product_amount || order.product_expect_amount;
+  const productOriginalAmount = summary.product_original_amount ?? order.product_original_amount ?? productExpectAmount;
+  const totalSavingsAmount = new import_decimal.default(toMoneyNumber(productOriginalAmount)).minus(toMoneyNumber(productExpectAmount)).plus(toMoneyNumber(discountAmount));
   return {
     fees,
     countFee: {
       total_amount: formatMoney(summary.total_amount || order.total_amount, currencySymbol),
-      product_expect_amount: formatMoney(
-        summary.product_expect_amount || summary.product_amount || order.product_expect_amount,
-        currencySymbol
-      ),
+      product_expect_amount: formatMoney(productExpectAmount, currencySymbol),
       expect_amount: formatMoney(summary.expect_amount || order.expect_amount || summary.total_amount || order.total_amount, currencySymbol),
       product_quantity: toNumber(
         summary.product_quantity || products.reduce((sum, product) => sum + product.product_quantity, 0),
@@ -558,7 +628,7 @@ function buildFees(params) {
       tax_title: stringify(summary.tax_title || order.tax_title || shopInfo.tax_title),
       total_refund_amount: formatMoney(summary.total_refund_amount || order.total_refund_amount, currencySymbol),
       ...isNonZero(roundingAmount) ? { rounding_amount: formatMoney(roundingAmount, currencySymbol) } : {},
-      ...isNonZero(discountAmount) ? { order_total_discount: formatMoney(discountAmount, currencySymbol) } : {},
+      ...isNonZero(totalSavingsAmount) ? { order_total_discount: formatMoney(totalSavingsAmount, currencySymbol) } : {},
       ...isNonZero(payProcessingFee) ? { pay_processing_fee: formatMoney(payProcessingFee, currencySymbol) } : {},
       ...isNonZero(taxFee) ? { tax_fee: formatMoney(taxFee, currencySymbol) } : {}
     }

package/lib/solution/BaseSales/index.js

@@ -70,6 +70,11 @@ function preserveManualProductDiscountProducts(previousProducts, nextProducts) {
     return previous && isBaseSalesManualProductDiscountProduct(previous) ? previous : product;
   });
 }
+function isBaseSalesHistoricalDiscountEntry(discount) {
+  return Boolean(
+    (discount == null ? void 0 : discount.isEditMode) || (discount == null ? void 0 : discount.isDisabled) || (discount == null ? void 0 : discount.order_discount_id) != null
+  );
+}
 function getBaseSalesUniqueArrayMetadataKey(key) {
   if (key === "products" || key === "bookings")
     return "unique_identification_number";
@@ -883,7 +888,11 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     const historyIds = new Set(historyDiscountList.map((discount) => discount.id));
     return [
       ...historyDiscountList,
-      ...(discountList || []).filter((discount) => !historyIds.has(discount.id))
+      ...(discountList || []).filter((discount) => {
+        if (!historyIds.has(discount.id))
+          return true;
+        return !isBaseSalesHistoricalDiscountEntry(discount);
+      })
     ];
   }
   shouldSkipAutoApplyFetchedDiscountsInEditMode(params) {
@@ -906,11 +915,17 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   mergeCurrentDiscountSelectionState(discountList, currentDiscountList) {
     if (!currentDiscountList.length)
       return discountList;
-    const currentDiscountMap = new Map(
-      currentDiscountList.map((discount) => [discount.id, discount])
-    );
+    const currentDiscountMap = /* @__PURE__ */ new Map();
+    currentDiscountList.forEach((discount) => {
+      currentDiscountMap.set(
+        `${discount.id}:${isBaseSalesHistoricalDiscountEntry(discount) ? "historical" : "runtime"}`,
+        discount
+      );
+    });
     return discountList.map((discount) => {
-      const currentDiscount = currentDiscountMap.get(discount.id);
+      const currentDiscount = currentDiscountMap.get(
+        `${discount.id}:${isBaseSalesHistoricalDiscountEntry(discount) ? "historical" : "runtime"}`
+      );
       if (!currentDiscount)
         return discount;
       if (currentDiscount.isManualSelect) {
@@ -1145,7 +1160,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         throw new Error("order 模块未初始化");
       const list = this.store.order.getDiscountList();
       const updated = list.map(
-        (d) => d.id === params.discountId ? {
+        (d) => d.id === params.discountId && !isBaseSalesHistoricalDiscountEntry(d) ? {
           ...d,
           isSelected: params.isSelected,
           isManualSelect: !params.isSelected

package/lib/solution/BookingByStep/index.d.ts

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 5 | 1 | 4 | 2 | 3 | 6;
+        weekNum: 0 | 2 | 1 | 6 | 3 | 4 | 5;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.2.247",
+  "version": "2.2.248",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",