@pisell/pisellos 0.10.34 → 0.10.36

package/dist/modules/Order/index.js

@@ -107,13 +107,6 @@ function getVoucherPaymentLifecycleKey(payment) {
   if (!isVoucherPaymentRecord(payment)) return null;
   return "".concat(String(payment.voucher_id), "::").concat(String(payment.status || ''));
 }
-function hasPersistedOrderId(orderId) {
-  if (orderId === undefined || orderId === null || orderId === '') return false;
-  if (typeof orderId === 'string' && orderId.startsWith('LOCAL_')) return false;
-  var normalizedOrderId = Number(orderId);
-  if (Number.isFinite(normalizedOrderId)) return normalizedOrderId > 0;
-  return String(orderId).trim() !== '';
-}
 export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(OrderModule, _BaseModule);
   var _super = _createSuper(OrderModule);
@@ -593,7 +586,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.store.virtualCurrencyList = (prepareConfigResult === null || prepareConfigResult === void 0 ? void 0 : prepareConfigResult.virtualCurrencyList) || [];
               if (prepareConfigResult) {
                 this.writePointCardSnapshotFromPrepareConfig({
-                  orderId: orderId,
                   customerId: params.customerId,
                   availableWalletPassList: prepareConfigResult.availableWalletPassList || []
                 });
@@ -1467,12 +1459,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "writePointCardSnapshotFromPrepareConfig",
     value: function writePointCardSnapshotFromPrepareConfig(params) {
-      var _tempOrder$customer_i, _params$orderId;
+      var _tempOrder$customer_i;
       var tempOrder = this.store.tempOrder;
       if (!tempOrder) return;
       if (String((_tempOrder$customer_i = tempOrder.customer_id) !== null && _tempOrder$customer_i !== void 0 ? _tempOrder$customer_i : '') !== String(params.customerId)) return;
-      var effectiveOrderId = (_params$orderId = params.orderId) !== null && _params$orderId !== void 0 ? _params$orderId : tempOrder.order_id;
-      if (hasPersistedOrderId(effectiveOrderId)) return;
       tempOrder.order_meta_list = _objectSpread(_objectSpread({}, normalizeOrderMetaList(tempOrder.order_meta_list) || {}), {}, {
         point_cards_snapshot: buildPointCardSnapshotFromWalletPassList(params.availableWalletPassList)
       });
@@ -3507,7 +3497,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         email: tempOrder.email
       });
       var nextCustomerId = (_tempOrder$customer_i4 = tempOrder.customer_id) !== null && _tempOrder$customer_i4 !== void 0 ? _tempOrder$customer_i4 : null;
-      if (String(previousCustomerId !== null && previousCustomerId !== void 0 ? previousCustomerId : '') !== String(nextCustomerId !== null && nextCustomerId !== void 0 ? nextCustomerId : '') && !hasPersistedOrderId(tempOrder.order_id)) {
+      if (String(previousCustomerId !== null && previousCustomerId !== void 0 ? previousCustomerId : '') !== String(nextCustomerId !== null && nextCustomerId !== void 0 ? nextCustomerId : '')) {
         this.store.availableWalletIds = [];
         this.clearTempOrderPointCardSnapshot(tempOrder);
       }
@@ -3550,9 +3540,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (String(previousCustomerId !== null && previousCustomerId !== void 0 ? previousCustomerId : '') !== String(nextCustomerId !== null && nextCustomerId !== void 0 ? nextCustomerId : '')) {
         this.store.availableWalletIds = [];
         this.store.virtualCurrencyList = [];
-        if (!hasPersistedOrderId(tempOrder.order_id)) {
-          this.clearTempOrderPointCardSnapshot(tempOrder);
-        }
+        this.clearTempOrderPointCardSnapshot(tempOrder);
         clearTempOrderHolderAssignments(tempOrder);
         this.clearCustomerBoundDiscounts(tempOrder);
         this.applyDiscount();
@@ -3599,9 +3587,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (tempOrder._extend) delete tempOrder._extend.customerSnapshot;
       this.store.availableWalletIds = [];
       this.store.virtualCurrencyList = [];
-      if (!hasPersistedOrderId(tempOrder.order_id)) {
-        this.clearTempOrderPointCardSnapshot(tempOrder);
-      }
+      this.clearTempOrderPointCardSnapshot(tempOrder);
       this.clearCustomerBoundDiscounts(tempOrder);
       this.applyDiscount();
       this.persistTempOrder();

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

@@ -35,7 +35,7 @@ export interface SmallTicketProduct {
     selling_price: string;
     total_selling_price: string;
     original_price: string;
-    base_price: string;
+    base_price?: string;
     total_original_price: string;
     options_total_price?: string;
     package_items_total_price?: string;

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

@@ -327,13 +327,16 @@ function buildProducts(order, locale, productMap) {
     var productNote = resolveProductNote(product, locale);
     var basePrice = resolveProductBasePrice(product);
     var resolvedCombinations = Array.isArray(product.combinations) && product.combinations.length ? normalizeExistingCombinations(product.combinations, locale, currencySymbol) : combinations;
-    return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
+    var shouldIncludeBasePrice = options.length > 0 || resolvedCombinations.length > 0 || hasProductDiscount(product, extensionList);
+    return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
       product_title: productTitle,
       product_quantity: quantity,
       selling_price: formatMoney(sellingPrice, currencySymbol),
       total_selling_price: formatCalculatedMoney(new Decimal(toMoneyNumber(sellingPrice)).mul(quantity), currencySymbol),
-      original_price: formatMoney(originalPrice, currencySymbol),
-      base_price: formatCalculatedMoney(basePrice !== null && basePrice !== void 0 ? basePrice : 0, currencySymbol),
+      original_price: formatMoney(originalPrice, currencySymbol)
+    }, shouldIncludeBasePrice ? {
+      base_price: formatCalculatedMoney(basePrice !== null && basePrice !== void 0 ? basePrice : 0, currencySymbol)
+    } : {}), {}, {
       total_original_price: formatMoney(new Decimal(toMoneyNumber(originalPrice)).mul(quantity), currencySymbol)
     }, options.length ? {
       options_total_price: sumNormalizedOptionTotals(options, currencySymbol)
@@ -387,6 +390,16 @@ function normalizeProductDiscounts(params) {
     };
   });
 }
