payment-kit 1.20.5 → 1.20.6

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

@@ -29,6 +29,7 @@ import type {
 } from './types';
 import { Invoice } from './invoice';
 import { Subscription } from './subscription';
+import { PaymentIntent } from './payment-intent';
 
 export const nextCheckoutSessionId = createIdGenerator('cs', 58);
 
@@ -195,24 +196,47 @@ export class CheckoutSession extends Model<InferAttributes<CheckoutSession>, Inf
 
   declare cross_sell_behavior?: LiteralUnion<'auto' | 'required', string>;
 
-  // FIXME: Only exist on creation
-  // declare discounts?: {
-  //   coupon?: string;
-  //   promotion_code?: string;
-  // };
-
-  // TODO: following fields not supported yet
-  // automatic_tax
-  // locale --> auto selected
-  // payment_method_collection // FIXME:
-  // payment_method_options
-  // setup_intent_data
-  // shipping_address_collection
-  // shipping_options
-  // tax_id_collection
-  // shipping_cost
-  // shipping_details
-  // shipping_options
+  declare fulfillment_status?: LiteralUnion<
+    | 'pending'
+    | 'processing'
+    | 'completed'
+    | 'failed'
+    | 'cancelled'
+    | 'max_retries_exceeded'
+    | 'return_requested'
+    | 'sent',
+    string
+  >;
+  declare vendor_info?: Array<{
+    vendor_id: string;
+    vendor_key: string;
+    order_id: string;
+    status:
+      | 'pending'
+      | 'processing'
+      | 'completed'
+      | 'failed'
+      | 'cancelled'
+      | 'max_retries_exceeded'
+      | 'return_requested'
+      | 'sent';
+    service_url?: string;
+    app_url?: string;
+    error_message?: string;
+    amount: string;
+
+    attempts?: number;
+    lastAttemptAt?: string;
+    completedAt?: string;
+    commissionAmount?: string;
+
+    returnRequest?: {
+      reason: string;
+      requestedAt: string;
+      status: 'pending' | 'accepted' | 'rejected';
+      returnDetails?: string;
+    };
+  }>;
 
   declare created_at: CreationOptional<Date>;
   declare created_via: LiteralUnion<'api' | 'dashboard' | 'portal', string>;
@@ -438,6 +462,14 @@ export class CheckoutSession extends Model<InferAttributes<CheckoutSession>, Inf
           type: DataTypes.INTEGER,
           defaultValue: 0,
         },
+        fulfillment_status: {
+          type: DataTypes.STRING,
+          allowNull: true,
+        },
+        vendor_info: {
+          type: DataTypes.JSON,
+          allowNull: true,
+        },
       },
       {
         sequelize,
@@ -542,6 +574,40 @@ export class CheckoutSession extends Model<InferAttributes<CheckoutSession>, Inf
     }
     return checkoutSession;
   }
+
+  public static async findByPaymentIntentId(paymentIntentId: string): Promise<CheckoutSession | null> {
+    try {
+      // Method 1: Direct lookup by payment_intent_id
+      let checkoutSession = await CheckoutSession.findOne({
+        where: { payment_intent_id: paymentIntentId },
+      });
+
+      if (checkoutSession) {
+        return checkoutSession;
+      }
+
+      // Method 2: Lookup via Invoice -> Subscription for original CheckoutSession
+      // This typically occurs during subscription renewals
+      const paymentIntent = await PaymentIntent.findByPk(paymentIntentId);
+      if (!paymentIntent || !paymentIntent.invoice_id) {
+        return null;
+      }
+
+      const invoice = await Invoice.findByPk(paymentIntent.invoice_id);
+      if (!invoice || !invoice.subscription_id) {
+        return null;
+      }
+
+      // Find original CheckoutSession through subscription
+      checkoutSession = await CheckoutSession.findBySubscriptionId(invoice.subscription_id);
+      if (checkoutSession) {
+        return checkoutSession;
+      }
+      return null;
+    } catch (error: any) {
+      return null;
+    }
+  }
 }
 
 export type TCheckoutSession = InferAttributes<CheckoutSession>;

package/api/src/store/models/index.ts

@@ -32,6 +32,7 @@ import { CreditTransaction, TCreditTransaction } from './credit-transaction';
 import { Meter, TMeter } from './meter';
 import { MeterEvent, TMeterEvent } from './meter-event';
 import { AutoRechargeConfig } from './auto-recharge-config';
