@pisell/pisellos 2.3.8 → 2.3.9

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

@@ -458,7 +458,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: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/dist/modules/Order/index.js

@@ -79,6 +79,9 @@ function isPendingVoucherPaymentRecord(payment) {
 function isPaidPaymentRecord(payment) {
   return (payment === null || payment === void 0 ? void 0 : payment.status) === ORDER_PAYMENT_STATUS_PAID;
 }
+function isCommittedVoucherPaymentRecord(payment) {
+  return isVoucherPaymentRecord(payment) && (payment === null || payment === void 0 ? void 0 : payment.status) !== 'voided' && (hasSyncedOrderPaymentRecord(payment) || isPaidPaymentRecord(payment));
+}
 export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(OrderModule, _BaseModule);
   var _super = _createSuper(OrderModule);
@@ -3253,6 +3256,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       this.applyPaymentLifecycleChange(tempOrder, _objectSpread(_objectSpread({}, options), {}, {
         logContext: 'confirmPendingVoucherPayments'
       }));
+      // this.recalculateSummary();
       return tempOrder.payments;
     }
   }, {
@@ -3322,21 +3326,41 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var nonVoucherPayments = (tempOrder.payments || []).filter(function (payment) {
         return !isVoucherPaymentRecord(payment);
       });
-      var syncedVoucherPayments = (tempOrder.payments || []).filter(function (payment) {
-        return isVoucherPaymentRecord(payment) && hasSyncedOrderPaymentRecord(payment);
+      var normalizeCommittedVoucherPayment = function normalizeCommittedVoucherPayment(payment) {
+        if (hasSyncedOrderPaymentRecord(payment) && (payment.status === undefined || payment.status === 'active')) {
+          return _objectSpread(_objectSpread({}, payment), {}, {
+            status: ORDER_PAYMENT_STATUS_PAID
+          });
+        }
+        return payment;
+      };
+      var committedVoucherPayments = (tempOrder.payments || []).filter(function (payment) {
+        return isCommittedVoucherPaymentRecord(payment);
+      }).map(function (payment) {
+        return normalizeCommittedVoucherPayment(payment);
       });
-      var syncedVoucherPaymentIds = new Set(syncedVoucherPayments.map(function (payment) {
+      var committedVoucherPaymentIds = new Set(committedVoucherPayments.filter(function (payment) {
+        return hasSyncedOrderPaymentRecord(payment);
+      }).map(function (payment) {
         return String(payment.order_payment_id);
       }));
+      var committedVoucherIds = new Set(committedVoucherPayments.map(function (payment) {
+        return String(payment.voucher_id);
+      }));
       var replaceableVouchers = mappedVouchers.filter(function (payment) {
-        if (!hasSyncedOrderPaymentRecord(payment)) return true;
-        return !syncedVoucherPaymentIds.has(String(payment.order_payment_id));
+        if (hasSyncedOrderPaymentRecord(payment) && committedVoucherPaymentIds.has(String(payment.order_payment_id))) {
+          return false;
+        }
+        if (payment.voucher_id !== undefined && committedVoucherIds.has(String(payment.voucher_id))) {
+          return false;
+        }
+        return true;
       });
       var cappedVouchers = this.capVoucherPaymentsByRemainingAmount({
         vouchers: replaceableVouchers,
-        nonVoucherPayments: [].concat(_toConsumableArray(nonVoucherPayments), _toConsumableArray(syncedVoucherPayments))
+        nonVoucherPayments: [].concat(_toConsumableArray(nonVoucherPayments), _toConsumableArray(committedVoucherPayments))
       });
-      tempOrder.payments = [].concat(_toConsumableArray(nonVoucherPayments), _toConsumableArray(syncedVoucherPayments), _toConsumableArray(cappedVouchers));
+      tempOrder.payments = [].concat(_toConsumableArray(nonVoucherPayments), _toConsumableArray(committedVoucherPayments), _toConsumableArray(cappedVouchers));
       this.updateTempOrderPaymentStatus(tempOrder);
       this.persistTempOrder();
       void this.recalculateSummary({
@@ -4533,7 +4557,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               enhancePayload = hasPaymentOverride || hasPaymentStatusOverride || hasSmallTicketDataFlagOverride || params !== null && params !== void 0 && params.enhancePayload ? function (payload, ctx) {
                 var nextPayload = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, payload), hasPaymentOverride ? {
                   payments: preparedPaymentOverride || []
-                } : {}), hasPaymentStatusOverride ? {
+                } : {}), hasPaymentStatusOverride && !shouldConfirmPendingVoucherPayments ? {
                   payment_status: params === null || params === void 0 ? void 0 : params.paymentStatus
                 } : {}), hasSmallTicketDataFlagOverride ? {
                   small_ticket_data_flag: params === null || params === void 0 ? void 0 : params.smallTicketDataFlag

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

@@ -46,6 +46,9 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     protected hasManualDiscountSelection: boolean;
     private readonly reusedSharedSubModuleNames;
     private paymentMethodsCache;
+    private queuedAutoPaymentSync;
+    private autoPaymentSyncFlushing;
+    private autoPaymentSyncTimer;
     constructor(name?: string, version?: string);
     /**
      * 子类可覆盖此方法以追加/收敛要注册的子模块。
@@ -225,6 +228,10 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     getOrderPayments(): OrderPaymentData[];
     /** 覆盖当前订单支付项，内部由 OrderModule 清洗为 Sales 协议字段。 */
     setOrderPayments(payments: OrderPaymentSource[]): OrderPaymentData[];
+    private getPaymentStatusForSync;
+    private queueLatestAutoPaymentSync;
+    private scheduleQueuedAutoPaymentSyncFlush;
+    private flushQueuedAutoPaymentSync;
     /** 追加单个支付项到当前订单。 */
     addOrderPayment(payment: OrderPaymentSource): OrderPaymentData[];
     /** 更新当前订单中的指定支付项。 */