payment-kit 1.20.14 → 1.20.15

package/api/src/queues/vendors/fulfillment.ts

@@ -7,7 +7,7 @@ import { updateVendorFulfillmentStatus } from './fulfillment-coordinator';
 
 type VendorFulfillmentJob = {
   checkoutSessionId: string;
-  paymentIntentId: string;
+  invoiceId: string;
   vendorId: string;
   vendorConfig: any;
   retryOnError?: boolean;
@@ -19,7 +19,7 @@ export const handleVendorFulfillment = async (job: VendorFulfillmentJob) => {
     jobKeys: Object.keys(job),
   });
 
-  const { checkoutSessionId, paymentIntentId, vendorId, vendorConfig } = job;
+  const { checkoutSessionId, invoiceId, vendorId, vendorConfig } = job;
 
   try {
     const checkoutSession = await CheckoutSession.findByPk(checkoutSessionId);
@@ -31,7 +31,7 @@ export const handleVendorFulfillment = async (job: VendorFulfillmentJob) => {
       checkoutSessionId,
       amount_total: checkoutSession.amount_total,
       customer_id: checkoutSession.customer_id || '',
-      payment_intent_id: checkoutSession.payment_intent_id || '',
+      invoiceId,
       currency_id: checkoutSession.currency_id,
       customer_did: checkoutSession.customer_did || '',
     };
@@ -43,7 +43,7 @@ export const handleVendorFulfillment = async (job: VendorFulfillmentJob) => {
       status: fulfillmentResult.status,
     });
 
