@pisell/pisellos 0.10.37 → 0.10.38

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

@@ -535,7 +535,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

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

@@ -41,6 +41,7 @@ var LABELS = {
     giftCard: 'Gift card',
     pointCard: 'Point card',
     balance: 'Balance',
+    validity: 'Validity',
     remainingAmount: 'Remaining amount',
     redeemPoints: 'Redeem points',
     remainingPoints: 'Points balance',
@@ -79,6 +80,7 @@ var LABELS = {
     giftCard: '礼品卡',
     pointCard: '积分卡',
     balance: '余额',
+    validity: '有效期',
     remainingAmount: '剩余金额',
     redeemPoints: '本次使用积分',
     remainingPoints: '积分余额',
@@ -117,6 +119,7 @@ var LABELS = {
     giftCard: '禮品卡',
     pointCard: '積分卡',
     balance: '餘額',
+    validity: '有效期',
     remainingAmount: '剩餘金額',
     redeemPoints: '本次使用積分',
     remainingPoints: '積分餘額',
@@ -153,6 +156,7 @@ var LABELS = {
     giftCard: 'ギフトカード',
     pointCard: 'ポイントカード',
     balance: '残高',
+    validity: '有効期限',
     remainingAmount: '残高',
     redeemPoints: '利用ポイント',
     remainingPoints: 'ポイント残高',
@@ -190,6 +194,7 @@ var LABELS = {
     giftCard: 'Cartão-presente',
     pointCard: 'Cartão de pontos',
     balance: 'Saldo',
+    validity: 'Validade',
     remainingAmount: 'Saldo restante',
     redeemPoints: 'Pontos utilizados',
     remainingPoints: 'Saldo de pontos',
@@ -671,7 +676,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, _bundle$metadata;
+    var _ref26, _bundle$num;
     var combinationsOptions = normalizeProductOptions({
       product: {},
       locale: locale,
@@ -690,7 +695,7 @@ function normalizeProductCombinations(params) {
     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 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 explicitBasePrice = resolveCombinationBasePrice(bundle);
     var basePrice = isPresentId(explicitBasePrice) ? explicitBasePrice : 0;
     var extensionList = buildProductExtensionList({
       product: bundle,
@@ -747,7 +752,7 @@ function normalizeExistingCombinations(combinations, locale, currencySymbol) {
     var optionsAmount = sumMoneyValues(normalizedOptions.map(function (option) {
       return option.total_price;
     }));
-    var explicitBasePrice = firstPresentValue(combination.base_price);
+    var explicitBasePrice = resolveCombinationBasePrice(combination, true);
     var basePrice = isPresentId(explicitBasePrice) ? explicitBasePrice : 0;
     var extensionList = buildProductExtensionList({
       product: combination,
@@ -784,6 +789,12 @@ function sumMoneyValues(values) {
     return sum.plus(toMoneyNumber(value));
   }, new Decimal(0));
 }
+function resolveCombinationBasePrice(combination) {
+  var _combination$metadata;
+  var preferOriginalPrice = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  var fallbackPrices = preferOriginalPrice ? [combination.original_price, combination.product_price, combination.price] : [combination.price, combination.original_price, combination.product_price];
+  return firstPresentValue.apply(void 0, [combination.base_price, (_combination$metadata = combination.metadata) === null || _combination$metadata === void 0 ? void 0 : _combination$metadata.source_product_price].concat(fallbackPrices));
+}
 function sumNormalizedOptionTotals(options, currencySymbol) {
   return formatCalculatedMoney(sumMoneyValues(options.map(function (option) {
     return option.total_price;
@@ -1058,12 +1069,6 @@ function buildFees(params) {
   });
   var isPriceIncludeTax = firstPresentValue(summary.is_price_include_tax, order.is_price_include_tax, shopInfo.is_price_include_tax);
   var roundingAmount = firstPresentValue(summary.rounding_amount, order.rounding_amount);
-  if (isNonZero(roundingAmount)) {
-    fees.push({
-      item: label(locale, 'rounding'),
-      value: formatMoney(roundingAmount, currencySymbol)
-    });
-  }
   var payProcessingFee = financials.payProcessingFee;
   if (isNonZero(payProcessingFee)) {
     fees.push({
@@ -1539,18 +1544,34 @@ function getPointCardSnapshotRemainingPoints(snapshot) {
 }
 function buildVoucherAssets(params) {
   var seenVoucherKeys = new Set();
+  var fallbackAssetTime = firstPresentValue(params.order.updated_at, params.order.created_at);
   return normalizeArray(params.order.vouchers).flatMap(function (voucher, index) {
     if (!voucher || _typeof(voucher) !== 'object' || Array.isArray(voucher)) return [];
     var voucherKey = getVoucherAssetKey(voucher, index);
     if (seenVoucherKeys.has(voucherKey)) return [];
     seenVoucherKeys.add(voucherKey);
     var name = getVoucherAssetName(voucher, params.locale);
+    var assetTime = firstPresentValue(voucher.updated_at, voucher.created_at, voucher.collection_time, fallbackAssetTime);
+    var timeRow = isPresentId(assetTime) ? {
+      item: formatDateTime(assetTime, params.locale),
+      value: ''
+    } : null;
+    if (isTicketVoucher(voucher)) {
+      var validity = getVoucherValidity(voucher, params.locale);
+      return [[{
+        item: name,
+        value: ''
+      }].concat(_toConsumableArray(validity ? [{
+        item: label(params.locale, 'validity'),
+        value: validity
+      }] : []))];
+    }
     var percent = getVoucherDiscountPercent(voucher);
     if (percent) {
       return [[{
         item: appendPercentToVoucherName(name, percent),
         value: formatVoucherDiscount(percent, params.locale)
-      }]];
+      }].concat(_toConsumableArray(timeRow ? [timeRow] : []))];
     }
     var balance = getVoucherBalance(voucher);
     return [[{
@@ -1559,9 +1580,71 @@ function buildVoucherAssets(params) {
     }, {
       item: label(params.locale, 'balance'),
       value: formatMoney(balance, params.currencySymbol)
-    }]];
+    }].concat(_toConsumableArray(timeRow ? [timeRow] : []))];
   });
 }
+function isTicketVoucher(voucher) {
+  return stringify(voucher.tag).trim().toLowerCase() === 'ticket';
+}
+function getVoucherValidity(voucher, locale) {
+  var _voucher$metadata, _voucher$metadata2, _voucher$metadata3, _voucher$metadata4, _voucher$metadata5, _voucher$metadata6, _voucher$metadata7, _voucher$metadata8, _voucher$metadata9, _voucher$metadata10, _voucher$start_time, _voucher$metadata11, _voucher$end_time, _voucher$metadata12;
+  var availableTime = firstPresentValue(voucher.available_time, voucher.avaliable_time, (_voucher$metadata = voucher.metadata) === null || _voucher$metadata === void 0 ? void 0 : _voucher$metadata.available_time, (_voucher$metadata2 = voucher.metadata) === null || _voucher$metadata2 === void 0 ? void 0 : _voucher$metadata2.avaliable_time);
+  var availableTimeText = formatVoucherAvailableTime(availableTime, locale);
+  if (availableTimeText) return availableTimeText;
+  var startDate = firstPresentValue(voucher.valid_from, voucher.start_at, voucher.start_date_time, voucher.start_date, (_voucher$metadata3 = voucher.metadata) === null || _voucher$metadata3 === void 0 ? void 0 : _voucher$metadata3.valid_from, (_voucher$metadata4 = voucher.metadata) === null || _voucher$metadata4 === void 0 ? void 0 : _voucher$metadata4.start_at, (_voucher$metadata5 = voucher.metadata) === null || _voucher$metadata5 === void 0 ? void 0 : _voucher$metadata5.start_date);
+  var endDate = firstPresentValue(voucher.valid_to, voucher.end_at, voucher.end_date_time, voucher.expire_date, voucher.end_date, voucher.expire_time, (_voucher$metadata6 = voucher.metadata) === null || _voucher$metadata6 === void 0 ? void 0 : _voucher$metadata6.valid_to, (_voucher$metadata7 = voucher.metadata) === null || _voucher$metadata7 === void 0 ? void 0 : _voucher$metadata7.end_at, (_voucher$metadata8 = voucher.metadata) === null || _voucher$metadata8 === void 0 ? void 0 : _voucher$metadata8.expire_date, (_voucher$metadata9 = voucher.metadata) === null || _voucher$metadata9 === void 0 ? void 0 : _voucher$metadata9.end_date, (_voucher$metadata10 = voucher.metadata) === null || _voucher$metadata10 === void 0 ? void 0 : _voucher$metadata10.expire_time);
+  return formatVoucherValidityRange(startDate, endDate, locale, {
+    startTime: (_voucher$start_time = voucher.start_time) !== null && _voucher$start_time !== void 0 ? _voucher$start_time : (_voucher$metadata11 = voucher.metadata) === null || _voucher$metadata11 === void 0 ? void 0 : _voucher$metadata11.start_time,
+    endTime: (_voucher$end_time = voucher.end_time) !== null && _voucher$end_time !== void 0 ? _voucher$end_time : (_voucher$metadata12 = voucher.metadata) === null || _voucher$metadata12 === void 0 ? void 0 : _voucher$metadata12.end_time
+  });
+}
+function formatVoucherAvailableTime(value, locale) {
+  if (!isPresentId(value)) return '';
+  if (Array.isArray(value)) {
+    return value.map(function (item) {
+      return formatVoucherAvailableTime(item, locale);
+    }).filter(Boolean).join(', ');
+  }
+  if (_typeof(value) !== 'object') return stringify(value).trim();
+  var start = firstPresentValue(value.start, value.start_at, value.start_date_time, value.start_date);
+  var end = firstPresentValue(value.end, value.end_at, value.end_date_time, value.expire_time, value.expire_date, value.end_date);
+  if (isPresentId(start) || isPresentId(end)) {
+    return formatVoucherValidityRange(start, end, locale, {
+      startTime: value.start_time,
+      endTime: value.end_time
+    });
+  }
+  return getLocalizedValue(value, locale).trim();
+}
+function formatVoucherValidityRange(startValue, endValue, locale) {
+  var times = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+  var start = combineVoucherDateAndTime(startValue, times.startTime);
+  var end = combineVoucherDateAndTime(endValue, times.endTime);
+  var startText = formatVoucherValidityDate(start, locale);
+  var endText = formatVoucherValidityDate(end, locale);
+  if (startText && endText) {
+    var parsedStart = dayjs(start);
+    var parsedEnd = dayjs(end);
+    var sameDay = parsedStart.isValid() && parsedEnd.isValid() && parsedStart.isSame(parsedEnd, 'day');
+    return "".concat(startText, " - ").concat(sameDay && /\d{1,2}:\d{2}/.test(stringify(end)) ? parsedEnd.format('HH:mm') : endText);
+  }
+  return startText || endText;
+}
+function combineVoucherDateAndTime(dateValue, timeValue) {
+  if (!isPresentId(dateValue) || !isPresentId(timeValue)) return dateValue;
+  var dateText = stringify(dateValue).trim();
+  if (/\d{1,2}:\d{2}/.test(dateText)) return dateValue;
+  return "".concat(dateText, " ").concat(stringify(timeValue).trim());
+}
+function formatVoucherValidityDate(value, locale) {
+  if (!isPresentId(value)) return '';
+  var source = stringify(value).trim();
+  var parsed = dayjs(source);
+  if (!parsed.isValid()) return source;
+  var hasTime = /\d{1,2}:\d{2}/.test(source);
+  if (locale === 'en') return parsed.format(hasTime ? 'DD/MM/YYYY HH:mm' : 'DD/MM/YYYY');
+  return parsed.format(hasTime ? 'YYYY/MM/DD HH:mm' : 'YYYY/MM/DD');
+}
 function getVoucherAssetKey(voucher, index) {
   var identity = firstPresentValue(voucher.voucher_id, voucher.id, voucher.code, voucher.encoded);
   return identity === undefined ? "voucher-index:".concat(index) : "voucher:".concat(String(identity));
@@ -1570,8 +1653,8 @@ function getVoucherAssetName(voucher, locale) {
   return getLocalizedValue(voucher.product_name || voucher.name || voucher.title, locale) || stringify(voucher.encoded || voucher.code || label(locale, 'giftCard'));
 }
 function getVoucherDiscountPercent(voucher) {
-  var _voucher$metadata;
-  var discountType = stringify(((_voucher$metadata = voucher.metadata) === null || _voucher$metadata === void 0 ? void 0 : _voucher$metadata.discount_card_type) || voucher.discount_card_type).toLowerCase();
+  var _voucher$metadata13;
+  var discountType = stringify(((_voucher$metadata13 = voucher.metadata) === null || _voucher$metadata13 === void 0 ? void 0 : _voucher$metadata13.discount_card_type) || voucher.discount_card_type).toLowerCase();
   if (discountType !== 'percent' && discountType !== 'percentage') return null;
   var percent = new Decimal(toMoneyNumber(voucher.par_value));
   if (!percent.isFinite() || percent.lte(0) || percent.gt(100)) return null;

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

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 1 | 2 | 5 | 4 | 3 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -1,46 +1 @@
-"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; }
+"use strict";

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

@@ -535,7 +535,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

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

@@ -29,6 +29,7 @@ const LABELS = {
     giftCard: 'Gift card',
     pointCard: 'Point card',
     balance: 'Balance',
+    validity: 'Validity',
     remainingAmount: 'Remaining amount',
     redeemPoints: 'Redeem points',
     remainingPoints: 'Points balance',
@@ -67,6 +68,7 @@ const LABELS = {
     giftCard: '礼品卡',
     pointCard: '积分卡',
     balance: '余额',
+    validity: '有效期',
     remainingAmount: '剩余金额',
     redeemPoints: '本次使用积分',
     remainingPoints: '积分余额',
@@ -105,6 +107,7 @@ const LABELS = {
     giftCard: '禮品卡',
     pointCard: '積分卡',
     balance: '餘額',
+    validity: '有效期',
     remainingAmount: '剩餘金額',
     redeemPoints: '本次使用積分',
     remainingPoints: '積分餘額',
@@ -141,6 +144,7 @@ const LABELS = {
     giftCard: 'ギフトカード',
     pointCard: 'ポイントカード',
     balance: '残高',
+    validity: '有効期限',
     remainingAmount: '残高',
     redeemPoints: '利用ポイント',
     remainingPoints: 'ポイント残高',
@@ -178,6 +182,7 @@ const LABELS = {
     giftCard: 'Cartão-presente',
     pointCard: 'Cartão de pontos',
     balance: 'Saldo',
+    validity: 'Validade',
     remainingAmount: 'Saldo restante',
     redeemPoints: 'Pontos utilizados',
     remainingPoints: 'Saldo de pontos',
@@ -658,7 +663,7 @@ function normalizeProductCombinations(params) {
     const quantity = toNumber(bundle.num ?? bundle.quantity ?? 1, 1);
     const formattedPrice = formatBundlePrice(bundle, currencySymbol);
     const optionsTotal = sumNormalizedOptionTotals(combinationsOptions, currencySymbol);
-    const explicitBasePrice = firstPresentValue(bundle.base_price, bundle.metadata?.source_product_price);
+    const explicitBasePrice = resolveCombinationBasePrice(bundle);
     const basePrice = isPresentId(explicitBasePrice) ? explicitBasePrice : 0;
     const extensionList = buildProductExtensionList({
       product: bundle,
@@ -719,7 +724,7 @@ function normalizeExistingCombinations(combinations, locale, currencySymbol) {
     const quantity = toNumber(combination.product_quantity ?? combination.num ?? combination.quantity ?? 1, 1);
     const unitPrice = firstPresentValue(combination.selling_price, combination.price, combination.original_price) ?? 0;
     const optionsAmount = sumMoneyValues(normalizedOptions.map(option => option.total_price));
-    const explicitBasePrice = firstPresentValue(combination.base_price);
+    const explicitBasePrice = resolveCombinationBasePrice(combination, true);
     const basePrice = isPresentId(explicitBasePrice) ? explicitBasePrice : 0;
     const extensionList = buildProductExtensionList({
       product: combination,
@@ -762,6 +767,10 @@ function normalizeExistingCombinations(combinations, locale, currencySymbol) {
 function sumMoneyValues(values) {
   return values.reduce((sum, value) => sum.plus(toMoneyNumber(value)), new _decimal.default(0));
 }
+function resolveCombinationBasePrice(combination, preferOriginalPrice = false) {
+  const fallbackPrices = preferOriginalPrice ? [combination.original_price, combination.product_price, combination.price] : [combination.price, combination.original_price, combination.product_price];
+  return firstPresentValue(combination.base_price, combination.metadata?.source_product_price, ...fallbackPrices);
+}
 function sumNormalizedOptionTotals(options, currencySymbol) {
   return formatCalculatedMoney(sumMoneyValues(options.map(option => option.total_price)), currencySymbol);
 }
@@ -998,12 +1007,6 @@ function buildFees(params) {
   });
   const isPriceIncludeTax = firstPresentValue(summary.is_price_include_tax, order.is_price_include_tax, shopInfo.is_price_include_tax);
   const roundingAmount = firstPresentValue(summary.rounding_amount, order.rounding_amount);
-  if (isNonZero(roundingAmount)) {
-    fees.push({
-      item: label(locale, 'rounding'),
-      value: formatMoney(roundingAmount, currencySymbol)
-    });
-  }
   const payProcessingFee = financials.payProcessingFee;
   if (isNonZero(payProcessingFee)) {
     fees.push({
@@ -1428,18 +1431,34 @@ function getPointCardSnapshotRemainingPoints(snapshot) {
 }
 function buildVoucherAssets(params) {
   const seenVoucherKeys = new Set();
+  const fallbackAssetTime = firstPresentValue(params.order.updated_at, params.order.created_at);
   return normalizeArray(params.order.vouchers).flatMap((voucher, index) => {
     if (!voucher || typeof voucher !== 'object' || Array.isArray(voucher)) return [];
     const voucherKey = getVoucherAssetKey(voucher, index);
     if (seenVoucherKeys.has(voucherKey)) return [];
     seenVoucherKeys.add(voucherKey);
     const name = getVoucherAssetName(voucher, params.locale);
+    const assetTime = firstPresentValue(voucher.updated_at, voucher.created_at, voucher.collection_time, fallbackAssetTime);
+    const timeRow = isPresentId(assetTime) ? {
+      item: formatDateTime(assetTime, params.locale),
+      value: ''
+    } : null;
+    if (isTicketVoucher(voucher)) {
+      const validity = getVoucherValidity(voucher, params.locale);
+      return [[{
+        item: name,
+        value: ''
+      }, ...(validity ? [{
+        item: label(params.locale, 'validity'),
+        value: validity
+      }] : [])]];
+    }
     const percent = getVoucherDiscountPercent(voucher);
     if (percent) {
       return [[{
         item: appendPercentToVoucherName(name, percent),
         value: formatVoucherDiscount(percent, params.locale)
-      }]];
+      }, ...(timeRow ? [timeRow] : [])]];
     }
     const balance = getVoucherBalance(voucher);
     return [[{
@@ -1448,9 +1467,67 @@ function buildVoucherAssets(params) {
     }, {
       item: label(params.locale, 'balance'),
       value: formatMoney(balance, params.currencySymbol)
-    }]];
+    }, ...(timeRow ? [timeRow] : [])]];
   });
 }
+function isTicketVoucher(voucher) {
+  return stringify(voucher.tag).trim().toLowerCase() === 'ticket';
+}
+function getVoucherValidity(voucher, locale) {
+  const availableTime = firstPresentValue(voucher.available_time, voucher.avaliable_time, voucher.metadata?.available_time, voucher.metadata?.avaliable_time);
+  const availableTimeText = formatVoucherAvailableTime(availableTime, locale);
+  if (availableTimeText) return availableTimeText;
+  const startDate = firstPresentValue(voucher.valid_from, voucher.start_at, voucher.start_date_time, voucher.start_date, voucher.metadata?.valid_from, voucher.metadata?.start_at, voucher.metadata?.start_date);
+  const endDate = firstPresentValue(voucher.valid_to, voucher.end_at, voucher.end_date_time, voucher.expire_date, voucher.end_date, voucher.expire_time, voucher.metadata?.valid_to, voucher.metadata?.end_at, voucher.metadata?.expire_date, voucher.metadata?.end_date, voucher.metadata?.expire_time);
+  return formatVoucherValidityRange(startDate, endDate, locale, {
+    startTime: voucher.start_time ?? voucher.metadata?.start_time,
+    endTime: voucher.end_time ?? voucher.metadata?.end_time
+  });
+}
+function formatVoucherAvailableTime(value, locale) {
+  if (!isPresentId(value)) return '';
+  if (Array.isArray(value)) {
+    return value.map(item => formatVoucherAvailableTime(item, locale)).filter(Boolean).join(', ');
+  }
+  if (typeof value !== 'object') return stringify(value).trim();
+  const start = firstPresentValue(value.start, value.start_at, value.start_date_time, value.start_date);
+  const end = firstPresentValue(value.end, value.end_at, value.end_date_time, value.expire_time, value.expire_date, value.end_date);
+  if (isPresentId(start) || isPresentId(end)) {
+    return formatVoucherValidityRange(start, end, locale, {
+      startTime: value.start_time,
+      endTime: value.end_time
+    });
+  }
+  return getLocalizedValue(value, locale).trim();
+}
+function formatVoucherValidityRange(startValue, endValue, locale, times = {}) {
+  const start = combineVoucherDateAndTime(startValue, times.startTime);
+  const end = combineVoucherDateAndTime(endValue, times.endTime);
+  const startText = formatVoucherValidityDate(start, locale);
+  const endText = formatVoucherValidityDate(end, locale);
+  if (startText && endText) {
+    const parsedStart = (0, _dayjs.default)(start);
+    const parsedEnd = (0, _dayjs.default)(end);
+    const sameDay = parsedStart.isValid() && parsedEnd.isValid() && parsedStart.isSame(parsedEnd, 'day');
+    return `${startText} - ${sameDay && /\d{1,2}:\d{2}/.test(stringify(end)) ? parsedEnd.format('HH:mm') : endText}`;
+  }
+  return startText || endText;
+}
+function combineVoucherDateAndTime(dateValue, timeValue) {
+  if (!isPresentId(dateValue) || !isPresentId(timeValue)) return dateValue;
+  const dateText = stringify(dateValue).trim();
+  if (/\d{1,2}:\d{2}/.test(dateText)) return dateValue;
+  return `${dateText} ${stringify(timeValue).trim()}`;
+}
+function formatVoucherValidityDate(value, locale) {
+  if (!isPresentId(value)) return '';
+  const source = stringify(value).trim();
+  const parsed = (0, _dayjs.default)(source);
+  if (!parsed.isValid()) return source;
+  const hasTime = /\d{1,2}:\d{2}/.test(source);
+  if (locale === 'en') return parsed.format(hasTime ? 'DD/MM/YYYY HH:mm' : 'DD/MM/YYYY');
+  return parsed.format(hasTime ? 'YYYY/MM/DD HH:mm' : 'YYYY/MM/DD');
+}
 function getVoucherAssetKey(voucher, index) {
   const identity = firstPresentValue(voucher.voucher_id, voucher.id, voucher.code, voucher.encoded);
   return identity === undefined ? `voucher-index:${index}` : `voucher:${String(identity)}`;

package/lib/solution/BookingByStep/index.d.ts

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 1 | 2 | 5 | 4 | 3 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/package.json

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