payment-kit 1.13.237 → 1.13.239

package/api/src/routes/checkout-sessions.ts

@@ -535,6 +535,8 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
       const paymentLink = checkoutSession.payment_link_id
         ? await PaymentLink.findByPk(checkoutSession.payment_link_id)
         : null;
+      const beneficiaries =
+        paymentLink?.payment_intent_data?.beneficiaries || paymentLink?.donation_settings?.beneficiaries || [];
 
       if (checkoutSession.payment_intent_id) {
         paymentIntent = await PaymentIntent.findByPk(checkoutSession.payment_intent_id);
@@ -560,10 +562,7 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
           payment_method_id: paymentMethod.id,
           receipt_email: customer.email,
           last_payment_error: null,
-          beneficiaries: createPaymentBeneficiaries(
-            checkoutSession.amount_total,
-            paymentLink?.donation_settings?.beneficiaries || []
-          ),
+          beneficiaries: createPaymentBeneficiaries(checkoutSession.amount_total, beneficiaries),
         });
         logger.info('payment intent for checkout session reset', {
           session: checkoutSession.id,
@@ -588,10 +587,7 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
             checkoutSession.payment_intent_data?.statement_descriptor || getStatementDescriptor(lineItems),
           statement_descriptor_suffix: '',
           setup_future_usage: 'on_session',
-          beneficiaries: createPaymentBeneficiaries(
-            checkoutSession.amount_total,
-            paymentLink?.donation_settings?.beneficiaries || []
-          ),
+          beneficiaries: createPaymentBeneficiaries(checkoutSession.amount_total, beneficiaries),
           metadata: checkoutSession.payment_intent_data?.metadata || checkoutSession.metadata,
         });
         logger.info('paymentIntent created on checkout session submit', {

package/api/src/routes/payment-links.ts

@@ -47,6 +47,7 @@ const formatBeforeSave = (payload: any) => {
       },
       submit_type: 'pay',
       cross_sell_behavior: 'auto',
+      payment_intent_data: null,
       donation_settings: null,
     },
     pick(payload, [
@@ -63,6 +64,7 @@ const formatBeforeSave = (payload: any) => {
       'billing_address_collection',
       'submit_type',
       'subscription_data',
+      'payment_intent_data',
       'nft_mint_settings',
       'cross_sell_behavior',
       'donation_settings',

package/api/src/store/migrations/20240508-beneficiaries.ts

@@ -0,0 +1,21 @@
+import { DataTypes } from 'sequelize';
+
+import { Migration, safeApplyColumnChanges } from '../migrate';
+
+export const up: Migration = async ({ context }) => {
+  await safeApplyColumnChanges(context, {
+    payment_links: [
+      {
+        name: 'beneficiaries',
+        field: {
+          type: DataTypes.JSON,
+          allowNull: true,
+        },
+      },
+    ],
+  });
+};
+
+export const down: Migration = async ({ context }) => {
+  await context.removeColumn('payment_links', 'beneficiaries');
+};

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

@@ -23,6 +23,8 @@ import type {
   NftMintDetails,
   NftMintSettings,
   PaymentDetails,
+  PaymentIntentData,
+  SubscriptionData,
 } from './types';
 
 export const nextCheckoutSessionId = createIdGenerator('cs', 58);
@@ -155,11 +157,8 @@ export class CheckoutSession extends Model<InferAttributes<CheckoutSession>, Inf
   declare billing_address_collection?: LiteralUnion<'auto' | 'required', string>;
 
   // When creating a subscription, the specified configuration data will be used.
-  declare subscription_data?: {
-    description: string;
-    trial_period_days: number;
+  declare subscription_data?: SubscriptionData & {
     billing_cycle_anchor?: number;
-    billing_threshold_amount?: number;
     metadata?: Record<string, any>;
     proration_behavior?: LiteralUnion<'create_prorations' | 'none', string>;
     trial_end?: number;
@@ -176,11 +175,7 @@ export class CheckoutSession extends Model<InferAttributes<CheckoutSession>, Inf
   declare payment_details?: PaymentDetails;
 
   // A subset of parameters to be passed to PaymentIntent creation for Checkout Sessions in payment mode.
-  declare payment_intent_data?: {
-    description?: string;
-    statement_descriptor?: string;
-    metadata?: Record<string, any>;
-  };
+  declare payment_intent_data?: PaymentIntentData;
 
   // Whether should we mint an nft to the customer on checkout complete
   // Will use setting from payment method

package/api/src/store/models/payment-link.ts

@@ -4,7 +4,15 @@ import type { LiteralUnion } from 'type-fest';
 
 import { createEvent } from '../../libs/audit';
 import { createIdGenerator } from '../../libs/util';
-import type { AfterPayment, CustomField, DonationSettings, LineItem, NftMintSettings } from './types';
+import type {
+  AfterPayment,
+  CustomField,
+  DonationSettings,
+  LineItem,
+  NftMintSettings,
+  PaymentIntentData,
+  SubscriptionData,
+} from './types';
 
 export const nextPaymentLinkId = createIdGenerator('plink', 24);
 
@@ -66,11 +74,7 @@ export class PaymentLink extends Model<InferAttributes<PaymentLink>, InferCreati
   declare submit_type: LiteralUnion<'auto' | 'book' | 'donate' | 'pay', string>;
 
   // When creating a subscription, the specified configuration data will be used.
-  declare subscription_data?: {
-    description: string;
-    trial_period_days: number;
-    billing_threshold_amount?: number;
-  };
+  declare subscription_data?: SubscriptionData;
 
   declare nft_mint_settings?: NftMintSettings;
 
@@ -81,6 +85,8 @@ export class PaymentLink extends Model<InferAttributes<PaymentLink>, InferCreati
 
   declare metadata?: Record<string, any>;
 
+  declare payment_intent_data?: PaymentIntentData;
+
   // TODO: following fields not supported
   // application_fee_amount
   // application_fee_percent
@@ -89,7 +95,6 @@ export class PaymentLink extends Model<InferAttributes<PaymentLink>, InferCreati
   // tax_id_collection
   // consent_collection
   // on_behalf_of
-  // payment_intent_data
   // payment_method_collection
   // shipping_address_collection
   // shipping_options

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

@@ -330,6 +330,12 @@ export type DonationSettings = {
     };
   };
 };
+export type PaymentIntentData = {
+  description?: string;
+  statement_descriptor?: string;
+  beneficiaries?: PaymentBeneficiary[];
+  metadata?: Record<string, any>;
+};
 
 export type NftMintSettings = {
   enabled: boolean;
@@ -351,6 +357,13 @@ export type NftMintDetails = {
   ethereum?: NftMintItem;
 };
 
+export type SubscriptionData = {
+  description: string;
+  trial_period_days: number;
+  billing_threshold_amount?: number;
+  metadata?: Record<string, any>;
+};
+
 // Very similar to PaymentLink
 export type PricingTableItem = {
   price_id: string;
@@ -391,15 +404,13 @@ export type PricingTableItem = {
   submit_type: LiteralUnion<'auto' | 'book' | 'donate' | 'pay', string>;
 
   // When creating a subscription, the specified configuration data will be used.
-  subscription_data?: {
-    description: string;
-    trial_period_days: number;
-    billing_threshold_amount?: number;
-  };
+  subscription_data?: SubscriptionData;
 
   nft_mint_settings?: NftMintSettings;
 
   cross_sell_behavior?: LiteralUnion<'auto' | 'required', string>;
+
+  payment_intent_data?: PaymentIntentData;
 };
 
 export type BrandSettings = {

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.13.237
+version: 1.13.239
 logo: logo.png
 files:
   - dist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.237",
+  "version": "1.13.239",
   "scripts": {
     "dev": "cross-env COMPONENT_STORE_URL=https://test.store.blocklet.dev blocklet dev --open",
     "eject": "vite eject",
@@ -51,7 +51,7 @@
     "@arcblock/ux": "^2.9.75",
     "@arcblock/validator": "^1.18.115",
     "@blocklet/logger": "1.16.26",
-    "@blocklet/payment-react": "1.13.237",
+    "@blocklet/payment-react": "1.13.239",
     "@blocklet/sdk": "1.16.26",
     "@blocklet/ui-react": "^2.9.75",
     "@blocklet/uploader": "^0.0.78",
@@ -116,7 +116,7 @@
   "devDependencies": {
     "@abtnode/types": "1.16.26",
     "@arcblock/eslint-config-ts": "^0.3.0",
-    "@blocklet/payment-types": "1.13.237",
+    "@blocklet/payment-types": "1.13.239",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
@@ -155,5 +155,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "895430a130d53b62707f4f78c5295b06ce55d4db"
+  "gitHead": "898fbcb595e77f6183aa0cac9fa69dbceb19d75f"
 }