@pisell/pisellos 0.10.36 → 0.10.37

package/dist/server/utils/small-ticket.d.ts

@@ -28,6 +28,8 @@ export interface SmallTicketItem {
     value: string;
     size?: number;
     align?: string;
+    product_uid?: string | number;
+    booking_uid?: string | number;
 }
 export interface SmallTicketProduct {
     product_title: string;
@@ -53,11 +55,7 @@ export interface SmallTicketProduct {
     variant?: string;
     combinations?: any[];
 }
-export interface SmallTicketBookingSnapshot extends Record<string, any> {
-    product_uid?: string | number;
-    booking_uid?: string | number;
-}
-export type SmallTicketAppointment = SmallTicketItem[] | SmallTicketBookingSnapshot[];
+export type SmallTicketAppointment = SmallTicketItem[];
 export interface SmallTicketLocaleData {
     base_data: Record<string, any>;
     products: SmallTicketProduct[];

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

@@ -1,12 +1,16 @@
+var _excluded = ["isMarkup"];
 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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 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 _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; }
 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; }
@@ -41,8 +45,13 @@ var LABELS = {
     redeemPoints: 'Redeem points',
     remainingPoints: 'Points balance',
     table: 'Table',
+    bookingId: 'Booking ID',
+    bookingDateTime: 'Date & time',
+    bookingResource: 'Resource',
+    bookingHolder: 'Holder',
     orderDiscount: 'Order discount',
     manualDiscount: 'Manual discount',
+    manualMarkup: 'Manual markup',
     payProcessingFee: 'Pay processing fee',
     surchargeIncluded: 'Surcharge(Included)',
     rounding: 'Rounding',
@@ -74,8 +83,13 @@ var LABELS = {
     redeemPoints: '本次使用积分',
     remainingPoints: '积分余额',
     table: '桌台',
+    bookingId: '预约编号',
+    bookingDateTime: '日期和时间',
+    bookingResource: '资源',
+    bookingHolder: '预约人',
     orderDiscount: '整单折扣',
     manualDiscount: '手动折扣',
+    manualMarkup: '手动加价',
     payProcessingFee: '支付手续费',
     surchargeIncluded: '手续费(已含)',
     rounding: '抹零',
@@ -107,8 +121,13 @@ var LABELS = {
     redeemPoints: '本次使用積分',
     remainingPoints: '積分餘額',
     table: '桌台',
+    bookingId: '預約編號',
+    bookingDateTime: '日期和時間',
+    bookingResource: '資源',
+    bookingHolder: '預約人',
     orderDiscount: '整單折扣',
     manualDiscount: '手動折扣',
+    manualMarkup: '手動加價',
     payProcessingFee: '支付手續費',
     surchargeIncluded: '手續費(已含)',
     rounding: '抹零',
@@ -138,8 +157,13 @@ var LABELS = {
     redeemPoints: '利用ポイント',
     remainingPoints: 'ポイント残高',
     table: 'テーブル',
+    bookingId: '予約ID',
+    bookingDateTime: '日時',
+    bookingResource: 'リソース',
+    bookingHolder: '予約者',
     orderDiscount: '注文割引',
     manualDiscount: '手動割引',
+    manualMarkup: '手動値上げ',
     payProcessingFee: '決済手数料',
     rounding: '端数調整',
     gross: '総重量',
@@ -170,8 +194,13 @@ var LABELS = {
     redeemPoints: 'Pontos utilizados',
     remainingPoints: 'Saldo de pontos',
     table: 'Mesa',
+    bookingId: 'ID da reserva',
+    bookingDateTime: 'Data e hora',
+    bookingResource: 'Recurso',
+    bookingHolder: 'Titular',
     orderDiscount: 'Desconto do pedido',
     manualDiscount: 'Desconto manual',
+    manualMarkup: 'Acréscimo manual',
     payProcessingFee: 'Taxa de processamento',
     rounding: 'Arredondamento',
     gross: 'Peso bruto',
@@ -285,8 +314,9 @@ function buildBaseData(params) {
 }
 function buildProducts(order, locale, productMap) {
   var products = Array.isArray(order.products) ? order.products : [];
-  return products.map(function (product) {
+  return products.map(function (rawProduct) {
     var _ref, _ref2, _product$product_quan, _ref3, _ref4, _ref5, _product$original_pri, _ref6, _ref7, _product$selling_pric, _product$product_id, _product$metadata, _product$metadata2;
+    var product = restoreReceiptDiscountHierarchy(rawProduct);
     var quantity = toNumber((_ref = (_ref2 = (_product$product_quan = product.product_quantity) !== null && _product$product_quan !== void 0 ? _product$product_quan : product.quantity) !== null && _ref2 !== void 0 ? _ref2 : product.num) !== null && _ref !== void 0 ? _ref : 1, 1);
     var originalPrice = (_ref3 = (_ref4 = (_ref5 = (_product$original_pri = product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : product.selling_price) !== null && _ref5 !== void 0 ? _ref5 : product.payment_price) !== null && _ref4 !== void 0 ? _ref4 : product.price) !== null && _ref3 !== void 0 ? _ref3 : 0;
     var sellingPrice = (_ref6 = (_ref7 = (_product$selling_pric = product.selling_price) !== null && _product$selling_pric !== void 0 ? _product$selling_pric : product.payment_price) !== null && _ref7 !== void 0 ? _ref7 : product.price) !== null && _ref6 !== void 0 ? _ref6 : originalPrice;
@@ -359,6 +389,96 @@ function buildProducts(order, locale, productMap) {
     } : {});
   });
 }
+var RECEIPT_BUNDLE_MAP_ID_KEY = 'custom_product_bundle_map_id';
+function restoreReceiptDiscountHierarchy(source) {
+  if (!source || _typeof(source) !== 'object' || Array.isArray(source)) {
+    return source;
+  }
+  var childKey = Array.isArray(source.combinations) && source.combinations.length ? 'combinations' : Array.isArray(source.product_bundle) && source.product_bundle.length ? 'product_bundle' : null;
+  if (!childKey) return _objectSpread({}, source);
+  var children = source[childKey].map(function (child) {
+    return child && _typeof(child) === 'object' && !Array.isArray(child) ? restoreReceiptDiscountHierarchy(child) : child;
+  });
+  var restored = _objectSpread(_objectSpread({}, source), {}, _defineProperty({}, childKey, children));
+  if (!Array.isArray(source.discount_list) || !source.discount_list.length) {
+    return restored;
+  }
+  var descendantsByMapId = new Map();
+  indexReceiptDiscountTargets(children, descendantsByMapId);
+  if (!descendantsByMapId.size) return restored;
+  var ownDiscounts = [];
+  var _iterator = _createForOfIteratorHelper(source.discount_list),
+    _step;
+  try {
+    var _loop = function _loop() {
+      var discount = _step.value;
+      var mapId = getReceiptDiscountBundleMapId(discount);
+      var target = mapId ? descendantsByMapId.get(mapId) : undefined;
+      if (!target) {
+        ownDiscounts.push(discount);
+        return 1; // continue
+      }
+      var targetDiscounts = Array.isArray(target.discount_list) ? target.discount_list : [];
+      if (!targetDiscounts.some(function (item) {
+        return isSameReceiptDiscount(item, discount);
+      })) {
+        target.discount_list = [].concat(_toConsumableArray(targetDiscounts), [discount]);
+      }
+    };
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      if (_loop()) continue;
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  restored.discount_list = ownDiscounts;
+  return restored;
+}
+function indexReceiptDiscountTargets(nodes, targets) {
+  var _iterator2 = _createForOfIteratorHelper(nodes),
+    _step2;
+  try {
+    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+      var node = _step2.value;
+      if (!node || _typeof(node) !== 'object' || Array.isArray(node)) continue;
+      var mapId = getReceiptBundleMapId(node);
+      if (mapId && !targets.has(mapId)) targets.set(mapId, node);
+      var children = Array.isArray(node.combinations) && node.combinations.length ? node.combinations : Array.isArray(node.product_bundle) ? node.product_bundle : [];
+      indexReceiptDiscountTargets(children, targets);
+    }
+  } catch (err) {
+    _iterator2.e(err);
+  } finally {
+    _iterator2.f();
+  }
+}
+function normalizeReceiptId(value) {
+  if (value === undefined || value === null) return null;
+  var normalized = String(value).trim();
+  return normalized ? normalized : null;
+}
+function getReceiptBundleMapId(node) {
+  var _node$metadata$RECEIP, _node$metadata;
+  return normalizeReceiptId((_node$metadata$RECEIP = (_node$metadata = node.metadata) === null || _node$metadata === void 0 ? void 0 : _node$metadata[RECEIPT_BUNDLE_MAP_ID_KEY]) !== null && _node$metadata$RECEIP !== void 0 ? _node$metadata$RECEIP : node._id);
+}
+function getReceiptDiscountBundleMapId(discount) {
+  var _discount$metadata;
+  return normalizeReceiptId(discount === null || discount === void 0 || (_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata[RECEIPT_BUNDLE_MAP_ID_KEY]);
+}
+function isSameReceiptDiscount(left, right) {
+  var _ref8, _left$discount$resour, _left$discount, _ref9, _right$discount$resou, _right$discount, _ref10, _ref11, _left$amount, _ref12, _ref13, _right$amount;
+  var leftOrderDiscountId = normalizeReceiptId(left === null || left === void 0 ? void 0 : left.order_discount_id);
+  var rightOrderDiscountId = normalizeReceiptId(right === null || right === void 0 ? void 0 : right.order_discount_id);
+  if (leftOrderDiscountId && rightOrderDiscountId) {
+    return leftOrderDiscountId === rightOrderDiscountId;
+  }
+  var leftResourceId = normalizeReceiptId((_ref8 = (_left$discount$resour = left === null || left === void 0 || (_left$discount = left.discount) === null || _left$discount === void 0 ? void 0 : _left$discount.resource_id) !== null && _left$discount$resour !== void 0 ? _left$discount$resour : left === null || left === void 0 ? void 0 : left.resource_id) !== null && _ref8 !== void 0 ? _ref8 : left === null || left === void 0 ? void 0 : left.discount_id);
+  var rightResourceId = normalizeReceiptId((_ref9 = (_right$discount$resou = right === null || right === void 0 || (_right$discount = right.discount) === null || _right$discount === void 0 ? void 0 : _right$discount.resource_id) !== null && _right$discount$resou !== void 0 ? _right$discount$resou : right === null || right === void 0 ? void 0 : right.resource_id) !== null && _ref9 !== void 0 ? _ref9 : right === null || right === void 0 ? void 0 : right.discount_id);
+  if (!leftResourceId || !rightResourceId) return false;
+  return leftResourceId === rightResourceId && getReceiptDiscountBundleMapId(left) === getReceiptDiscountBundleMapId(right) && String((_ref10 = (_ref11 = (_left$amount = left === null || left === void 0 ? void 0 : left.amount) !== null && _left$amount !== void 0 ? _left$amount : left === null || left === void 0 ? void 0 : left.value) !== null && _ref11 !== void 0 ? _ref11 : left === null || left === void 0 ? void 0 : left.discount_amount) !== null && _ref10 !== void 0 ? _ref10 : '') === String((_ref12 = (_ref13 = (_right$amount = right === null || right === void 0 ? void 0 : right.amount) !== null && _right$amount !== void 0 ? _right$amount : right === null || right === void 0 ? void 0 : right.value) !== null && _ref13 !== void 0 ? _ref13 : right === null || right === void 0 ? void 0 : right.discount_amount) !== null && _ref12 !== void 0 ? _ref12 : '');
+}
 function resolveProductBasePrice(product) {
   var _product$product_vari, _product$_origin, _product$_origin2;
   var metadata = product.metadata || {};
@@ -375,26 +495,43 @@ function normalizeProductDiscounts(params) {
     locale = params.locale,
     currencySymbol = params.currencySymbol,
     quantity = params.quantity;
-  return normalizeArray(product.discount_list).filter(function (discount) {
-    var _ref8, _discount$amount;
-    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 rows = normalizeArray(product.discount_list).filter(function (discount) {
+    var _ref14, _discount$amount;
+    var amount = (_ref14 = (_discount$amount = discount.amount) !== null && _discount$amount !== void 0 ? _discount$amount : discount.value) !== null && _ref14 !== void 0 ? _ref14 : discount.discount_amount;
     return isNonZero(amount);
   }).map(function (discount) {
-    var _ref9, _discount$amount2;
+    var _ref15, _discount$amount2;
     var title = resolveDiscountTitleWithPercent(discount, locale);
-    var amount = (_ref9 = (_discount$amount2 = discount.amount) !== null && _discount$amount2 !== void 0 ? _discount$amount2 : discount.value) !== null && _ref9 !== void 0 ? _ref9 : discount.discount_amount;
-    var formattedAmount = formatNegativeMoney(new Decimal(toMoneyNumber(amount)).mul(quantity), currencySymbol);
+    var amount = (_ref15 = (_discount$amount2 = discount.amount) !== null && _discount$amount2 !== void 0 ? _discount$amount2 : discount.value) !== null && _ref15 !== void 0 ? _ref15 : discount.discount_amount;
+    var isMarkup = isManualMarkup(discount);
+    var totalAmount = new Decimal(toMoneyNumber(amount)).mul(quantity);
+    var formattedAmount = isMarkup ? formatMoney(totalAmount.abs(), currencySymbol) : formatNegativeMoney(totalAmount, currencySymbol);
     return {
       item: title,
-      value: formattedAmount
+      value: formattedAmount,
+      isMarkup: isMarkup
     };
   });
+  return rows.sort(function (left, right) {
+    return Number(right.isMarkup) - Number(left.isMarkup);
+  }).map(function (_ref16) {
+    var _isMarkup = _ref16.isMarkup,
+      row = _objectWithoutProperties(_ref16, _excluded);
+    return row;
+  });
+}
+function isManualMarkup(discount) {
+  var _discount$discount, _ref17, _discount$amount3;
+  if (discount.type !== 'product') return false;
+  if (((_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.discount_type) === 'change_price') return true;
+  var amount = (_ref17 = (_discount$amount3 = discount.amount) !== null && _discount$amount3 !== void 0 ? _discount$amount3 : discount.value) !== null && _ref17 !== void 0 ? _ref17 : discount.discount_amount;
+  return new Decimal(toMoneyNumber(amount)).isNegative();
 }
 function hasProductDiscount(product) {
   var extensionList = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var hasDiscountListAmount = normalizeArray(product.discount_list).some(function (discount) {
-    var _ref10, _discount$amount3;
-    return isNonZero((_ref10 = (_discount$amount3 = discount.amount) !== null && _discount$amount3 !== void 0 ? _discount$amount3 : discount.value) !== null && _ref10 !== void 0 ? _ref10 : discount.discount_amount);
+    var _ref18, _discount$amount4;
+    return isNonZero((_ref18 = (_discount$amount4 = discount.amount) !== null && _discount$amount4 !== void 0 ? _discount$amount4 : discount.value) !== null && _ref18 !== void 0 ? _ref18 : discount.discount_amount);
   });
   return hasDiscountListAmount || extensionList.some(function (row) {
     return /^\s*-/.test(stringify(row === null || row === void 0 ? void 0 : row.value));
@@ -465,10 +602,10 @@ function buildProductQuantityPriceText(params) {
   return "".concat(quantity, " @ ").concat(currencySymbol).concat(stringify(price), " EACH");
 }
 function resolveDiscountTitleWithPercent(discount, locale) {
-  var _discount$discount, _discount$discount$di, _discount$discount2;
+  var _discount$discount2, _discount$discount$di, _discount$discount3;
   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 percentRaw = (_discount$discount2 = discount.discount) === null || _discount$discount2 === void 0 ? void 0 : _discount$discount2.percent;
+  var cardType = (_discount$discount$di = (_discount$discount3 = discount.discount) === null || _discount$discount3 === void 0 ? void 0 : _discount$discount3.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;
@@ -476,10 +613,12 @@ function resolveDiscountTitleWithPercent(discount, locale) {
   return "".concat(title, " (").concat(percent, "%)");
 }
 function resolveDiscountTitle(discount, locale) {
-  var _ref11, _ref12, _ref13, _ref14, _discount$discount$na, _discount$discount3, _discount$discount4, _discount$discount5;
-  var title = getLocalizedValue((_ref11 = (_ref12 = (_ref13 = (_ref14 = (_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 && _ref14 !== void 0 ? _ref14 : (_discount$discount5 = discount.discount) === null || _discount$discount5 === void 0 ? void 0 : _discount$discount5.message) !== null && _ref13 !== void 0 ? _ref13 : discount.name) !== null && _ref12 !== void 0 ? _ref12 : discount.title) !== null && _ref11 !== void 0 ? _ref11 : discount.message, locale);
+  var _ref19, _ref20, _ref21, _ref22, _discount$discount$na, _discount$discount4, _discount$discount5, _discount$discount6;
+  var title = getLocalizedValue((_ref19 = (_ref20 = (_ref21 = (_ref22 = (_discount$discount$na = (_discount$discount4 = discount.discount) === null || _discount$discount4 === void 0 ? void 0 : _discount$discount4.name) !== null && _discount$discount$na !== void 0 ? _discount$discount$na : (_discount$discount5 = discount.discount) === null || _discount$discount5 === void 0 ? void 0 : _discount$discount5.title) !== null && _ref22 !== void 0 ? _ref22 : (_discount$discount6 = discount.discount) === null || _discount$discount6 === void 0 ? void 0 : _discount$discount6.message) !== null && _ref21 !== void 0 ? _ref21 : discount.name) !== null && _ref20 !== void 0 ? _ref20 : discount.title) !== null && _ref19 !== void 0 ? _ref19 : discount.message, locale);
   if (title) return title;
-  if (discount.type === 'product') return label(locale, 'manualDiscount');
+  if (discount.type === 'product') {
+    return label(locale, isManualMarkup(discount) ? 'manualMarkup' : 'manualDiscount');
+  }
   return '';
 }
 function resolveProductTitle(params) {
@@ -502,10 +641,10 @@ function normalizeProductOptions(params) {
     parentProduct = params.parentProduct;
   var rawOptions = Array.isArray(params.options) ? params.options : Array.isArray(product.options) ? product.options : Array.isArray((_product$product_sku = product.product_sku) === null || _product$product_sku === void 0 ? void 0 : _product$product_sku.option) ? product.product_sku.option : [];
   return rawOptions.map(function (option) {
-    var _ref15, _option$original_pric, _ref16, _option$num, _ref17, _option$value;
-    var price = (_ref15 = (_option$original_pric = option.original_price) !== null && _option$original_pric !== void 0 ? _option$original_pric : option.add_price) !== null && _ref15 !== void 0 ? _ref15 : option.price;
-    var quantity = toNumber((_ref16 = (_option$num = option.num) !== null && _option$num !== void 0 ? _option$num : option.quantity) !== null && _ref16 !== void 0 ? _ref16 : 1, 1);
-    var value = (_ref17 = (_option$value = option.value) !== null && _option$value !== void 0 ? _option$value : option.option) !== null && _ref17 !== void 0 ? _ref17 : option.item;
+    var _ref23, _option$original_pric, _ref24, _option$num, _ref25, _option$value;
+    var price = (_ref23 = (_option$original_pric = option.original_price) !== null && _option$original_pric !== void 0 ? _option$original_pric : option.add_price) !== null && _ref23 !== void 0 ? _ref23 : option.price;
+    var quantity = toNumber((_ref24 = (_option$num = option.num) !== null && _option$num !== void 0 ? _option$num : option.quantity) !== null && _ref24 !== void 0 ? _ref24 : 1, 1);
+    var value = (_ref25 = (_option$value = option.value) !== null && _option$value !== void 0 ? _option$value : option.option) !== null && _ref25 !== void 0 ? _ref25 : option.item;
     var name = getProductTitleSource(option, locale) || resolveOptionTitleFromParentProduct({
       option: option,
       parentProduct: parentProduct,
@@ -532,7 +671,7 @@ function normalizeProductCombinations(params) {
     parentProduct = params.parentProduct;
   var bundles = Array.isArray(product.product_bundle) ? product.product_bundle : [];
   return bundles.map(function (bundle) {
-    var _ref18, _bundle$num, _bundle$metadata;
+    var _ref26, _bundle$num, _bundle$metadata;
     var combinationsOptions = normalizeProductOptions({
       product: {},
       locale: locale,
@@ -548,13 +687,20 @@ function normalizeProductCombinations(params) {
     });
     var productNote = resolveProductNote(bundle, locale);
     var nestedCombinations = Array.isArray(bundle.combinations) ? normalizeExistingCombinations(bundle.combinations, locale, currencySymbol) : [];
-    var quantity = toNumber((_ref18 = (_bundle$num = bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle.quantity) !== null && _ref18 !== void 0 ? _ref18 : 1, 1);
+    var quantity = toNumber((_ref26 = (_bundle$num = bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle.quantity) !== null && _ref26 !== void 0 ? _ref26 : 1, 1);
     var formattedPrice = formatBundlePrice(bundle, currencySymbol);
     var optionsTotal = sumNormalizedOptionTotals(combinationsOptions, currencySymbol);
     var explicitBasePrice = firstPresentValue(bundle.base_price, (_bundle$metadata = bundle.metadata) === null || _bundle$metadata === void 0 ? void 0 : _bundle$metadata.source_product_price);
     var basePrice = isPresentId(explicitBasePrice) ? explicitBasePrice : 0;
-    var shouldIncludeBasePrice = combinationsOptions.length > 0 || nestedCombinations.length > 0 || hasProductDiscount(bundle);
-    return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
+    var extensionList = buildProductExtensionList({
+      product: bundle,
+      locale: locale,
+      currencySymbol: currencySymbol,
+      quantity: quantity,
+      originalPrice: formattedPrice
+    });
+    var shouldIncludeBasePrice = combinationsOptions.length > 0 || nestedCombinations.length > 0 || hasProductDiscount(bundle, extensionList);
+    return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
       product_title: baseTitle,
       product_quantity: quantity,
       price: formattedPrice,
@@ -569,6 +715,8 @@ function normalizeProductCombinations(params) {
       package_items_total_price: sumCombinationTotals(nestedCombinations, currencySymbol)
     } : {}), productNote ? {
       product_note: productNote
+    } : {}), extensionList.length ? {
+      extension_list: extensionList
     } : {}), nestedCombinations.length ? {
       combinations: nestedCombinations
     } : {});
@@ -576,7 +724,7 @@ function normalizeProductCombinations(params) {
 }
 function normalizeExistingCombinations(combinations, locale, currencySymbol) {
   return combinations.map(function (combination) {
-    var _ref19, _ref20, _combination$product_, _firstPresentValue;
+    var _ref27, _ref28, _combination$product_, _firstPresentValue;
     if (!combination || _typeof(combination) !== 'object' || Array.isArray(combination)) {
       return combination;
     }
@@ -593,15 +741,23 @@ function normalizeExistingCombinations(combinations, locale, currencySymbol) {
     delete snapshot.product_note;
     delete snapshot.note;
     delete snapshot.combinations;
-    var quantity = toNumber((_ref19 = (_ref20 = (_combination$product_ = combination.product_quantity) !== null && _combination$product_ !== void 0 ? _combination$product_ : combination.num) !== null && _ref20 !== void 0 ? _ref20 : combination.quantity) !== null && _ref19 !== void 0 ? _ref19 : 1, 1);
+    delete snapshot.discount_list;
+    var quantity = toNumber((_ref27 = (_ref28 = (_combination$product_ = combination.product_quantity) !== null && _combination$product_ !== void 0 ? _combination$product_ : combination.num) !== null && _ref28 !== void 0 ? _ref28 : combination.quantity) !== null && _ref27 !== void 0 ? _ref27 : 1, 1);
     var unitPrice = (_firstPresentValue = firstPresentValue(combination.selling_price, combination.price, combination.original_price)) !== null && _firstPresentValue !== void 0 ? _firstPresentValue : 0;
     var optionsAmount = sumMoneyValues(normalizedOptions.map(function (option) {
       return option.total_price;
     }));
     var explicitBasePrice = firstPresentValue(combination.base_price);
     var basePrice = isPresentId(explicitBasePrice) ? explicitBasePrice : 0;
-    var shouldIncludeBasePrice = normalizedOptions.length > 0 || nestedCombinations.length > 0 || hasProductDiscount(combination, normalizeArray(combination.extension_list));
-    return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, snapshot), {}, {
+    var extensionList = buildProductExtensionList({
+      product: combination,
+      locale: locale,
+      currencySymbol: currencySymbol,
+      quantity: quantity,
+      originalPrice: unitPrice
+    });
+    var shouldIncludeBasePrice = normalizedOptions.length > 0 || nestedCombinations.length > 0 || hasProductDiscount(combination, extensionList);
+    return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, snapshot), {}, {
       product_quantity: quantity,
       total_selling_price: formatCalculatedMoney(new Decimal(toMoneyNumber(unitPrice)).mul(quantity), currencySymbol)
     }, shouldIncludeBasePrice ? {
@@ -616,6 +772,8 @@ function normalizeExistingCombinations(combinations, locale, currencySymbol) {
       package_items_total_price: sumCombinationTotals(nestedCombinations, currencySymbol)
     } : {}), productNote ? {
       product_note: productNote
+    } : {}), extensionList.length ? {
+      extension_list: extensionList
     } : {}), nestedCombinations.length ? {
       combinations: nestedCombinations
     } : {});
@@ -642,7 +800,7 @@ function resolveProductNote(product, locale) {
   return getLocalizedValue(product.note, locale).trim();
 }
 function resolveBundleProductTitle(params) {
-  var _ref21, _ref22, _bundle$bundle_produc;
+  var _ref29, _ref30, _bundle$bundle_produc;
   var bundle = params.bundle,
     productMap = params.productMap,
     locale = params.locale,
@@ -655,7 +813,7 @@ function resolveBundleProductTitle(params) {
   });
   var parentBundleTitle = parentBundleItem ? getProductTitleSource(parentBundleItem, locale) : '';
   if (parentBundleTitle) return parentBundleTitle;
-  var productId = (_ref21 = (_ref22 = (_bundle$bundle_produc = bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle._bundle_product_id) !== null && _ref22 !== void 0 ? _ref22 : bundle.product_id) !== null && _ref21 !== void 0 ? _ref21 : bundle.id;
+  var productId = (_ref29 = (_ref30 = (_bundle$bundle_produc = bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle._bundle_product_id) !== null && _ref30 !== void 0 ? _ref30 : bundle.product_id) !== null && _ref29 !== void 0 ? _ref29 : bundle.id;
   var fallbackProduct = resolveProductFromMap(productId, productMap);
   if (!fallbackProduct) return '';
   return getProductTitleSource(fallbackProduct, locale);
@@ -707,10 +865,10 @@ function resolveVariantTextFromSkuKey(params) {
 }
 function resolveVariantTextFromNameMap(params) {
   if (!params.nameMap || _typeof(params.nameMap) !== 'object') return '';
-  return Object.entries(params.nameMap).map(function (_ref23) {
-    var _ref24 = _slicedToArray(_ref23, 2),
-      groupPositionId = _ref24[0],
-      value = _ref24[1];
+  return Object.entries(params.nameMap).map(function (_ref31) {
+    var _ref32 = _slicedToArray(_ref31, 2),
+      groupPositionId = _ref32[0],
+      value = _ref32[1];
     var group = resolveVariantGroup(params.parentProduct, groupPositionId);
     if (!group) return '';
     var groupName = getLocalizedValue(group.name, params.locale);
@@ -744,12 +902,12 @@ function getProductTitleSource(source, locale) {
   return resolveTitleValue(source.product_title, locale) || resolveTitleValue(source.title, locale) || resolveTitleValue(source.name, locale);
 }
 function resolveTitleValue(value, locale) {
-  var _ref25, _ref26, _ref27, _ref28, _value$locale;
+  var _ref33, _ref34, _ref35, _ref36, _value$locale;
   if (value === undefined || value === null) return '';
   if (_typeof(value) !== 'object') return stringify(value);
   var dashedLocale = locale.replace('_', '-');
   var underscoredLocale = locale.replace('-', '_');
-  return stringify((_ref25 = (_ref26 = (_ref27 = (_ref28 = (_value$locale = value[locale]) !== null && _value$locale !== void 0 ? _value$locale : value[dashedLocale]) !== null && _ref28 !== void 0 ? _ref28 : value[underscoredLocale]) !== null && _ref27 !== void 0 ? _ref27 : value.original) !== null && _ref26 !== void 0 ? _ref26 : value.auto) !== null && _ref25 !== void 0 ? _ref25 : '');
+  return stringify((_ref33 = (_ref34 = (_ref35 = (_ref36 = (_value$locale = value[locale]) !== null && _value$locale !== void 0 ? _value$locale : value[dashedLocale]) !== null && _ref36 !== void 0 ? _ref36 : value[underscoredLocale]) !== null && _ref35 !== void 0 ? _ref35 : value.original) !== null && _ref34 !== void 0 ? _ref34 : value.auto) !== null && _ref33 !== void 0 ? _ref33 : '');
 }
 function resolveOptionTitleFromParentProduct(params) {
   var option = params.option,
@@ -767,17 +925,17 @@ function flattenOptionItems(parentProduct) {
   return optionGroups.flatMap(function (group) {
     var items = normalizeArray(group.option_item || group.option_items || group.option || group.options || group.items || group.children || group.product_option_item);
     return items.map(function (item) {
-      var _ref29, _item$option_group_id;
+      var _ref37, _item$option_group_id;
       return _objectSpread(_objectSpread({}, item), {}, {
-        option_group_id: (_ref29 = (_item$option_group_id = item.option_group_id) !== null && _item$option_group_id !== void 0 ? _item$option_group_id : group.id) !== null && _ref29 !== void 0 ? _ref29 : group.option_group_id
+        option_group_id: (_ref37 = (_item$option_group_id = item.option_group_id) !== null && _item$option_group_id !== void 0 ? _item$option_group_id : group.id) !== null && _ref37 !== void 0 ? _ref37 : group.option_group_id
       });
     });
   });
 }
 function isOptionItemMatch(option, item) {
-  var _ref30, _option$option_group_, _ref31, _item$option_group_it, _option$option_group_2, _item$option_group_id2;
-  var optionItemId = (_ref30 = (_option$option_group_ = option.option_group_item_id) !== null && _option$option_group_ !== void 0 ? _option$option_group_ : option.product_option_item_id) !== null && _ref30 !== void 0 ? _ref30 : option.id;
-  var itemId = (_ref31 = (_item$option_group_it = item.option_group_item_id) !== null && _item$option_group_it !== void 0 ? _item$option_group_it : item.product_option_item_id) !== null && _ref31 !== void 0 ? _ref31 : item.id;
+  var _ref38, _option$option_group_, _ref39, _item$option_group_it, _option$option_group_2, _item$option_group_id2;
+  var optionItemId = (_ref38 = (_option$option_group_ = option.option_group_item_id) !== null && _option$option_group_ !== void 0 ? _option$option_group_ : option.product_option_item_id) !== null && _ref38 !== void 0 ? _ref38 : option.id;
+  var itemId = (_ref39 = (_item$option_group_it = item.option_group_item_id) !== null && _item$option_group_it !== void 0 ? _item$option_group_it : item.product_option_item_id) !== null && _ref39 !== void 0 ? _ref39 : item.id;
   if (!isSameId(optionItemId, itemId)) return false;
   var optionGroupId = (_option$option_group_2 = option.option_group_id) !== null && _option$option_group_2 !== void 0 ? _option$option_group_2 : option.group_id;
   var itemGroupId = (_item$option_group_id2 = item.option_group_id) !== null && _item$option_group_id2 !== void 0 ? _item$option_group_id2 : item.group_id;
@@ -787,16 +945,16 @@ function isOptionItemMatch(option, item) {
   return true;
 }
 function resolveBundleItemFromParentProduct(params) {
-  var _ref32, _bundle$bundle_varian, _bundle$bundle_id, _bundle$bundle_group_, _ref34, _bundle$bundle_produc2;
+  var _ref40, _bundle$bundle_varian, _bundle$bundle_id, _bundle$bundle_group_, _ref42, _bundle$bundle_produc2;
   var bundle = params.bundle,
     parentProduct = params.parentProduct;
   if (!parentProduct) return null;
   var bundleItems = flattenBundleItems(parentProduct);
-  var bundleVariantId = (_ref32 = (_bundle$bundle_varian = bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle.variant_id) !== null && _ref32 !== void 0 ? _ref32 : bundle.product_variant_id;
+  var bundleVariantId = (_ref40 = (_bundle$bundle_varian = bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle.variant_id) !== null && _ref40 !== void 0 ? _ref40 : bundle.product_variant_id;
   if (isNonZeroId(bundleVariantId)) {
     var matchedByVariant = bundleItems.find(function (item) {
-      var _ref33, _item$bundle_variant_;
-      return isSameId((_ref33 = (_item$bundle_variant_ = item.bundle_variant_id) !== null && _item$bundle_variant_ !== void 0 ? _item$bundle_variant_ : item.variant_id) !== null && _ref33 !== void 0 ? _ref33 : item.product_variant_id, bundleVariantId);
+      var _ref41, _item$bundle_variant_;
+      return isSameId((_ref41 = (_item$bundle_variant_ = item.bundle_variant_id) !== null && _item$bundle_variant_ !== void 0 ? _item$bundle_variant_ : item.variant_id) !== null && _ref41 !== void 0 ? _ref41 : item.product_variant_id, bundleVariantId);
     });
     if (matchedByVariant) return matchedByVariant;
   }
@@ -809,18 +967,18 @@ function resolveBundleItemFromParentProduct(params) {
     if (matchedByBundleId) return matchedByBundleId;
   }
   var bundleGroupId = (_bundle$bundle_group_ = bundle.bundle_group_id) !== null && _bundle$bundle_group_ !== void 0 ? _bundle$bundle_group_ : bundle.group_id;
-  var bundleProductId = (_ref34 = (_bundle$bundle_produc2 = bundle.bundle_product_id) !== null && _bundle$bundle_produc2 !== void 0 ? _bundle$bundle_produc2 : bundle._bundle_product_id) !== null && _ref34 !== void 0 ? _ref34 : bundle.product_id;
+  var bundleProductId = (_ref42 = (_bundle$bundle_produc2 = bundle.bundle_product_id) !== null && _bundle$bundle_produc2 !== void 0 ? _bundle$bundle_produc2 : bundle._bundle_product_id) !== null && _ref42 !== void 0 ? _ref42 : bundle.product_id;
   if (isPresentId(bundleGroupId) && isPresentId(bundleProductId)) {
     var matchedByGroupAndProduct = bundleItems.find(function (item) {
-      var _item$group_id, _ref35, _item$bundle_product_;
-      return isSameId((_item$group_id = item.group_id) !== null && _item$group_id !== void 0 ? _item$group_id : item.bundle_group_id, bundleGroupId) && isSameId((_ref35 = (_item$bundle_product_ = item.bundle_product_id) !== null && _item$bundle_product_ !== void 0 ? _item$bundle_product_ : item._bundle_product_id) !== null && _ref35 !== void 0 ? _ref35 : item.product_id, bundleProductId);
+      var _item$group_id, _ref43, _item$bundle_product_;
+      return isSameId((_item$group_id = item.group_id) !== null && _item$group_id !== void 0 ? _item$group_id : item.bundle_group_id, bundleGroupId) && isSameId((_ref43 = (_item$bundle_product_ = item.bundle_product_id) !== null && _item$bundle_product_ !== void 0 ? _item$bundle_product_ : item._bundle_product_id) !== null && _ref43 !== void 0 ? _ref43 : item.product_id, bundleProductId);
     });
     if (matchedByGroupAndProduct) return matchedByGroupAndProduct;
   }
   if (isPresentId(bundleProductId)) {
     return bundleItems.find(function (item) {
-      var _ref36, _item$bundle_product_2;
-      return isSameId((_ref36 = (_item$bundle_product_2 = item.bundle_product_id) !== null && _item$bundle_product_2 !== void 0 ? _item$bundle_product_2 : item._bundle_product_id) !== null && _ref36 !== void 0 ? _ref36 : item.product_id, bundleProductId);
+      var _ref44, _item$bundle_product_2;
+      return isSameId((_ref44 = (_item$bundle_product_2 = item.bundle_product_id) !== null && _item$bundle_product_2 !== void 0 ? _item$bundle_product_2 : item._bundle_product_id) !== null && _ref44 !== void 0 ? _ref44 : item.product_id, bundleProductId);
     }) || null;
   }
   return null;
@@ -830,9 +988,9 @@ function flattenBundleItems(parentProduct) {
   return bundleGroups.flatMap(function (group) {
     var items = Array.isArray(group.bundle_item) ? group.bundle_item : [];
     return items.map(function (item) {
-      var _ref37, _item$group_id2;
+      var _ref45, _item$group_id2;
       return _objectSpread(_objectSpread({}, item), {}, {
-        group_id: (_ref37 = (_item$group_id2 = item.group_id) !== null && _item$group_id2 !== void 0 ? _item$group_id2 : group.id) !== null && _ref37 !== void 0 ? _ref37 : group.group_id
+        group_id: (_ref45 = (_item$group_id2 = item.group_id) !== null && _item$group_id2 !== void 0 ? _item$group_id2 : group.id) !== null && _ref45 !== void 0 ? _ref45 : group.group_id
       });
     });
   });
@@ -856,8 +1014,8 @@ function isSameId(left, right) {
   return String(left) === String(right);
 }
 function formatBundlePrice(bundle, currencySymbol) {
-  var _ref38, _ref39, _bundle$bundle_sellin;
-  var value = (_ref38 = (_ref39 = (_bundle$bundle_sellin = bundle.bundle_selling_price) !== null && _bundle$bundle_sellin !== void 0 ? _bundle$bundle_sellin : bundle.bundle_sum_price) !== null && _ref39 !== void 0 ? _ref39 : bundle.price) !== null && _ref38 !== void 0 ? _ref38 : 0;
+  var _ref46, _ref47, _bundle$bundle_sellin;
+  var value = (_ref46 = (_ref47 = (_bundle$bundle_sellin = bundle.bundle_selling_price) !== null && _bundle$bundle_sellin !== void 0 ? _bundle$bundle_sellin : bundle.bundle_sum_price) !== null && _ref47 !== void 0 ? _ref47 : bundle.price) !== null && _ref46 !== void 0 ? _ref46 : 0;
   var amount = new Decimal(toMoneyNumber(value));
   // 套餐价格协议：只有 markdown 是减价；加价与商品原价都保持正数。
   var isNegative = bundle.price_type === 'markdown';
@@ -875,9 +1033,9 @@ function buildFees(params) {
     financials = params.financials;
   var fees = [];
   for (var _i = 0, _normalizeArray = normalizeArray(order.surcharges || summary.surcharges); _i < _normalizeArray.length; _i++) {
-    var _ref40, _surcharge$amount;
+    var _ref48, _surcharge$amount;
     var surcharge = _normalizeArray[_i];
-    var value = (_ref40 = (_surcharge$amount = surcharge.amount) !== null && _surcharge$amount !== void 0 ? _surcharge$amount : surcharge.value) !== null && _ref40 !== void 0 ? _ref40 : surcharge.total_amount;
+    var value = (_ref48 = (_surcharge$amount = surcharge.amount) !== null && _surcharge$amount !== void 0 ? _surcharge$amount : surcharge.value) !== null && _ref48 !== void 0 ? _ref48 : surcharge.total_amount;
     if (!isNonZero(value)) continue;
     fees.push({
       item: getLocalizedValue(surcharge.name || surcharge.title || surcharge.item, locale),
@@ -985,9 +1143,9 @@ function resolveTaxTitle(params) {
 }
 function calculateProductOriginalAmount(order) {
   return normalizeArray(order.products).reduce(function (total, product) {
-    var _ref41, _ref42, _product$product_quan2, _ref43, _ref44, _ref45, _product$original_pri2;
-    var quantity = toNumber((_ref41 = (_ref42 = (_product$product_quan2 = product.product_quantity) !== null && _product$product_quan2 !== void 0 ? _product$product_quan2 : product.quantity) !== null && _ref42 !== void 0 ? _ref42 : product.num) !== null && _ref41 !== void 0 ? _ref41 : 1, 1);
-    var originalPrice = (_ref43 = (_ref44 = (_ref45 = (_product$original_pri2 = product.original_price) !== null && _product$original_pri2 !== void 0 ? _product$original_pri2 : product.selling_price) !== null && _ref45 !== void 0 ? _ref45 : product.payment_price) !== null && _ref44 !== void 0 ? _ref44 : product.price) !== null && _ref43 !== void 0 ? _ref43 : 0;
+    var _ref49, _ref50, _product$product_quan2, _ref51, _ref52, _ref53, _product$original_pri2;
+    var quantity = toNumber((_ref49 = (_ref50 = (_product$product_quan2 = product.product_quantity) !== null && _product$product_quan2 !== void 0 ? _product$product_quan2 : product.quantity) !== null && _ref50 !== void 0 ? _ref50 : product.num) !== null && _ref49 !== void 0 ? _ref49 : 1, 1);
+    var originalPrice = (_ref51 = (_ref52 = (_ref53 = (_product$original_pri2 = product.original_price) !== null && _product$original_pri2 !== void 0 ? _product$original_pri2 : product.selling_price) !== null && _ref53 !== void 0 ? _ref53 : product.payment_price) !== null && _ref52 !== void 0 ? _ref52 : product.price) !== null && _ref51 !== void 0 ? _ref51 : 0;
     return total.plus(new Decimal(toMoneyNumber(originalPrice)).mul(quantity));
   }, new Decimal(0));
 }
@@ -1035,18 +1193,14 @@ function buildAppointment(order, locale) {
   var _order$metadata13, _order$metadata14, _order$form_data;
   var bookings = sortBookings(normalizeArray(order.bookings));
   if (bookings.length) {
-    return bookings.map(function (booking) {
-      var _booking$metadata, _booking$metadata2;
-      var snapshot = _objectSpread({}, booking);
-      delete snapshot.product_uid;
-      delete snapshot.booking_uid;
-      var productUid = firstPresentValue(booking.product_uid, (_booking$metadata = booking.metadata) === null || _booking$metadata === void 0 ? void 0 : _booking$metadata.product_uid);
-      var bookingUid = firstPresentValue((_booking$metadata2 = booking.metadata) === null || _booking$metadata2 === void 0 ? void 0 : _booking$metadata2.unique_identification_number, booking.booking_uid);
-      return _objectSpread(_objectSpread(_objectSpread({}, snapshot), isPresentId(productUid) ? {
-        product_uid: productUid
-      } : {}), isPresentId(bookingUid) ? {
-        booking_uid: bookingUid
-      } : {});
+    var allResources = normalizeArray(order.resources || order.resource_list);
+    return bookings.flatMap(function (booking) {
+      return buildAppointmentRows({
+        booking: booking,
+        allResources: allResources,
+        bookingCount: bookings.length,
+        locale: locale
+      });
     });
   }
   var tableName = order.table_name || ((_order$metadata13 = order.metadata) === null || _order$metadata13 === void 0 ? void 0 : _order$metadata13.table_name) || ((_order$metadata14 = order.metadata) === null || _order$metadata14 === void 0 || (_order$metadata14 = _order$metadata14.table) === null || _order$metadata14 === void 0 ? void 0 : _order$metadata14.name) || ((_order$form_data = order.form_data) === null || _order$form_data === void 0 ? void 0 : _order$form_data.table_name);
@@ -1056,6 +1210,104 @@ function buildAppointment(order, locale) {
     value: getLocalizedValue(tableName, locale)
   }];
 }
+function buildAppointmentRows(params) {
+  var _booking$metadata, _booking$metadata2, _booking$holder$name, _booking$holder, _booking$metadata3;
+  var booking = params.booking,
+    allResources = params.allResources,
+    bookingCount = params.bookingCount,
+    locale = params.locale;
+  var productUid = stringify(firstPresentValue(booking.product_uid, (_booking$metadata = booking.metadata) === null || _booking$metadata === void 0 ? void 0 : _booking$metadata.product_uid)).trim();
+  var bookingUid = stringify(firstPresentValue((_booking$metadata2 = booking.metadata) === null || _booking$metadata2 === void 0 ? void 0 : _booking$metadata2.unique_identification_number, booking.booking_uid)).trim();
+  var association = {
+    product_uid: productUid,
+    booking_uid: bookingUid
+  };
+  var bookingId = stringify(firstPresentValue(booking.booking_id, booking.schedule_event_id, bookingUid)).trim();
+  var bookingTime = formatBookingRange(booking, locale);
+  var resourceText = formatBookingResources(resolveBookingResourcesForReceipt(booking, allResources, bookingCount), locale);
+  var holder = getLocalizedValue((_booking$holder$name = (_booking$holder = booking.holder) === null || _booking$holder === void 0 ? void 0 : _booking$holder.name) !== null && _booking$holder$name !== void 0 ? _booking$holder$name : (_booking$metadata3 = booking.metadata) === null || _booking$metadata3 === void 0 || (_booking$metadata3 = _booking$metadata3.holder) === null || _booking$metadata3 === void 0 ? void 0 : _booking$metadata3.name, locale).trim();
+  return [_objectSpread({
+    item: label(locale, 'bookingId'),
+    value: bookingId
+  }, association), _objectSpread({
+    item: label(locale, 'bookingDateTime'),
+    value: bookingTime
+  }, association), _objectSpread({
+    item: label(locale, 'bookingResource'),
+    value: resourceText
+  }, association), _objectSpread({
+    item: label(locale, 'bookingHolder'),
+    value: holder
+  }, association)].filter(function (row) {
+    return Boolean(row.value);
+  });
+}
+function formatBookingRange(booking, locale) {
+  var startDate = stringify(booking.start_date);
+  var startTime = stringify(booking.start_time);
+  var endDate = stringify(booking.end_date || startDate);
+  var endTime = stringify(booking.end_time);
+  var start = firstValidBookingDate(booking.start_at, booking.start_datetime, booking.start_date_time, "".concat(startDate, " ").concat(startTime).trim());
+  var end = firstValidBookingDate(booking.end_at, booking.end_datetime, booking.end_date_time, endTime ? "".concat(endDate, " ").concat(endTime).trim() : '');
+  if (!start) {
+    return [startDate, startTime, endTime ? "- ".concat(endDate, " ").concat(endTime) : ''].filter(Boolean).join(' ');
+  }
+  var dateFormat = locale === 'en' ? 'DD/MM/YYYY' : 'YYYY/MM/DD';
+  var startText = start.format("".concat(dateFormat, " HH:mm"));
+  if (!end) return startText;
+  return "".concat(startText, " - ").concat(end.isSame(start, 'day') ? end.format('HH:mm') : end.format("".concat(dateFormat, " HH:mm")));
+}
+function firstValidBookingDate() {
+  for (var _len2 = arguments.length, values = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+    values[_key2] = arguments[_key2];
+  }
+  for (var _i2 = 0, _values = values; _i2 < _values.length; _i2++) {
+    var value = _values[_i2];
+    if (!isPresentId(value)) continue;
+    var parsed = dayjs(value);
+    if (parsed.isValid()) return parsed;
+  }
+  return null;
+}
+function resolveBookingResourcesForReceipt(booking, allResources, bookingCount) {
+  var _booking$metadata4;
+  var embedded = normalizeArray(booking.resources).filter(function (resource) {
+    return Boolean(resource) && _typeof(resource) === 'object' && !Array.isArray(resource);
+  });
+  var resourceIds = new Set([booking.resource_id, booking.relation_id].concat(_toConsumableArray(normalizeArray(booking.resource_ids)), _toConsumableArray(normalizeArray((_booking$metadata4 = booking.metadata) === null || _booking$metadata4 === void 0 ? void 0 : _booking$metadata4.resource_ids))).map(function (value) {
+    return stringify(value).trim();
+  }).filter(Boolean));
+  var _iterator3 = _createForOfIteratorHelper(embedded),
+    _step3;
+  try {
+    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+      var _ref55, _resource$id2;
+      var resource = _step3.value;
+      var id = stringify((_ref55 = (_resource$id2 = resource.id) !== null && _resource$id2 !== void 0 ? _resource$id2 : resource.resource_id) !== null && _ref55 !== void 0 ? _ref55 : resource.relation_id).trim();
+      if (id) resourceIds.add(id);
+    }
+  } catch (err) {
+    _iterator3.e(err);
+  } finally {
+    _iterator3.f();
+  }
+  if (resourceIds.size) {
+    var matched = allResources.filter(function (resource) {
+      var _ref54, _resource$id;
+      return resourceIds.has(stringify((_ref54 = (_resource$id = resource.id) !== null && _resource$id !== void 0 ? _resource$id : resource.resource_id) !== null && _ref54 !== void 0 ? _ref54 : resource.relation_id).trim());
+    });
+    if (matched.length) return matched;
+  }
+  if (embedded.length) return embedded;
+  if (bookingCount === 1 && allResources.length) return allResources;
+  return [];
+}
+function formatBookingResources(resources, locale) {
+  return resources.map(function (resource) {
+    var _resource$metadata, _resource$metadata2, _resource$metadata3, _resource$metadata4;
+    return [getLocalizedValue(resource.form_title || ((_resource$metadata = resource.metadata) === null || _resource$metadata === void 0 ? void 0 : _resource$metadata.form_name) || resource.relation_form_name || ((_resource$metadata2 = resource.metadata) === null || _resource$metadata2 === void 0 ? void 0 : _resource$metadata2.relation_form_name), locale), getLocalizedValue(resource.title || resource.name || resource.main_field || ((_resource$metadata3 = resource.metadata) === null || _resource$metadata3 === void 0 ? void 0 : _resource$metadata3.main_field) || ((_resource$metadata4 = resource.metadata) === null || _resource$metadata4 === void 0 ? void 0 : _resource$metadata4.resource_name), locale)].filter(Boolean).join(' ');
+  }).filter(Boolean).join(', ');
+}
 function sortBookings(bookings) {
   return bookings.map(function (booking, index) {
     return {
@@ -1067,23 +1319,23 @@ function sortBookings(bookings) {
     var leftStart = bookingStartTimestamp(left.booking);
     var rightStart = bookingStartTimestamp(right.booking);
     if (leftStart !== rightStart) return leftStart < rightStart ? -1 : 1;
-    for (var _i2 = 0, _arr = ['booking_id', 'schedule_event_id']; _i2 < _arr.length; _i2++) {
+    for (var _i3 = 0, _arr = ['booking_id', 'schedule_event_id']; _i3 < _arr.length; _i3++) {
       var _left$booking, _right$booking;
-      var field = _arr[_i2];
+      var field = _arr[_i3];
       var fieldOrder = compareOptionalValues((_left$booking = left.booking) === null || _left$booking === void 0 ? void 0 : _left$booking[field], (_right$booking = right.booking) === null || _right$booking === void 0 ? void 0 : _right$booking[field]);
       if (fieldOrder !== 0) return fieldOrder;
     }
     var bookingUidOrder = compareOptionalValues(firstPresentValue((_left$booking2 = left.booking) === null || _left$booking2 === void 0 || (_left$booking2 = _left$booking2.metadata) === null || _left$booking2 === void 0 ? void 0 : _left$booking2.unique_identification_number, (_left$booking3 = left.booking) === null || _left$booking3 === void 0 ? void 0 : _left$booking3.booking_uid), firstPresentValue((_right$booking2 = right.booking) === null || _right$booking2 === void 0 || (_right$booking2 = _right$booking2.metadata) === null || _right$booking2 === void 0 ? void 0 : _right$booking2.unique_identification_number, (_right$booking3 = right.booking) === null || _right$booking3 === void 0 ? void 0 : _right$booking3.booking_uid));
     return bookingUidOrder || left.index - right.index;
-  }).map(function (_ref46) {
-    var booking = _ref46.booking;
+  }).map(function (_ref56) {
+    var booking = _ref56.booking;
     return booking;
   });
 }
 function bookingStartTimestamp(booking) {
   var startValues = [booking === null || booking === void 0 ? void 0 : booking.start_at, booking === null || booking === void 0 ? void 0 : booking.start_datetime, booking === null || booking === void 0 ? void 0 : booking.booking_time, isPresentId(booking === null || booking === void 0 ? void 0 : booking.start_date) ? "".concat(booking.start_date, " ").concat(stringify(booking.start_time)).trim() : undefined];
-  for (var _i3 = 0, _startValues = startValues; _i3 < _startValues.length; _i3++) {
-    var startValue = _startValues[_i3];
+  for (var _i4 = 0, _startValues = startValues; _i4 < _startValues.length; _i4++) {
+    var startValue = _startValues[_i4];
     if (!isPresentId(startValue)) continue;
     var timestamp = dayjs(startValue).valueOf();
     if (Number.isFinite(timestamp)) return timestamp;
@@ -1138,8 +1390,8 @@ function buildRefundData(params) {
       result.set(identity, candidate);
     }
     return result;
-  }, new Map()).values()).filter(function (_ref47) {
-    var refund = _ref47.refund;
+  }, new Map()).values()).filter(function (_ref57) {
+    var refund = _ref57.refund;
     return isPrintableRefund(refund);
   }).sort(function (left, right) {
     var leftTime = refundTimestamp(left.refund);
@@ -1147,9 +1399,9 @@ function buildRefundData(params) {
     if (leftTime !== rightTime) return leftTime < rightTime ? -1 : 1;
     return left.index - right.index;
   });
-  return refunds.map(function (_ref48) {
+  return refunds.map(function (_ref58) {
     var _firstPresentValue8;
-    var refund = _ref48.refund;
+    var refund = _ref58.refund;
     var payment = resolveRefundPayment(refund, payments);
     var methodName = paymentMethodName(payment, params.locale) || label(params.locale, 'refund');
     var amount = (_firstPresentValue8 = firstPresentValue(refund.amount, refund.refund_amount, refund.total_amount)) !== null && _firstPresentValue8 !== void 0 ? _firstPresentValue8 : 0;
@@ -1377,8 +1629,8 @@ function buildPaymentItems(params) {
       includeUsage: includeFundRecordUsage
     })));
   } else {
-    var _ref49, _payment$remaining_am, _payment$metadata;
-    var remainingAmount = (_ref49 = (_payment$remaining_am = payment.remaining_amount) !== null && _payment$remaining_am !== void 0 ? _payment$remaining_am : payment.balance) !== null && _ref49 !== void 0 ? _ref49 : (_payment$metadata = payment.metadata) === null || _payment$metadata === void 0 ? void 0 : _payment$metadata.remaining_amount;
+    var _ref59, _payment$remaining_am, _payment$metadata;
+    var remainingAmount = (_ref59 = (_payment$remaining_am = payment.remaining_amount) !== null && _payment$remaining_am !== void 0 ? _payment$remaining_am : payment.balance) !== null && _ref59 !== void 0 ? _ref59 : (_payment$metadata = payment.metadata) === null || _payment$metadata === void 0 ? void 0 : _payment$metadata.remaining_amount;
     if (remainingAmount !== undefined && remainingAmount !== null) {
       items.push({
         item: label(locale, 'remainingAmount'),
@@ -1532,12 +1784,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 _ref50, _ref51, _ref52, _ref53, _ref54, _ref55, _value$locale2;
+  var _ref60, _ref61, _ref62, _ref63, _ref64, _ref65, _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((_ref50 = (_ref51 = (_ref52 = (_ref53 = (_ref54 = (_ref55 = (_value$locale2 = value[locale]) !== null && _value$locale2 !== void 0 ? _value$locale2 : value[dashedLocale]) !== null && _ref55 !== void 0 ? _ref55 : value[underscoredLocale]) !== null && _ref54 !== void 0 ? _ref54 : value.original) !== null && _ref53 !== void 0 ? _ref53 : value.auto) !== null && _ref52 !== void 0 ? _ref52 : value.default) !== null && _ref51 !== void 0 ? _ref51 : value.en) !== null && _ref50 !== void 0 ? _ref50 : '');
+  return stringify((_ref60 = (_ref61 = (_ref62 = (_ref63 = (_ref64 = (_ref65 = (_value$locale2 = value[locale]) !== null && _value$locale2 !== void 0 ? _value$locale2 : value[dashedLocale]) !== null && _ref65 !== void 0 ? _ref65 : value[underscoredLocale]) !== null && _ref64 !== void 0 ? _ref64 : value.original) !== null && _ref63 !== void 0 ? _ref63 : value.auto) !== null && _ref62 !== void 0 ? _ref62 : value.default) !== null && _ref61 !== void 0 ? _ref61 : value.en) !== null && _ref60 !== void 0 ? _ref60 : '');
 }
 function resolveServiceTypeLabelKey(serviceType, order) {
   var normalized = serviceType.trim().toLowerCase().replace(/[\s-]+/g, '_');

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

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

package/lib/server/utils/small-ticket.d.ts

@@ -28,6 +28,8 @@ export interface SmallTicketItem {
     value: string;
     size?: number;
     align?: string;
+    product_uid?: string | number;
+    booking_uid?: string | number;
 }
 export interface SmallTicketProduct {
     product_title: string;
@@ -53,11 +55,7 @@ export interface SmallTicketProduct {
     variant?: string;
     combinations?: any[];
 }
-export interface SmallTicketBookingSnapshot extends Record<string, any> {
-    product_uid?: string | number;
-    booking_uid?: string | number;
-}
-export type SmallTicketAppointment = SmallTicketItem[] | SmallTicketBookingSnapshot[];
+export type SmallTicketAppointment = SmallTicketItem[];
 export interface SmallTicketLocaleData {
     base_data: Record<string, any>;
     products: SmallTicketProduct[];

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

@@ -33,8 +33,13 @@ const LABELS = {
     redeemPoints: 'Redeem points',
     remainingPoints: 'Points balance',
     table: 'Table',
+    bookingId: 'Booking ID',
+    bookingDateTime: 'Date & time',
+    bookingResource: 'Resource',
+    bookingHolder: 'Holder',
     orderDiscount: 'Order discount',
     manualDiscount: 'Manual discount',
+    manualMarkup: 'Manual markup',
     payProcessingFee: 'Pay processing fee',
     surchargeIncluded: 'Surcharge(Included)',
     rounding: 'Rounding',
@@ -66,8 +71,13 @@ const LABELS = {
     redeemPoints: '本次使用积分',
     remainingPoints: '积分余额',
     table: '桌台',
+    bookingId: '预约编号',
+    bookingDateTime: '日期和时间',
+    bookingResource: '资源',
+    bookingHolder: '预约人',
     orderDiscount: '整单折扣',
     manualDiscount: '手动折扣',
+    manualMarkup: '手动加价',
     payProcessingFee: '支付手续费',
     surchargeIncluded: '手续费(已含)',
     rounding: '抹零',
@@ -99,8 +109,13 @@ const LABELS = {
     redeemPoints: '本次使用積分',
     remainingPoints: '積分餘額',
     table: '桌台',
+    bookingId: '預約編號',
+    bookingDateTime: '日期和時間',
+    bookingResource: '資源',
+    bookingHolder: '預約人',
     orderDiscount: '整單折扣',
     manualDiscount: '手動折扣',
+    manualMarkup: '手動加價',
     payProcessingFee: '支付手續費',
     surchargeIncluded: '手續費(已含)',
     rounding: '抹零',
@@ -130,8 +145,13 @@ const LABELS = {
     redeemPoints: '利用ポイント',
     remainingPoints: 'ポイント残高',
     table: 'テーブル',
+    bookingId: '予約ID',
+    bookingDateTime: '日時',
+    bookingResource: 'リソース',
+    bookingHolder: '予約者',
     orderDiscount: '注文割引',
     manualDiscount: '手動割引',
+    manualMarkup: '手動値上げ',
     payProcessingFee: '決済手数料',
     rounding: '端数調整',
     gross: '総重量',
@@ -162,8 +182,13 @@ const LABELS = {
     redeemPoints: 'Pontos utilizados',
     remainingPoints: 'Saldo de pontos',
     table: 'Mesa',
+    bookingId: 'ID da reserva',
+    bookingDateTime: 'Data e hora',
+    bookingResource: 'Recurso',
+    bookingHolder: 'Titular',
     orderDiscount: 'Desconto do pedido',
     manualDiscount: 'Desconto manual',
+    manualMarkup: 'Acréscimo manual',
     payProcessingFee: 'Taxa de processamento',
     rounding: 'Arredondamento',
     gross: 'Peso bruto',
@@ -281,7 +306,8 @@ function buildBaseData(params) {
 }
 function buildProducts(order, locale, productMap) {
   const products = Array.isArray(order.products) ? order.products : [];
-  return products.map(product => {
+  return products.map(rawProduct => {
+    const product = restoreReceiptDiscountHierarchy(rawProduct);
     const quantity = toNumber(product.product_quantity ?? product.quantity ?? product.num ?? 1, 1);
     const originalPrice = product.original_price ?? product.selling_price ?? product.payment_price ?? product.price ?? 0;
     const sellingPrice = product.selling_price ?? product.payment_price ?? product.price ?? originalPrice;
@@ -361,6 +387,73 @@ function buildProducts(order, locale, productMap) {
     };
   });
 }
+const RECEIPT_BUNDLE_MAP_ID_KEY = 'custom_product_bundle_map_id';
+function restoreReceiptDiscountHierarchy(source) {
+  if (!source || typeof source !== 'object' || Array.isArray(source)) {
+    return source;
+  }
+  const childKey = Array.isArray(source.combinations) && source.combinations.length ? 'combinations' : Array.isArray(source.product_bundle) && source.product_bundle.length ? 'product_bundle' : null;
+  if (!childKey) return {
+    ...source
+  };
+  const children = source[childKey].map(child => child && typeof child === 'object' && !Array.isArray(child) ? restoreReceiptDiscountHierarchy(child) : child);
+  const restored = {
+    ...source,
+    [childKey]: children
+  };
+  if (!Array.isArray(source.discount_list) || !source.discount_list.length) {
+    return restored;
+  }
+  const descendantsByMapId = new Map();
+  indexReceiptDiscountTargets(children, descendantsByMapId);
+  if (!descendantsByMapId.size) return restored;
+  const ownDiscounts = [];
+  for (const discount of source.discount_list) {
+    const mapId = getReceiptDiscountBundleMapId(discount);
+    const target = mapId ? descendantsByMapId.get(mapId) : undefined;
+    if (!target) {
+      ownDiscounts.push(discount);
+      continue;
+    }
+    const targetDiscounts = Array.isArray(target.discount_list) ? target.discount_list : [];
+    if (!targetDiscounts.some(item => isSameReceiptDiscount(item, discount))) {
+      target.discount_list = [...targetDiscounts, discount];
+    }
+  }
+  restored.discount_list = ownDiscounts;
+  return restored;
+}
+function indexReceiptDiscountTargets(nodes, targets) {
+  for (const node of nodes) {
+    if (!node || typeof node !== 'object' || Array.isArray(node)) continue;
+    const mapId = getReceiptBundleMapId(node);
+    if (mapId && !targets.has(mapId)) targets.set(mapId, node);
+    const children = Array.isArray(node.combinations) && node.combinations.length ? node.combinations : Array.isArray(node.product_bundle) ? node.product_bundle : [];
+    indexReceiptDiscountTargets(children, targets);
+  }
+}
+function normalizeReceiptId(value) {
+  if (value === undefined || value === null) return null;
+  const normalized = String(value).trim();
+  return normalized ? normalized : null;
+}
+function getReceiptBundleMapId(node) {
+  return normalizeReceiptId(node.metadata?.[RECEIPT_BUNDLE_MAP_ID_KEY] ?? node._id);
+}
+function getReceiptDiscountBundleMapId(discount) {
+  return normalizeReceiptId(discount?.metadata?.[RECEIPT_BUNDLE_MAP_ID_KEY]);
+}
+function isSameReceiptDiscount(left, right) {
+  const leftOrderDiscountId = normalizeReceiptId(left?.order_discount_id);
+  const rightOrderDiscountId = normalizeReceiptId(right?.order_discount_id);
+  if (leftOrderDiscountId && rightOrderDiscountId) {
+    return leftOrderDiscountId === rightOrderDiscountId;
+  }
+  const leftResourceId = normalizeReceiptId(left?.discount?.resource_id ?? left?.resource_id ?? left?.discount_id);
+  const rightResourceId = normalizeReceiptId(right?.discount?.resource_id ?? right?.resource_id ?? right?.discount_id);
+  if (!leftResourceId || !rightResourceId) return false;
+  return leftResourceId === rightResourceId && getReceiptDiscountBundleMapId(left) === getReceiptDiscountBundleMapId(right) && String(left?.amount ?? left?.value ?? left?.discount_amount ?? '') === String(right?.amount ?? right?.value ?? right?.discount_amount ?? '');
+}
 function resolveProductBasePrice(product) {
   const metadata = product.metadata || {};
   const origin = product._origin || metadata.origin || {};
@@ -376,18 +469,31 @@ function normalizeProductDiscounts(params) {
     currencySymbol,
     quantity
   } = params;
-  return normalizeArray(product.discount_list).filter(discount => {
+  const rows = normalizeArray(product.discount_list).filter(discount => {
     const amount = discount.amount ?? discount.value ?? discount.discount_amount;
     return isNonZero(amount);
   }).map(discount => {
     const title = resolveDiscountTitleWithPercent(discount, locale);
     const amount = discount.amount ?? discount.value ?? discount.discount_amount;
-    const formattedAmount = formatNegativeMoney(new _decimal.default(toMoneyNumber(amount)).mul(quantity), currencySymbol);
+    const isMarkup = isManualMarkup(discount);
+    const totalAmount = new _decimal.default(toMoneyNumber(amount)).mul(quantity);
+    const formattedAmount = isMarkup ? formatMoney(totalAmount.abs(), currencySymbol) : formatNegativeMoney(totalAmount, currencySymbol);
     return {
       item: title,
-      value: formattedAmount
+      value: formattedAmount,
+      isMarkup
     };
   });
+  return rows.sort((left, right) => Number(right.isMarkup) - Number(left.isMarkup)).map(({
+    isMarkup: _isMarkup,
+    ...row
+  }) => row);
+}
+function isManualMarkup(discount) {
+  if (discount.type !== 'product') return false;
+  if (discount.discount?.discount_type === 'change_price') return true;
+  const amount = discount.amount ?? discount.value ?? discount.discount_amount;
+  return new _decimal.default(toMoneyNumber(amount)).isNegative();
 }
 function hasProductDiscount(product, extensionList = []) {
   const hasDiscountListAmount = normalizeArray(product.discount_list).some(discount => isNonZero(discount.amount ?? discount.value ?? discount.discount_amount));
@@ -474,7 +580,9 @@ function resolveDiscountTitleWithPercent(discount, locale) {
 function resolveDiscountTitle(discount, locale) {
   const title = getLocalizedValue(discount.discount?.name ?? discount.discount?.title ?? discount.discount?.message ?? discount.name ?? discount.title ?? discount.message, locale);
   if (title) return title;
-  if (discount.type === 'product') return label(locale, 'manualDiscount');
+  if (discount.type === 'product') {
+    return label(locale, isManualMarkup(discount) ? 'manualMarkup' : 'manualDiscount');
+  }
   return '';
 }
 function resolveProductTitle(params) {
@@ -552,7 +660,14 @@ function normalizeProductCombinations(params) {
     const optionsTotal = sumNormalizedOptionTotals(combinationsOptions, currencySymbol);
     const explicitBasePrice = firstPresentValue(bundle.base_price, bundle.metadata?.source_product_price);
     const basePrice = isPresentId(explicitBasePrice) ? explicitBasePrice : 0;
-    const shouldIncludeBasePrice = combinationsOptions.length > 0 || nestedCombinations.length > 0 || hasProductDiscount(bundle);
+    const extensionList = buildProductExtensionList({
+      product: bundle,
+      locale,
+      currencySymbol,
+      quantity,
+      originalPrice: formattedPrice
+    });
+    const shouldIncludeBasePrice = combinationsOptions.length > 0 || nestedCombinations.length > 0 || hasProductDiscount(bundle, extensionList);
     return {
       product_title: baseTitle,
       product_quantity: quantity,
@@ -571,6 +686,9 @@ function normalizeProductCombinations(params) {
       ...(productNote ? {
         product_note: productNote
       } : {}),
+      ...(extensionList.length ? {
+        extension_list: extensionList
+      } : {}),
       ...(nestedCombinations.length ? {
         combinations: nestedCombinations
       } : {})
@@ -597,12 +715,20 @@ function normalizeExistingCombinations(combinations, locale, currencySymbol) {
     delete snapshot.product_note;
     delete snapshot.note;
     delete snapshot.combinations;
+    delete snapshot.discount_list;
     const quantity = toNumber(combination.product_quantity ?? combination.num ?? combination.quantity ?? 1, 1);
     const unitPrice = firstPresentValue(combination.selling_price, combination.price, combination.original_price) ?? 0;
     const optionsAmount = sumMoneyValues(normalizedOptions.map(option => option.total_price));
     const explicitBasePrice = firstPresentValue(combination.base_price);
     const basePrice = isPresentId(explicitBasePrice) ? explicitBasePrice : 0;
-    const shouldIncludeBasePrice = normalizedOptions.length > 0 || nestedCombinations.length > 0 || hasProductDiscount(combination, normalizeArray(combination.extension_list));
+    const extensionList = buildProductExtensionList({
+      product: combination,
+      locale,
+      currencySymbol,
+      quantity,
+      originalPrice: unitPrice
+    });
+    const shouldIncludeBasePrice = normalizedOptions.length > 0 || nestedCombinations.length > 0 || hasProductDiscount(combination, extensionList);
     return {
       ...snapshot,
       product_quantity: quantity,
@@ -624,6 +750,9 @@ function normalizeExistingCombinations(combinations, locale, currencySymbol) {
       ...(productNote ? {
         product_note: productNote
       } : {}),
+      ...(extensionList.length ? {
+        extension_list: extensionList
+      } : {}),
       ...(nestedCombinations.length ? {
         combinations: nestedCombinations
       } : {})
@@ -998,24 +1127,13 @@ function buildDelivery(order, locale) {
 function buildAppointment(order, locale) {
   const bookings = sortBookings(normalizeArray(order.bookings));
   if (bookings.length) {
-    return bookings.map(booking => {
-      const snapshot = {
-        ...booking
-      };
-      delete snapshot.product_uid;
-      delete snapshot.booking_uid;
-      const productUid = firstPresentValue(booking.product_uid, booking.metadata?.product_uid);
-      const bookingUid = firstPresentValue(booking.metadata?.unique_identification_number, booking.booking_uid);
-      return {
-        ...snapshot,
-        ...(isPresentId(productUid) ? {
-          product_uid: productUid
-        } : {}),
-        ...(isPresentId(bookingUid) ? {
-          booking_uid: bookingUid
-        } : {})
-      };
-    });
+    const allResources = normalizeArray(order.resources || order.resource_list);
+    return bookings.flatMap(booking => buildAppointmentRows({
+      booking,
+      allResources,
+      bookingCount: bookings.length,
+      locale
+    }));
   }
   const tableName = order.table_name || order.metadata?.table_name || order.metadata?.table?.name || order.form_data?.table_name;
   if (!tableName) return [];
@@ -1024,6 +1142,82 @@ function buildAppointment(order, locale) {
     value: getLocalizedValue(tableName, locale)
   }];
 }
+function buildAppointmentRows(params) {
+  const {
+    booking,
+    allResources,
+    bookingCount,
+    locale
+  } = params;
+  const productUid = stringify(firstPresentValue(booking.product_uid, booking.metadata?.product_uid)).trim();
+  const bookingUid = stringify(firstPresentValue(booking.metadata?.unique_identification_number, booking.booking_uid)).trim();
+  const association = {
+    product_uid: productUid,
+    booking_uid: bookingUid
+  };
+  const bookingId = stringify(firstPresentValue(booking.booking_id, booking.schedule_event_id, bookingUid)).trim();
+  const bookingTime = formatBookingRange(booking, locale);
+  const resourceText = formatBookingResources(resolveBookingResourcesForReceipt(booking, allResources, bookingCount), locale);
+  const holder = getLocalizedValue(booking.holder?.name ?? booking.metadata?.holder?.name, locale).trim();
+  return [{
+    item: label(locale, 'bookingId'),
+    value: bookingId,
+    ...association
+  }, {
+    item: label(locale, 'bookingDateTime'),
+    value: bookingTime,
+    ...association
+  }, {
+    item: label(locale, 'bookingResource'),
+    value: resourceText,
+    ...association
+  }, {
+    item: label(locale, 'bookingHolder'),
+    value: holder,
+    ...association
+  }].filter(row => Boolean(row.value));
+}
+function formatBookingRange(booking, locale) {
+  const startDate = stringify(booking.start_date);
+  const startTime = stringify(booking.start_time);
+  const endDate = stringify(booking.end_date || startDate);
+  const endTime = stringify(booking.end_time);
+  const start = firstValidBookingDate(booking.start_at, booking.start_datetime, booking.start_date_time, `${startDate} ${startTime}`.trim());
+  const end = firstValidBookingDate(booking.end_at, booking.end_datetime, booking.end_date_time, endTime ? `${endDate} ${endTime}`.trim() : '');
+  if (!start) {
+    return [startDate, startTime, endTime ? `- ${endDate} ${endTime}` : ''].filter(Boolean).join(' ');
+  }
+  const dateFormat = locale === 'en' ? 'DD/MM/YYYY' : 'YYYY/MM/DD';
+  const startText = start.format(`${dateFormat} HH:mm`);
+  if (!end) return startText;
+  return `${startText} - ${end.isSame(start, 'day') ? end.format('HH:mm') : end.format(`${dateFormat} HH:mm`)}`;
+}
+function firstValidBookingDate(...values) {
+  for (const value of values) {
+    if (!isPresentId(value)) continue;
+    const parsed = (0, _dayjs.default)(value);
+    if (parsed.isValid()) return parsed;
+  }
+  return null;
+}
+function resolveBookingResourcesForReceipt(booking, allResources, bookingCount) {
+  const embedded = normalizeArray(booking.resources).filter(resource => Boolean(resource) && typeof resource === 'object' && !Array.isArray(resource));
+  const resourceIds = new Set([booking.resource_id, booking.relation_id, ...normalizeArray(booking.resource_ids), ...normalizeArray(booking.metadata?.resource_ids)].map(value => stringify(value).trim()).filter(Boolean));
+  for (const resource of embedded) {
+    const id = stringify(resource.id ?? resource.resource_id ?? resource.relation_id).trim();
+    if (id) resourceIds.add(id);
+  }
+  if (resourceIds.size) {
+    const matched = allResources.filter(resource => resourceIds.has(stringify(resource.id ?? resource.resource_id ?? resource.relation_id).trim()));
+    if (matched.length) return matched;
+  }
+  if (embedded.length) return embedded;
+  if (bookingCount === 1 && allResources.length) return allResources;
+  return [];
+}
+function formatBookingResources(resources, locale) {
+  return resources.map(resource => [getLocalizedValue(resource.form_title || resource.metadata?.form_name || resource.relation_form_name || resource.metadata?.relation_form_name, locale), getLocalizedValue(resource.title || resource.name || resource.main_field || resource.metadata?.main_field || resource.metadata?.resource_name, locale)].filter(Boolean).join(' ')).filter(Boolean).join(', ');
+}
 function sortBookings(bookings) {
   return bookings.map((booking, index) => ({
     booking,

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

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

package/package.json

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