@pisell/pisellos 0.10.50 → 0.10.52

package/dist/server/modules/order/types.d.ts

@@ -454,6 +454,7 @@ export interface OrderData {
             id: number | string;
             tag: 'point_card';
             product_id?: number | string;
+            code?: string;
             product_name: string;
             par_value: string;
             used_par_value: string;

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

@@ -20,6 +20,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 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); }
 import dayjs from 'dayjs';
 import Decimal from 'decimal.js';
+import { isFulfillmentTimingBooking } from "../../modules/Order/pickupTiming";
 var DEFAULT_LOCALES = ['en', 'zh_CN'];
 var SERVICE_TYPE_LABEL_KEYS = {
   takeaway: 'takeAway',
@@ -530,7 +531,7 @@ function isSameReceiptDiscount(left, right) {
   return leftResourceId === rightResourceId && getReceiptDiscountBundleMapId(left) === getReceiptDiscountBundleMapId(right) && String((_ref10 = (_ref11 = (_left$amount = left === null || left === void 0 ? void 0 : left.amount) !== null && _left$amount !== void 0 ? _left$amount : left === null || left === void 0 ? void 0 : left.value) !== null && _ref11 !== void 0 ? _ref11 : left === null || left === void 0 ? void 0 : left.discount_amount) !== null && _ref10 !== void 0 ? _ref10 : '') === String((_ref12 = (_ref13 = (_right$amount = right === null || right === void 0 ? void 0 : right.amount) !== null && _right$amount !== void 0 ? _right$amount : right === null || right === void 0 ? void 0 : right.value) !== null && _ref13 !== void 0 ? _ref13 : right === null || right === void 0 ? void 0 : right.discount_amount) !== null && _ref12 !== void 0 ? _ref12 : '');
 }
 function resolveProductBasePrice(product) {
-  var _product$product_vari, _product$_origin, _product$_origin2;
+  var _product$product_vari, _ref14, _ref15, _product$product_quan2, _product$product_sku, _product$_origin, _product$_origin2;
   var metadata = product.metadata || {};
   var origin = product._origin || metadata.origin || {};
   var variantId = (_product$product_vari = product.product_variant_id) !== null && _product$product_vari !== void 0 ? _product$product_vari : product.variant_id;
@@ -538,7 +539,18 @@ function resolveProductBasePrice(product) {
     return isSameId(item === null || item === void 0 ? void 0 : item.id, variantId);
   }) : undefined;
   var isV2 = metadata.price_schema_version === 2 || metadata.price_schema_version === '2';
-  return firstPresentValue(metadata.source_product_price, variant === null || variant === void 0 ? void 0 : variant.price, (_product$_origin = product._origin) === null || _product$_origin === void 0 ? void 0 : _product$_origin.price, (_product$_origin2 = product._origin) === null || _product$_origin2 === void 0 ? void 0 : _product$_origin2.base_price, !isV2 ? metadata.main_product_original_price : undefined, product.base_price, product.price);
+  var quantity = toNumber((_ref14 = (_ref15 = (_product$product_quan2 = product.product_quantity) !== null && _product$product_quan2 !== void 0 ? _product$product_quan2 : product.quantity) !== null && _ref15 !== void 0 ? _ref15 : product.num) !== null && _ref14 !== void 0 ? _ref14 : 1, 1);
+  var hasEntitlementPass = normalizeArray(product.discount_list).some(function (discount) {
+    return getProductWalletDiscountType(discount) === 'entitlement_pass';
+  });
+  var hasOptions = normalizeArray(product.options).length > 0 || normalizeArray((_product$product_sku = product.product_sku) === null || _product$product_sku === void 0 ? void 0 : _product$product_sku.option).length > 0;
+  var hasCombinations = normalizeArray(product.combinations).length > 0 || normalizeArray(product.product_bundle).length > 0 || normalizeArray(product.bundle).length > 0;
+  var aggregateSourcePrice = firstPresentValue(metadata.source_product_price, product.price);
+  var originalPrice = product.original_price;
+  // 部分旧 entitlement 商品把 source/price 持久化成了整行总价，但
+  // original_price 仍是单件价。仅在等式能明确证明该口径时做窄幅回退。
+  var useOriginalPriceAsLegacyUnitPrice = hasEntitlementPass && quantity > 1 && !hasOptions && !hasCombinations && isNumericAmount(aggregateSourcePrice) && isNumericAmount(originalPrice) && new Decimal(aggregateSourcePrice).eq(new Decimal(originalPrice).mul(quantity));
+  return firstPresentValue(useOriginalPriceAsLegacyUnitPrice ? originalPrice : undefined, metadata.source_product_price, variant === null || variant === void 0 ? void 0 : variant.price, (_product$_origin = product._origin) === null || _product$_origin === void 0 ? void 0 : _product$_origin.price, (_product$_origin2 = product._origin) === null || _product$_origin2 === void 0 ? void 0 : _product$_origin2.base_price, !isV2 ? metadata.main_product_original_price : undefined, product.base_price, product.price);
 }
 function normalizeProductDiscounts(params) {
   var product = params.product,
@@ -546,16 +558,17 @@ function normalizeProductDiscounts(params) {
     currencySymbol = params.currencySymbol,
     quantity = params.quantity;
   var rows = normalizeArray(product.discount_list).filter(function (discount) {
-    var _ref14, _discount$amount;
-    var amount = (_ref14 = (_discount$amount = discount.amount) !== null && _discount$amount !== void 0 ? _discount$amount : discount.value) !== null && _ref14 !== void 0 ? _ref14 : discount.discount_amount;
+    var _ref16, _discount$amount;
+    var amount = (_ref16 = (_discount$amount = discount.amount) !== null && _discount$amount !== void 0 ? _discount$amount : discount.value) !== null && _ref16 !== void 0 ? _ref16 : discount.discount_amount;
     return isNonZero(amount);
   }).map(function (discount) {
-    var _ref15, _discount$amount2;
+    var _ref17, _discount$amount2;
     var title = resolveDiscountTitleWithPercent(discount, locale);
-    var amount = (_ref15 = (_discount$amount2 = discount.amount) !== null && _discount$amount2 !== void 0 ? _discount$amount2 : discount.value) !== null && _ref15 !== void 0 ? _ref15 : discount.discount_amount;
+    var amount = (_ref17 = (_discount$amount2 = discount.amount) !== null && _discount$amount2 !== void 0 ? _discount$amount2 : discount.value) !== null && _ref17 !== void 0 ? _ref17 : discount.discount_amount;
     var isMarkup = isManualMarkup(discount);
-    var isAggregatedBundleEntitlement = getProductWalletDiscountType(discount) === 'entitlement_pass' && Boolean(getReceiptDiscountBundleMapId(discount));
-    var totalAmount = new Decimal(toMoneyNumber(amount)).mul(isAggregatedBundleEntitlement ? 1 : quantity);
+    var isAggregatedBundleDiscount = Boolean(getReceiptDiscountBundleMapId(discount));
+    var isEntitlementPass = getProductWalletDiscountType(discount) === 'entitlement_pass';
+    var totalAmount = new Decimal(toMoneyNumber(amount)).mul(isAggregatedBundleDiscount || isEntitlementPass ? 1 : quantity);
     var formattedAmount = isMarkup ? formatMoney(totalAmount.abs(), currencySymbol) : formatNegativeMoney(totalAmount, currencySymbol);
     return {
       item: title,
@@ -565,24 +578,24 @@ function normalizeProductDiscounts(params) {
   });
   return rows.sort(function (left, right) {
     return Number(right.isMarkup) - Number(left.isMarkup);
-  }).map(function (_ref16) {
-    var _isMarkup = _ref16.isMarkup,
-      row = _objectWithoutProperties(_ref16, _excluded);
+  }).map(function (_ref18) {
+    var _isMarkup = _ref18.isMarkup,
+      row = _objectWithoutProperties(_ref18, _excluded);
     return row;
   });
 }
 function isManualMarkup(discount) {
-  var _discount$discount, _ref17, _discount$amount3;
+  var _discount$discount, _ref19, _discount$amount3;
   if (discount.type !== 'product') return false;
   if (((_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.discount_type) === 'change_price') return true;
-  var amount = (_ref17 = (_discount$amount3 = discount.amount) !== null && _discount$amount3 !== void 0 ? _discount$amount3 : discount.value) !== null && _ref17 !== void 0 ? _ref17 : discount.discount_amount;
+  var amount = (_ref19 = (_discount$amount3 = discount.amount) !== null && _discount$amount3 !== void 0 ? _discount$amount3 : discount.value) !== null && _ref19 !== void 0 ? _ref19 : discount.discount_amount;
   return new Decimal(toMoneyNumber(amount)).isNegative();
 }
 function hasProductDiscount(product) {
   var extensionList = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var hasDiscountListAmount = normalizeArray(product.discount_list).some(function (discount) {
-    var _ref18, _discount$amount4;
-    return isNonZero((_ref18 = (_discount$amount4 = discount.amount) !== null && _discount$amount4 !== void 0 ? _discount$amount4 : discount.value) !== null && _ref18 !== void 0 ? _ref18 : discount.discount_amount);
+    var _ref20, _discount$amount4;
+    return isNonZero((_ref20 = (_discount$amount4 = discount.amount) !== null && _discount$amount4 !== void 0 ? _discount$amount4 : discount.value) !== null && _ref20 !== void 0 ? _ref20 : discount.discount_amount);
   });
   return hasDiscountListAmount || extensionList.some(function (row) {
     return /^\s*-/.test(stringify(row === null || row === void 0 ? void 0 : row.value));
@@ -667,8 +680,8 @@ function resolveDiscountTitleWithPercent(discount, locale) {
   return "".concat(title, " (").concat(percent, "%)");
 }
 function resolveDiscountTitle(discount, locale) {
-  var _ref19, _ref20, _ref21, _ref22, _discount$discount$na, _discount$discount4, _discount$discount5, _discount$discount6;
-  var title = getLocalizedValue((_ref19 = (_ref20 = (_ref21 = (_ref22 = (_discount$discount$na = (_discount$discount4 = discount.discount) === null || _discount$discount4 === void 0 ? void 0 : _discount$discount4.name) !== null && _discount$discount$na !== void 0 ? _discount$discount$na : (_discount$discount5 = discount.discount) === null || _discount$discount5 === void 0 ? void 0 : _discount$discount5.title) !== null && _ref22 !== void 0 ? _ref22 : (_discount$discount6 = discount.discount) === null || _discount$discount6 === void 0 ? void 0 : _discount$discount6.message) !== null && _ref21 !== void 0 ? _ref21 : discount.name) !== null && _ref20 !== void 0 ? _ref20 : discount.title) !== null && _ref19 !== void 0 ? _ref19 : discount.message, locale);
+  var _ref21, _ref22, _ref23, _ref24, _discount$discount$na, _discount$discount4, _discount$discount5, _discount$discount6;
+  var title = getLocalizedValue((_ref21 = (_ref22 = (_ref23 = (_ref24 = (_discount$discount$na = (_discount$discount4 = discount.discount) === null || _discount$discount4 === void 0 ? void 0 : _discount$discount4.name) !== null && _discount$discount$na !== void 0 ? _discount$discount$na : (_discount$discount5 = discount.discount) === null || _discount$discount5 === void 0 ? void 0 : _discount$discount5.title) !== null && _ref24 !== void 0 ? _ref24 : (_discount$discount6 = discount.discount) === null || _discount$discount6 === void 0 ? void 0 : _discount$discount6.message) !== null && _ref23 !== void 0 ? _ref23 : discount.name) !== null && _ref22 !== void 0 ? _ref22 : discount.title) !== null && _ref21 !== void 0 ? _ref21 : discount.message, locale);
   if (title) return title;
   if (discount.type === 'product') {
     return label(locale, isManualMarkup(discount) ? 'manualMarkup' : 'manualDiscount');
@@ -688,17 +701,17 @@ function resolveProductTitle(params) {
   return getProductTitleSource(fallbackProduct, locale);
 }
 function normalizeProductOptions(params) {
-  var _product$product_sku;
+  var _product$product_sku2;
   var product = params.product,
     locale = params.locale,
     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 : [];
+  var rawOptions = Array.isArray(params.options) ? params.options : Array.isArray(product.options) ? product.options : Array.isArray((_product$product_sku2 = product.product_sku) === null || _product$product_sku2 === void 0 ? void 0 : _product$product_sku2.option) ? product.product_sku.option : [];
   return rawOptions.map(function (option) {
-    var _ref23, _option$original_pric, _ref24, _option$num, _ref25, _option$value;
-    var price = (_ref23 = (_option$original_pric = option.original_price) !== null && _option$original_pric !== void 0 ? _option$original_pric : option.add_price) !== null && _ref23 !== void 0 ? _ref23 : option.price;
-    var quantity = toNumber((_ref24 = (_option$num = option.num) !== null && _option$num !== void 0 ? _option$num : option.quantity) !== null && _ref24 !== void 0 ? _ref24 : 1, 1);
-    var value = (_ref25 = (_option$value = option.value) !== null && _option$value !== void 0 ? _option$value : option.option) !== null && _ref25 !== void 0 ? _ref25 : option.item;
+    var _ref25, _option$original_pric, _ref26, _option$num, _ref27, _option$value;
+    var price = (_ref25 = (_option$original_pric = option.original_price) !== null && _option$original_pric !== void 0 ? _option$original_pric : option.add_price) !== null && _ref25 !== void 0 ? _ref25 : option.price;
+    var quantity = toNumber((_ref26 = (_option$num = option.num) !== null && _option$num !== void 0 ? _option$num : option.quantity) !== null && _ref26 !== void 0 ? _ref26 : 1, 1);
+    var value = (_ref27 = (_option$value = option.value) !== null && _option$value !== void 0 ? _option$value : option.option) !== null && _ref27 !== void 0 ? _ref27 : option.item;
     var name = getProductTitleSource(option, locale) || resolveOptionTitleFromParentProduct({
       option: option,
       parentProduct: parentProduct,
@@ -725,7 +738,7 @@ function normalizeProductCombinations(params) {
     parentProduct = params.parentProduct;
   var bundles = Array.isArray(product.product_bundle) ? product.product_bundle : [];
   return bundles.map(function (bundle) {
-    var _ref26, _bundle$num;
+    var _ref28, _bundle$num;
     var combinationsOptions = normalizeProductOptions({
       product: {},
       locale: locale,
@@ -741,7 +754,7 @@ function normalizeProductCombinations(params) {
     });
     var productNote = resolveProductNote(bundle, locale);
     var nestedCombinations = Array.isArray(bundle.combinations) ? normalizeExistingCombinations(bundle.combinations, locale, currencySymbol) : [];
-    var quantity = toNumber((_ref26 = (_bundle$num = bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle.quantity) !== null && _ref26 !== void 0 ? _ref26 : 1, 1);
+    var quantity = toNumber((_ref28 = (_bundle$num = bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle.quantity) !== null && _ref28 !== void 0 ? _ref28 : 1, 1);
     var formattedPrice = formatBundlePrice(bundle, currencySymbol);
     var optionsTotal = sumNormalizedOptionTotals(combinationsOptions, currencySymbol);
     var explicitBasePrice = resolveCombinationBasePrice(bundle);
@@ -778,7 +791,7 @@ function normalizeProductCombinations(params) {
 }
 function normalizeExistingCombinations(combinations, locale, currencySymbol) {
   return combinations.map(function (combination) {
-    var _ref27, _ref28, _combination$product_, _firstPresentValue;
+    var _ref29, _ref30, _combination$product_, _firstPresentValue;
     if (!combination || _typeof(combination) !== 'object' || Array.isArray(combination)) {
       return combination;
     }
@@ -791,12 +804,14 @@ function normalizeExistingCombinations(combinations, locale, currencySymbol) {
       options: rawOptions
     });
     var nestedCombinations = Array.isArray(combination.combinations) ? normalizeExistingCombinations(combination.combinations, locale, currencySymbol) : [];
+    var productTitle = getBundleProductTitleSource(combination, locale);
     var snapshot = _objectSpread({}, combination);
+    delete snapshot.product_title;
     delete snapshot.product_note;
     delete snapshot.note;
     delete snapshot.combinations;
     delete snapshot.discount_list;
-    var quantity = toNumber((_ref27 = (_ref28 = (_combination$product_ = combination.product_quantity) !== null && _combination$product_ !== void 0 ? _combination$product_ : combination.num) !== null && _ref28 !== void 0 ? _ref28 : combination.quantity) !== null && _ref27 !== void 0 ? _ref27 : 1, 1);
+    var quantity = toNumber((_ref29 = (_ref30 = (_combination$product_ = combination.product_quantity) !== null && _combination$product_ !== void 0 ? _combination$product_ : combination.num) !== null && _ref30 !== void 0 ? _ref30 : combination.quantity) !== null && _ref29 !== void 0 ? _ref29 : 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;
@@ -811,7 +826,9 @@ function normalizeExistingCombinations(combinations, locale, currencySymbol) {
       originalPrice: unitPrice
     });
     var shouldIncludeBasePrice = normalizedOptions.length > 0 || nestedCombinations.length > 0 || hasProductDiscount(combination, extensionList);
-    return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, snapshot), {}, {
+    return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, snapshot), productTitle ? {
+      product_title: productTitle
+    } : {}), {}, {
       product_quantity: quantity,
       total_selling_price: formatCalculatedMoney(new Decimal(toMoneyNumber(unitPrice)).mul(quantity), currencySymbol)
     }, shouldIncludeBasePrice ? {
@@ -879,23 +896,23 @@ function buildProductAllergyMap(order, locale) {
   return allergyByProductUid;
 }
 function resolveBundleProductTitle(params) {
-  var _ref29, _ref30, _bundle$bundle_produc;
+  var _ref31, _ref32, _bundle$bundle_produc;
   var bundle = params.bundle,
     productMap = params.productMap,
     locale = params.locale,
     parentProduct = params.parentProduct;
-  var ownTitle = getProductTitleSource(bundle, locale);
+  var ownTitle = getBundleProductTitleSource(bundle, locale);
   if (ownTitle) return ownTitle;
   var parentBundleItem = resolveBundleItemFromParentProduct({
     bundle: bundle,
     parentProduct: parentProduct
   });
-  var parentBundleTitle = parentBundleItem ? getProductTitleSource(parentBundleItem, locale) : '';
+  var parentBundleTitle = parentBundleItem ? getBundleProductTitleSource(parentBundleItem, locale) : '';
   if (parentBundleTitle) return parentBundleTitle;
-  var productId = (_ref29 = (_ref30 = (_bundle$bundle_produc = bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle._bundle_product_id) !== null && _ref30 !== void 0 ? _ref30 : bundle.product_id) !== null && _ref29 !== void 0 ? _ref29 : bundle.id;
+  var productId = (_ref31 = (_ref32 = (_bundle$bundle_produc = bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle._bundle_product_id) !== null && _ref32 !== void 0 ? _ref32 : bundle.product_id) !== null && _ref31 !== void 0 ? _ref31 : bundle.id;
   var fallbackProduct = resolveProductFromMap(productId, productMap);
   if (!fallbackProduct) return '';
-  return getProductTitleSource(fallbackProduct, locale);
+  return getBundleProductTitleSource(fallbackProduct, locale);
 }
 function resolveProductFromMap(productId, productMap) {
   if (productId === undefined || productId === null || productId === '') return null;
@@ -944,10 +961,10 @@ function resolveVariantTextFromSkuKey(params) {
 }
 function resolveVariantTextFromNameMap(params) {
   if (!params.nameMap || _typeof(params.nameMap) !== 'object') return '';
-  return Object.entries(params.nameMap).map(function (_ref31) {
-    var _ref32 = _slicedToArray(_ref31, 2),
-      groupPositionId = _ref32[0],
-      value = _ref32[1];
+  return Object.entries(params.nameMap).map(function (_ref33) {
+    var _ref34 = _slicedToArray(_ref33, 2),
+      groupPositionId = _ref34[0],
+      value = _ref34[1];
     var group = resolveVariantGroup(params.parentProduct, groupPositionId);
     if (!group) return '';
     var groupName = getLocalizedValue(group.name, params.locale);
@@ -978,15 +995,19 @@ function resolveVariantItem(group, itemPositionId) {
 }
 function getProductTitleSource(source, locale) {
   if (!source || _typeof(source) !== 'object') return '';
-  return resolveTitleValue(source.product_title, locale) || resolveTitleValue(source.title, locale) || resolveTitleValue(source.name, locale);
+  return resolveTitleValue(source.product_title, locale) || resolveTitleValue(source.title_i18n, locale) || resolveTitleValue(source.title, locale) || resolveTitleValue(source.name, locale);
+}
+function getBundleProductTitleSource(source, locale) {
+  if (!source || _typeof(source) !== 'object') return '';
+  return resolveTitleValue(source.bundle_title, locale) || resolveTitleValue(source.trans_title, locale) || resolveTitleValue(source.title_i18n, locale) || resolveTitleValue(source.product_title, locale) || resolveTitleValue(source.title, locale) || resolveTitleValue(source.name, locale);
 }
 function resolveTitleValue(value, locale) {
-  var _ref33, _ref34, _ref35, _ref36, _value$locale;
+  var _ref35, _ref36, _ref37, _ref38, _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((_ref33 = (_ref34 = (_ref35 = (_ref36 = (_value$locale = value[locale]) !== null && _value$locale !== void 0 ? _value$locale : value[dashedLocale]) !== null && _ref36 !== void 0 ? _ref36 : value[underscoredLocale]) !== null && _ref35 !== void 0 ? _ref35 : value.original) !== null && _ref34 !== void 0 ? _ref34 : value.auto) !== null && _ref33 !== void 0 ? _ref33 : '');
+  return stringify((_ref35 = (_ref36 = (_ref37 = (_ref38 = (_value$locale = value[locale]) !== null && _value$locale !== void 0 ? _value$locale : value[dashedLocale]) !== null && _ref38 !== void 0 ? _ref38 : value[underscoredLocale]) !== null && _ref37 !== void 0 ? _ref37 : value.original) !== null && _ref36 !== void 0 ? _ref36 : value.auto) !== null && _ref35 !== void 0 ? _ref35 : '');
 }
 function resolveOptionTitleFromParentProduct(params) {
   var option = params.option,
@@ -1004,17 +1025,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 _ref37, _item$option_group_id;
+      var _ref39, _item$option_group_id;
       return _objectSpread(_objectSpread({}, item), {}, {
-        option_group_id: (_ref37 = (_item$option_group_id = item.option_group_id) !== null && _item$option_group_id !== void 0 ? _item$option_group_id : group.id) !== null && _ref37 !== void 0 ? _ref37 : group.option_group_id
+        option_group_id: (_ref39 = (_item$option_group_id = item.option_group_id) !== null && _item$option_group_id !== void 0 ? _item$option_group_id : group.id) !== null && _ref39 !== void 0 ? _ref39 : group.option_group_id
       });
     });
   });
 }
 function isOptionItemMatch(option, item) {
-  var _ref38, _option$option_group_, _ref39, _item$option_group_it, _option$option_group_2, _item$option_group_id2;
-  var optionItemId = (_ref38 = (_option$option_group_ = option.option_group_item_id) !== null && _option$option_group_ !== void 0 ? _option$option_group_ : option.product_option_item_id) !== null && _ref38 !== void 0 ? _ref38 : option.id;
-  var itemId = (_ref39 = (_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 && _ref39 !== void 0 ? _ref39 : item.id;
+  var _ref40, _option$option_group_, _ref41, _item$option_group_it, _option$option_group_2, _item$option_group_id2;
+  var optionItemId = (_ref40 = (_option$option_group_ = option.option_group_item_id) !== null && _option$option_group_ !== void 0 ? _option$option_group_ : option.product_option_item_id) !== null && _ref40 !== void 0 ? _ref40 : option.id;
+  var itemId = (_ref41 = (_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 && _ref41 !== void 0 ? _ref41 : 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;
@@ -1024,16 +1045,16 @@ function isOptionItemMatch(option, item) {
   return true;
 }
 function resolveBundleItemFromParentProduct(params) {
-  var _ref40, _bundle$bundle_varian, _bundle$bundle_id, _bundle$bundle_group_, _ref42, _bundle$bundle_produc2;
+  var _ref42, _bundle$bundle_varian, _bundle$bundle_id, _bundle$bundle_group_, _ref44, _bundle$bundle_produc2;
   var bundle = params.bundle,
     parentProduct = params.parentProduct;
   if (!parentProduct) return null;
   var bundleItems = flattenBundleItems(parentProduct);
-  var bundleVariantId = (_ref40 = (_bundle$bundle_varian = bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle.variant_id) !== null && _ref40 !== void 0 ? _ref40 : bundle.product_variant_id;
+  var bundleVariantId = (_ref42 = (_bundle$bundle_varian = bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle.variant_id) !== null && _ref42 !== void 0 ? _ref42 : bundle.product_variant_id;
   if (isNonZeroId(bundleVariantId)) {
     var matchedByVariant = bundleItems.find(function (item) {
-      var _ref41, _item$bundle_variant_;
-      return isSameId((_ref41 = (_item$bundle_variant_ = item.bundle_variant_id) !== null && _item$bundle_variant_ !== void 0 ? _item$bundle_variant_ : item.variant_id) !== null && _ref41 !== void 0 ? _ref41 : item.product_variant_id, bundleVariantId);
+      var _ref43, _item$bundle_variant_;
+      return isSameId((_ref43 = (_item$bundle_variant_ = item.bundle_variant_id) !== null && _item$bundle_variant_ !== void 0 ? _item$bundle_variant_ : item.variant_id) !== null && _ref43 !== void 0 ? _ref43 : item.product_variant_id, bundleVariantId);
     });
     if (matchedByVariant) return matchedByVariant;
   }
@@ -1046,18 +1067,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 = (_ref42 = (_bundle$bundle_produc2 = bundle.bundle_product_id) !== null && _bundle$bundle_produc2 !== void 0 ? _bundle$bundle_produc2 : bundle._bundle_product_id) !== null && _ref42 !== void 0 ? _ref42 : bundle.product_id;
+  var bundleProductId = (_ref44 = (_bundle$bundle_produc2 = bundle.bundle_product_id) !== null && _bundle$bundle_produc2 !== void 0 ? _bundle$bundle_produc2 : bundle._bundle_product_id) !== null && _ref44 !== void 0 ? _ref44 : bundle.product_id;
   if (isPresentId(bundleGroupId) && isPresentId(bundleProductId)) {
     var matchedByGroupAndProduct = bundleItems.find(function (item) {
-      var _item$group_id, _ref43, _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((_ref43 = (_item$bundle_product_ = item.bundle_product_id) !== null && _item$bundle_product_ !== void 0 ? _item$bundle_product_ : item._bundle_product_id) !== null && _ref43 !== void 0 ? _ref43 : item.product_id, bundleProductId);
+      var _item$group_id, _ref45, _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((_ref45 = (_item$bundle_product_ = item.bundle_product_id) !== null && _item$bundle_product_ !== void 0 ? _item$bundle_product_ : item._bundle_product_id) !== null && _ref45 !== void 0 ? _ref45 : item.product_id, bundleProductId);
     });
     if (matchedByGroupAndProduct) return matchedByGroupAndProduct;
   }
   if (isPresentId(bundleProductId)) {
     return bundleItems.find(function (item) {
-      var _ref44, _item$bundle_product_2;
-      return isSameId((_ref44 = (_item$bundle_product_2 = item.bundle_product_id) !== null && _item$bundle_product_2 !== void 0 ? _item$bundle_product_2 : item._bundle_product_id) !== null && _ref44 !== void 0 ? _ref44 : item.product_id, bundleProductId);
+      var _ref46, _item$bundle_product_2;
+      return isSameId((_ref46 = (_item$bundle_product_2 = item.bundle_product_id) !== null && _item$bundle_product_2 !== void 0 ? _item$bundle_product_2 : item._bundle_product_id) !== null && _ref46 !== void 0 ? _ref46 : item.product_id, bundleProductId);
     }) || null;
   }
   return null;
@@ -1067,9 +1088,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 _ref45, _item$group_id2;
+      var _ref47, _item$group_id2;
       return _objectSpread(_objectSpread({}, item), {}, {
-        group_id: (_ref45 = (_item$group_id2 = item.group_id) !== null && _item$group_id2 !== void 0 ? _item$group_id2 : group.id) !== null && _ref45 !== void 0 ? _ref45 : group.group_id
+        group_id: (_ref47 = (_item$group_id2 = item.group_id) !== null && _item$group_id2 !== void 0 ? _item$group_id2 : group.id) !== null && _ref47 !== void 0 ? _ref47 : group.group_id
       });
     });
   });
@@ -1093,8 +1114,8 @@ function isSameId(left, right) {
   return String(left) === String(right);
 }
 function formatBundlePrice(bundle, currencySymbol) {
-  var _ref46, _ref47, _bundle$bundle_sellin;
-  var value = (_ref46 = (_ref47 = (_bundle$bundle_sellin = bundle.bundle_selling_price) !== null && _bundle$bundle_sellin !== void 0 ? _bundle$bundle_sellin : bundle.bundle_sum_price) !== null && _ref47 !== void 0 ? _ref47 : bundle.price) !== null && _ref46 !== void 0 ? _ref46 : 0;
+  var _ref48, _ref49, _bundle$bundle_sellin;
+  var value = (_ref48 = (_ref49 = (_bundle$bundle_sellin = bundle.bundle_selling_price) !== null && _bundle$bundle_sellin !== void 0 ? _bundle$bundle_sellin : bundle.bundle_sum_price) !== null && _ref49 !== void 0 ? _ref49 : bundle.price) !== null && _ref48 !== void 0 ? _ref48 : 0;
   var amount = new Decimal(toMoneyNumber(value));
   // 套餐价格协议：只有 markdown 是减价；加价与商品原价都保持正数。
   var isNegative = bundle.price_type === 'markdown';
@@ -1112,9 +1133,9 @@ function buildFees(params) {
     financials = params.financials;
   var fees = [];
   for (var _i2 = 0, _normalizeArray2 = normalizeArray(order.surcharges || summary.surcharges); _i2 < _normalizeArray2.length; _i2++) {
-    var _ref48, _surcharge$amount;
+    var _ref50, _surcharge$amount;
     var surcharge = _normalizeArray2[_i2];
-    var value = (_ref48 = (_surcharge$amount = surcharge.amount) !== null && _surcharge$amount !== void 0 ? _surcharge$amount : surcharge.value) !== null && _ref48 !== void 0 ? _ref48 : surcharge.total_amount;
+    var value = (_ref50 = (_surcharge$amount = surcharge.amount) !== null && _surcharge$amount !== void 0 ? _surcharge$amount : surcharge.value) !== null && _ref50 !== void 0 ? _ref50 : surcharge.total_amount;
     if (!isNonZero(value)) continue;
     fees.push({
       item: getLocalizedValue(surcharge.name || surcharge.title || surcharge.item, locale),
@@ -1216,9 +1237,9 @@ function resolveTaxTitle(params) {
 }
 function calculateProductOriginalAmount(order) {
   return normalizeArray(order.products).reduce(function (total, product) {
-    var _ref49, _ref50, _product$product_quan2, _ref51, _ref52, _ref53, _product$original_pri2;
-    var quantity = toNumber((_ref49 = (_ref50 = (_product$product_quan2 = product.product_quantity) !== null && _product$product_quan2 !== void 0 ? _product$product_quan2 : product.quantity) !== null && _ref50 !== void 0 ? _ref50 : product.num) !== null && _ref49 !== void 0 ? _ref49 : 1, 1);
-    var originalPrice = (_ref51 = (_ref52 = (_ref53 = (_product$original_pri2 = product.original_price) !== null && _product$original_pri2 !== void 0 ? _product$original_pri2 : product.selling_price) !== null && _ref53 !== void 0 ? _ref53 : product.payment_price) !== null && _ref52 !== void 0 ? _ref52 : product.price) !== null && _ref51 !== void 0 ? _ref51 : 0;
+    var _ref51, _ref52, _product$product_quan3, _ref53, _ref54, _ref55, _product$original_pri2;
+    var quantity = toNumber((_ref51 = (_ref52 = (_product$product_quan3 = product.product_quantity) !== null && _product$product_quan3 !== void 0 ? _product$product_quan3 : product.quantity) !== null && _ref52 !== void 0 ? _ref52 : product.num) !== null && _ref51 !== void 0 ? _ref51 : 1, 1);
+    var originalPrice = (_ref53 = (_ref54 = (_ref55 = (_product$original_pri2 = product.original_price) !== null && _product$original_pri2 !== void 0 ? _product$original_pri2 : product.selling_price) !== null && _ref55 !== void 0 ? _ref55 : product.payment_price) !== null && _ref54 !== void 0 ? _ref54 : product.price) !== null && _ref53 !== void 0 ? _ref53 : 0;
     return total.plus(new Decimal(toMoneyNumber(originalPrice)).mul(quantity));
   }, new Decimal(0));
 }
@@ -1247,11 +1268,21 @@ function buildDelivery(order, locale) {
   var serviceTypeLabelKey = resolveServiceTypeLabelKey(serviceType);
   if (!serviceTypeLabelKey) return [];
   var items = [{
-    item: '',
-    value: label(locale, serviceTypeLabelKey),
-    size: 2,
-    align: 'left'
+    item: label(locale, serviceTypeLabelKey),
+    value: '',
+    size: 2
   }];
+  if (serviceType === 'pick_up') {
+    var pickupTime = formatPickupBookingStart(order.bookings, locale);
+    if (pickupTime) {
+      items.push({
+        item: pickupTime,
+        value: '',
+        size: 2
+      });
+      return items;
+    }
+  }
   var handoverTime = firstPresentValue(order.handover_time, order.handover_at, order.pickup_time, order.pickup_at, order.scheduled_pickup_time, order.delivery_time, order.delivery_at, order.scheduled_delivery_time, order.fulfillment_time, order.fulfillment_at, (_order$metadata3 = order.metadata) === null || _order$metadata3 === void 0 ? void 0 : _order$metadata3.handover_time, (_order$metadata4 = order.metadata) === null || _order$metadata4 === void 0 ? void 0 : _order$metadata4.handover_at, (_order$metadata5 = order.metadata) === null || _order$metadata5 === void 0 ? void 0 : _order$metadata5.pickup_time, (_order$metadata6 = order.metadata) === null || _order$metadata6 === void 0 ? void 0 : _order$metadata6.pickup_at, (_order$metadata7 = order.metadata) === null || _order$metadata7 === void 0 ? void 0 : _order$metadata7.scheduled_pickup_time, (_order$metadata8 = order.metadata) === null || _order$metadata8 === void 0 ? void 0 : _order$metadata8.delivery_time, (_order$metadata9 = order.metadata) === null || _order$metadata9 === void 0 ? void 0 : _order$metadata9.delivery_at, (_order$metadata10 = order.metadata) === null || _order$metadata10 === void 0 ? void 0 : _order$metadata10.scheduled_delivery_time, (_order$metadata11 = order.metadata) === null || _order$metadata11 === void 0 ? void 0 : _order$metadata11.fulfillment_time, (_order$metadata12 = order.metadata) === null || _order$metadata12 === void 0 ? void 0 : _order$metadata12.fulfillment_at);
   if (isPresentId(handoverTime)) {
     items.push({
@@ -1261,9 +1292,34 @@ function buildDelivery(order, locale) {
   }
   return items;
 }
+function formatPickupBookingStart(bookings, locale) {
+  var booking = normalizeArray(bookings).find(isFulfillmentTimingBooking);
+  var date = stringify(booking === null || booking === void 0 ? void 0 : booking.start_date).trim();
+  var time = stringify(booking === null || booking === void 0 ? void 0 : booking.start_time).trim();
+  if (!/^\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[12]\d|3[01])$/.test(date) || !/^([01]\d|2[0-3]):[0-5]\d(?::[0-5]\d)?$/.test(time)) {
+    return '';
+  }
+
+  // Validate only the calendar date in UTC; display the stored shop-local
+  // fields verbatim so the printing device's timezone cannot shift pickup.
+  var calendarDate = new Date("".concat(date, "T00:00:00.000Z"));
+  if (!Number.isFinite(calendarDate.getTime()) || calendarDate.toISOString().slice(0, 10) !== date) {
+    return '';
+  }
+  var _date$split = date.split('-'),
+    _date$split2 = _slicedToArray(_date$split, 3),
+    year = _date$split2[0],
+    month = _date$split2[1],
+    day = _date$split2[2];
+  var dateText = locale === 'en' ? "".concat(day, "/").concat(month, "/").concat(year) : "".concat(year, "/").concat(month, "/").concat(day);
+  return "".concat(time.slice(0, 5), " ").concat(dateText);
+}
 function buildAppointment(order, locale) {
-  var _order$metadata13, _order$metadata14, _order$form_data;
-  var bookings = sortBookings(normalizeArray(order.bookings));
+  var _order$metadata13, _order$metadata14, _order$metadata15, _order$form_data;
+  var parentScheduleId = (_order$metadata13 = order.metadata) === null || _order$metadata13 === void 0 ? void 0 : _order$metadata13.appointment_booking_parent_schedule_id;
+  var bookings = sortBookings(normalizeArray(order.bookings).filter(function (booking) {
+    return !isFulfillmentTimingBooking(booking) && isReceiptAppointmentBooking(booking, parentScheduleId);
+  }));
   if (bookings.length) {
     var allResources = normalizeArray(order.resources || order.resource_list);
     return bookings.flatMap(function (booking) {
@@ -1275,13 +1331,26 @@ function buildAppointment(order, locale) {
       });
     });
   }
-  var tableName = order.table_name || ((_order$metadata13 = order.metadata) === null || _order$metadata13 === void 0 ? void 0 : _order$metadata13.table_name) || ((_order$metadata14 = order.metadata) === null || _order$metadata14 === void 0 || (_order$metadata14 = _order$metadata14.table) === null || _order$metadata14 === void 0 ? void 0 : _order$metadata14.name) || ((_order$form_data = order.form_data) === null || _order$form_data === void 0 ? void 0 : _order$form_data.table_name);
+  var tableName = order.table_name || ((_order$metadata14 = order.metadata) === null || _order$metadata14 === void 0 ? void 0 : _order$metadata14.table_name) || ((_order$metadata15 = order.metadata) === null || _order$metadata15 === void 0 || (_order$metadata15 = _order$metadata15.table) === null || _order$metadata15 === void 0 ? void 0 : _order$metadata15.name) || ((_order$form_data = order.form_data) === null || _order$form_data === void 0 ? void 0 : _order$form_data.table_name);
   if (!tableName) return [];
   return [{
     item: label(locale, 'table'),
     value: getLocalizedValue(tableName, locale)
   }];
 }
+function isReceiptAppointmentBooking(booking, parentScheduleId) {
+  if (!booking || _typeof(booking) !== 'object' || Array.isArray(booking)) {
+    return false;
+  }
+  if (isPresentId(parentScheduleId) && isSameId(booking.schedule_event_id, parentScheduleId)) {
+    return false;
+  }
+  var parentId = booking.parent_id;
+  if (parentId === undefined || parentId === null || parentId === '') {
+    return true;
+  }
+  return Number(parentId) !== 0;
+}
 function buildAppointmentRows(params) {
   var _booking$metadata, _booking$metadata2, _booking$holder$name, _booking$holder, _booking$metadata3;
   var booking = params.booking,
@@ -1353,9 +1422,9 @@ function resolveBookingResourcesForReceipt(booking, allResources, bookingCount)
     _step3;
   try {
     for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-      var _ref55, _resource$id2;
+      var _ref57, _resource$id2;
       var resource = _step3.value;
-      var id = stringify((_ref55 = (_resource$id2 = resource.id) !== null && _resource$id2 !== void 0 ? _resource$id2 : resource.resource_id) !== null && _ref55 !== void 0 ? _ref55 : resource.relation_id).trim();
+      var id = stringify((_ref57 = (_resource$id2 = resource.id) !== null && _resource$id2 !== void 0 ? _resource$id2 : resource.resource_id) !== null && _ref57 !== void 0 ? _ref57 : resource.relation_id).trim();
       if (id) resourceIds.add(id);
     }
   } catch (err) {
@@ -1365,8 +1434,8 @@ function resolveBookingResourcesForReceipt(booking, allResources, bookingCount)
   }
   if (resourceIds.size) {
     var matched = allResources.filter(function (resource) {
-      var _ref54, _resource$id;
-      return resourceIds.has(stringify((_ref54 = (_resource$id = resource.id) !== null && _resource$id !== void 0 ? _resource$id : resource.resource_id) !== null && _ref54 !== void 0 ? _ref54 : resource.relation_id).trim());
+      var _ref56, _resource$id;
+      return resourceIds.has(stringify((_ref56 = (_resource$id = resource.id) !== null && _resource$id !== void 0 ? _resource$id : resource.resource_id) !== null && _ref56 !== void 0 ? _ref56 : resource.relation_id).trim());
     });
     if (matched.length) return matched;
   }
@@ -1399,8 +1468,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 (_ref56) {
-    var booking = _ref56.booking;
+  }).map(function (_ref58) {
+    var booking = _ref58.booking;
     return booking;
   });
 }
@@ -1462,8 +1531,8 @@ function buildRefundData(params) {
       result.set(identity, candidate);
     }
     return result;
-  }, new Map()).values()).filter(function (_ref57) {
-    var refund = _ref57.refund;
+  }, new Map()).values()).filter(function (_ref59) {
+    var refund = _ref59.refund;
     return isPrintableRefund(refund);
   }).sort(function (left, right) {
     var leftTime = refundTimestamp(left.refund);
@@ -1471,9 +1540,9 @@ function buildRefundData(params) {
     if (leftTime !== rightTime) return leftTime < rightTime ? -1 : 1;
     return left.index - right.index;
   });
-  return refunds.map(function (_ref58) {
+  return refunds.map(function (_ref60) {
     var _firstPresentValue8;
-    var refund = _ref58.refund;
+    var refund = _ref60.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;
@@ -1867,7 +1936,7 @@ function buildPointCardSnapshotAssets(params) {
       codes: []
     })) return [];
     var rows = [{
-      item: stringify(pointCard.product_name).trim() || label(params.locale, 'pointCard'),
+      item: appendMaskedCardCode(stringify(pointCard.product_name).trim() || label(params.locale, 'pointCard'), pointCard.code),
       value: ''
     }];
     var remainingPoints = getPointCardSnapshotRemainingPoints(pointCard);
@@ -2255,8 +2324,8 @@ function buildPaymentItems(params) {
       virtualCurrencyUnit: virtualCurrencyUnit
     })));
   } else {
-    var _ref59, _payment$remaining_am, _payment$metadata;
-    var remainingAmount = (_ref59 = (_payment$remaining_am = payment.remaining_amount) !== null && _payment$remaining_am !== void 0 ? _payment$remaining_am : payment.balance) !== null && _ref59 !== void 0 ? _ref59 : (_payment$metadata = payment.metadata) === null || _payment$metadata === void 0 ? void 0 : _payment$metadata.remaining_amount;
+    var _ref61, _payment$remaining_am, _payment$metadata;
+    var remainingAmount = (_ref61 = (_payment$remaining_am = payment.remaining_amount) !== null && _payment$remaining_am !== void 0 ? _payment$remaining_am : payment.balance) !== null && _ref61 !== void 0 ? _ref61 : (_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'),
@@ -2367,9 +2436,14 @@ function isPointCardPayment(payment) {
   return code === 'POINTCARD' || type === 'point_card';
 }
 function maskMachineCode(code) {
-  var text = stringify(code);
-  if (text.length <= 6) return text;
-  return "".concat(text.slice(0, 2), "**").concat(text.slice(-4));
+  var text = stringify(code).trim();
+  if (!text) return '';
+  if (text.length <= 6) return '*'.repeat(text.length);
+  return "".concat(text.slice(0, 2), "****").concat(text.slice(-4));
+}
+function appendMaskedCardCode(name, code) {
+  var maskedCode = maskMachineCode(code);
+  return maskedCode ? "".concat(name, "(").concat(maskedCode, ")") : name;
 }
 function trimDecimal(value) {
   return value.toDecimalPlaces(2).toFixed(2).replace(/\.?0+$/, '');
@@ -2378,16 +2452,13 @@ function getFundRecordPaymentName(payment, locale) {
   var fundRecord = getFundRecord(payment);
   if (!fundRecord) return '';
   var name = getLocalizedValue(fundRecord.wallet_pass_name, locale);
-  var code = maskMachineCode(fundRecord.code);
-  if (!name && !code) return '';
-  if (!code) return name;
+  if (!name && !maskMachineCode(fundRecord.code)) return '';
   var fallbackName = getLocalizedValue(payment.name || payment.title || payment.payment_method_name || payment.method_name || payment.code, locale);
-  return "".concat(name || fallbackName, "(").concat(code, ")");
+  return appendMaskedCardCode(name || fallbackName, fundRecord.code);
 }
 function appendMachineCodeToName(name, payment) {
   var fundRecord = getFundRecord(payment);
-  if (!(fundRecord !== null && fundRecord !== void 0 && fundRecord.code)) return name;
-  return "".concat(name, "(").concat(maskMachineCode(fundRecord.code), ")");
+  return appendMaskedCardCode(name, fundRecord === null || fundRecord === void 0 ? void 0 : fundRecord.code);
 }
 function paymentMethodName(payment, locale) {
   var fundRecordName = getFundRecordPaymentName(payment, locale);
@@ -2419,12 +2490,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 _ref60, _ref61, _ref62, _ref63, _ref64, _ref65, _value$locale2;
+  var _ref62, _ref63, _ref64, _ref65, _ref66, _ref67, _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((_ref60 = (_ref61 = (_ref62 = (_ref63 = (_ref64 = (_ref65 = (_value$locale2 = value[locale]) !== null && _value$locale2 !== void 0 ? _value$locale2 : value[dashedLocale]) !== null && _ref65 !== void 0 ? _ref65 : value[underscoredLocale]) !== null && _ref64 !== void 0 ? _ref64 : value.original) !== null && _ref63 !== void 0 ? _ref63 : value.auto) !== null && _ref62 !== void 0 ? _ref62 : value.default) !== null && _ref61 !== void 0 ? _ref61 : value.en) !== null && _ref60 !== void 0 ? _ref60 : '');
+  return stringify((_ref62 = (_ref63 = (_ref64 = (_ref65 = (_ref66 = (_ref67 = (_value$locale2 = value[locale]) !== null && _value$locale2 !== void 0 ? _value$locale2 : value[dashedLocale]) !== null && _ref67 !== void 0 ? _ref67 : value[underscoredLocale]) !== null && _ref66 !== void 0 ? _ref66 : value.original) !== null && _ref65 !== void 0 ? _ref65 : value.auto) !== null && _ref64 !== void 0 ? _ref64 : value.default) !== null && _ref63 !== void 0 ? _ref63 : value.en) !== null && _ref62 !== void 0 ? _ref62 : '');
 }
 function resolveServiceTypeLabelKey(serviceType) {
   return SERVICE_TYPE_LABEL_KEYS[serviceType] || null;