@pisell/pisellos 2.2.187 → 2.2.189

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

@@ -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;