@pisell/pisellos 2.2.186 → 2.2.188

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

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

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

@@ -16,6 +16,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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); }
 import dayjs from 'dayjs';
 import { resolveManualDiscountMessage } from "../../Order/utils/manualProductDiscount";
+import { buildProductOptionStringFromOrderLine } from "./orderLineDisplay";
 function safeFormat(value, fmt) {
   if (value === undefined || value === null) return undefined;
   var d = dayjs(value);
@@ -188,12 +189,13 @@ export function buildCacheItemFromOrderLine(input) {
   var capacity = resolveCapacityFromBooking(booking);
   var holderId = (_booking$metadata$hol = (_booking$metadata2 = booking.metadata) === null || _booking$metadata2 === void 0 ? void 0 : _booking$metadata2.holder_id) !== null && _booking$metadata$hol !== void 0 ? _booking$metadata$hol : booking.holder_id;
   var productTitle = resolveProductTitle(product, booking, sourceProduct);
+  var productOptionString = buildProductOptionStringFromOrderLine(product);
   var other = {
     product_variant_id: (_product$product_vari = product.product_variant_id) !== null && _product$product_vari !== void 0 ? _product$product_vari : 0,
     option: Array.isArray(product.product_option_item) ? _toConsumableArray(product.product_option_item) : [],
     bundle: Array.isArray(product.product_bundle) ? _toConsumableArray(product.product_bundle) : []
   };
-  var extend = {
+  var extend = _objectSpread({
     start_date: startDate ? dayjs(startDate) : undefined,
     end_date: endDate ? dayjs(endDate) : undefined,
     startDate: startDate ? dayjs(startDate) : undefined,
@@ -214,7 +216,9 @@ export function buildCacheItemFromOrderLine(input) {
     other: other,
     like_status: booking.like_status || 'common',
     discount_reason: resolveManualDiscountMessage(product.discount_list, (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.product_discount_reason) || undefined
-  };
+  }, productOptionString ? {
+    product_option_string: productOptionString
+  } : {});
   var manualDiscount = (product.discount_list || []).find(function (d) {
     return (d === null || d === void 0 ? void 0 : d.type) === 'product';
   });
@@ -234,14 +238,17 @@ export function buildCacheItemFromOrderLine(input) {
   if (Array.isArray(booking.relation_forms)) {
     extend.relation_forms = booking.relation_forms;
   }
-  var base = _objectSpread(_objectSpread({}, sourceProduct || {}), {}, {
+  var base = _objectSpread(_objectSpread(_objectSpread({}, sourceProduct || {}), {}, {
     id: resolvedId,
     product_id: resolvedId,
     extension_type: (_ref9 = (_extension_type = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.extension_type) !== null && _extension_type !== void 0 ? _extension_type : booking === null || booking === void 0 || (_booking$product2 = booking.product) === null || _booking$product2 === void 0 ? void 0 : _booking$product2.extension_type) !== null && _ref9 !== void 0 ? _ref9 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.extension_type,
     title: productTitle || (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title) || (booking === null || booking === void 0 || (_booking$product3 = booking.product) === null || _booking$product3 === void 0 ? void 0 : _booking$product3.title),
     price: (_price = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price) !== null && _price !== void 0 ? _price : selling,
     selling_price: product.selling_price,
-    original_price: product.original_price,
+    original_price: product.original_price
+  }, productOptionString ? {
+    product_option_string: productOptionString
+  } : {}), {}, {
     _extend: extend,
     new: 0,
     autoClose: false,

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

@@ -13,6 +13,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _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; }
+import { buildProductOptionStringFromOrderLine } from "./orderLineDisplay";
 /**
  * 从已加车的普通商品 order line 反查 SkuDetailModal edit 所需的 cacheItem。
  *
@@ -86,6 +87,7 @@ export function buildNormalProductCacheItemFromOrderLine(input) {
   var option = Array.isArray(product.product_option_item) ? _toConsumableArray(product.product_option_item) : [];
   var bundle = mapOrderBundleToOtherBundle(Array.isArray(product.product_bundle) ? product.product_bundle : []);
   var originExtend = (_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 || (_product$metadata2 = _product$metadata2.origin) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2._extend;
+  var productOptionString = buildProductOptionStringFromOrderLine(product);
   var other = {
     product_id: resolvedId,
     product_variant_id: (_product$product_vari = product.product_variant_id) !== null && _product$product_vari !== void 0 ? _product$product_vari : 0,
@@ -99,7 +101,7 @@ export function buildNormalProductCacheItemFromOrderLine(input) {
     option: other.option,
     bundle: other.bundle
   };
-  var extend = _objectSpread(_objectSpread({
+  var extend = _objectSpread(_objectSpread(_objectSpread({
     quantity: (_product$num2 = product.num) !== null && _product$num2 !== void 0 ? _product$num2 : 1,
     product_name: (_title = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title) !== null && _title !== void 0 ? _title : '',
     note: (_product$note = product.note) !== null && _product$note !== void 0 ? _product$note : '',
@@ -111,7 +113,9 @@ export function buildNormalProductCacheItemFromOrderLine(input) {
     skuValue: JSON.parse(JSON.stringify(skuValue)),
     _skuValue: JSON.parse(JSON.stringify(skuValue)),
     isNormalProduct: true
-  }, (originExtend === null || originExtend === void 0 ? void 0 : originExtend.priceOverride) !== undefined ? {
+  }, productOptionString ? {
+    product_option_string: productOptionString
+  } : {}), (originExtend === null || originExtend === void 0 ? void 0 : originExtend.priceOverride) !== undefined ? {
     priceOverride: originExtend.priceOverride
   } : {}), (originExtend === null || originExtend === void 0 ? void 0 : originExtend.bundle_edit) !== undefined ? {
     bundle_edit: originExtend.bundle_edit
@@ -120,14 +124,17 @@ export function buildNormalProductCacheItemFromOrderLine(input) {
     extend.skuValue = JSON.parse(JSON.stringify(originExtend.skuValue || originExtend._skuValue));
     extend._skuValue = JSON.parse(JSON.stringify(extend.skuValue));
   }
-  return _objectSpread(_objectSpread({}, sourceProduct || {}), {}, {
+  return _objectSpread(_objectSpread(_objectSpread({}, sourceProduct || {}), {}, {
     id: resolvedId,
     product_id: resolvedId,
     _id: uid,
     title: sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title,
     price: (_price3 = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price) !== null && _price3 !== void 0 ? _price3 : sourcePrice,
     selling_price: product.selling_price,
-    original_price: product.original_price,
+    original_price: product.original_price
+  }, productOptionString ? {
+    product_option_string: productOptionString
+  } : {}), {}, {
     note: product.note,
     order_detail_id: (_product$order_detail = product.order_detail_id) !== null && _product$order_detail !== void 0 ? _product$order_detail : null,
     new: 0,

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

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

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

@@ -0,0 +1,36 @@
+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 _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 pickDisplayText(value) {
+  if (value === undefined || 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) {
+  var groupText = pickDisplayText(group);
+  var itemText = pickDisplayText(item);
+  if (groupText && itemText) return "".concat(groupText, ":").concat(itemText);
+  return groupText || itemText;
+}
+export function buildProductOptionStringFromOrderLine(product) {
+  var segments = [];
+  var sku = (product === null || product === void 0 ? void 0 : product.product_sku) || {};
+  if (Array.isArray(sku.variant)) {
+    var _iterator = _createForOfIteratorHelper(sku.variant),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var variant = _step.value;
+        var segment = formatNamePair(variant === null || variant === void 0 ? void 0 : variant.group, variant === null || variant === void 0 ? void 0 : variant.item);
+        if (segment) segments.push(segment);
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+  }
+  return segments.join(', ');
+}

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

@@ -312,7 +312,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/dist/modules/Order/index.js

@@ -1127,7 +1127,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       return mapPaymentItemsToOrderPayments(payments, {
         includeVoided: false
       }).reduce(function (sum, payment) {
-        var amount = new Decimal(payment.amount || 0);
+        var amount = new Decimal(payment.amount || 0).minus(new Decimal(payment.service_fee || 0));
         var rounding = new Decimal(payment.rounding_amount || 0);
         return sum.plus(amount.minus(rounding));
       }, new Decimal(0));
@@ -1156,12 +1156,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "updateTempOrderPaymentStatus",
     value: function updateTempOrderPaymentStatus(tempOrder) {
       var paymentTotal = this.calculatePaymentTotal(tempOrder.payments || []);
+      var targetAmount = this.getPaymentTargetAmount();
+      if (targetAmount.lte(0)) {
+        tempOrder.payment_status = 'paid';
+        return;
+      }
       if (paymentTotal.lte(0)) {
         tempOrder.payment_status = tempOrder.payment_status || 'payment_processing';
         return;
       }
-      var targetAmount = this.getPaymentTargetAmount();
-      tempOrder.payment_status = targetAmount.gt(0) && paymentTotal.gte(targetAmount) ? 'paid' : 'partially_paid';
+      tempOrder.payment_status = paymentTotal.gte(targetAmount) ? 'paid' : 'partially_paid';
     }
   }, {
     key: "calculatePaidPaymentSummary",
@@ -2225,8 +2229,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "updateOrderProduct",
     value: function () {
       var _updateOrderProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(params) {
-        var _targetProduct$metada2, _metadata, _metadata2, _metadata3, _nextProduct$metadata, _targetProduct$metada3, _tempOrder$products$p;
-        var product_id, product_variant_id, updates, unique_identification_number, identity_key, product_option_item, product_bundle, booking, tempOrder, identityLookup, productIndex, targetUid, targetProduct, nextProduct, callerUpdatesTopPrice, callerUpdatesMainMeta, existedMeta, normalizedProduct, preservedBookingUid, _normalizedProduct$me, _targetProduct$metada4, productUid, linked;
+        var _targetProduct$metada2, _metadata, _metadata2, _metadata3, _metadata4, _metadata5, _metadata6, _nextProduct$metadata, _targetProduct$metada7, _tempOrder$products$p;
+        var product_id, product_variant_id, updates, unique_identification_number, identity_key, product_option_item, product_bundle, booking, tempOrder, identityLookup, productIndex, targetUid, targetProduct, nextProduct, callerUpdatesTopPrice, callerUpdatesMainMeta, isPersistedOrderLine, callerUpdatesManualPrice, _targetProduct$metada3, _targetProduct$metada4, _targetProduct$metada5, _targetProduct$metada6, existedMeta, normalizedProduct, preservedBookingUid, _normalizedProduct$me, _targetProduct$metada8, productUid, linked;
         return _regeneratorRuntime().wrap(function _callee17$(_context19) {
           while (1) switch (_context19.prev = _context19.next) {
             case 0:
@@ -2281,7 +2285,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               // 如果 caller 走推荐路径（updates.metadata.* 显式指定主价），保留 metadata 由 normalize 认它。
               callerUpdatesTopPrice = Object.prototype.hasOwnProperty.call(updates || {}, 'selling_price') || Object.prototype.hasOwnProperty.call(updates || {}, 'original_price');
               callerUpdatesMainMeta = (updates === null || updates === void 0 || (_metadata = updates.metadata) === null || _metadata === void 0 ? void 0 : _metadata.main_product_selling_price) !== undefined || (updates === null || updates === void 0 || (_metadata2 = updates.metadata) === null || _metadata2 === void 0 ? void 0 : _metadata2.main_product_original_price) !== undefined || (updates === null || updates === void 0 || (_metadata3 = updates.metadata) === null || _metadata3 === void 0 ? void 0 : _metadata3.source_product_price) !== undefined;
-              if (callerUpdatesTopPrice && !callerUpdatesMainMeta) {
+              isPersistedOrderLine = targetProduct.order_detail_id !== undefined && targetProduct.order_detail_id !== null;
+              callerUpdatesManualPrice = (updates === null || updates === void 0 || (_metadata4 = updates.metadata) === null || _metadata4 === void 0 ? void 0 : _metadata4.price_override) !== undefined || (updates === null || updates === void 0 || (_metadata5 = updates.metadata) === null || _metadata5 === void 0 ? void 0 : _metadata5.is_manual_discount) !== undefined || (updates === null || updates === void 0 || (_metadata6 = updates.metadata) === null || _metadata6 === void 0 ? void 0 : _metadata6.product_discount_reason) !== undefined || Array.isArray(updates === null || updates === void 0 ? 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 = _objectSpread(_objectSpread({}, nextProduct.metadata || {}), {}, {
+                  source_product_price: (_targetProduct$metada3 = targetProduct.metadata) === null || _targetProduct$metada3 === void 0 ? void 0 : _targetProduct$metada3.source_product_price,
+                  main_product_selling_price: (_targetProduct$metada4 = targetProduct.metadata) === null || _targetProduct$metada4 === void 0 ? void 0 : _targetProduct$metada4.main_product_selling_price,
+                  main_product_original_price: (_targetProduct$metada5 = targetProduct.metadata) === null || _targetProduct$metada5 === void 0 ? void 0 : _targetProduct$metada5.main_product_original_price,
+                  price_schema_version: (_targetProduct$metada6 = targetProduct.metadata) === null || _targetProduct$metada6 === void 0 ? void 0 : _targetProduct$metada6.price_schema_version
+                });
+              } else if (callerUpdatesTopPrice && !callerUpdatesMainMeta) {
                 existedMeta = nextProduct.metadata || {};
                 nextProduct.metadata = _objectSpread({}, existedMeta);
                 delete nextProduct.metadata.source_product_price;
@@ -2293,7 +2309,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               // 否则 → 把顶层 selling_price 视作 source，派生 main_product_* 并写 price_schema_version: 2。
               normalizedProduct = mergeOrderProductDisplayFields(nextProduct, normalizeOrderProduct(nextProduct));
               normalizedProduct.discount_list = normalizeOrderProductDiscountList(normalizedProduct.discount_list);
-              preservedBookingUid = nextProduct.booking_uid || ((_nextProduct$metadata = nextProduct.metadata) === null || _nextProduct$metadata === void 0 ? void 0 : _nextProduct$metadata.booking_uid) || targetProduct.booking_uid || ((_targetProduct$metada3 = targetProduct.metadata) === null || _targetProduct$metada3 === void 0 ? void 0 : _targetProduct$metada3.booking_uid);
+              preservedBookingUid = nextProduct.booking_uid || ((_nextProduct$metadata = nextProduct.metadata) === null || _nextProduct$metadata === void 0 ? void 0 : _nextProduct$metadata.booking_uid) || targetProduct.booking_uid || ((_targetProduct$metada7 = targetProduct.metadata) === null || _targetProduct$metada7 === void 0 ? void 0 : _targetProduct$metada7.booking_uid);
               if (!booking && preservedBookingUid) {
                 normalizedProduct.booking_uid = preservedBookingUid;
                 normalizedProduct.metadata = _objectSpread(_objectSpread({}, normalizedProduct.metadata || {}), {}, {
@@ -2301,7 +2317,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 });
               }
               if (booking) {
-                productUid = String(((_normalizedProduct$me = normalizedProduct.metadata) === null || _normalizedProduct$me === void 0 ? void 0 : _normalizedProduct$me.unique_identification_number) || ((_targetProduct$metada4 = targetProduct.metadata) === null || _targetProduct$metada4 === void 0 ? void 0 : _targetProduct$metada4.unique_identification_number) || unique_identification_number || createUuidV4());
+                productUid = String(((_normalizedProduct$me = normalizedProduct.metadata) === null || _normalizedProduct$me === void 0 ? void 0 : _normalizedProduct$me.unique_identification_number) || ((_targetProduct$metada8 = targetProduct.metadata) === null || _targetProduct$metada8 === void 0 ? void 0 : _targetProduct$metada8.unique_identification_number) || unique_identification_number || createUuidV4());
                 normalizedProduct.metadata = _objectSpread(_objectSpread({}, normalizedProduct.metadata || {}), {}, {
                   unique_identification_number: productUid
                 });
@@ -2323,18 +2339,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               tempOrder.products[productIndex] = normalizedProduct;
               this.captureProductRuntime(tempOrder, updates, tempOrder.products[productIndex], (_tempOrder$products$p = tempOrder.products[productIndex].metadata) === null || _tempOrder$products$p === void 0 ? void 0 : _tempOrder$products$p.unique_identification_number);
-              _context19.next = 27;
+              _context19.next = 29;
               return this.applyPromotion();
-            case 27:
+            case 29:
               this.applyDiscount();
-              _context19.next = 30;
+              _context19.next = 32;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 30:
+            case 32:
               this.persistTempOrder();
               return _context19.abrupt("return", tempOrder.products);
-            case 32:
+            case 34:
             case "end":
               return _context19.stop();
           }
@@ -2349,7 +2365,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "updateOrderProductQuantity",
     value: function () {
       var _updateOrderProductQuantity = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(params) {
-        var _targetProduct$metada5;
+        var _targetProduct$metada9;
         var product_id, product_variant_id, num, unique_identification_number, identity_key, product_option_item, product_bundle, tempOrder, identityLookup, productIndex, targetUid, targetProduct, normalizedProduct;
         return _regeneratorRuntime().wrap(function _callee18$(_context20) {
           while (1) switch (_context20.prev = _context20.next) {
@@ -2390,7 +2406,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               normalizedProduct = normalizeOrderProduct(_objectSpread(_objectSpread({}, targetProduct), {}, {
                 num: getSafeProductNum(num),
                 metadata: _objectSpread(_objectSpread({}, targetProduct.metadata || {}), {}, {
-                  unique_identification_number: ((_targetProduct$metada5 = targetProduct.metadata) === null || _targetProduct$metada5 === void 0 ? void 0 : _targetProduct$metada5.unique_identification_number) || unique_identification_number
+                  unique_identification_number: ((_targetProduct$metada9 = targetProduct.metadata) === null || _targetProduct$metada9 === void 0 ? void 0 : _targetProduct$metada9.unique_identification_number) || unique_identification_number
                 })
               }));
               normalizedProduct.discount_list = normalizeOrderProductDiscountList(normalizedProduct.discount_list);
@@ -2715,7 +2731,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               mappedPayments = mapPaymentItemsToOrderPayments(params.payments || []);
               paymentTotal = this.calculatePaymentTotal(mappedPayments);
               targetAmount = this.getPaymentTargetAmount();
-              isFullyPaid = targetAmount.lte(0) ? false : paymentTotal.gte(targetAmount);
+              isFullyPaid = targetAmount.lte(0) ? true : paymentTotal.gte(targetAmount);
               paymentStatus = isFullyPaid ? params.paymentStatus || 'paid' : 'partially_paid';
               tempOrder.payments = mappedPayments;
               tempOrder.payment_status = paymentStatus;
@@ -3324,8 +3340,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           var existed = productsByUid[uid] && _typeof(productsByUid[uid]) === 'object' ? productsByUid[uid] : {};
           var rawProduct = rawProducts[index] && _typeof(rawProducts[index]) === 'object' ? rawProducts[index] : product;
           var origin = (_ref23 = (_ref24 = (_existed$origin = existed.origin) !== null && _existed$origin !== void 0 ? _existed$origin : rawProduct._origin) !== null && _ref24 !== void 0 ? _ref24 : (_rawProduct$metadata = rawProduct.metadata) === null || _rawProduct$metadata === void 0 ? void 0 : _rawProduct$metadata.origin) !== null && _ref23 !== void 0 ? _ref23 : rawProduct;
+          var originSnapshot = cloneDeep(origin);
+          var productOptionString = this.buildHydratedProductOptionString(rawProduct) || this.buildHydratedProductOptionString(product);
+          if (productOptionString && originSnapshot && _typeof(originSnapshot) === 'object') {
+            if (originSnapshot.product_option_string === undefined) {
+              originSnapshot.product_option_string = productOptionString;
+            }
+            if (originSnapshot.product_options_stirng === undefined) {
+              originSnapshot.product_options_stirng = productOptionString;
+            }
+          }
           productsByUid[uid] = _objectSpread(_objectSpread({}, existed), {}, {
-            origin: cloneDeep(origin)
+            origin: originSnapshot
           });
         }
       } catch (err) {
@@ -3340,6 +3366,44 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       nextTempOrder.vouchers = raw.vouchers || [];
       return nextTempOrder;
     }
+  }, {
+    key: "pickHydratedDisplayText",
+    value: function pickHydratedDisplayText(value) {
+      if (value === undefined || 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'] || '';
+    }
+  }, {
+    key: "formatHydratedNamePair",
+    value: function formatHydratedNamePair(group, item) {
+      var groupText = this.pickHydratedDisplayText(group);
+      var itemText = this.pickHydratedDisplayText(item);
+      if (groupText && itemText) return "".concat(groupText, ":").concat(itemText);
+      return groupText || itemText;
+    }
+  }, {
+    key: "buildHydratedProductOptionString",
+    value: function buildHydratedProductOptionString(product) {
+      var segments = [];
+      var sku = (product === null || product === void 0 ? void 0 : product.product_sku) || {};
+      if (Array.isArray(sku.variant)) {
+        var _iterator9 = _createForOfIteratorHelper(sku.variant),
+          _step9;
+        try {
+          for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+            var variant = _step9.value;
+            var segment = this.formatHydratedNamePair(variant === null || variant === void 0 ? void 0 : variant.group, variant === null || variant === void 0 ? void 0 : variant.item);
+            if (segment) segments.push(segment);
+          }
+        } catch (err) {
+          _iterator9.e(err);
+        } finally {
+          _iterator9.f();
+        }
+      }
+      return segments.join(', ');
+    }
   }, {
     key: "normalizeHydratedProductOptionItem",
     value: function normalizeHydratedProductOptionItem(optionItem) {
@@ -3348,22 +3412,58 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var parsedNum = Number(rawNum);
       var rawPrice = (_ref26 = (_optionItem$price = optionItem === null || optionItem === void 0 ? void 0 : optionItem.price) !== null && _optionItem$price !== void 0 ? _optionItem$price : optionItem === null || optionItem === void 0 ? void 0 : optionItem.add_price) !== null && _ref26 !== void 0 ? _ref26 : 0;
       var parsedPrice = Number(rawPrice);
-      return {
+      var normalized = {
         option_group_item_id: optionItem === null || optionItem === void 0 ? void 0 : optionItem.option_group_item_id,
         option_group_id: optionItem === null || optionItem === void 0 ? void 0 : optionItem.option_group_id,
         num: Number.isFinite(parsedNum) && parsedNum > 0 ? parsedNum : 1,
         price: Number.isFinite(parsedPrice) ? parsedPrice : 0
       };
+      if ((optionItem === null || optionItem === void 0 ? void 0 : optionItem.name) !== undefined) normalized.name = optionItem.name;
+      if ((optionItem === null || optionItem === void 0 ? void 0 : optionItem.group_name) !== undefined) normalized.group_name = optionItem.group_name;
+      if ((optionItem === null || optionItem === void 0 ? void 0 : optionItem.id) !== undefined) normalized.id = optionItem.id;
+      return normalized;
+    }
+  }, {
+    key: "mergeHydratedProductOptionDisplayFields",
+    value: function mergeHydratedProductOptionDisplayFields(options, skuOptions) {
+      if (!Array.isArray(skuOptions) || skuOptions.length === 0) return options;
+      var displayByItemId = new Map();
+      var _iterator10 = _createForOfIteratorHelper(skuOptions),
+        _step10;
+      try {
+        for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+          var option = _step10.value;
+          var key = option === null || option === void 0 ? void 0 : option.option_group_item_id;
+          if (key === undefined || key === null || key === '') continue;
+          displayByItemId.set(String(key), option);
+        }
+      } catch (err) {
+        _iterator10.e(err);
+      } finally {
+        _iterator10.f();
+      }
+      return options.map(function (option) {
+        var _option$option_group_;
+        var display = displayByItemId.get(String((_option$option_group_ = option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _option$option_group_ !== void 0 ? _option$option_group_ : ''));
+        if (!display) return option;
+        return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, option), option.name === undefined && display.name !== undefined ? {
+          name: display.name
+        } : {}), option.group_name === undefined && display.group_name !== undefined ? {
+          group_name: display.group_name
+        } : {}), option.id === undefined && display.id !== undefined ? {
+          id: display.id
+        } : {});
+      });
     }
   }, {
     key: "resolveHydratedProductOptions",
     value: function resolveHydratedProductOptions(row) {
       var _row$product_sku,
         _this11 = this;
+      var skuOptions = (_row$product_sku = row.product_sku) === null || _row$product_sku === void 0 ? void 0 : _row$product_sku.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);
       }
-      var skuOptions = (_row$product_sku = row.product_sku) === null || _row$product_sku === void 0 ? void 0 : _row$product_sku.option;
       if (!Array.isArray(skuOptions)) return [];
       return skuOptions.map(function (optionItem) {
         return _this11.normalizeHydratedProductOptionItem(optionItem || {});
@@ -3444,67 +3544,67 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         var amount = new Decimal(discount.amount || 0).times(qty).plus(((_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.product_discount_difference) || 0);
         savedMap.set(discountKey, (savedMap.get(discountKey) || new Decimal(0)).plus(amount));
       };
-      var _iterator9 = _createForOfIteratorHelper(productList),
-        _step9;
+      var _iterator11 = _createForOfIteratorHelper(productList),
+        _step11;
       try {
-        for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-          var product = _step9.value;
+        for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+          var product = _step11.value;
           var qty = product.num || 1;
-          var _iterator11 = _createForOfIteratorHelper(product.discount_list || []),
-            _step11;
+          var _iterator13 = _createForOfIteratorHelper(product.discount_list || []),
+            _step13;
           try {
-            for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
-              var pd = _step11.value;
+            for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
+              var pd = _step13.value;
               addDiscountAmount(pd, qty);
             }
           } catch (err) {
-            _iterator11.e(err);
+            _iterator13.e(err);
           } finally {
-            _iterator11.f();
+            _iterator13.f();
           }
-          var _iterator12 = _createForOfIteratorHelper(product.product_bundle || []),
-            _step12;
+          var _iterator14 = _createForOfIteratorHelper(product.product_bundle || []),
+            _step14;
           try {
-            for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
+            for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
               var _ref27, _bundle$num;
-              var bundle = _step12.value;
+              var bundle = _step14.value;
               var bundleQty = new Decimal(Number(qty) || 1).times(Number((_ref27 = (_bundle$num = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle === null || bundle === void 0 ? void 0 : bundle.quantity) !== null && _ref27 !== void 0 ? _ref27 : 1) || 1).toNumber();
-              var _iterator13 = _createForOfIteratorHelper((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []),
-                _step13;
+              var _iterator15 = _createForOfIteratorHelper((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []),
+                _step15;
               try {
-                for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
-                  var _pd = _step13.value;
+                for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
+                  var _pd = _step15.value;
                   addDiscountAmount(_pd, bundleQty);
                 }
               } catch (err) {
-                _iterator13.e(err);
+                _iterator15.e(err);
               } finally {
-                _iterator13.f();
+                _iterator15.f();
               }
             }
           } catch (err) {
-            _iterator12.e(err);
+            _iterator14.e(err);
           } finally {
-            _iterator12.f();
+            _iterator14.f();
           }
         }
       } catch (err) {
-        _iterator9.e(err);
+        _iterator11.e(err);
       } finally {
-        _iterator9.f();
+        _iterator11.f();
       }
-      var _iterator10 = _createForOfIteratorHelper(discountList),
-        _step10;
+      var _iterator12 = _createForOfIteratorHelper(discountList),
+        _step12;
       try {
-        for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-          var d = _step10.value;
+        for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
+          var d = _step12.value;
           var key = d.id;
           d.savedAmount = d.isSelected && key != null && savedMap.has(key) ? savedMap.get(key).toNumber() : 0;
         }
       } catch (err) {
-        _iterator10.e(err);
+        _iterator12.e(err);
       } finally {
-        _iterator10.f();
+        _iterator12.f();
       }
     }
   }]);