+import { ProductVendor } from './product-vendor';
 
 const models = {
   CheckoutSession,
@@ -67,6 +68,7 @@ const models = {
   Meter,
   MeterEvent,
   AutoRechargeConfig,
+  ProductVendor,
 };
 
 export function initialize(sequelize: any) {
@@ -116,6 +118,7 @@ export * from './credit-transaction';
 export * from './meter';
 export * from './meter-event';
 export * from './auto-recharge-config';
+export * from './product-vendor';
 
 export type TPriceExpanded = TPrice & {
   object: 'price';

package/api/src/store/models/payout.ts

@@ -31,6 +31,13 @@ export class Payout extends Model<InferAttributes<Payout>, InferCreationAttribut
 
   declare metadata?: Record<string, any>;
 
+  declare vendor_info?: {
+    vendor_id: string;
+    app_pid?: string;
+    order_id: string;
+    commission_amount: string;
+  };
+
   declare status: LiteralUnion<'pending' | 'paid' | 'failed' | 'canceled' | 'in_transit', string>;
 
   // retry logic
@@ -168,6 +175,10 @@ export class Payout extends Model<InferAttributes<Payout>, InferCreationAttribut
     this.init(
       {
         ...Payout.GENESIS_ATTRIBUTES,
+        vendor_info: {
+          type: DataTypes.JSON,
+          allowNull: true,
+        },
       },
       {
         sequelize,

package/api/src/store/models/product-vendor.ts

@@ -0,0 +1,118 @@
+/* eslint-disable @typescript-eslint/lines-between-class-members */
+import { CreationOptional, DataTypes, InferAttributes, InferCreationAttributes, Model } from 'sequelize';
+
+import { createIdGenerator } from '../../libs/util';
+
+export const nextProductVendorId = createIdGenerator('pv', 24);
+
+export class ProductVendor extends Model<InferAttributes<ProductVendor>, InferCreationAttributes<ProductVendor>> {
+  declare id: CreationOptional<string>;
+  declare vendor_key: string;
+  declare name: string;
+  declare description: string;
+
+  declare app_url: string;
+  declare webhook_path?: string;
+
+  declare default_commission_rate: number;
+  declare default_commission_type: 'percentage' | 'fixed_amount';
+
+  declare order_create_params: Record<string, any>;
+
+  declare app_pid?: string;
+  declare app_logo?: string;
+
+  declare status: 'active' | 'inactive';
+  declare metadata: Record<string, any>;
+
+  declare created_by: string;
+  declare created_at: CreationOptional<Date>;
+  declare updated_at: CreationOptional<Date>;
+
+  public static readonly GENESIS_ATTRIBUTES = {
+    id: {
+      type: DataTypes.STRING(30),
+      primaryKey: true,
+      allowNull: false,
+      defaultValue: nextProductVendorId,
+    },
+    vendor_key: {
+      type: DataTypes.STRING(50),
+      allowNull: false,
+      unique: true,
+    },
+    name: {
+      type: DataTypes.STRING(255),
+      allowNull: false,
+    },
+    description: {
+      type: DataTypes.TEXT,
+      allowNull: true,
+    },
+    app_url: {
+      type: DataTypes.STRING(512),
+      allowNull: false,
+    },
+    webhook_path: {
+      type: DataTypes.STRING(255),
+      allowNull: true,
+    },
+    default_commission_rate: {
+      type: DataTypes.DECIMAL(7, 4),
+      allowNull: false,
+    },
+    default_commission_type: {
+      type: DataTypes.ENUM('percentage', 'fixed_amount'),
+      allowNull: false,
+    },
+    order_create_params: {
+      type: DataTypes.JSON,
+      allowNull: true,
+      defaultValue: {},
+    },
+    app_pid: {
+      type: DataTypes.STRING(255),
+      allowNull: true,
+    },
+    app_logo: {
+      type: DataTypes.STRING(512),
+      allowNull: true,
+    },
+    status: {
+      type: DataTypes.ENUM('active', 'inactive'),
+      allowNull: false,
+      defaultValue: 'active',
+    },
+    metadata: {
+      type: DataTypes.JSON,
+      allowNull: true,
+      defaultValue: {},
+    },
+    created_by: {
+      type: DataTypes.STRING(30),
+      allowNull: true,
+    },
+    created_at: {
+      type: DataTypes.DATE,
+      defaultValue: DataTypes.NOW,
+      allowNull: false,
+    },
+    updated_at: {
+      type: DataTypes.DATE,
+      defaultValue: DataTypes.NOW,
+      allowNull: false,
+    },
+  };
+
+  public static initialize(sequelize: any) {
+    this.init(ProductVendor.GENESIS_ATTRIBUTES, {
+      sequelize,
+      modelName: 'ProductVendor',
+      tableName: 'product_vendors',
+      createdAt: 'created_at',
+      updatedAt: 'updated_at',
+    });
+  }
+}
+
+export type TProductVendor = InferAttributes<ProductVendor>;

package/api/src/store/models/product.ts

@@ -51,6 +51,17 @@ export class Product extends Model<InferAttributes<Product>, InferCreationAttrib
     cross_sells_to_id: string;
   };
 
+  declare vendor_config?: Array<{
+    vendor_id: string;
+    vendor_key: string;
+    name?: string;
+    description?: string;
+    commission_rate?: number;
+    commission_type?: 'percentage' | 'fixed_amount';
+    amount?: string;
+    custom_params?: Record<string, any>;
+  }>;
+
   // TODO: goods related props are not supported
   // declare package_dimensions?: any;
   // declare shippable?: boolean;
@@ -138,6 +149,10 @@ export class Product extends Model<InferAttributes<Product>, InferCreationAttrib
           type: DataTypes.JSON,
           allowNull: true,
         },
+        vendor_config: {
+          type: DataTypes.JSON,
+          allowNull: true,
+        },
       },
       {
         sequelize,

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.5
+version: 1.20.6
 logo: logo.png
 files:
   - dist
@@ -66,7 +66,13 @@ scripts:
   preStart: node api/hooks/pre-start.js
   preFlight: node api/hooks/pre-flight.js
   dev: pnpm run start
-environments: []
+environments:
+  - name: SHORT_URL_API_KEY
+    description: Short URL service API Key
+    required: false
+    default: ''
+    secure: true
+    shared: false
 capabilities:
   navigation: true
   clusterMode: false