-    await updateVendorFulfillmentStatus(checkoutSessionId, paymentIntentId, vendorId, 'sent', {
+    await updateVendorFulfillmentStatus(checkoutSessionId, invoiceId, vendorId, 'sent', {
       orderId: fulfillmentResult.orderId,
       commissionAmount: fulfillmentResult.commissionAmount,
       serviceUrl: fulfillmentResult.serviceUrl,
@@ -55,7 +55,7 @@ export const handleVendorFulfillment = async (job: VendorFulfillmentJob) => {
       error,
     });
 
-    await updateVendorFulfillmentStatus(checkoutSessionId, paymentIntentId, vendorId, 'failed', {
+    await updateVendorFulfillmentStatus(checkoutSessionId, invoiceId, vendorId, 'failed', {
       lastError: error.message,
     });
 

package/api/src/queues/vendors/return-processor.ts

@@ -157,7 +157,6 @@ async function callVendorReturn(
     const returnResult = await vendorAdapter.requestReturn({
       orderId: vendor.order_id,
       reason: 'Subscription canceled',
-      paymentIntentId: checkoutSession.payment_intent_id || '',
       customParams: {
         checkoutSessionId: checkoutSession.id,
         subscriptionId: checkoutSession.subscription_id,

package/api/src/queues/vendors/status-check.ts

@@ -83,7 +83,7 @@ export const handleVendorStatusCheck = async (job: VendorStatusCheckJob) => {
         id: `fulfillment-coordinator-${checkoutSessionId}-${vendorId}`,
         job: {
           checkoutSessionId,
-          paymentIntentId: checkoutSession?.payment_intent_id || '',
+          invoiceId: checkoutSession?.invoice_id || '',
           triggeredBy: 'vendor-status-check-timeout',
         },
       });
@@ -158,7 +158,7 @@ export const handleVendorStatusCheck = async (job: VendorStatusCheckJob) => {
       id: `fulfillment-coordinator-${checkoutSessionId}-${vendorId}`,
       job: {
         checkoutSessionId,
-        paymentIntentId: checkoutSession?.payment_intent_id || '',
+        invoiceId: checkoutSession?.invoice_id || '',
         triggeredBy: 'vendor-status-check',
       },
     });

package/api/src/routes/vendor.ts

@@ -355,9 +355,12 @@ async function getVendorStatus(sessionId: string, isDetail = false) {
     };
   }
 
+  // FIXME: will remove payment_status @pengfei
+  const paymentStatus = doc.status === 'complete' ? 'paid' : 'unpaid';
+
   if (doc.status !== 'complete') {
     return {
-      payment_status: doc.payment_status,
+      payment_status: paymentStatus,
       session_status: doc.status,
       error: 'CheckoutSession not complete',
       vendors: [],
@@ -365,7 +368,7 @@ async function getVendorStatus(sessionId: string, isDetail = false) {
   }
   if (!doc.vendor_info) {
     return {
-      payment_status: doc.payment_status,
+      payment_status: paymentStatus,
       session_status: doc.status,
       error: 'Vendor info not found',
       vendors: [],
@@ -373,7 +376,13 @@ async function getVendorStatus(sessionId: string, isDetail = false) {
   }
 
   const vendors = doc.vendor_info.map((item) => {
-    return getVendorStatusByVendorId(item.vendor_id, item.order_id, isDetail);
+    return getVendorStatusByVendorId(item.vendor_id, item.order_id, isDetail).then((status) => {
+      return {
+        error_message: item.error_message,
+        status: item.status,
+        ...status,
+      };
+    });
   });
 
   const subscriptionId = doc.subscription_id;
@@ -390,7 +399,7 @@ async function getVendorStatus(sessionId: string, isDetail = false) {
   }
 
   return {
-    payment_status: doc.payment_status,
+    payment_status: paymentStatus,
     session_status: doc.status,
     subscriptionUrl: shortSubscriptionUrl,
     vendors: await Promise.all(vendors),

package/api/src/store/models/checkout-session.ts

@@ -623,6 +623,29 @@ export class CheckoutSession extends Model<InferAttributes<CheckoutSession>, Inf
       return null;
     }
   }
+
+  public static async findByInvoiceId(invoiceId: string): Promise<CheckoutSession | null> {
+    try {
+      const invoice = await Invoice.findByPk(invoiceId);
+      if (!invoice) {
+        return null;
+      }
+
+      if (invoice.checkout_session_id) {
+        return await CheckoutSession.findByPk(invoice.checkout_session_id);
+      }
+
+      if (!invoice.subscription_id) {
+        return null;
+      }
+
+      // Find original CheckoutSession through subscription
+      const checkoutSession = await CheckoutSession.findBySubscriptionId(invoice.subscription_id);
+      return checkoutSession;
+    } catch (error: any) {
+      return null;
+    }
+  }
 }
 
 export type TCheckoutSession = InferAttributes<CheckoutSession>;

package/blocklet.yml

@@ -14,7 +14,7 @@ repository:
   type: git
   url: git+https://github.com/blocklet/payment-kit.git
 specVersion: 1.2.8
-version: 1.20.14
+version: 1.20.15
 logo: logo.png
 files:
   - dist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.20.14",
+  "version": "1.20.15",
   "scripts": {
     "dev": "blocklet dev --open",
     "lint": "tsc --noEmit && eslint src api/src --ext .mjs,.js,.jsx,.ts,.tsx",
@@ -56,8 +56,8 @@
     "@blocklet/error": "^0.2.5",
     "@blocklet/js-sdk": "^1.16.52-beta-20250912-112002-e3499e9c",
     "@blocklet/logger": "^1.16.52-beta-20250912-112002-e3499e9c",
-    "@blocklet/payment-react": "1.20.14",
-    "@blocklet/payment-vendor": "1.20.14",
+    "@blocklet/payment-react": "1.20.15",
+    "@blocklet/payment-vendor": "1.20.15",
     "@blocklet/sdk": "^1.16.52-beta-20250912-112002-e3499e9c",
     "@blocklet/ui-react": "^3.1.41",
     "@blocklet/uploader": "^0.2.11",
@@ -126,7 +126,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.16.52-beta-20250912-112002-e3499e9c",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.20.14",
+    "@blocklet/payment-types": "1.20.15",
     "@types/cookie-parser": "^1.4.9",
     "@types/cors": "^2.8.19",
     "@types/debug": "^4.1.12",
@@ -173,5 +173,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "365b60721b7f3a372c472f774cda290d56dad365"
+  "gitHead": "d205c3b1ec7d2b819e375ed2eb8b70c9d48f0bcb"
 }