payment-kit 1.18.30 → 1.18.31

package/scripts/sdk.js

@@ -1,161 +1,492 @@
-// run sdk test: # blocklet exec /scripts/sdk.js --app-id=appid
+/* eslint-disable @typescript-eslint/no-unused-vars */
+// run sdk test: # pnpm run sdk-test
 
 /* eslint-disable import/no-extraneous-dependencies */
 /* eslint-disable no-console */
-const payment = require('@blocklet/payment-js').default;
+const { spawn } = require('child_process');
+const payment = require('../../../packages/client/lib').default;
 
-(async () => {
+function getAppId() {
+  const args = process.argv.slice(2);
+  let appId = '';
+
+  for (let i = 0; i < args.length; i++) {
+    if (args[i] === '--app-id' && i + 1 < args.length) {
+      appId = args[i + 1];
+      break;
+    }
+  }
+
+  if (!appId) {
+    appId =
+      process.env.BLOCKLET_DEV_APP_DID?.split(':').pop() ||
+      process.env.BLOCKLET_APP_ID ||
+      'zNKuN3XwXN7xq2NsJQjjfwujyqCxx26DhwgV';
+  }
+
+  return appId;
+}
+
+const checkoutModule = {
+  // 订阅级别管理通知
+  async createWithNotification() {
+    const checkoutSession = await payment.checkout.sessions.create({
+      mode: 'subscription',
+      line_items: [{ price_id: 'price_fQFIS12yi0JR3KePLmitjrhA', quantity: 1 }],
+      subscription_data: {
+        notification_settings: {
+          self_handle: true,
+          include_events: ['customer.subscription.started'],
+        },
+        no_stake: true,
+      },
+    });
+    console.log('createWithNotification', checkoutSession);
+    return checkoutSession;
+  },
+
+  // 批量订阅 + 免质押
+  async createBatchSubscription() {
+    const checkoutSession = await payment.checkout.sessions.create({
+      mode: 'subscription',
+      line_items: [
+        {
+          price_id: 'price_fQFIS12yi0JR3KePLmitjrhA',
+          quantity: 1,
+          subscription_data: {
+            metadata: { test: 'test price_fQFIS12yi0JR3KePLmitjrhA' },
+          },
+        },
+        {
+          price_id: 'price_PXyI9Duz99eqty1AqbaEc73u',
+          quantity: 1,
+          subscription_data: {
+            metadata: { test: 'test price_PXyI9Duz99eqty1AqbaEc73u' },
+          },
+        },
+      ],
+      enable_subscription_grouping: true,
+      subscription_data: {
+        no_stake: true,
+      },
+    });
+    console.log('createBatchSubscription', checkoutSession);
+    return checkoutSession;
+  },
+
+  // 批量订阅 + 试用 + 免质押
+  async createWithTrial() {
+    const checkoutSession = await payment.checkout.sessions.create({
+      mode: 'subscription',
+      line_items: [
+        { price_id: 'price_dsjm7m1qzxEg370uLAjma4zS', quantity: 2 },
+        { price_id: 'price_n9xjC3M2cILR3iWez7ToMRjd', quantity: 1 },
+        { price_id: 'price_6P2bJXtWx8Awk65NC4f1PAsf', quantity: 1 },
+      ],
+      enable_subscription_grouping: true,
+      subscription_data: {
+        no_stake: true,
+      },
+    });
+    console.log('createWithTrial', checkoutSession);
+    return checkoutSession;
+  },
+
+  // 创建通知设置
+  async createNotificationSetting() {
+    const setting = await payment.settings.create({
+      type: 'notification',
+      mountLocation: 'core.sdk.test',
+      description: 'test',
+      settings: {
+        self_handle: true,
+        include_events: ['customer.subscription.started'],
+      },
+    });
+    console.log('createNotificationSetting', setting);
+    return setting;
+  },
+
+  // 应用级别管理通知
+  async createCheckoutWithSettingId() {
+    // 先创建设置
+    const NOTIFICATION_MOUNT_LOCATION = 'core.sdk.test';
+    const setting = await payment.settings.create({
+      type: 'notification',
+      mountLocation: NOTIFICATION_MOUNT_LOCATION,
+      description: 'test',
+      settings: {
+        self_handle: true,
+        include_events: ['customer.subscription.started'],
+      },
+    });
+    console.log('createNotificationSetting', setting);
+    // 使用设置ID创建结账会话
+    const checkoutSession = await payment.checkout.sessions.create({
+      mode: 'subscription',
+      line_items: [{ price_id: 'price_fQFIS12yi0JR3KePLmitjrhA', quantity: 1 }],
+      metadata: {
+        setting_id: NOTIFICATION_MOUNT_LOCATION, // 也可以是 setting.id
+      },
+    });
+    console.log('createCheckoutWithSettingId', checkoutSession);
+    return { setting, checkoutSession };
+  },
+};
+
+const paymentModule = {
+  // 获取支付意图
+  async retrievePaymentIntent() {
+    const paymentIntent = await payment.paymentIntents.retrieve('pi_ybTOCWweEnb9grWZsTH7MCVi');
+    console.log('retrievePaymentIntent', paymentIntent);
+    return paymentIntent;
+  },
+
+  // === 退款相关测试 ===
+
+  // 创建退款
+  async createRefund() {
+    const paymentIntentId = 'pi_ybTOCWweEnb9grWZsTH7MCVi';
+
+    const refundResult = await payment.paymentIntents.refund(paymentIntentId, {
+      amount: '0.001',
+      reason: 'requested_by_customer',
+      description: 'Refund Test',
+    });
+    console.log('createRefund', refundResult);
+    return refundResult;
+  },
+
+  // 获取退款详情
+  async retrieveRefund() {
+    const refund = await payment.refunds.retrieve('re_loHv143R78cSe38uGjxRBsfv');
+    console.log('retrieveRefund', refund);
+    return refund;
+  },
+
+  // 获取退款列表
+  async listRefunds() {
+    const paymentIntentId = 'pi_ybTOCWweEnb9grWZsTH7MCVi';
+    const paymentIntent = await payment.paymentIntents.retrieve(paymentIntentId);
+
+    const refunds = await payment.refunds.list({
+      invoice_id: paymentIntent.invoice_id,
+    });
+    console.log('listRefunds', refunds);
+    return refunds;
+  },
+
+  // 创建自定义退款
+  async createCustomRefund() {
+    const paymentIntentId = 'pi_ybTOCWweEnb9grWZsTH7MCVi';
+    const paymentIntent = await payment.paymentIntents.retrieve(paymentIntentId);
+
+    const refundData = {
+      amount: '0.001',
+      reason: 'requested_by_admin',
+      description: 'Custom Refund Test',
+      invoice_id: paymentIntent.invoice_id,
+      payment_intent_id: paymentIntent.id,
+      currency_id: paymentIntent.currency_id,
+      payment_method_id: paymentIntent.payment_method_id,
+      customer_id: paymentIntent.customer_id,
+    };
+
+    const customRefund = await payment.refunds.create(refundData);
+    console.log('createCustomRefund', customRefund);
+    return customRefund;
+  },
+
+  // 完整支付和退款流程
+  async paymentAndRefundFlow() {
+    // 注意：测试中使用已有的支付意图，实际应用中应先创建支付意图
+    const paymentIntentId = 'pi_ybTOCWweEnb9grWZsTH7MCVi';
+    const paymentIntent = await payment.paymentIntents.retrieve(paymentIntentId);
+
+    const partialRefund = await payment.paymentIntents.refund(paymentIntentId, {
+      amount: '0.0005', // 部分金额
+      reason: 'requested_by_customer',
+      description: 'Partial Refund Test',
+    });
+
+    const refunds = await payment.refunds.list({
+      invoice_id: paymentIntent.invoice_id,
+    });
+
+    console.log('paymentAndRefundFlow', {
+      paymentIntent,
+      partialRefund,
+      refundsList: refunds,
+    });
+    return {
+      paymentIntent,
+      partialRefund,
+      refundsList: refunds,
+    };
+  },
+};
+
+const productModule = {
+  // 创建单个产品
+  async createProduct() {
+    const product = await payment.products.create({
+      name: 'Test SDK product',
+      description: 'test',
+    });
+    console.log('createProduct', product);
+    return product;
+  },
+
+  // === 价格相关测试 ===
+
+  // 方式1：创建产品时一并创建价格
+  async createProductWithPrice() {
+    const product = await payment.products.create({
+      name: 'Test One-time Price Product',
+      description: 'Product for one-time price test',
+      type: 'good',
+      prices: [
+        {
+          type: 'one_time',
+          unit_amount: '1',
+          currency_id: 'pc_9l5sh8bcjbLU',
+          lookup_key: 'test_one_time_price',
+        },
+      ],
+    });
+    console.log('createProductWithPrice', product);
+    return product;
+  },
+
+  // 方式2：先创建产品，再创建价格
+  async createOneTimePrice() {
+    const product = await payment.products.create({
+      name: 'Test Separate Price Product',
+      description: 'Product for separate price creation test',
+    });
+
+    const price = await payment.prices.create({
+      product_id: product.id,
+      type: 'one_time',
+      unit_amount: '1',
+      currency_id: 'pc_9l5sh8bcjbLU',
+    });
+    console.log('createOneTimePrice', { product, price });
+    return { product, price };
+  },
+
+  // 创建循环订阅价格
+  async createRecurringPrice() {
+    const productId = 'prod_Acj9sSjFaABVQm'; // 使用已存在的产品ID
+
+    const price = await payment.prices.create({
+      locked: false,
+      model: 'standard',
+      billing_scheme: '',
+      currency_id: 'pc_aW2zy2y8yoi7',
+      nickname: '',
+      type: 'recurring',
+      unit_amount: '0.001',
+      lookup_key: '',
+      recurring: {
+        interval_config: 'month_1',
+        interval: 'month',
+        interval_count: 1,
+        usage_type: 'licensed',
+        aggregate_usage: 'sum',
+      },
+      transform_quantity: { divide_by: 1, round: 'up' },
+      tiers: [],
+      metadata: [],
+      custom_unit_amount: null,
+      currency_options: [],
+      tiers_mode: null,
+      quantity_available: 10,
+      quantity_limit_per_checkout: '2',
+      product_id: productId,
+    });
+    console.log('createRecurringPrice', price);
+    return price;
+  },
+
+  // 价格库存管理
+  async updateInventory() {
+    const inventoryPrice = await payment.prices.inventory('price_xUd1QXTwhoIdOfHa9WT6MdBe', {
+      quantity: 1,
+      action: 'decrement',
+    });
+    console.log('updateInventory', inventoryPrice);
+    return inventoryPrice;
+  },
+
+  // 完整流程：展示两种创建方式
+  async createProductWithPrices() {
+    // 方式1：内联价格
+    const productWithInlinePrices = await payment.products.create({
+      name: 'Product with Inline Prices',
+      description: 'Product with prices defined inline',
+      prices: [
+        {
+          type: 'one_time',
+          unit_amount: '15',
+          currency_id: 'pc_9l5sh8bcjbLU',
+        },
+        {
+          type: 'recurring',
+          unit_amount: '7.5',
+          currency_id: 'pc_aW2zy2y8yoi7',
+          recurring: {
+            interval_config: 'month_1',
+            interval: 'month',
+            interval_count: 1,
+            usage_type: 'licensed',
+          },
+        },
+      ],
+    });
+
+    // 方式2：分步创建
+    const product = await payment.products.create({
+      name: 'Product with Separate Prices',
+      description: 'Product with separately defined prices',
+    });
+
+    const oneTimePrice = await payment.prices.create({
+      product_id: product.id,
+      type: 'one_time',
+      unit_amount: '10',
+      currency_id: 'pc_9l5sh8bcjbLU',
+    });
+
+    const subscriptionPrice = await payment.prices.create({
+      product_id: product.id,
+      type: 'recurring',
+      unit_amount: '5',
+      currency_id: 'pc_aW2zy2y8yoi7',
+      recurring: {
+        interval_config: 'month_1',
+        interval: 'month',
+        interval_count: 1,
+        usage_type: 'licensed',
+      },
+    });
+    console.log('createProductWithPrices', {
+      inlineMethod: productWithInlinePrices,
+      separateMethod: {
+        product,
+        prices: {
+          oneTime: oneTimePrice,
+          subscription: subscriptionPrice,
+        },
+      },
+    });
+    return {
+      inlineMethod: productWithInlinePrices,
+      separateMethod: {
+        product,
+        prices: {
+          oneTime: oneTimePrice,
+          subscription: subscriptionPrice,
+        },
+      },
+    };
+  },
+};
+
+const subscriptionModule = {
+  // 获取所有订阅
+  async listSubscriptions() {
+    const subscriptions = await payment.subscriptions.list({
+      order: 'updated_at:ASC',
+      // 支持Sequelize排序格式
+      // order: [
+      //   ['status', 'DESC'],
+      //   ['updated_at', 'ASC'],
+      // ],
+      activeFirst: true,
+    });
+    console.log('listSubscriptions', subscriptions);
+    return subscriptions;
+  },
+
+  // 上报用量
+  async createUsageRecord() {
+    const record = {
+      subscription_item_id: 'si_Tq4c2KsC40uPq7',
+      quantity: 1,
+      action: 'increment',
+      livemode: false,
+      timestamp: Math.floor(Date.now() / 1000),
+    };
+
+    const result = await payment.subscriptionItems.createUsageRecord(record);
+    console.log('createUsageRecord', result);
+    return result;
+  },
+
+  // 并发上报
+  async createBatchUsageRecords() {
+    const records = [
+      {
+        subscription_item_id: 'si_Tq4c2KsC40uPq7',
+        quantity: 1,
+        action: 'increment',
+        livemode: false,
+        timestamp: Math.floor(Date.now() / 1000),
+      },
+      {
+        subscription_item_id: 'si_Tq4c2KsC40uPq7',
+        quantity: 2,
+        action: 'increment',
+        livemode: false,
+        timestamp: Math.floor(Date.now() / 1000),
+      },
+    ];
+
+    const results = await Promise.allSettled(
+      records.map((record) => payment.subscriptionItems.createUsageRecord(record))
+    );
+    console.log('createBatchUsageRecords', results);
+    return results;
+  },
+};
+
+// 测试模块注册
+const testModules = {
+  checkout: checkoutModule,
+  payment: paymentModule,
+  product: productModule,
+  subscription: subscriptionModule,
+};
+
+async function runTest() {
   payment.environments.setTestMode(true);
-  const subcriptions = await payment.subscriptions.list({
-    order: 'updated_at:ASC',
-    // order: [
-    //   ['status', 'DESC'],
-    //   ['updated_at', 'ASC'],
-    // ], // also support sequelize order
-    activeFirst: true,
+  await testModules.checkout.createBatchSubscription();
+}
+
+async function main() {
+  if (process.env.BLOCKLET_APP_ID) {
+    await runTest();
+    process.exit(0);
+  }
+
+  const appId = getAppId();
+  const args = process.argv.slice(2).filter((arg) => arg !== '--app-id' && arg !== appId);
+
+  console.log(`Running with blocklet exec, app-id: ${appId}`);
+
+  const child = spawn('blocklet', ['exec', '/scripts/sdk.js', '--app-id', appId, ...args], {
+    stdio: 'inherit',
+  });
+
+  child.on('exit', (code) => {
+    process.exit(code || 0);
+  });
+}
+
+if (require.main === module) {
+  main().catch((error) => {
+    console.error('Error:', error);
+    process.exit(1);
   });
-  console.log('🚀 ~ subcriptions:', subcriptions);
-
-  // const paymentIntent = await payment.paymentIntents.retrieve('pi_ybTOCWweEnb9grWZsTH7MCVi');
-
-  // console.log('paymentIntent', paymentIntent);
-
-  // const refundResult = await payment.paymentIntents.refund('pi_ybTOCWweEnb9grWZsTH7MCVi', {
-  //   amount: '0.001',
-  //   reason: 'requested_by_customer',
-  //   description: 'Refund Test',
-  // });
-  // console.log('refundResult', refundResult);
-
-  // const refund = await payment.refunds.retrieve('re_loHv143R78cSe38uGjxRBsfv');
-  // console.log('🚀 ~ refund:', refund);
-
-  // const refunds = await payment.refunds.list({
-  //   invoice_id: paymentIntent.invoice_id,
-  // });
-  // console.log('🚀 ~ refunds:', refunds);
-
-  // const customRefundResult = await payment.refunds.create({
-  //   amount: '0.001',
-  //   reason: 'requested_by_admin',
-  //   description: 'Custom Refund Test',
-  //   invoice_id: paymentIntent.invoice_id,
-  //   payment_intent_id: paymentIntent.id,
-  //   currency_id: paymentIntent.currency_id,
-  //   payment_method_id: paymentIntent.payment_method_id,
-  //   customer_id: paymentIntent.customer_id,
-  // });
-  // console.log('🚀 ~ customRefundResult:', customRefundResult);
-
-  // const price = await payment.prices.create({
-  //   locked: false,
-  //   model: 'standard',
-  //   billing_scheme: '',
-  //   currency_id: 'pc_aW2zy2y8yoi7',
-  //   nickname: '',
-  //   type: 'recurring',
-  //   unit_amount: '0.001',
-  //   lookup_key: '',
-  //   recurring: {
-  //     interval_config: 'month_1',
-  //     interval: 'month',
-  //     interval_count: 1,
-  //     usage_type: 'licensed',
-  //     aggregate_usage: 'sum',
-  //   },
-  //   transform_quantity: { divide_by: 1, round: 'up' },
-  //   tiers: [],
-  //   metadata: [],
-  //   custom_unit_amount: null,
-  //   currency_options: [],
-  //   tiers_mode: null,
-  //   quantity_available: 10,
-  //   quantity_limit_per_checkout: '2',
-  //   product_id: 'prod_Acj9sSjFaABVQm',
-  // });
-  // console.log('🚀 ~ price:', price);
-  // const inventoryPrice = await payment.prices.inventory('price_xUd1QXTwhoIdOfHa9WT6MdBe', {
-  //   quantity: 1,
-  //   action: 'decrement',
-  // });
-  // console.log('inventoryPrice', inventoryPrice);
-
-  // const checkoutSession = await payment.checkout.sessions.create({
-  //   success_url:
-  //     'https://bbqa2t5pfyfroyobmzknmktshckzto4btkfagxyjqwy.did.abtnet.io/store/api/payment/success?redirect=https://bbqa2t5pfyfroyobmzknmktshckzto4btkfagxyjqwy.did.abtnet.io/maker/mint/z3CtLCSchoZj4H5gqwyATSAEdvfd1m88VnDUZ',
-  //   cancel_url:
-  //     'https://bbqa2t5pfyfroyobmzknmktshckzto4btkfagxyjqwy.did.abtnet.io/store/api/payment/cancel?redirect=https://bbqa2t5pfyfroyobmzknmktshckzto4btkfagxyjqwy.did.abtnet.io/maker/mint/z3CtLCSchoZj4H5gqwyATSAEdvfd1m88VnDUZ',
-  //   mode: 'payment',
-  //   line_items: [
-  //     { price_id: 'price_G7TE6QZbvqkIaqzDJVb2afws', quantity: 2 },
-  //     { price_id: 'price_rOUdD9fQrBGqn6M3YywXdDeK', quantity: 2 },
-  //   ],
-  //   subscription_data: {
-  //     service_actions: [
-  //       {
-  //         type: 'notification',
-  //         text: {
-  //           zh: '查看文档',
-  //           en: 'View Documentation',
-  //         },
-  //         link: 'https://www.arcblock.io/docs/createblocklet/en/quick-start',
-  //         triggerEvents: ['customer.subscription.started', 'customer.subscription.deleted'],
-  //       },
-  //       {
-  //         type: 'notification',
-  //         text: {
-  //           zh: '社区提问',
-  //           en: 'Ask in Community',
-  //         },
-  //         link: 'https://community.arcblock.io/?locale=en',
-  //         triggerEvents: ['customer.subscription.started', 'customer.subscription.renewed'],
-  //       },
-  //       {
-  //         type: 'custom',
-  //         text: {
-  //           zh: '查看',
-  //           en: 'View',
-  //         },
-  //         link: 'https://www.arcblock.io/docs/createblocklet/en/quick-start',
-  //         color: 'primary',
-  //         variant: 'outlined',
-  //       },
-  //     ],
-  //   },
-  //   expires_at: 1729243800,
-  // });
-  // console.log('checkoutSession', checkoutSession);
-  // const product = await payment.products.create({
-  //   name: 'Test SDK product',
-  //   description: 'test',
-  // });
-  // console.log('🚀 ~ product:', product);
-  // const paymentPrice = await payment.prices.create({
-  //   product_id: product.id,
-  //   type: 'one_time',
-  //   unit_amount: '1',
-  //   currency_id: 'pc_9l5sh8bcjbLU',
-  // });
-  // console.log('🚀 ~ paymentPrice:', paymentPrice);
-
-  // 测试下并发上报
-  // const promises = [
-  //   {
-  //     subscription_item_id: 'si_Tq4c2KsC40uPq7',
-  //     quantity: 1,
-  //     action: 'increment',
-  //     livemode: false,
-  //     timestamp: 1730692388,
-  //   },
-  //   // {
-  //   //   subscription_item_id: 'si_Tq4c2KsC40uPq7',
-  //   //   quantity: 2,
-  //   //   action: 'increment',
-  //   //   livemode: false,
-  //   //   timestamp: 1730692388,
-  //   // },
-  // ];
-  // const results = await Promise.allSettled(promises.map((p) => payment.subscriptionItems.createUsageRecord(p)));
-  // console.log('🚀 ~ results:', results);
-  process.exit(0);
-})();
+}

package/src/locales/en.tsx

@@ -762,7 +762,7 @@ export default flat({
       bufferThreshold: 'Buffer Threshold',
       bufferThresholdHelp:
         'Only when the amount exceeding the deposit threshold reaches the buffer threshold will the collection operation be triggered.',
-      bufferThresholdInvalid: 'Buffer threshold must be greater than 0',
+      bufferThresholdInvalid: 'Buffer threshold must be greater than or equal to 0',
       edit: 'Configure',
       enable: 'Enable',
       editTitle: 'Configure {currency} Vault Settings',

package/src/locales/zh.tsx

@@ -743,7 +743,7 @@ export default flat({
       withdrawThreshold: '提取阈值',
       bufferThreshold: '差额阈值',
       bufferThresholdHelp: '只有当超出存入阈值的金额达到差额阈值时，才会触发归集操作.',
-      bufferThresholdInvalid: '差额阈值必须大于0',
+      bufferThresholdInvalid: '差额阈值不能小于0',
       edit: '配置',
       enable: '启用',
       editTitle: '配置 {currency} 冷钱包设置',

package/src/pages/admin/settings/vault-config/edit-form.tsx

@@ -220,7 +220,7 @@ function EditForm({ item, onClose, onSuccess, isOwner }: EditFormProps) {
                   rules={{
                     required: true,
                     validate: (value) => {
-                      if (Number(value) <= 0) {
+                      if (Number(value) < 0) {
                         return t('admin.vaultConfig.bufferThresholdInvalid');
                       }
                       const validPrecision = formatAmountPrecisionLimit(value.toString(), locale, item.decimal || 6);

package/src/pages/customer/subscription/change-payment.tsx

@@ -242,11 +242,16 @@ function CustomerSubscriptionChangePayment({ subscription, customer, onComplete
         <Controller
           name="payment_currency"
           control={control}
-          render={() => (
+          render={({ field }) => (
             <CurrencySelector
-              value={selectedCurrencyIndex}
+              value={field.value}
               currencies={currencies}
-              onChange={setSelectedCurrencyIndex}
+              onChange={(currencyId: string) => {
+                const index = currencies.findIndex((x) => x.id === currencyId);
+                if (index >= 0) {
+                  setSelectedCurrencyIndex(index);
+                }
+              }}
             />
           )}
         />