+function hasProductDiscount(product) {
+  var extensionList = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  var hasDiscountListAmount = normalizeArray(product.discount_list).some(function (discount) {
+    var _ref10, _discount$amount3;
+    return isNonZero((_ref10 = (_discount$amount3 = discount.amount) !== null && _discount$amount3 !== void 0 ? _discount$amount3 : discount.value) !== null && _ref10 !== void 0 ? _ref10 : discount.discount_amount);
+  });
+  return hasDiscountListAmount || extensionList.some(function (row) {
+    return /^\s*-/.test(stringify(row === null || row === void 0 ? void 0 : row.value));
+  });
+}
 function buildProductExtensionList(params) {
   var product = params.product,
     locale = params.locale,
@@ -463,8 +476,8 @@ function resolveDiscountTitleWithPercent(discount, locale) {
   return "".concat(title, " (").concat(percent, "%)");
 }
 function resolveDiscountTitle(discount, locale) {
-  var _ref10, _ref11, _ref12, _ref13, _discount$discount$na, _discount$discount3, _discount$discount4, _discount$discount5;
-  var title = getLocalizedValue((_ref10 = (_ref11 = (_ref12 = (_ref13 = (_discount$discount$na = (_discount$discount3 = discount.discount) === null || _discount$discount3 === void 0 ? void 0 : _discount$discount3.name) !== null && _discount$discount$na !== void 0 ? _discount$discount$na : (_discount$discount4 = discount.discount) === null || _discount$discount4 === void 0 ? void 0 : _discount$discount4.title) !== null && _ref13 !== void 0 ? _ref13 : (_discount$discount5 = discount.discount) === null || _discount$discount5 === void 0 ? void 0 : _discount$discount5.message) !== null && _ref12 !== void 0 ? _ref12 : discount.name) !== null && _ref11 !== void 0 ? _ref11 : discount.title) !== null && _ref10 !== void 0 ? _ref10 : discount.message, locale);
+  var _ref11, _ref12, _ref13, _ref14, _discount$discount$na, _discount$discount3, _discount$discount4, _discount$discount5;
+  var title = getLocalizedValue((_ref11 = (_ref12 = (_ref13 = (_ref14 = (_discount$discount$na = (_discount$discount3 = discount.discount) === null || _discount$discount3 === void 0 ? void 0 : _discount$discount3.name) !== null && _discount$discount$na !== void 0 ? _discount$discount$na : (_discount$discount4 = discount.discount) === null || _discount$discount4 === void 0 ? void 0 : _discount$discount4.title) !== null && _ref14 !== void 0 ? _ref14 : (_discount$discount5 = discount.discount) === null || _discount$discount5 === void 0 ? void 0 : _discount$discount5.message) !== null && _ref13 !== void 0 ? _ref13 : discount.name) !== null && _ref12 !== void 0 ? _ref12 : discount.title) !== null && _ref11 !== void 0 ? _ref11 : discount.message, locale);
   if (title) return title;
   if (discount.type === 'product') return label(locale, 'manualDiscount');
   return '';
@@ -489,10 +502,10 @@ function normalizeProductOptions(params) {
     parentProduct = params.parentProduct;
   var rawOptions = Array.isArray(params.options) ? params.options : Array.isArray(product.options) ? product.options : Array.isArray((_product$product_sku = product.product_sku) === null || _product$product_sku === void 0 ? void 0 : _product$product_sku.option) ? product.product_sku.option : [];
   return rawOptions.map(function (option) {
-    var _ref14, _option$original_pric, _ref15, _option$num, _ref16, _option$value;
-    var price = (_ref14 = (_option$original_pric = option.original_price) !== null && _option$original_pric !== void 0 ? _option$original_pric : option.add_price) !== null && _ref14 !== void 0 ? _ref14 : option.price;
-    var quantity = toNumber((_ref15 = (_option$num = option.num) !== null && _option$num !== void 0 ? _option$num : option.quantity) !== null && _ref15 !== void 0 ? _ref15 : 1, 1);
-    var value = (_ref16 = (_option$value = option.value) !== null && _option$value !== void 0 ? _option$value : option.option) !== null && _ref16 !== void 0 ? _ref16 : option.item;
+    var _ref15, _option$original_pric, _ref16, _option$num, _ref17, _option$value;
+    var price = (_ref15 = (_option$original_pric = option.original_price) !== null && _option$original_pric !== void 0 ? _option$original_pric : option.add_price) !== null && _ref15 !== void 0 ? _ref15 : option.price;
+    var quantity = toNumber((_ref16 = (_option$num = option.num) !== null && _option$num !== void 0 ? _option$num : option.quantity) !== null && _ref16 !== void 0 ? _ref16 : 1, 1);
+    var value = (_ref17 = (_option$value = option.value) !== null && _option$value !== void 0 ? _option$value : option.option) !== null && _ref17 !== void 0 ? _ref17 : option.item;
     var name = getProductTitleSource(option, locale) || resolveOptionTitleFromParentProduct({
       option: option,
       parentProduct: parentProduct,
@@ -519,7 +532,7 @@ function normalizeProductCombinations(params) {
     parentProduct = params.parentProduct;
   var bundles = Array.isArray(product.product_bundle) ? product.product_bundle : [];
   return bundles.map(function (bundle) {
-    var _ref17, _bundle$num, _bundle$metadata;
+    var _ref18, _bundle$num, _bundle$metadata;
     var combinationsOptions = normalizeProductOptions({
       product: {},
       locale: locale,
@@ -535,17 +548,20 @@ function normalizeProductCombinations(params) {
     });
     var productNote = resolveProductNote(bundle, locale);
     var nestedCombinations = Array.isArray(bundle.combinations) ? normalizeExistingCombinations(bundle.combinations, locale, currencySymbol) : [];
-    var quantity = toNumber((_ref17 = (_bundle$num = bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle.quantity) !== null && _ref17 !== void 0 ? _ref17 : 1, 1);
+    var quantity = toNumber((_ref18 = (_bundle$num = bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle.quantity) !== null && _ref18 !== void 0 ? _ref18 : 1, 1);
     var formattedPrice = formatBundlePrice(bundle, currencySymbol);
     var optionsTotal = sumNormalizedOptionTotals(combinationsOptions, currencySymbol);
     var explicitBasePrice = firstPresentValue(bundle.base_price, (_bundle$metadata = bundle.metadata) === null || _bundle$metadata === void 0 ? void 0 : _bundle$metadata.source_product_price);
     var basePrice = isPresentId(explicitBasePrice) ? explicitBasePrice : 0;
-    return _objectSpread(_objectSpread(_objectSpread(_objectSpread({
+    var shouldIncludeBasePrice = combinationsOptions.length > 0 || nestedCombinations.length > 0 || hasProductDiscount(bundle);
+    return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
       product_title: baseTitle,
       product_quantity: quantity,
       price: formattedPrice,
-      total_selling_price: formatCalculatedMoney(new Decimal(toMoneyNumber(formattedPrice)).mul(quantity), currencySymbol),
-      base_price: formatCalculatedMoney(basePrice, currencySymbol),
+      total_selling_price: formatCalculatedMoney(new Decimal(toMoneyNumber(formattedPrice)).mul(quantity), currencySymbol)
+    }, shouldIncludeBasePrice ? {
+      base_price: formatCalculatedMoney(basePrice, currencySymbol)
+    } : {}), {}, {
       combinations_options: combinationsOptions
     }, combinationsOptions.length ? {
       options_total_price: optionsTotal
@@ -560,7 +576,7 @@ function normalizeProductCombinations(params) {
 }
 function normalizeExistingCombinations(combinations, locale, currencySymbol) {
   return combinations.map(function (combination) {
-    var _ref18, _ref19, _combination$product_, _firstPresentValue;
+    var _ref19, _ref20, _combination$product_, _firstPresentValue;
     if (!combination || _typeof(combination) !== 'object' || Array.isArray(combination)) {
       return combination;
     }
@@ -577,18 +593,20 @@ function normalizeExistingCombinations(combinations, locale, currencySymbol) {
     delete snapshot.product_note;
     delete snapshot.note;
     delete snapshot.combinations;
-    var quantity = toNumber((_ref18 = (_ref19 = (_combination$product_ = combination.product_quantity) !== null && _combination$product_ !== void 0 ? _combination$product_ : combination.num) !== null && _ref19 !== void 0 ? _ref19 : combination.quantity) !== null && _ref18 !== void 0 ? _ref18 : 1, 1);
+    var quantity = toNumber((_ref19 = (_ref20 = (_combination$product_ = combination.product_quantity) !== null && _combination$product_ !== void 0 ? _combination$product_ : combination.num) !== null && _ref20 !== void 0 ? _ref20 : combination.quantity) !== null && _ref19 !== void 0 ? _ref19 : 1, 1);
     var unitPrice = (_firstPresentValue = firstPresentValue(combination.selling_price, combination.price, combination.original_price)) !== null && _firstPresentValue !== void 0 ? _firstPresentValue : 0;
     var optionsAmount = sumMoneyValues(normalizedOptions.map(function (option) {
       return option.total_price;
     }));
     var explicitBasePrice = firstPresentValue(combination.base_price);
     var basePrice = isPresentId(explicitBasePrice) ? explicitBasePrice : 0;
-    return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, snapshot), {}, {
+    var shouldIncludeBasePrice = normalizedOptions.length > 0 || nestedCombinations.length > 0 || hasProductDiscount(combination, normalizeArray(combination.extension_list));
+    return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, snapshot), {}, {
       product_quantity: quantity,
-      total_selling_price: formatCalculatedMoney(new Decimal(toMoneyNumber(unitPrice)).mul(quantity), currencySymbol),
+      total_selling_price: formatCalculatedMoney(new Decimal(toMoneyNumber(unitPrice)).mul(quantity), currencySymbol)
+    }, shouldIncludeBasePrice ? {
       base_price: formatCalculatedMoney(basePrice, currencySymbol)
-    }, Array.isArray(combination.combinations_options) ? {
+    } : {}), Array.isArray(combination.combinations_options) ? {
       combinations_options: normalizedOptions
     } : Array.isArray(combination.options) ? {
       options: normalizedOptions
@@ -624,7 +642,7 @@ function resolveProductNote(product, locale) {
   return getLocalizedValue(product.note, locale).trim();
 }
 function resolveBundleProductTitle(params) {
-  var _ref20, _ref21, _bundle$bundle_produc;
+  var _ref21, _ref22, _bundle$bundle_produc;
   var bundle = params.bundle,
     productMap = params.productMap,
     locale = params.locale,
@@ -637,7 +655,7 @@ function resolveBundleProductTitle(params) {
   });
   var parentBundleTitle = parentBundleItem ? getProductTitleSource(parentBundleItem, locale) : '';
   if (parentBundleTitle) return parentBundleTitle;
-  var productId = (_ref20 = (_ref21 = (_bundle$bundle_produc = bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle._bundle_product_id) !== null && _ref21 !== void 0 ? _ref21 : bundle.product_id) !== null && _ref20 !== void 0 ? _ref20 : bundle.id;
+  var productId = (_ref21 = (_ref22 = (_bundle$bundle_produc = bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle._bundle_product_id) !== null && _ref22 !== void 0 ? _ref22 : bundle.product_id) !== null && _ref21 !== void 0 ? _ref21 : bundle.id;
   var fallbackProduct = resolveProductFromMap(productId, productMap);
   if (!fallbackProduct) return '';
   return getProductTitleSource(fallbackProduct, locale);
@@ -689,10 +707,10 @@ function resolveVariantTextFromSkuKey(params) {
 }
 function resolveVariantTextFromNameMap(params) {
   if (!params.nameMap || _typeof(params.nameMap) !== 'object') return '';
-  return Object.entries(params.nameMap).map(function (_ref22) {
-    var _ref23 = _slicedToArray(_ref22, 2),
-      groupPositionId = _ref23[0],
-      value = _ref23[1];
+  return Object.entries(params.nameMap).map(function (_ref23) {
+    var _ref24 = _slicedToArray(_ref23, 2),
+      groupPositionId = _ref24[0],
+      value = _ref24[1];
     var group = resolveVariantGroup(params.parentProduct, groupPositionId);
     if (!group) return '';
     var groupName = getLocalizedValue(group.name, params.locale);
@@ -726,12 +744,12 @@ function getProductTitleSource(source, locale) {
   return resolveTitleValue(source.product_title, locale) || resolveTitleValue(source.title, locale) || resolveTitleValue(source.name, locale);
 }
 function resolveTitleValue(value, locale) {
-  var _ref24, _ref25, _ref26, _ref27, _value$locale;
+  var _ref25, _ref26, _ref27, _ref28, _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((_ref24 = (_ref25 = (_ref26 = (_ref27 = (_value$locale = value[locale]) !== null && _value$locale !== void 0 ? _value$locale : value[dashedLocale]) !== null && _ref27 !== void 0 ? _ref27 : value[underscoredLocale]) !== null && _ref26 !== void 0 ? _ref26 : value.original) !== null && _ref25 !== void 0 ? _ref25 : value.auto) !== null && _ref24 !== void 0 ? _ref24 : '');
+  return stringify((_ref25 = (_ref26 = (_ref27 = (_ref28 = (_value$locale = value[locale]) !== null && _value$locale !== void 0 ? _value$locale : value[dashedLocale]) !== null && _ref28 !== void 0 ? _ref28 : value[underscoredLocale]) !== null && _ref27 !== void 0 ? _ref27 : value.original) !== null && _ref26 !== void 0 ? _ref26 : value.auto) !== null && _ref25 !== void 0 ? _ref25 : '');
 }
 function resolveOptionTitleFromParentProduct(params) {
   var option = params.option,
@@ -749,17 +767,17 @@ function flattenOptionItems(parentProduct) {
   return optionGroups.flatMap(function (group) {
     var items = normalizeArray(group.option_item || group.option_items || group.option || group.options || group.items || group.children || group.product_option_item);
     return items.map(function (item) {
-      var _ref28, _item$option_group_id;
+      var _ref29, _item$option_group_id;
       return _objectSpread(_objectSpread({}, item), {}, {
-        option_group_id: (_ref28 = (_item$option_group_id = item.option_group_id) !== null && _item$option_group_id !== void 0 ? _item$option_group_id : group.id) !== null && _ref28 !== void 0 ? _ref28 : group.option_group_id
+        option_group_id: (_ref29 = (_item$option_group_id = item.option_group_id) !== null && _item$option_group_id !== void 0 ? _item$option_group_id : group.id) !== null && _ref29 !== void 0 ? _ref29 : group.option_group_id
       });
     });
   });
 }
 function isOptionItemMatch(option, item) {
-  var _ref29, _option$option_group_, _ref30, _item$option_group_it, _option$option_group_2, _item$option_group_id2;
-  var optionItemId = (_ref29 = (_option$option_group_ = option.option_group_item_id) !== null && _option$option_group_ !== void 0 ? _option$option_group_ : option.product_option_item_id) !== null && _ref29 !== void 0 ? _ref29 : option.id;
-  var itemId = (_ref30 = (_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 && _ref30 !== void 0 ? _ref30 : item.id;
+  var _ref30, _option$option_group_, _ref31, _item$option_group_it, _option$option_group_2, _item$option_group_id2;
+  var optionItemId = (_ref30 = (_option$option_group_ = option.option_group_item_id) !== null && _option$option_group_ !== void 0 ? _option$option_group_ : option.product_option_item_id) !== null && _ref30 !== void 0 ? _ref30 : option.id;
+  var itemId = (_ref31 = (_item$option_group_it = item.option_group_item_id) !== null && _item$option_group_it !== void 0 ? _item$option_group_it : item.product_option_item_id) !== null && _ref31 !== void 0 ? _ref31 : item.id;
   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;
@@ -769,16 +787,16 @@ function isOptionItemMatch(option, item) {
   return true;
 }
 function resolveBundleItemFromParentProduct(params) {
-  var _ref31, _bundle$bundle_varian, _bundle$bundle_id, _bundle$bundle_group_, _ref33, _bundle$bundle_produc2;
+  var _ref32, _bundle$bundle_varian, _bundle$bundle_id, _bundle$bundle_group_, _ref34, _bundle$bundle_produc2;
   var bundle = params.bundle,
     parentProduct = params.parentProduct;
   if (!parentProduct) return null;
   var bundleItems = flattenBundleItems(parentProduct);
-  var bundleVariantId = (_ref31 = (_bundle$bundle_varian = bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle.variant_id) !== null && _ref31 !== void 0 ? _ref31 : bundle.product_variant_id;
+  var bundleVariantId = (_ref32 = (_bundle$bundle_varian = bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle.variant_id) !== null && _ref32 !== void 0 ? _ref32 : bundle.product_variant_id;
   if (isNonZeroId(bundleVariantId)) {
     var matchedByVariant = bundleItems.find(function (item) {
-      var _ref32, _item$bundle_variant_;
-      return isSameId((_ref32 = (_item$bundle_variant_ = item.bundle_variant_id) !== null && _item$bundle_variant_ !== void 0 ? _item$bundle_variant_ : item.variant_id) !== null && _ref32 !== void 0 ? _ref32 : item.product_variant_id, bundleVariantId);
+      var _ref33, _item$bundle_variant_;
+      return isSameId((_ref33 = (_item$bundle_variant_ = item.bundle_variant_id) !== null && _item$bundle_variant_ !== void 0 ? _item$bundle_variant_ : item.variant_id) !== null && _ref33 !== void 0 ? _ref33 : item.product_variant_id, bundleVariantId);
     });
     if (matchedByVariant) return matchedByVariant;
   }
@@ -791,18 +809,18 @@ function resolveBundleItemFromParentProduct(params) {
     if (matchedByBundleId) return matchedByBundleId;
   }
   var bundleGroupId = (_bundle$bundle_group_ = bundle.bundle_group_id) !== null && _bundle$bundle_group_ !== void 0 ? _bundle$bundle_group_ : bundle.group_id;
-  var bundleProductId = (_ref33 = (_bundle$bundle_produc2 = bundle.bundle_product_id) !== null && _bundle$bundle_produc2 !== void 0 ? _bundle$bundle_produc2 : bundle._bundle_product_id) !== null && _ref33 !== void 0 ? _ref33 : bundle.product_id;
+  var bundleProductId = (_ref34 = (_bundle$bundle_produc2 = bundle.bundle_product_id) !== null && _bundle$bundle_produc2 !== void 0 ? _bundle$bundle_produc2 : bundle._bundle_product_id) !== null && _ref34 !== void 0 ? _ref34 : bundle.product_id;
   if (isPresentId(bundleGroupId) && isPresentId(bundleProductId)) {
     var matchedByGroupAndProduct = bundleItems.find(function (item) {
-      var _item$group_id, _ref34, _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((_ref34 = (_item$bundle_product_ = item.bundle_product_id) !== null && _item$bundle_product_ !== void 0 ? _item$bundle_product_ : item._bundle_product_id) !== null && _ref34 !== void 0 ? _ref34 : item.product_id, bundleProductId);
+      var _item$group_id, _ref35, _item$bundle_product_;
+      return isSameId((_item$group_id = item.group_id) !== null && _item$group_id !== void 0 ? _item$group_id : item.bundle_group_id, bundleGroupId) && isSameId((_ref35 = (_item$bundle_product_ = item.bundle_product_id) !== null && _item$bundle_product_ !== void 0 ? _item$bundle_product_ : item._bundle_product_id) !== null && _ref35 !== void 0 ? _ref35 : item.product_id, bundleProductId);
     });
     if (matchedByGroupAndProduct) return matchedByGroupAndProduct;
   }
   if (isPresentId(bundleProductId)) {
     return bundleItems.find(function (item) {
-      var _ref35, _item$bundle_product_2;
-      return isSameId((_ref35 = (_item$bundle_product_2 = item.bundle_product_id) !== null && _item$bundle_product_2 !== void 0 ? _item$bundle_product_2 : item._bundle_product_id) !== null && _ref35 !== void 0 ? _ref35 : item.product_id, bundleProductId);
+      var _ref36, _item$bundle_product_2;
+      return isSameId((_ref36 = (_item$bundle_product_2 = item.bundle_product_id) !== null && _item$bundle_product_2 !== void 0 ? _item$bundle_product_2 : item._bundle_product_id) !== null && _ref36 !== void 0 ? _ref36 : item.product_id, bundleProductId);
     }) || null;
   }
   return null;
@@ -812,9 +830,9 @@ function flattenBundleItems(parentProduct) {
   return bundleGroups.flatMap(function (group) {
     var items = Array.isArray(group.bundle_item) ? group.bundle_item : [];
     return items.map(function (item) {
-      var _ref36, _item$group_id2;
+      var _ref37, _item$group_id2;
       return _objectSpread(_objectSpread({}, item), {}, {
-        group_id: (_ref36 = (_item$group_id2 = item.group_id) !== null && _item$group_id2 !== void 0 ? _item$group_id2 : group.id) !== null && _ref36 !== void 0 ? _ref36 : group.group_id
+        group_id: (_ref37 = (_item$group_id2 = item.group_id) !== null && _item$group_id2 !== void 0 ? _item$group_id2 : group.id) !== null && _ref37 !== void 0 ? _ref37 : group.group_id
       });
     });
   });
@@ -838,8 +856,8 @@ function isSameId(left, right) {
   return String(left) === String(right);
 }
 function formatBundlePrice(bundle, currencySymbol) {
-  var _ref37, _ref38, _bundle$bundle_sellin;
-  var value = (_ref37 = (_ref38 = (_bundle$bundle_sellin = bundle.bundle_selling_price) !== null && _bundle$bundle_sellin !== void 0 ? _bundle$bundle_sellin : bundle.bundle_sum_price) !== null && _ref38 !== void 0 ? _ref38 : bundle.price) !== null && _ref37 !== void 0 ? _ref37 : 0;
+  var _ref38, _ref39, _bundle$bundle_sellin;
+  var value = (_ref38 = (_ref39 = (_bundle$bundle_sellin = bundle.bundle_selling_price) !== null && _bundle$bundle_sellin !== void 0 ? _bundle$bundle_sellin : bundle.bundle_sum_price) !== null && _ref39 !== void 0 ? _ref39 : bundle.price) !== null && _ref38 !== void 0 ? _ref38 : 0;
   var amount = new Decimal(toMoneyNumber(value));
   // 套餐价格协议：只有 markdown 是减价；加价与商品原价都保持正数。
   var isNegative = bundle.price_type === 'markdown';
@@ -857,9 +875,9 @@ function buildFees(params) {
     financials = params.financials;
   var fees = [];
   for (var _i = 0, _normalizeArray = normalizeArray(order.surcharges || summary.surcharges); _i < _normalizeArray.length; _i++) {
-    var _ref39, _surcharge$amount;
+    var _ref40, _surcharge$amount;
     var surcharge = _normalizeArray[_i];
-    var value = (_ref39 = (_surcharge$amount = surcharge.amount) !== null && _surcharge$amount !== void 0 ? _surcharge$amount : surcharge.value) !== null && _ref39 !== void 0 ? _ref39 : surcharge.total_amount;
+    var value = (_ref40 = (_surcharge$amount = surcharge.amount) !== null && _surcharge$amount !== void 0 ? _surcharge$amount : surcharge.value) !== null && _ref40 !== void 0 ? _ref40 : surcharge.total_amount;
     if (!isNonZero(value)) continue;
     fees.push({
       item: getLocalizedValue(surcharge.name || surcharge.title || surcharge.item, locale),
@@ -967,9 +985,9 @@ function resolveTaxTitle(params) {
 }
 function calculateProductOriginalAmount(order) {
   return normalizeArray(order.products).reduce(function (total, product) {
-    var _ref40, _ref41, _product$product_quan2, _ref42, _ref43, _ref44, _product$original_pri2;
-    var quantity = toNumber((_ref40 = (_ref41 = (_product$product_quan2 = product.product_quantity) !== null && _product$product_quan2 !== void 0 ? _product$product_quan2 : product.quantity) !== null && _ref41 !== void 0 ? _ref41 : product.num) !== null && _ref40 !== void 0 ? _ref40 : 1, 1);
-    var originalPrice = (_ref42 = (_ref43 = (_ref44 = (_product$original_pri2 = product.original_price) !== null && _product$original_pri2 !== void 0 ? _product$original_pri2 : product.selling_price) !== null && _ref44 !== void 0 ? _ref44 : product.payment_price) !== null && _ref43 !== void 0 ? _ref43 : product.price) !== null && _ref42 !== void 0 ? _ref42 : 0;
+    var _ref41, _ref42, _product$product_quan2, _ref43, _ref44, _ref45, _product$original_pri2;
+    var quantity = toNumber((_ref41 = (_ref42 = (_product$product_quan2 = product.product_quantity) !== null && _product$product_quan2 !== void 0 ? _product$product_quan2 : product.quantity) !== null && _ref42 !== void 0 ? _ref42 : product.num) !== null && _ref41 !== void 0 ? _ref41 : 1, 1);
+    var originalPrice = (_ref43 = (_ref44 = (_ref45 = (_product$original_pri2 = product.original_price) !== null && _product$original_pri2 !== void 0 ? _product$original_pri2 : product.selling_price) !== null && _ref45 !== void 0 ? _ref45 : product.payment_price) !== null && _ref44 !== void 0 ? _ref44 : product.price) !== null && _ref43 !== void 0 ? _ref43 : 0;
     return total.plus(new Decimal(toMoneyNumber(originalPrice)).mul(quantity));
   }, new Decimal(0));
 }
@@ -1057,8 +1075,8 @@ function sortBookings(bookings) {
     }
     var bookingUidOrder = compareOptionalValues(firstPresentValue((_left$booking2 = left.booking) === null || _left$booking2 === void 0 || (_left$booking2 = _left$booking2.metadata) === null || _left$booking2 === void 0 ? void 0 : _left$booking2.unique_identification_number, (_left$booking3 = left.booking) === null || _left$booking3 === void 0 ? void 0 : _left$booking3.booking_uid), firstPresentValue((_right$booking2 = right.booking) === null || _right$booking2 === void 0 || (_right$booking2 = _right$booking2.metadata) === null || _right$booking2 === void 0 ? void 0 : _right$booking2.unique_identification_number, (_right$booking3 = right.booking) === null || _right$booking3 === void 0 ? void 0 : _right$booking3.booking_uid));
     return bookingUidOrder || left.index - right.index;
-  }).map(function (_ref45) {
-    var booking = _ref45.booking;
+  }).map(function (_ref46) {
+    var booking = _ref46.booking;
     return booking;
   });
 }
@@ -1120,8 +1138,8 @@ function buildRefundData(params) {
       result.set(identity, candidate);
     }
     return result;
-  }, new Map()).values()).filter(function (_ref46) {
-    var refund = _ref46.refund;
+  }, new Map()).values()).filter(function (_ref47) {
+    var refund = _ref47.refund;
     return isPrintableRefund(refund);
   }).sort(function (left, right) {
     var leftTime = refundTimestamp(left.refund);
@@ -1129,9 +1147,9 @@ function buildRefundData(params) {
     if (leftTime !== rightTime) return leftTime < rightTime ? -1 : 1;
     return left.index - right.index;
   });
-  return refunds.map(function (_ref47) {
+  return refunds.map(function (_ref48) {
     var _firstPresentValue8;
-    var refund = _ref47.refund;
+    var refund = _ref48.refund;
     var payment = resolveRefundPayment(refund, payments);
     var methodName = paymentMethodName(payment, params.locale) || label(params.locale, 'refund');
     var amount = (_firstPresentValue8 = firstPresentValue(refund.amount, refund.refund_amount, refund.total_amount)) !== null && _firstPresentValue8 !== void 0 ? _firstPresentValue8 : 0;
@@ -1226,6 +1244,7 @@ function buildPointCardSnapshotAssets(params) {
   var _params$order$order_m;
   var snapshots = (_params$order$order_m = params.order.order_meta_list) === null || _params$order$order_m === void 0 ? void 0 : _params$order$order_m.point_cards_snapshot;
   if (!Array.isArray(snapshots)) return [];
+  var snapshotTime = firstPresentValue(params.order.updated_at, params.order.created_at);
   var seenSnapshotIds = new Set();
   return snapshots.flatMap(function (snapshot) {
     if (!snapshot || _typeof(snapshot) !== 'object' || Array.isArray(snapshot)) return [];
@@ -1246,6 +1265,12 @@ function buildPointCardSnapshotAssets(params) {
         value: trimDecimal(remainingPoints)
       });
     }
+    if (isPresentId(snapshotTime)) {
+      rows.push({
+        item: formatDateTime(snapshotTime, params.locale),
+        value: ''
+      });
+    }
     return [rows];
   });
 }
@@ -1352,8 +1377,8 @@ function buildPaymentItems(params) {
       includeUsage: includeFundRecordUsage
     })));
   } else {
-    var _ref48, _payment$remaining_am, _payment$metadata;
-    var remainingAmount = (_ref48 = (_payment$remaining_am = payment.remaining_amount) !== null && _payment$remaining_am !== void 0 ? _payment$remaining_am : payment.balance) !== null && _ref48 !== void 0 ? _ref48 : (_payment$metadata = payment.metadata) === null || _payment$metadata === void 0 ? void 0 : _payment$metadata.remaining_amount;
+    var _ref49, _payment$remaining_am, _payment$metadata;
+    var remainingAmount = (_ref49 = (_payment$remaining_am = payment.remaining_amount) !== null && _payment$remaining_am !== void 0 ? _payment$remaining_am : payment.balance) !== null && _ref49 !== void 0 ? _ref49 : (_payment$metadata = payment.metadata) === null || _payment$metadata === void 0 ? void 0 : _payment$metadata.remaining_amount;
     if (remainingAmount !== undefined && remainingAmount !== null) {
       items.push({
         item: label(locale, 'remainingAmount'),
@@ -1507,12 +1532,12 @@ function label(locale, key) {
   return ((_LABELS$locale = LABELS[locale]) === null || _LABELS$locale === void 0 ? void 0 : _LABELS$locale[key]) || LABELS.en[key] || key;
 }
 function getLocalizedValue(value, locale) {
-  var _ref49, _ref50, _ref51, _ref52, _ref53, _ref54, _value$locale2;
+  var _ref50, _ref51, _ref52, _ref53, _ref54, _ref55, _value$locale2;
   if (value === undefined || value === null) return '';
   if (_typeof(value) !== 'object') return stringify(value);
   var dashedLocale = locale.replace('_', '-');
   var underscoredLocale = locale.replace('-', '_');
-  return stringify((_ref49 = (_ref50 = (_ref51 = (_ref52 = (_ref53 = (_ref54 = (_value$locale2 = value[locale]) !== null && _value$locale2 !== void 0 ? _value$locale2 : value[dashedLocale]) !== null && _ref54 !== void 0 ? _ref54 : value[underscoredLocale]) !== null && _ref53 !== void 0 ? _ref53 : value.original) !== null && _ref52 !== void 0 ? _ref52 : value.auto) !== null && _ref51 !== void 0 ? _ref51 : value.default) !== null && _ref50 !== void 0 ? _ref50 : value.en) !== null && _ref49 !== void 0 ? _ref49 : '');
+  return stringify((_ref50 = (_ref51 = (_ref52 = (_ref53 = (_ref54 = (_ref55 = (_value$locale2 = value[locale]) !== null && _value$locale2 !== void 0 ? _value$locale2 : value[dashedLocale]) !== null && _ref55 !== void 0 ? _ref55 : value[underscoredLocale]) !== null && _ref54 !== void 0 ? _ref54 : value.original) !== null && _ref53 !== void 0 ? _ref53 : value.auto) !== null && _ref52 !== void 0 ? _ref52 : value.default) !== null && _ref51 !== void 0 ? _ref51 : value.en) !== null && _ref50 !== void 0 ? _ref50 : '');
 }
 function resolveServiceTypeLabelKey(serviceType, order) {
   var normalized = serviceType.trim().toLowerCase().replace(/[\s-]+/g, '_');

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

@@ -1 +1,46 @@
-"use strict";
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "BUY_X_GET_Y_FREE_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.BUY_X_GET_Y_FREE_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "ITEM_REWARD_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.ITEM_REWARD_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "PromotionAdapter", {
+  enumerable: true,
+  get: function () {
+    return _adapter.PromotionAdapter;
+  }
+});
+Object.defineProperty(exports, "PromotionEvaluator", {
+  enumerable: true,
+  get: function () {
+    return _evaluator.PromotionEvaluator;
+  }
+});
+Object.defineProperty(exports, "X_ITEMS_FOR_Y_PRICE_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.X_ITEMS_FOR_Y_PRICE_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: function () {
+    return _adapter.default;
+  }
+});
+var _evaluator = require("./evaluator");
+var _adapter = _interopRequireWildcard(require("./adapter"));
+var _examples = require("./examples");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }

package/lib/modules/Order/index.js

@@ -72,13 +72,6 @@ function getVoucherPaymentLifecycleKey(payment) {
   if (!isVoucherPaymentRecord(payment)) return null;
   return `${String(payment.voucher_id)}::${String(payment.status || '')}`;
 }
-function hasPersistedOrderId(orderId) {
-  if (orderId === undefined || orderId === null || orderId === '') return false;
-  if (typeof orderId === 'string' && orderId.startsWith('LOCAL_')) return false;
-  const normalizedOrderId = Number(orderId);
-  if (Number.isFinite(normalizedOrderId)) return normalizedOrderId > 0;
-  return String(orderId).trim() !== '';
-}
 class OrderModule extends _BaseModule.BaseModule {
   defaultName = 'order';
   defaultVersion = '1.0.0';
@@ -480,7 +473,6 @@ class OrderModule extends _BaseModule.BaseModule {
     this.store.virtualCurrencyList = prepareConfigResult?.virtualCurrencyList || [];
     if (prepareConfigResult) {
       this.writePointCardSnapshotFromPrepareConfig({
-        orderId,
         customerId: params.customerId,
         availableWalletPassList: prepareConfigResult.availableWalletPassList || []
       });
@@ -986,8 +978,6 @@ class OrderModule extends _BaseModule.BaseModule {
     const tempOrder = this.store.tempOrder;
     if (!tempOrder) return;
     if (String(tempOrder.customer_id ?? '') !== String(params.customerId)) return;
-    const effectiveOrderId = params.orderId ?? tempOrder.order_id;
-    if (hasPersistedOrderId(effectiveOrderId)) return;
     tempOrder.order_meta_list = {
       ...((0, _utils.normalizeOrderMetaList)(tempOrder.order_meta_list) || {}),
       point_cards_snapshot: (0, _utils.buildPointCardSnapshotFromWalletPassList)(params.availableWalletPassList)
@@ -2465,7 +2455,7 @@ class OrderModule extends _BaseModule.BaseModule {
       email: tempOrder.email
     });
     const nextCustomerId = tempOrder.customer_id ?? null;
-    if (String(previousCustomerId ?? '') !== String(nextCustomerId ?? '') && !hasPersistedOrderId(tempOrder.order_id)) {
+    if (String(previousCustomerId ?? '') !== String(nextCustomerId ?? '')) {
       this.store.availableWalletIds = [];
       this.clearTempOrderPointCardSnapshot(tempOrder);
     }
@@ -2505,9 +2495,7 @@ class OrderModule extends _BaseModule.BaseModule {
     if (String(previousCustomerId ?? '') !== String(nextCustomerId ?? '')) {
       this.store.availableWalletIds = [];
       this.store.virtualCurrencyList = [];
-      if (!hasPersistedOrderId(tempOrder.order_id)) {
-        this.clearTempOrderPointCardSnapshot(tempOrder);
-      }
+      this.clearTempOrderPointCardSnapshot(tempOrder);
       (0, _utils.clearTempOrderHolderAssignments)(tempOrder);
       this.clearCustomerBoundDiscounts(tempOrder);
       this.applyDiscount();
@@ -2547,9 +2535,7 @@ class OrderModule extends _BaseModule.BaseModule {
     if (tempOrder._extend) delete tempOrder._extend.customerSnapshot;
     this.store.availableWalletIds = [];
     this.store.virtualCurrencyList = [];
-    if (!hasPersistedOrderId(tempOrder.order_id)) {
-      this.clearTempOrderPointCardSnapshot(tempOrder);
-    }
+    this.clearTempOrderPointCardSnapshot(tempOrder);
     this.clearCustomerBoundDiscounts(tempOrder);
     this.applyDiscount();
     this.persistTempOrder();

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

@@ -35,7 +35,7 @@ export interface SmallTicketProduct {
     selling_price: string;
     total_selling_price: string;
     original_price: string;
-    base_price: string;
+    base_price?: string;
     total_original_price: string;
     options_total_price?: string;
     package_items_total_price?: string;

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

@@ -322,13 +322,16 @@ function buildProducts(order, locale, productMap) {
     const productNote = resolveProductNote(product, locale);
     const basePrice = resolveProductBasePrice(product);
     const resolvedCombinations = Array.isArray(product.combinations) && product.combinations.length ? normalizeExistingCombinations(product.combinations, locale, currencySymbol) : combinations;
+    const shouldIncludeBasePrice = options.length > 0 || resolvedCombinations.length > 0 || hasProductDiscount(product, extensionList);
     return {
       product_title: productTitle,
       product_quantity: quantity,
       selling_price: formatMoney(sellingPrice, currencySymbol),
       total_selling_price: formatCalculatedMoney(new _decimal.default(toMoneyNumber(sellingPrice)).mul(quantity), currencySymbol),
       original_price: formatMoney(originalPrice, currencySymbol),
-      base_price: formatCalculatedMoney(basePrice ?? 0, currencySymbol),
+      ...(shouldIncludeBasePrice ? {
+        base_price: formatCalculatedMoney(basePrice ?? 0, currencySymbol)
+      } : {}),
       total_original_price: formatMoney(new _decimal.default(toMoneyNumber(originalPrice)).mul(quantity), currencySymbol),
       ...(options.length ? {
         options_total_price: sumNormalizedOptionTotals(options, currencySymbol)
@@ -386,6 +389,10 @@ function normalizeProductDiscounts(params) {
     };
   });
 }
+function hasProductDiscount(product, extensionList = []) {
+  const hasDiscountListAmount = normalizeArray(product.discount_list).some(discount => isNonZero(discount.amount ?? discount.value ?? discount.discount_amount));
+  return hasDiscountListAmount || extensionList.some(row => /^\s*-/.test(stringify(row?.value)));
+}
 function buildProductExtensionList(params) {
   const {
     product,
@@ -545,12 +552,15 @@ function normalizeProductCombinations(params) {
     const optionsTotal = sumNormalizedOptionTotals(combinationsOptions, currencySymbol);
     const explicitBasePrice = firstPresentValue(bundle.base_price, bundle.metadata?.source_product_price);
     const basePrice = isPresentId(explicitBasePrice) ? explicitBasePrice : 0;
+    const shouldIncludeBasePrice = combinationsOptions.length > 0 || nestedCombinations.length > 0 || hasProductDiscount(bundle);
     return {
       product_title: baseTitle,
       product_quantity: quantity,
       price: formattedPrice,
       total_selling_price: formatCalculatedMoney(new _decimal.default(toMoneyNumber(formattedPrice)).mul(quantity), currencySymbol),
-      base_price: formatCalculatedMoney(basePrice, currencySymbol),
+      ...(shouldIncludeBasePrice ? {
+        base_price: formatCalculatedMoney(basePrice, currencySymbol)
+      } : {}),
       combinations_options: combinationsOptions,
       ...(combinationsOptions.length ? {
         options_total_price: optionsTotal
@@ -592,11 +602,14 @@ function normalizeExistingCombinations(combinations, locale, currencySymbol) {
     const optionsAmount = sumMoneyValues(normalizedOptions.map(option => option.total_price));
     const explicitBasePrice = firstPresentValue(combination.base_price);
     const basePrice = isPresentId(explicitBasePrice) ? explicitBasePrice : 0;
+    const shouldIncludeBasePrice = normalizedOptions.length > 0 || nestedCombinations.length > 0 || hasProductDiscount(combination, normalizeArray(combination.extension_list));
     return {
       ...snapshot,
       product_quantity: quantity,
       total_selling_price: formatCalculatedMoney(new _decimal.default(toMoneyNumber(unitPrice)).mul(quantity), currencySymbol),
-      base_price: formatCalculatedMoney(basePrice, currencySymbol),
+      ...(shouldIncludeBasePrice ? {
+        base_price: formatCalculatedMoney(basePrice, currencySymbol)
+      } : {}),
       ...(Array.isArray(combination.combinations_options) ? {
         combinations_options: normalizedOptions
       } : Array.isArray(combination.options) ? {
@@ -1178,6 +1191,7 @@ function collectDisplayedWalletPassIds(payments) {
 function buildPointCardSnapshotAssets(params) {
   const snapshots = params.order.order_meta_list?.point_cards_snapshot;
   if (!Array.isArray(snapshots)) return [];
+  const snapshotTime = firstPresentValue(params.order.updated_at, params.order.created_at);
   const seenSnapshotIds = new Set();
   return snapshots.flatMap(snapshot => {
     if (!snapshot || typeof snapshot !== 'object' || Array.isArray(snapshot)) return [];
@@ -1198,6 +1212,12 @@ function buildPointCardSnapshotAssets(params) {
         value: trimDecimal(remainingPoints)
       });
     }
+    if (isPresentId(snapshotTime)) {
+      rows.push({
+        item: formatDateTime(snapshotTime, params.locale),
+        value: ''
+      });
+    }
     return [rows];
   });
 }

package/package.json

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