@pisell/pisellos 0.10.29 → 0.10.31

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

@@ -35,6 +35,7 @@ var LABELS = {
     eftpos: 'Eftpos',
     wallet: 'Wallet',
     giftCard: 'Gift card',
+    pointCard: 'Point card',
     balance: 'Balance',
     remainingAmount: 'Remaining amount',
     redeemPoints: 'Redeem points',
@@ -67,6 +68,7 @@ var LABELS = {
     eftpos: '刷卡支付',
     wallet: '钱包支付',
     giftCard: '礼品卡',
+    pointCard: '积分卡',
     balance: '余额',
     remainingAmount: '剩余金额',
     redeemPoints: '本次使用积分',
@@ -99,6 +101,7 @@ var LABELS = {
     eftpos: '刷卡支付',
     wallet: '錢包支付',
     giftCard: '禮品卡',
+    pointCard: '積分卡',
     balance: '餘額',
     remainingAmount: '剩餘金額',
     redeemPoints: '本次使用積分',
@@ -129,6 +132,7 @@ var LABELS = {
     eftpos: 'カード',
     wallet: 'ウォレット',
     giftCard: 'ギフトカード',
+    pointCard: 'ポイントカード',
     balance: '残高',
     remainingAmount: '残高',
     redeemPoints: '利用ポイント',
@@ -160,6 +164,7 @@ var LABELS = {
     eftpos: 'Cartão',
     wallet: 'Carteira',
     giftCard: 'Cartão-presente',
+    pointCard: 'Cartão de pontos',
     balance: 'Saldo',
     remainingAmount: 'Saldo restante',
     redeemPoints: 'Pontos utilizados',
@@ -1120,9 +1125,10 @@ function resolveRefundPayment(refund, payments) {
   return matchedPayment || refund;
 }
 function buildWallets(params) {
-  var paymentWallets = normalizeArray(params.order.payments).filter(function (payment) {
+  var displayedWalletPayments = normalizeArray(params.order.payments).filter(function (payment) {
     return isPrintablePayment(payment) && !!getFundRecord(payment);
-  }).map(function (payment) {
+  });
+  var paymentWallets = displayedWalletPayments.map(function (payment) {
     return buildPaymentItems({
       payment: payment,
       locale: params.locale,
@@ -1130,7 +1136,61 @@ function buildWallets(params) {
       includeFundRecordBalance: true
     });
   });
-  return [].concat(_toConsumableArray(paymentWallets), _toConsumableArray(buildVoucherAssets(params)));
+  var displayedWalletPassIds = collectDisplayedWalletPassIds(displayedWalletPayments);
+  return [].concat(_toConsumableArray(paymentWallets), _toConsumableArray(buildVoucherAssets(params)), _toConsumableArray(buildPointCardSnapshotAssets({
+    order: params.order,
+    locale: params.locale,
+    displayedWalletPassIds: displayedWalletPassIds
+  })));
+}
+function collectDisplayedWalletPassIds(payments) {
+  var ids = new Set();
+  payments.forEach(function (payment) {
+    var fundRecord = getFundRecord(payment);
+    [payment.voucher_id, fundRecord === null || fundRecord === void 0 ? void 0 : fundRecord.voucher_id].forEach(function (value) {
+      var id = normalizeWalletPassId(value);
+      if (id) ids.add(id);
+    });
+  });
+  return ids;
+}
+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 seenSnapshotIds = new Set();
+  return snapshots.flatMap(function (snapshot) {
+    if (!snapshot || _typeof(snapshot) !== 'object' || Array.isArray(snapshot)) return [];
+    var pointCard = snapshot;
+    if (stringify(pointCard.tag).trim().toLowerCase() !== 'point_card') return [];
+    var id = normalizeWalletPassId(pointCard.id);
+    if (!id || seenSnapshotIds.has(id)) return [];
+    seenSnapshotIds.add(id);
+    if (params.displayedWalletPassIds.has(id)) return [];
+    var rows = [{
+      item: stringify(pointCard.product_name).trim() || label(params.locale, 'pointCard'),
+      value: ''
+    }];
+    var remainingPoints = getPointCardSnapshotRemainingPoints(pointCard);
+    if (remainingPoints) {
+      rows.push({
+        item: label(params.locale, 'remainingPoints'),
+        value: trimDecimal(remainingPoints)
+      });
+    }
+    return [rows];
+  });
+}
+function normalizeWalletPassId(value) {
+  if (typeof value === 'number') return Number.isFinite(value) ? String(value) : null;
+  if (typeof value !== 'string') return null;
+  return value.trim() || null;
+}
+function getPointCardSnapshotRemainingPoints(snapshot) {
+  if (!isNumericAmount(snapshot.par_value) || !isNumericAmount(snapshot.used_par_value)) {
+    return null;
+  }
+  return Decimal.max(new Decimal(snapshot.par_value).minus(new Decimal(snapshot.used_par_value)), 0);
 }
 function buildVoucherAssets(params) {
   var seenVoucherKeys = new Set();

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 | 5 | 4 | 3 | 6;
+        weekNum: 0 | 5 | 3 | 1 | 2 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -27,6 +27,7 @@ const LABELS = {
     eftpos: 'Eftpos',
     wallet: 'Wallet',
     giftCard: 'Gift card',
+    pointCard: 'Point card',
     balance: 'Balance',
     remainingAmount: 'Remaining amount',
     redeemPoints: 'Redeem points',
@@ -59,6 +60,7 @@ const LABELS = {
     eftpos: '刷卡支付',
     wallet: '钱包支付',
     giftCard: '礼品卡',
+    pointCard: '积分卡',
     balance: '余额',
     remainingAmount: '剩余金额',
     redeemPoints: '本次使用积分',
@@ -91,6 +93,7 @@ const LABELS = {
     eftpos: '刷卡支付',
     wallet: '錢包支付',
     giftCard: '禮品卡',
+    pointCard: '積分卡',
     balance: '餘額',
     remainingAmount: '剩餘金額',
     redeemPoints: '本次使用積分',
@@ -121,6 +124,7 @@ const LABELS = {
     eftpos: 'カード',
     wallet: 'ウォレット',
     giftCard: 'ギフトカード',
+    pointCard: 'ポイントカード',
     balance: '残高',
     remainingAmount: '残高',
     redeemPoints: '利用ポイント',
@@ -152,6 +156,7 @@ const LABELS = {
     eftpos: 'Cartão',
     wallet: 'Carteira',
     giftCard: 'Cartão-presente',
+    pointCard: 'Cartão de pontos',
     balance: 'Saldo',
     remainingAmount: 'Saldo restante',
     redeemPoints: 'Pontos utilizados',
@@ -1083,13 +1088,67 @@ function resolveRefundPayment(refund, payments) {
   return matchedPayment || refund;
 }
 function buildWallets(params) {
-  const paymentWallets = normalizeArray(params.order.payments).filter(payment => isPrintablePayment(payment) && !!getFundRecord(payment)).map(payment => buildPaymentItems({
+  const displayedWalletPayments = normalizeArray(params.order.payments).filter(payment => isPrintablePayment(payment) && !!getFundRecord(payment));
+  const paymentWallets = displayedWalletPayments.map(payment => buildPaymentItems({
     payment,
     locale: params.locale,
     currencySymbol: params.currencySymbol,
     includeFundRecordBalance: true
   }));
-  return [...paymentWallets, ...buildVoucherAssets(params)];
+  const displayedWalletPassIds = collectDisplayedWalletPassIds(displayedWalletPayments);
+  return [...paymentWallets, ...buildVoucherAssets(params), ...buildPointCardSnapshotAssets({
+    order: params.order,
+    locale: params.locale,
+    displayedWalletPassIds
+  })];
+}
+function collectDisplayedWalletPassIds(payments) {
+  const ids = new Set();
+  payments.forEach(payment => {
+    const fundRecord = getFundRecord(payment);
+    [payment.voucher_id, fundRecord?.voucher_id].forEach(value => {
+      const id = normalizeWalletPassId(value);
+      if (id) ids.add(id);
+    });
+  });
+  return ids;
+}
+function buildPointCardSnapshotAssets(params) {
+  const snapshots = params.order.order_meta_list?.point_cards_snapshot;
+  if (!Array.isArray(snapshots)) return [];
+  const seenSnapshotIds = new Set();
+  return snapshots.flatMap(snapshot => {
+    if (!snapshot || typeof snapshot !== 'object' || Array.isArray(snapshot)) return [];
+    const pointCard = snapshot;
+    if (stringify(pointCard.tag).trim().toLowerCase() !== 'point_card') return [];
+    const id = normalizeWalletPassId(pointCard.id);
+    if (!id || seenSnapshotIds.has(id)) return [];
+    seenSnapshotIds.add(id);
+    if (params.displayedWalletPassIds.has(id)) return [];
+    const rows = [{
+      item: stringify(pointCard.product_name).trim() || label(params.locale, 'pointCard'),
+      value: ''
+    }];
+    const remainingPoints = getPointCardSnapshotRemainingPoints(pointCard);
+    if (remainingPoints) {
+      rows.push({
+        item: label(params.locale, 'remainingPoints'),
+        value: trimDecimal(remainingPoints)
+      });
+    }
+    return [rows];
+  });
+}
+function normalizeWalletPassId(value) {
+  if (typeof value === 'number') return Number.isFinite(value) ? String(value) : null;
+  if (typeof value !== 'string') return null;
+  return value.trim() || null;
+}
+function getPointCardSnapshotRemainingPoints(snapshot) {
+  if (!isNumericAmount(snapshot.par_value) || !isNumericAmount(snapshot.used_par_value)) {
+    return null;
+  }
+  return _decimal.default.max(new _decimal.default(snapshot.par_value).minus(new _decimal.default(snapshot.used_par_value)), 0);
 }
 function buildVoucherAssets(params) {
   const seenVoucherKeys = new Set();

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 | 5 | 4 | 3 | 6;
+        weekNum: 0 | 5 | 3 | 1 | 2 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/package.json

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