@pisell/pisellos 2.2.222 → 2.2.224

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

@@ -164,7 +164,7 @@ function buildBaseData(params) {
 function buildProducts(order, locale, productMap) {
   var products = Array.isArray(order.products) ? order.products : [];
   return products.map(function (product) {
-    var _ref, _ref2, _product$product_quan, _ref3, _ref4, _ref5, _product$original_pri, _ref6, _ref7, _product$selling_pric;
+    var _ref, _ref2, _product$product_quan, _ref3, _ref4, _ref5, _product$original_pri, _ref6, _ref7, _product$selling_pric, _product$product_id;
     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;
@@ -173,17 +173,20 @@ function buildProducts(order, locale, productMap) {
       productMap: productMap,
       locale: locale
     });
+    var parentProduct = resolveProductFromMap((_product$product_id = product.product_id) !== null && _product$product_id !== void 0 ? _product$product_id : product.id, productMap);
     var currencySymbol = getCurrencySymbol(order, null);
     var options = normalizeProductOptions({
       product: product,
       locale: locale,
-      currencySymbol: currencySymbol
+      currencySymbol: currencySymbol,
+      parentProduct: parentProduct
     });
     var combinations = normalizeProductCombinations({
       product: product,
       productMap: productMap,
       locale: locale,
-      currencySymbol: currencySymbol
+      currencySymbol: currencySymbol,
+      parentProduct: parentProduct
     });
     return _objectSpread(_objectSpread(_objectSpread({
       product_title: productTitle,
@@ -204,29 +207,36 @@ function buildProducts(order, locale, productMap) {
   });
 }
 function resolveProductTitle(params) {
-  var _product$product, _product$product_id, _fallbackProduct$prod;
+  var _product$product_id2;
   var product = params.product,
     productMap = params.productMap,
     locale = params.locale;
-  var ownTitle = getLocalizedValue(product.product_title || product.title || product.name || ((_product$product = product.product) === null || _product$product === void 0 ? void 0 : _product$product.title), locale);
-  if (ownTitle) return ownTitle;
-  var productId = (_product$product_id = product.product_id) !== null && _product$product_id !== void 0 ? _product$product_id : product.id;
-  var fallbackProduct = productId !== undefined && productId !== null ? productMap[productId] || productMap[String(productId)] : null;
-  if (!fallbackProduct) return '';
-  return getLocalizedValue(fallbackProduct.product_title || fallbackProduct.title || fallbackProduct.name || fallbackProduct.format_title || ((_fallbackProduct$prod = fallbackProduct.product) === null || _fallbackProduct$prod === void 0 ? void 0 : _fallbackProduct$prod.title), locale);
+  var ownTitle = getProductTitleSource(product, locale);
+  // if (ownTitle) return ownTitle;
+
+  var productId = (_product$product_id2 = product.product_id) !== null && _product$product_id2 !== void 0 ? _product$product_id2 : product.id;
+  var fallbackProduct = resolveProductFromMap(productId, productMap);
+  if (!fallbackProduct) return ownTitle || '';
+  return getProductTitleSource(fallbackProduct, locale);
 }
 function normalizeProductOptions(params) {
   var _product$product_sku;
   var product = params.product,
     locale = params.locale,
-    currencySymbol = params.currencySymbol;
+    currencySymbol = params.currencySymbol,
+    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 _ref8, _option$original_pric, _ref9, _option$value, _option$num;
     var price = (_ref8 = (_option$original_pric = option.original_price) !== null && _option$original_pric !== void 0 ? _option$original_pric : option.add_price) !== null && _ref8 !== void 0 ? _ref8 : option.price;
     var value = (_ref9 = (_option$value = option.value) !== null && _option$value !== void 0 ? _option$value : option.option) !== null && _ref9 !== void 0 ? _ref9 : option.item;
+    var name = getProductTitleSource(option, locale) || resolveOptionTitleFromParentProduct({
+      option: option,
+      parentProduct: parentProduct,
+      locale: locale
+    });
     return _objectSpread(_objectSpread(_objectSpread({
-      name: getLocalizedValue(option.name || option.title, locale)
+      name: name
     }, option.num !== undefined || option.quantity !== undefined ? {
       num: toNumber((_option$num = option.num) !== null && _option$num !== void 0 ? _option$num : option.quantity, 1)
     } : {}), price !== undefined && price !== null && price !== '' ? {
@@ -240,7 +250,8 @@ function normalizeProductCombinations(params) {
   var product = params.product,
     productMap = params.productMap,
     locale = params.locale,
-    currencySymbol = params.currencySymbol;
+    currencySymbol = params.currencySymbol,
+    parentProduct = params.parentProduct;
   var bundles = Array.isArray(product.product_bundle) ? product.product_bundle : [];
   return bundles.map(function (bundle) {
     var _ref10, _bundle$num;
@@ -248,12 +259,14 @@ function normalizeProductCombinations(params) {
       product: {},
       locale: locale,
       currencySymbol: currencySymbol,
-      options: Array.isArray(bundle.option) ? bundle.option : []
+      options: Array.isArray(bundle.option) ? bundle.option : [],
+      parentProduct: parentProduct
     });
     var baseTitle = resolveBundleProductTitle({
       bundle: bundle,
       productMap: productMap,
-      locale: locale
+      locale: locale,
+      parentProduct: parentProduct
     });
     var optionTitle = buildOptionTitleSuffix(combinationsOptions);
     return {
@@ -265,16 +278,135 @@ function normalizeProductCombinations(params) {
   });
 }
 function resolveBundleProductTitle(params) {
-  var _bundle$product, _ref11, _ref12, _bundle$bundle_produc, _fallbackProduct$prod2;
+  var _ref11, _ref12, _bundle$bundle_produc;
   var bundle = params.bundle,
     productMap = params.productMap,
-    locale = params.locale;
-  var ownTitle = getLocalizedValue(bundle.product_title || bundle.title || bundle.name || ((_bundle$product = bundle.product) === null || _bundle$product === void 0 ? void 0 : _bundle$product.title), locale);
+    locale = params.locale,
+    parentProduct = params.parentProduct;
+  var ownTitle = getProductTitleSource(bundle, locale);
   if (ownTitle) return ownTitle;
+  var parentBundleItem = resolveBundleItemFromParentProduct({
+    bundle: bundle,
+    parentProduct: parentProduct
+  });
+  var parentBundleTitle = parentBundleItem ? getProductTitleSource(parentBundleItem, locale) : '';
+  if (parentBundleTitle) return parentBundleTitle;
   var productId = (_ref11 = (_ref12 = (_bundle$bundle_produc = bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle._bundle_product_id) !== null && _ref12 !== void 0 ? _ref12 : bundle.product_id) !== null && _ref11 !== void 0 ? _ref11 : bundle.id;
-  var fallbackProduct = productId !== undefined && productId !== null ? productMap[productId] || productMap[String(productId)] : null;
+  var fallbackProduct = resolveProductFromMap(productId, productMap);
   if (!fallbackProduct) return '';
-  return getLocalizedValue(fallbackProduct.product_title || fallbackProduct.title || fallbackProduct.name || fallbackProduct.format_title || ((_fallbackProduct$prod2 = fallbackProduct.product) === null || _fallbackProduct$prod2 === void 0 ? void 0 : _fallbackProduct$prod2.title), locale);
+  return getProductTitleSource(fallbackProduct, locale);
+}
+function resolveProductFromMap(productId, productMap) {
+  if (productId === undefined || productId === null || productId === '') return null;
+  return productMap[productId] || productMap[String(productId)] || null;
+}
+function getProductTitleSource(source, locale) {
+  if (!source || _typeof(source) !== 'object') return '';
+  return resolveTitleValue(source.product_title, locale) || resolveTitleValue(source.title, locale) || resolveTitleValue(source.name, locale);
+}
+function resolveTitleValue(value, locale) {
+  var _ref13, _ref14, _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((_ref13 = (_ref14 = (_value$locale = value[locale]) !== null && _value$locale !== void 0 ? _value$locale : value[dashedLocale]) !== null && _ref14 !== void 0 ? _ref14 : value[underscoredLocale]) !== null && _ref13 !== void 0 ? _ref13 : '');
+}
+function resolveOptionTitleFromParentProduct(params) {
+  var option = params.option,
+    parentProduct = params.parentProduct,
+    locale = params.locale;
+  if (!parentProduct) return '';
+  var optionItems = flattenOptionItems(parentProduct);
+  var matchedOption = optionItems.find(function (item) {
+    return isOptionItemMatch(option, item);
+  });
+  return getProductTitleSource(matchedOption, locale);
+}
+function flattenOptionItems(parentProduct) {
+  var optionGroups = Array.isArray(parentProduct.option_group) ? parentProduct.option_group : [];
+  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 _ref15, _item$option_group_id;
+      return _objectSpread(_objectSpread({}, item), {}, {
+        option_group_id: (_ref15 = (_item$option_group_id = item.option_group_id) !== null && _item$option_group_id !== void 0 ? _item$option_group_id : group.id) !== null && _ref15 !== void 0 ? _ref15 : group.option_group_id
+      });
+    });
+  });
+}
+function isOptionItemMatch(option, item) {
+  var _ref16, _option$option_group_, _ref17, _item$option_group_it, _option$option_group_2, _item$option_group_id2;
+  var optionItemId = (_ref16 = (_option$option_group_ = option.option_group_item_id) !== null && _option$option_group_ !== void 0 ? _option$option_group_ : option.product_option_item_id) !== null && _ref16 !== void 0 ? _ref16 : option.id;
+  var itemId = (_ref17 = (_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 && _ref17 !== void 0 ? _ref17 : 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;
+  if (isPresentId(optionGroupId) && isPresentId(itemGroupId)) {
+    return isSameId(optionGroupId, itemGroupId);
+  }
+  return true;
+}
+function resolveBundleItemFromParentProduct(params) {
+  var _ref18, _bundle$bundle_varian, _bundle$bundle_id, _bundle$bundle_group_, _ref20, _bundle$bundle_produc2;
+  var bundle = params.bundle,
+    parentProduct = params.parentProduct;
+  if (!parentProduct) return null;
+  var bundleItems = flattenBundleItems(parentProduct);
+  var bundleVariantId = (_ref18 = (_bundle$bundle_varian = bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle.variant_id) !== null && _ref18 !== void 0 ? _ref18 : bundle.product_variant_id;
+  if (isNonZeroId(bundleVariantId)) {
+    var matchedByVariant = bundleItems.find(function (item) {
+      var _ref19, _item$bundle_variant_;
+      return isSameId((_ref19 = (_item$bundle_variant_ = item.bundle_variant_id) !== null && _item$bundle_variant_ !== void 0 ? _item$bundle_variant_ : item.variant_id) !== null && _ref19 !== void 0 ? _ref19 : item.product_variant_id, bundleVariantId);
+    });
+    if (matchedByVariant) return matchedByVariant;
+  }
+  var bundleId = (_bundle$bundle_id = bundle.bundle_id) !== null && _bundle$bundle_id !== void 0 ? _bundle$bundle_id : bundle.id;
+  if (isPresentId(bundleId)) {
+    var matchedByBundleId = bundleItems.find(function (item) {
+      var _item$id;
+      return isSameId((_item$id = item.id) !== null && _item$id !== void 0 ? _item$id : item.bundle_id, bundleId);
+    });
+    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 = (_ref20 = (_bundle$bundle_produc2 = bundle.bundle_product_id) !== null && _bundle$bundle_produc2 !== void 0 ? _bundle$bundle_produc2 : bundle._bundle_product_id) !== null && _ref20 !== void 0 ? _ref20 : bundle.product_id;
+  if (isPresentId(bundleGroupId) && isPresentId(bundleProductId)) {
+    var matchedByGroupAndProduct = bundleItems.find(function (item) {
+      var _item$group_id, _ref21, _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((_ref21 = (_item$bundle_product_ = item.bundle_product_id) !== null && _item$bundle_product_ !== void 0 ? _item$bundle_product_ : item._bundle_product_id) !== null && _ref21 !== void 0 ? _ref21 : item.product_id, bundleProductId);
+    });
+    if (matchedByGroupAndProduct) return matchedByGroupAndProduct;
+  }
+  if (isPresentId(bundleProductId)) {
+    return bundleItems.find(function (item) {
+      var _ref22, _item$bundle_product_2;
+      return isSameId((_ref22 = (_item$bundle_product_2 = item.bundle_product_id) !== null && _item$bundle_product_2 !== void 0 ? _item$bundle_product_2 : item._bundle_product_id) !== null && _ref22 !== void 0 ? _ref22 : item.product_id, bundleProductId);
+    }) || null;
+  }
+  return null;
+}
+function flattenBundleItems(parentProduct) {
+  var bundleGroups = Array.isArray(parentProduct.bundle_group) ? parentProduct.bundle_group : [];
+  return bundleGroups.flatMap(function (group) {
+    var items = Array.isArray(group.bundle_item) ? group.bundle_item : [];
+    return items.map(function (item) {
+      var _ref23, _item$group_id2;
+      return _objectSpread(_objectSpread({}, item), {}, {
+        group_id: (_ref23 = (_item$group_id2 = item.group_id) !== null && _item$group_id2 !== void 0 ? _item$group_id2 : group.id) !== null && _ref23 !== void 0 ? _ref23 : group.group_id
+      });
+    });
+  });
+}
+function isNonZeroId(value) {
+  return isPresentId(value) && String(value) !== '0';
+}
+function isPresentId(value) {
+  return value !== undefined && value !== null && value !== '';
+}
+function isSameId(left, right) {
+  if (!isPresentId(left) || !isPresentId(right)) return false;
+  return String(left) === String(right);
 }
 function buildOptionTitleSuffix(options) {
   var text = options.map(function (option) {
@@ -287,8 +419,8 @@ function buildOptionTitleSuffix(options) {
   return text ? "(".concat(text, ")") : '';
 }
 function formatBundlePrice(bundle, currencySymbol) {
-  var _ref13, _ref14, _bundle$bundle_sellin;
-  var value = (_ref13 = (_ref14 = (_bundle$bundle_sellin = bundle.bundle_selling_price) !== null && _bundle$bundle_sellin !== void 0 ? _bundle$bundle_sellin : bundle.bundle_sum_price) !== null && _ref14 !== void 0 ? _ref14 : bundle.price) !== null && _ref13 !== void 0 ? _ref13 : 0;
+  var _ref24, _ref25, _bundle$bundle_sellin;
+  var value = (_ref24 = (_ref25 = (_bundle$bundle_sellin = bundle.bundle_selling_price) !== null && _bundle$bundle_sellin !== void 0 ? _bundle$bundle_sellin : bundle.bundle_sum_price) !== null && _ref25 !== void 0 ? _ref25 : bundle.price) !== null && _ref24 !== void 0 ? _ref24 : 0;
   var amount = new Decimal(toMoneyNumber(value));
   var isNegative = bundle.price_type === 'markdown' || bundle.price_type === 'markup' && bundle.price_type_ext === 'product_price';
   if (isNegative) return "-".concat(currencySymbol).concat(amount.abs().toFixed(2));
@@ -303,9 +435,9 @@ function buildFees(params) {
     currencySymbol = params.currencySymbol;
   var fees = [];
   for (var _i = 0, _normalizeArray = normalizeArray(order.surcharges || summary.surcharges); _i < _normalizeArray.length; _i++) {
-    var _ref15, _surcharge$amount;
+    var _ref26, _surcharge$amount;
     var surcharge = _normalizeArray[_i];
-    var value = (_ref15 = (_surcharge$amount = surcharge.amount) !== null && _surcharge$amount !== void 0 ? _surcharge$amount : surcharge.value) !== null && _ref15 !== void 0 ? _ref15 : surcharge.total_amount;
+    var value = (_ref26 = (_surcharge$amount = surcharge.amount) !== null && _surcharge$amount !== void 0 ? _surcharge$amount : surcharge.value) !== null && _ref26 !== void 0 ? _ref26 : surcharge.total_amount;
     if (!isNonZero(value)) continue;
     fees.push({
       item: getLocalizedValue(surcharge.name || surcharge.title || surcharge.item, locale),
@@ -440,8 +572,8 @@ function buildPaymentData(params) {
         currencySymbol: params.currencySymbol
       })));
     } else {
-      var _ref16, _payment$remaining_am, _payment$metadata;
-      var remainingAmount = (_ref16 = (_payment$remaining_am = payment.remaining_amount) !== null && _payment$remaining_am !== void 0 ? _payment$remaining_am : payment.balance) !== null && _ref16 !== void 0 ? _ref16 : (_payment$metadata = payment.metadata) === null || _payment$metadata === void 0 ? void 0 : _payment$metadata.remaining_amount;
+      var _ref27, _payment$remaining_am, _payment$metadata;
+      var remainingAmount = (_ref27 = (_payment$remaining_am = payment.remaining_amount) !== null && _payment$remaining_am !== void 0 ? _payment$remaining_am : payment.balance) !== null && _ref27 !== void 0 ? _ref27 : (_payment$metadata = payment.metadata) === null || _payment$metadata === void 0 ? void 0 : _payment$metadata.remaining_amount;
       if (remainingAmount !== undefined && remainingAmount !== null) {
         items.push({
           item: label(params.locale, 'remainingAmount'),
@@ -549,13 +681,11 @@ 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 _ref17, _ref18, _ref19, _ref20, _ref21, _ref22, _value$locale;
+  var _ref28, _ref29, _ref30, _value$locale2;
   if (value === undefined || value === null) return '';
   if (_typeof(value) !== 'object') return stringify(value);
   var dashedLocale = locale.replace('_', '-');
-  return stringify((_ref17 = (_ref18 = (_ref19 = (_ref20 = (_ref21 = (_ref22 = (_value$locale = value[locale]) !== null && _value$locale !== void 0 ? _value$locale : value[dashedLocale]) !== null && _ref22 !== void 0 ? _ref22 : value.default) !== null && _ref21 !== void 0 ? _ref21 : value.en) !== null && _ref20 !== void 0 ? _ref20 : value.zh_CN) !== null && _ref19 !== void 0 ? _ref19 : value['zh-CN']) !== null && _ref18 !== void 0 ? _ref18 : Object.values(value).find(function (item) {
-    return typeof item === 'string' || typeof item === 'number';
-  })) !== null && _ref17 !== void 0 ? _ref17 : '');
+  return stringify((_ref28 = (_ref29 = (_ref30 = (_value$locale2 = value[locale]) !== null && _value$locale2 !== void 0 ? _value$locale2 : value[dashedLocale]) !== null && _ref30 !== void 0 ? _ref30 : value.default) !== null && _ref29 !== void 0 ? _ref29 : value.en) !== null && _ref28 !== void 0 ? _ref28 : '');
 }
 function serviceTypeToLabelKey(serviceType) {
   var normalized = serviceType.toLowerCase();

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

@@ -83,6 +83,23 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      */
     protected createSubModule(moduleName: string): Module | null;
     protected getSubModuleHooks(moduleName: string): any;
+    /**
+     * 构造传给 BaseSales 子模块的完整运行态参数，保证初始化和后续同步语义一致。
+     *
+     * @example
+     * const params = this.buildSubModuleOtherParams();
+     * this.core.registerModule(orderModule, { otherParams: params });
+     */
+    protected buildSubModuleOtherParams(): Record<string, any>;
+    /**
+     * 将父级 otherParams 的变更显式同步给已注册的子模块。
+     *
+     * @example
+     * await this.syncOtherParamsToSubModules({ channel: 'pos' });
+     */
+    protected syncOtherParamsToSubModules(changedParams: Record<string, any>, { cover }?: {
+        cover?: boolean;
+    }): Promise<void>;
     /**
      * 读取 sessionStorage[this.name][cacheId]，作为子模块 initialState 的来源。
      * sessionStorage 损坏时静默忽略，按空状态注册。