@pisell/pisellos 2.2.187 → 2.2.189

package/dist/solution/BookingTicket/utils/scan/scanProductValues.js

@@ -0,0 +1,150 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _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; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+/**
+ * 扫码商品条码预选规格纯函数（对齐 ticketBooking addServiceVariant/utils）。
+ */
+
+/** 套餐商品 */
+export function isScanProductBundle(item) {
+  return ((item === null || item === void 0 ? void 0 : item.bundle_group_count) || 0) > 0;
+}
+
+/** 单规格 / 选项组商品 */
+export function isScanProductOption(item) {
+  var _item$option_group;
+  return ((item === null || item === void 0 ? void 0 : item.option_group_count) || 0) > 0 || ((item === null || item === void 0 || (_item$option_group = item.option_group) === null || _item$option_group === void 0 ? void 0 : _item$option_group.length) || 0) > 0;
+}
+function formatVariantGroupTitle(title) {
+  var variantGroup = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  try {
+    return variantGroup.map(function (group) {
+      var value = title === null || title === void 0 ? void 0 : title[group === null || group === void 0 ? void 0 : group.position_id];
+      return value ? "".concat((group === null || group === void 0 ? void 0 : group.name) || '-', ": ").concat(value) : '';
+    }).filter(Boolean).join(', ');
+  } catch (_unused) {
+    return '';
+  }
+}
+function formatDataKey(data) {
+  var _next$option, _next$bundle;
+  var next = _objectSpread({}, data);
+  var key = "".concat(next.product_id);
+  var rowKey = key;
+  if (next.product_variant_id) {
+    var str = "_".concat(next.product_variant_id);
+    key += str;
+    rowKey += str;
+  }
+  if (next !== null && next !== void 0 && (_next$option = next.option) !== null && _next$option !== void 0 && _next$option.length) {
+    var _iterator = _createForOfIteratorHelper(next.option),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var item = _step.value;
+        var _str = "_".concat(item.option_group_id, "_").concat(item.product_option_item_id);
+        key += _str;
+        rowKey += "".concat(_str, "_").concat(item.quantity || item.num);
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+  }
+  if (next !== null && next !== void 0 && (_next$bundle = next.bundle) !== null && _next$bundle !== void 0 && _next$bundle.length) {
+    var _iterator2 = _createForOfIteratorHelper(next.bundle),
+      _step2;
+    try {
+      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+        var _item = _step2.value;
+        var _str2 = "_".concat(_item.group_id, "_").concat(_item.bundle_product_id);
+        key += _str2;
+        rowKey += "".concat(_str2, "_").concat(_item.quantity || _item.num);
+        if (_item !== null && _item !== void 0 && _item.option) {
+          var _iterator3 = _createForOfIteratorHelper(_item.option),
+            _step3;
+          try {
+            for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+              var opt = _step3.value;
+              var optStr = "_".concat(opt.option_group_id, "_").concat(opt.product_option_item_id);
+              key += optStr;
+              rowKey += "".concat(optStr, "_").concat(opt.quantity || opt.num);
+            }
+          } catch (err) {
+            _iterator3.e(err);
+          } finally {
+            _iterator3.f();
+          }
+        }
+      }
+    } catch (err) {
+      _iterator2.e(err);
+    } finally {
+      _iterator2.f();
+    }
+  }
+  if (next !== null && next !== void 0 && next.session) {
+    var _next$session;
+    var _str3 = "_".concat((_next$session = next.session) === null || _next$session === void 0 ? void 0 : _next$session.key);
+    key += _str3;
+    rowKey += _str3;
+  }
+  if (next !== null && next !== void 0 && next.schedule) {
+    var _next$schedule;
+    var _str4 = "_".concat((_next$schedule = next.schedule) === null || _next$schedule === void 0 ? void 0 : _next$schedule.key);
+    key += _str4;
+    rowKey += _str4;
+  }
+  next.key = key;
+  next.rowKey = rowKey;
+  return next;
+}
+
+/**
+ * 根据条码匹配 variant，生成 cartDetailValue（对齐 ticketBooking `genValues`）。
+ *
+ * @example
+ * ```ts
+ * const values = genScanProductValues(catalogItem, '6901234567890');
+ * const itemWithSelection = { ...catalogItem, cartDetailValue: values };
+ * ```
+ */
+export function genScanProductValues(item, code) {
+  var _item$variant_group, _item$option_group2;
+  var params = {
+    bundle: [],
+    option: [],
+    product_id: item.id,
+    product_variant_id: 0,
+    quantity: 1,
+    rowKey: '',
+    session: null
+  };
+  if (item !== null && item !== void 0 && (_item$variant_group = item.variant_group) !== null && _item$variant_group !== void 0 && _item$variant_group.length || item !== null && item !== void 0 && (_item$option_group2 = item.option_group) !== null && _item$option_group2 !== void 0 && _item$option_group2.length) {
+    var variantItem = (item.variant || []).find(function (v) {
+      return (v === null || v === void 0 ? void 0 : v.code) === code || (v === null || v === void 0 ? void 0 : v.barcode) === code;
+    });
+    if (variantItem) {
+      params.price = Number((variantItem === null || variantItem === void 0 ? void 0 : variantItem.price) || 0);
+      params.product_variant_id = variantItem.id;
+      params.product_option_string = formatVariantGroupTitle(variantItem === null || variantItem === void 0 ? void 0 : variantItem.title, (item === null || item === void 0 ? void 0 : item.variant_group) || []);
+    }
+  }
+  return formatDataKey(params);
+}
+
+/**
+ * 统计条码命中的 variant 数量（多命中时需弹窗选择）。
+ */
+export function countScanVariantMatches(item, code) {
+  return ((item === null || item === void 0 ? void 0 : item.variant) || []).filter(function (v) {
+    return (v === null || v === void 0 ? void 0 : v.code) === code || (v === null || v === void 0 ? void 0 : v.barcode) === code;
+  }).length;
+}

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

@@ -0,0 +1,49 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/model/strategy/adapter/promotion/index.ts
+var promotion_exports = {};
+__export(promotion_exports, {
+  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter: () => import_adapter.PromotionAdapter,
+  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
+  default: () => import_adapter2.default
+});
+module.exports = __toCommonJS(promotion_exports);
+var import_evaluator = require("./evaluator");
+var import_adapter = require("./adapter");
+var import_adapter2 = __toESM(require("./adapter"));
+var import_examples = require("./examples");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter,
+  PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY
+});

package/lib/modules/BookingContext/utils/buildCacheItemFromOrderLine.js

@@ -34,6 +34,7 @@ __export(buildCacheItemFromOrderLine_exports, {
 module.exports = __toCommonJS(buildCacheItemFromOrderLine_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_manualProductDiscount = require("../../Order/utils/manualProductDiscount");
+var import_orderLineDisplay = require("./orderLineDisplay");
 function safeFormat(value, fmt) {
   if (value === void 0 || value === null)
     return void 0;
@@ -178,6 +179,7 @@ function buildCacheItemFromOrderLine(input) {
   const capacity = resolveCapacityFromBooking(booking);
   const holderId = ((_a = booking.metadata) == null ? void 0 : _a.holder_id) ?? booking.holder_id;
   const productTitle = resolveProductTitle(product, booking, sourceProduct);
+  const productOptionString = (0, import_orderLineDisplay.buildProductOptionStringFromOrderLine)(product);
   const other = {
     product_variant_id: product.product_variant_id ?? 0,
     option: Array.isArray(product.product_option_item) ? [...product.product_option_item] : [],
@@ -206,7 +208,8 @@ function buildCacheItemFromOrderLine(input) {
     discount_reason: (0, import_manualProductDiscount.resolveManualDiscountMessage)(
       product.discount_list,
       (_c = product.metadata) == null ? void 0 : _c.product_discount_reason
-    ) || void 0
+    ) || void 0,
+    ...productOptionString ? { product_option_string: productOptionString } : {}
   };
   const manualDiscount = (product.discount_list || []).find((d) => (d == null ? void 0 : d.type) === "product");
   if (manualDiscount && extend.origin_total === selling) {
@@ -233,6 +236,7 @@ function buildCacheItemFromOrderLine(input) {
     price: (sourceProduct == null ? void 0 : sourceProduct.price) ?? selling,
     selling_price: product.selling_price,
     original_price: product.original_price,
+    ...productOptionString ? { product_option_string: productOptionString } : {},
     _extend: extend,
     new: 0,
     autoClose: false,

package/lib/modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.js

@@ -22,6 +22,7 @@ __export(buildNormalProductCacheItemFromOrderLine_exports, {
   buildNormalProductCacheItemFromOrderLine: () => buildNormalProductCacheItemFromOrderLine
 });
 module.exports = __toCommonJS(buildNormalProductCacheItemFromOrderLine_exports);
+var import_orderLineDisplay = require("./orderLineDisplay");
 function resolveSourceProductPrice(product, sourceProduct) {
   var _a, _b, _c;
   const metadata = product.metadata || {};
@@ -85,6 +86,7 @@ function buildNormalProductCacheItemFromOrderLine(input) {
     Array.isArray(product.product_bundle) ? product.product_bundle : []
   );
   const originExtend = (_c = (_b = product.metadata) == null ? void 0 : _b.origin) == null ? void 0 : _c._extend;
+  const productOptionString = (0, import_orderLineDisplay.buildProductOptionStringFromOrderLine)(product);
   const other = {
     product_id: resolvedId,
     product_variant_id: product.product_variant_id ?? 0,
@@ -110,6 +112,7 @@ function buildNormalProductCacheItemFromOrderLine(input) {
     skuValue: JSON.parse(JSON.stringify(skuValue)),
     _skuValue: JSON.parse(JSON.stringify(skuValue)),
     isNormalProduct: true,
+    ...productOptionString ? { product_option_string: productOptionString } : {},
     ...(originExtend == null ? void 0 : originExtend.priceOverride) !== void 0 ? { priceOverride: originExtend.priceOverride } : {},
     ...(originExtend == null ? void 0 : originExtend.bundle_edit) !== void 0 ? { bundle_edit: originExtend.bundle_edit } : {}
   };
@@ -128,6 +131,7 @@ function buildNormalProductCacheItemFromOrderLine(input) {
     price: (sourceProduct == null ? void 0 : sourceProduct.price) ?? sourcePrice,
     selling_price: product.selling_price,
     original_price: product.original_price,
+    ...productOptionString ? { product_option_string: productOptionString } : {},
     note: product.note,
     order_detail_id: product.order_detail_id ?? null,
     new: 0,

package/lib/modules/BookingContext/utils/orderLineDisplay.d.ts

@@ -0,0 +1 @@
+export declare function buildProductOptionStringFromOrderLine(product: any): string;

package/lib/modules/BookingContext/utils/orderLineDisplay.js

@@ -0,0 +1,56 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/modules/BookingContext/utils/orderLineDisplay.ts
+var orderLineDisplay_exports = {};
+__export(orderLineDisplay_exports, {
+  buildProductOptionStringFromOrderLine: () => buildProductOptionStringFromOrderLine
+});
+module.exports = __toCommonJS(orderLineDisplay_exports);
+function pickDisplayText(value) {
+  if (value === void 0 || value === null)
+    return "";
+  if (typeof value === "string")
+    return value;
+  if (typeof value !== "object")
+    return String(value);
+  return value.auto || value.original || value.en || value["zh-CN"] || value["zh-HK"] || "";
+}
+function formatNamePair(group, item) {
+  const groupText = pickDisplayText(group);
+  const itemText = pickDisplayText(item);
+  if (groupText && itemText)
+    return `${groupText}:${itemText}`;
+  return groupText || itemText;
+}
+function buildProductOptionStringFromOrderLine(product) {
+  const segments = [];
+  const sku = (product == null ? void 0 : product.product_sku) || {};
+  if (Array.isArray(sku.variant)) {
+    for (const variant of sku.variant) {
+      const segment = formatNamePair(variant == null ? void 0 : variant.group, variant == null ? void 0 : variant.item);
+      if (segment)
+        segments.push(segment);
+    }
+  }
+  return segments.join(", ");
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  buildProductOptionStringFromOrderLine
+});

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

@@ -143,6 +143,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private saveDraftInBackground;
     private hydrateTempOrderFromLocalRecord;
     private extractOrderIdFromSubmitResult;
+    private calculatePaymentEffectiveAmount;
     private calculatePaymentTotal;
     private normalizePaymentSource;
     private updateTempOrderPaymentStatus;
@@ -312,7 +313,11 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         recalcOnHydrate?: boolean;
     }): Promise<OrderTempOrder>;
     private normalizeTempOrderForRuntime;
+    private pickHydratedDisplayText;
+    private formatHydratedNamePair;
+    private buildHydratedProductOptionString;
     private normalizeHydratedProductOptionItem;
+    private mergeHydratedProductOptionDisplayFields;
     private resolveHydratedProductOptions;
     private normalizeHydratedOrderProduct;
     getLastOrderInfo(): Record<string, any> | undefined;

package/lib/modules/Order/index.js

@@ -690,13 +690,16 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     var _a, _b;
     return ((_a = result == null ? void 0 : result.data) == null ? void 0 : _a.order_id) ?? (result == null ? void 0 : result.order_id) ?? ((_b = result == null ? void 0 : result.data) == null ? void 0 : _b.id) ?? (result == null ? void 0 : result.id) ?? null;
   }
+  calculatePaymentEffectiveAmount(payment) {
+    const amount = new import_decimal.default(payment.amount || 0).minus(new import_decimal.default(payment.service_fee || 0));
+    const rounding = new import_decimal.default(payment.rounding_amount || 0);
+    return amount.minus(rounding);
+  }
   calculatePaymentTotal(payments) {
     return (0, import_utils.mapPaymentItemsToOrderPayments)(payments, {
       includeVoided: false
     }).reduce((sum, payment) => {
-      const amount = new import_decimal.default(payment.amount || 0);
-      const rounding = new import_decimal.default(payment.rounding_amount || 0);
-      return sum.plus(amount.minus(rounding));
+      return sum.plus(this.calculatePaymentEffectiveAmount(payment));
     }, new import_decimal.default(0));
   }
   normalizePaymentSource(payment, options) {
@@ -739,12 +742,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         return {
           customerPaidAmount: summary.customerPaidAmount.plus(paymentRecord.amount || 0),
           orderPaidAmount: summary.orderPaidAmount.plus(paymentRecord.origin_amount || 0),
+          gapPaidAmount: summary.gapPaidAmount.plus(this.calculatePaymentEffectiveAmount(paymentRecord)),
           payServiceChargeAmount: summary.payServiceChargeAmount.plus(this.calculatePaymentServiceFee(paymentRecord))
         };
       },
       {
         customerPaidAmount: new import_decimal.default(0),
         orderPaidAmount: new import_decimal.default(0),
+        gapPaidAmount: new import_decimal.default(0),
         payServiceChargeAmount: new import_decimal.default(0)
       }
     );
@@ -1078,7 +1083,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         amount_gap: this.calculateSummaryAmountGap({
           tempOrder,
           summary: (0, import_utils.createEmptySummary)(),
-          orderPaidAmount: paidPaymentSummary.orderPaidAmount
+          orderPaidAmount: paidPaymentSummary.gapPaidAmount
         }),
         pay_service_charge_amount: paidPaymentSummary.payServiceChargeAmount.toFixed(2)
       };
@@ -1100,7 +1105,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       amount_gap: this.calculateSummaryAmountGap({
         tempOrder,
         summary: salesSummaryResult,
-        orderPaidAmount: paidPaymentSummary.orderPaidAmount
+        orderPaidAmount: paidPaymentSummary.gapPaidAmount
       }),
       pay_service_charge_amount: paidPaymentSummary.payServiceChargeAmount.toFixed(2)
     };
@@ -1564,7 +1569,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     );
   }
   async updateOrderProduct(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
     const {
       product_id,
       product_variant_id,
@@ -1624,7 +1629,20 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     nextProduct.num = (0, import_utils3.getSafeProductNum)(nextProduct.num);
     const callerUpdatesTopPrice = Object.prototype.hasOwnProperty.call(updates || {}, "selling_price") || Object.prototype.hasOwnProperty.call(updates || {}, "original_price");
     const callerUpdatesMainMeta = ((_b = updates == null ? void 0 : updates.metadata) == null ? void 0 : _b.main_product_selling_price) !== void 0 || ((_c = updates == null ? void 0 : updates.metadata) == null ? void 0 : _c.main_product_original_price) !== void 0 || ((_d = updates == null ? void 0 : updates.metadata) == null ? void 0 : _d.source_product_price) !== void 0;
-    if (callerUpdatesTopPrice && !callerUpdatesMainMeta) {
+    const isPersistedOrderLine = targetProduct.order_detail_id !== void 0 && targetProduct.order_detail_id !== null;
+    const callerUpdatesManualPrice = ((_e = updates == null ? void 0 : updates.metadata) == null ? void 0 : _e.price_override) !== void 0 || ((_f = updates == null ? void 0 : updates.metadata) == null ? void 0 : _f.is_manual_discount) !== void 0 || ((_g = updates == null ? void 0 : updates.metadata) == null ? void 0 : _g.product_discount_reason) !== void 0 || Array.isArray(updates == null ? void 0 : updates.discount_list) && updates.discount_list.length > 0;
+    if (isPersistedOrderLine && !callerUpdatesManualPrice) {
+      nextProduct.selling_price = targetProduct.selling_price;
+      nextProduct.original_price = targetProduct.original_price;
+      nextProduct.payment_price = targetProduct.payment_price;
+      nextProduct.metadata = {
+        ...nextProduct.metadata || {},
+        source_product_price: (_h = targetProduct.metadata) == null ? void 0 : _h.source_product_price,
+        main_product_selling_price: (_i = targetProduct.metadata) == null ? void 0 : _i.main_product_selling_price,
+        main_product_original_price: (_j = targetProduct.metadata) == null ? void 0 : _j.main_product_original_price,
+        price_schema_version: (_k = targetProduct.metadata) == null ? void 0 : _k.price_schema_version
+      };
+    } else if (callerUpdatesTopPrice && !callerUpdatesMainMeta) {
       const existedMeta = nextProduct.metadata || {};
       nextProduct.metadata = { ...existedMeta };
       delete nextProduct.metadata.source_product_price;
@@ -1639,7 +1657,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     normalizedProduct.discount_list = (0, import_utils.normalizeOrderProductDiscountList)(
       normalizedProduct.discount_list
     );
-    const preservedBookingUid = nextProduct.booking_uid || ((_e = nextProduct.metadata) == null ? void 0 : _e.booking_uid) || targetProduct.booking_uid || ((_f = targetProduct.metadata) == null ? void 0 : _f.booking_uid);
+    const preservedBookingUid = nextProduct.booking_uid || ((_l = nextProduct.metadata) == null ? void 0 : _l.booking_uid) || targetProduct.booking_uid || ((_m = targetProduct.metadata) == null ? void 0 : _m.booking_uid);
     if (!booking && preservedBookingUid) {
       normalizedProduct.booking_uid = preservedBookingUid;
       normalizedProduct.metadata = {
@@ -1649,7 +1667,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
     if (booking) {
       const productUid = String(
-        ((_g = normalizedProduct.metadata) == null ? void 0 : _g.unique_identification_number) || ((_h = targetProduct.metadata) == null ? void 0 : _h.unique_identification_number) || unique_identification_number || (0, import_utils.createUuidV4)()
+        ((_n = normalizedProduct.metadata) == null ? void 0 : _n.unique_identification_number) || ((_o = targetProduct.metadata) == null ? void 0 : _o.unique_identification_number) || unique_identification_number || (0, import_utils.createUuidV4)()
       );
       normalizedProduct.metadata = {
         ...normalizedProduct.metadata || {},
@@ -1679,7 +1697,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       tempOrder,
       updates,
       tempOrder.products[productIndex],
-      (_i = tempOrder.products[productIndex].metadata) == null ? void 0 : _i.unique_identification_number
+      (_p = tempOrder.products[productIndex].metadata) == null ? void 0 : _p.unique_identification_number
     );
     await this.applyPromotion();
     this.applyDiscount();
@@ -2333,9 +2351,19 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       const existed = productsByUid[uid] && typeof productsByUid[uid] === "object" ? productsByUid[uid] : {};
       const rawProduct = rawProducts[index] && typeof rawProducts[index] === "object" ? rawProducts[index] : product;
       const origin = existed.origin ?? rawProduct._origin ?? ((_b = rawProduct.metadata) == null ? void 0 : _b.origin) ?? rawProduct;
+      const originSnapshot = (0, import_lodash_es.cloneDeep)(origin);
+      const productOptionString = this.buildHydratedProductOptionString(rawProduct) || this.buildHydratedProductOptionString(product);
+      if (productOptionString && originSnapshot && typeof originSnapshot === "object") {
+        if (originSnapshot.product_option_string === void 0) {
+          originSnapshot.product_option_string = productOptionString;
+        }
+        if (originSnapshot.product_options_stirng === void 0) {
+          originSnapshot.product_options_stirng = productOptionString;
+        }
+      }
       productsByUid[uid] = {
         ...existed,
-        origin: (0, import_lodash_es.cloneDeep)(origin)
+        origin: originSnapshot
       };
     }
     tempOrderExtend.productsByUid = productsByUid;
@@ -2345,24 +2373,81 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     nextTempOrder.vouchers = raw.vouchers || [];
     return nextTempOrder;
   }
+  pickHydratedDisplayText(value) {
+    if (value === void 0 || value === null)
+      return "";
+    if (typeof value === "string")
+      return value;
+    if (typeof value !== "object")
+      return String(value);
+    return value.auto || value.original || value.en || value["zh-CN"] || value["zh-HK"] || "";
+  }
+  formatHydratedNamePair(group, item) {
+    const groupText = this.pickHydratedDisplayText(group);
+    const itemText = this.pickHydratedDisplayText(item);
+    if (groupText && itemText)
+      return `${groupText}:${itemText}`;
+    return groupText || itemText;
+  }
+  buildHydratedProductOptionString(product) {
+    const segments = [];
+    const sku = (product == null ? void 0 : product.product_sku) || {};
+    if (Array.isArray(sku.variant)) {
+      for (const variant of sku.variant) {
+        const segment = this.formatHydratedNamePair(variant == null ? void 0 : variant.group, variant == null ? void 0 : variant.item);
+        if (segment)
+          segments.push(segment);
+      }
+    }
+    return segments.join(", ");
+  }
   normalizeHydratedProductOptionItem(optionItem) {
     const rawNum = (optionItem == null ? void 0 : optionItem.num) ?? (optionItem == null ? void 0 : optionItem.quantity) ?? 1;
     const parsedNum = Number(rawNum);
     const rawPrice = (optionItem == null ? void 0 : optionItem.price) ?? (optionItem == null ? void 0 : optionItem.add_price) ?? 0;
     const parsedPrice = Number(rawPrice);
-    return {
+    const normalized = {
       option_group_item_id: optionItem == null ? void 0 : optionItem.option_group_item_id,
       option_group_id: optionItem == null ? void 0 : optionItem.option_group_id,
       num: Number.isFinite(parsedNum) && parsedNum > 0 ? parsedNum : 1,
       price: Number.isFinite(parsedPrice) ? parsedPrice : 0
     };
+    if ((optionItem == null ? void 0 : optionItem.name) !== void 0)
+      normalized.name = optionItem.name;
+    if ((optionItem == null ? void 0 : optionItem.group_name) !== void 0)
+      normalized.group_name = optionItem.group_name;
+    if ((optionItem == null ? void 0 : optionItem.id) !== void 0)
+      normalized.id = optionItem.id;
+    return normalized;
+  }
+  mergeHydratedProductOptionDisplayFields(options, skuOptions) {
+    if (!Array.isArray(skuOptions) || skuOptions.length === 0)
+      return options;
+    const displayByItemId = /* @__PURE__ */ new Map();
+    for (const option of skuOptions) {
+      const key = option == null ? void 0 : option.option_group_item_id;
+      if (key === void 0 || key === null || key === "")
+        continue;
+      displayByItemId.set(String(key), option);
+    }
+    return options.map((option) => {
+      const display = displayByItemId.get(String((option == null ? void 0 : option.option_group_item_id) ?? ""));
+      if (!display)
+        return option;
+      return {
+        ...option,
+        ...option.name === void 0 && display.name !== void 0 ? { name: display.name } : {},
+        ...option.group_name === void 0 && display.group_name !== void 0 ? { group_name: display.group_name } : {},
+        ...option.id === void 0 && display.id !== void 0 ? { id: display.id } : {}
+      };
+    });
   }
   resolveHydratedProductOptions(row) {
     var _a;
+    const skuOptions = (_a = row.product_sku) == null ? void 0 : _a.option;
     if (Array.isArray(row.product_option_item) && row.product_option_item.length > 0) {
-      return row.product_option_item;
+      return this.mergeHydratedProductOptionDisplayFields(row.product_option_item, skuOptions);
     }
-    const skuOptions = (_a = row.product_sku) == null ? void 0 : _a.option;
     if (!Array.isArray(skuOptions))
       return [];
     return skuOptions.map(

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

@@ -439,6 +439,7 @@ export interface OrderPaymentMetadata {
     [key: string]: any;
 }
 export interface OrderPaymentData {
+    order_payment_id?: number | string;
     amount: string;
     code: string;
     custom_payment_id: number;

package/lib/modules/Order/utils.js

@@ -753,6 +753,7 @@ function mapPaymentItemToOrderPayment(paymentItem) {
     }
   }
   return {
+    ...item.order_payment_id !== void 0 ? { order_payment_id: item.order_payment_id } : {},
     amount: String(item.amount ?? "0.00"),
     code: String(item.code || ""),
     custom_payment_id: Number(customPaymentId ?? 0),