payment-kit 1.19.10 → 1.19.12

package/api/src/libs/notification/template/one-time-payment-refund-succeeded.ts

@@ -0,0 +1,274 @@
+/* eslint-disable @typescript-eslint/brace-style */
+/* eslint-disable @typescript-eslint/indent */
+import { translate } from '../../../locales';
+import { PaymentIntent, PaymentMethod, Refund, Customer, CheckoutSession } from '../../../store/models';
+import { Invoice } from '../../../store/models/invoice';
+import { PaymentCurrency } from '../../../store/models/payment-currency';
+import { getUserLocale } from '../../../integrations/blocklet/notification';
+import { getMainProductNameByCheckoutSession } from '../../product';
+import { formatTime } from '../../time';
+import { formatCurrencyInfo, getExplorerLink } from '../../util';
+import type { BaseEmailTemplate, BaseEmailTemplateType } from './base';
+import { getCustomerInvoicePageUrl } from '../../invoice';
+
+export interface OneTimePaymentRefundSucceededEmailTemplateOptions {
+  refundId: string;
+}
+
+interface OneTimePaymentRefundSucceededEmailTemplateContext {
+  locale: string;
+  productName: string | undefined;
+  at: string;
+  chainHost: string | undefined;
+  userDid: string;
+  paymentInfo: string;
+  refundInfo: string;
+  viewInvoiceLink: string;
+  viewTxHashLink: string | undefined;
+  refund: Refund;
+  invoiceNumber?: string;
+}
+
+export class OneTimePaymentRefundSucceededEmailTemplate
+  implements BaseEmailTemplate<OneTimePaymentRefundSucceededEmailTemplateContext>
+{
+  options: OneTimePaymentRefundSucceededEmailTemplateOptions;
+
+  constructor(options: OneTimePaymentRefundSucceededEmailTemplateOptions) {
+    this.options = options;
+  }
+
+  async getContext(): Promise<OneTimePaymentRefundSucceededEmailTemplateContext> {
+    const refund = await Refund.findByPk(this.options.refundId);
+    if (!refund) {
+      throw new Error(`Refund not found: ${this.options.refundId}`);
+    }
+    if (refund.status !== 'succeeded') {
+      throw new Error(`Refund not succeeded: ${this.options.refundId}`);
+    }
+
+    const customer = await Customer.findByPk(refund.customer_id);
+    if (!customer) {
+      throw new Error(`Customer not found: ${refund.customer_id}`);
+    }
+    const userDid = customer.did;
+    const locale = await getUserLocale(userDid);
+
+    let invoiceNumber: string | undefined;
+    let productName: string | undefined;
+    let viewInvoiceLink = '';
+
+    if (refund.invoice_id) {
+      const invoice = await Invoice.findByPk(refund.invoice_id);
+      if (invoice) {
+        invoiceNumber = invoice.number;
+        viewInvoiceLink = getCustomerInvoicePageUrl({
+          invoiceId: refund.invoice_id,
+          userDid,
+          locale,
+        });
+
+        if (invoice.checkout_session_id) {
+          const checkoutSession = await CheckoutSession.findByPk(invoice.checkout_session_id);
+          if (checkoutSession) {
+            productName = await getMainProductNameByCheckoutSession(checkoutSession);
+          }
+        }
+      }
+    }
+
+    const paymentIntent = await PaymentIntent.findByPk(refund.payment_intent_id);
+    const paymentCurrency = await PaymentCurrency.findByPk(refund.currency_id);
+    if (!paymentCurrency) {
+      throw new Error(`PaymentCurrency not found: ${refund.currency_id}`);
+    }
+
+    const paymentMethod = await PaymentMethod.findByPk(refund.payment_method_id);
+
+    const paymentInfo = formatCurrencyInfo(paymentIntent?.amount_received || '0', paymentCurrency, paymentMethod);
+    const refundInfo = formatCurrencyInfo(refund.amount, paymentCurrency, paymentMethod);
+
+    // @ts-expect-error
+    const chainHost = paymentMethod?.settings?.[paymentMethod?.type]?.api_host;
+    // @ts-expect-error
+    const txHash = refund?.payment_details?.[paymentMethod?.type]?.tx_hash;
+    const viewTxHashLink =
+      txHash &&
+      getExplorerLink({
+        type: 'tx',
+        did: txHash,
+        chainHost,
+      });
+
+    const at = formatTime(refund.created_at);
+
+    return {
+      locale,
+      productName,
+      at,
+      userDid,
+      chainHost,
+      paymentInfo,
+      refundInfo,
+      viewInvoiceLink,
+      viewTxHashLink,
+      refund,
+      invoiceNumber,
+    };
+  }
+
+  async getTemplate(): Promise<BaseEmailTemplateType> {
+    const {
+      locale,
+      productName,
+      at,
+      userDid,
+      paymentInfo,
+      refundInfo,
+      viewInvoiceLink,
+      viewTxHashLink,
+      refund,
+      invoiceNumber,
+    } = await this.getContext();
+
+    if (refund.type === 'stake_return') {
+      throw new Error('Stake return is not supported for one-time payment refunds');
+    }
+
+    const commonFields = [
+      {
+        type: 'text',
+        data: {
+          type: 'plain',
+          color: '#9397A1',
+          text: translate('notification.common.account', locale),
+        },
+      },
+      {
+        type: 'text',
+        data: {
+          type: 'plain',
+          text: userDid,
+        },
+      },
+    ];
+
+    const productFields = productName
+      ? [
+          {
+            type: 'text',
+            data: {
+              type: 'plain',
+              color: '#9397A1',
+              text: translate('notification.common.product', locale),
+            },
+          },
+          {
+            type: 'text',
+            data: {
+              type: 'plain',
+              text: productName,
+            },
+          },
+        ]
+      : [];
+
+    const amountFields = [
+      {
+        type: 'text',
+        data: {
+          type: 'plain',
+          color: '#9397A1',
+          text: translate('notification.common.paymentAmount', locale),
+        },
+      },
+      {
+        type: 'text',
+        data: {
+          type: 'plain',
+          text: paymentInfo,
+        },
+      },
+      {
+        type: 'text',
+        data: {
+          type: 'plain',
+          color: '#9397A1',
+          text: translate('notification.common.refundAmount', locale),
+        },
+      },
+      {
+        type: 'text',
+        data: {
+          type: 'plain',
+          text: refundInfo,
+        },
+      },
+    ];
+
+    const invoiceFields = invoiceNumber
+      ? [
+          {
+            type: 'text',
+            data: {
+              type: 'plain',
+              color: '#9397A1',
+              text: translate('notification.common.invoiceNumber', locale),
+            },
+          },
+          {
+            type: 'text',
+            data: {
+              type: 'plain',
+              text: invoiceNumber,
+            },
+          },
+        ]
+      : [];
+
+    const actions = [
+      viewInvoiceLink && {
+        name: translate('notification.common.viewInvoice', locale),
+        title: translate('notification.common.viewInvoice', locale),
+        link: viewInvoiceLink,
+      },
+      viewTxHashLink && {
+        name: translate('notification.common.viewTxHash', locale),
+        title: translate('notification.common.viewTxHash', locale),
+        link: viewTxHashLink,
+      },
+    ].filter(Boolean);
+
+    const titleKey = productName
+      ? 'notification.oneTimePaymentRefundSucceeded.title'
+      : 'notification.oneTimePaymentRefundSucceeded.titleNoProduct';
+
+    const bodyKey = productName
+      ? 'notification.oneTimePaymentRefundSucceeded.body'
+      : 'notification.oneTimePaymentRefundSucceeded.bodyNoProduct';
+
+    const template: BaseEmailTemplateType = {
+      title: translate(titleKey, locale, {
+        productName,
+        invoiceNumber: invoiceNumber || '',
+      }),
+      body: translate(bodyKey, locale, {
+        at,
+        productName,
+        refundInfo,
+        invoiceNumber: invoiceNumber || '',
+      }),
+      // @ts-expect-error
+      attachments: [
+        {
+          type: 'section',
+          fields: [...commonFields, ...productFields, ...amountFields, ...invoiceFields].filter(Boolean),
+        },
+      ].filter(Boolean),
+      // @ts-ignore
+      actions,
+    };
+
+    return template;
+  }
+}

package/api/src/libs/notification/template/one-time-payment-succeeded.ts

@@ -10,6 +10,7 @@ import { getMainProductNameByCheckoutSession } from '../../product';
 import { formatTime } from '../../time';
 import { formatCurrencyInfo, getExplorerLink } from '../../util';
 import type { BaseEmailTemplate, BaseEmailTemplateType } from './base';
+import { getCustomerInvoicePageUrl } from '../../invoice';
 
 export interface OneTimePaymentSucceededEmailTemplateOptions {
   checkoutSessionId: string;
@@ -25,7 +26,6 @@ interface OneTimePaymentSucceededEmailTemplateContext {
   userDid: string;
   paymentInfo: string;
 
-  viewSubscriptionLink: string;
   viewInvoiceLink: string;
   viewTxHashLink: string | undefined;
 }
@@ -99,8 +99,13 @@ export class OneTimePaymentSucceededEmailTemplate
 
     // @ts-expect-error
     const chainHost: string | undefined = paymentMethod?.settings?.[paymentMethod.type]?.api_host;
-    const viewSubscriptionLink = '';
-    const viewInvoiceLink = '';
+    const viewInvoiceLink = paymentIntent?.invoice_id
+      ? getCustomerInvoicePageUrl({
+          invoiceId: paymentIntent.invoice_id,
+          userDid,
+          locale,
+        })
+      : '';
 
     // @ts-expect-error
     const txHash: string | undefined = paymentIntent?.payment_details?.[paymentMethod.type]?.tx_hash;
@@ -122,25 +127,14 @@ export class OneTimePaymentSucceededEmailTemplate
       chainHost,
       paymentInfo,
 
-      viewSubscriptionLink,
       viewInvoiceLink,
       viewTxHashLink,
     };
   }
 
   async getTemplate(): Promise<BaseEmailTemplateType> {
-    const {
-      locale,
-      productName,
-      at,
-      nftMintItem,
-      chainHost,
-      userDid,
-      paymentInfo,
-      viewSubscriptionLink,
-      viewInvoiceLink,
-      viewTxHashLink,
-    } = await this.getContext();
+    const { locale, productName, at, nftMintItem, chainHost, userDid, paymentInfo, viewInvoiceLink, viewTxHashLink } =
+      await this.getContext();
 
     const template: BaseEmailTemplateType = {
       title: `${translate('notification.oneTimePaymentSucceeded.title', locale, {
@@ -213,11 +207,6 @@ export class OneTimePaymentSucceededEmailTemplate
       ].filter(Boolean),
       // @ts-ignore
       actions: [
-        viewSubscriptionLink && {
-          name: translate('notification.common.viewSubscription', locale),
-          title: translate('notification.common.viewSubscription', locale),
-          link: viewSubscriptionLink,
-        },
         viewInvoiceLink && {
           name: translate('notification.common.viewInvoice', locale),
           title: translate('notification.common.viewInvoice', locale),

package/api/src/libs/notification/template/subscription-refund-succeeded.ts

@@ -4,6 +4,7 @@ import { translate } from '../../../locales';
 import { PaymentIntent, PaymentMethod, Refund, Subscription } from '../../../store/models';
 import { Invoice } from '../../../store/models/invoice';
 import { PaymentCurrency } from '../../../store/models/payment-currency';
+import { getCustomerInvoicePageUrl } from '../../invoice';
 import { formatTime } from '../../time';
 import { formatCurrencyInfo, getExplorerLink } from '../../util';
 import { BaseSubscriptionEmailTemplate, BaseEmailTemplateType } from './base';
@@ -28,6 +29,7 @@ interface SubscriptionRefundSucceededEmailTemplateContext {
   unusedDuration: string;
   viewSubscriptionLink: string;
   viewTxHashLink: string | undefined;
+  viewInvoiceLink: string;
   refund: Refund;
   customActions: any[];
   isCreditSubscription: boolean;
@@ -49,9 +51,12 @@ export class SubscriptionRefundSucceededEmailTemplate extends BaseSubscriptionEm
     if (refund.status !== 'succeeded') {
       throw new Error(`Refund not succeeded: ${this.options.refundId}`);
     }
+    if (!refund.subscription_id) {
+      throw new Error(`Refund must have subscription_id: ${this.options.refundId}`);
+    }
 
     // 获取基础订阅数据
-    const basicData = await this.getSubscriptionBasicData(refund.subscription_id!);
+    const basicData = await this.getSubscriptionBasicData(refund.subscription_id);
     const { userDid, locale, productName, isCreditSubscription } = basicData;
 
     // 获取支付相关信息
@@ -102,6 +107,7 @@ export class SubscriptionRefundSucceededEmailTemplate extends BaseSubscriptionEm
     // 获取链接
     let customActions: any[] = [];
     let viewSubscriptionLink = '';
+
     if (refund?.subscription_id) {
       const subscription = await Subscription.findByPk(refund.subscription_id);
       if (subscription) {
@@ -118,6 +124,13 @@ export class SubscriptionRefundSucceededEmailTemplate extends BaseSubscriptionEm
       }
     }
 
+    const viewInvoiceLink = refund.invoice_id
+      ? getCustomerInvoicePageUrl({
+          invoiceId: refund.invoice_id,
+          locale,
+          userDid,
+        })
+      : '';
     // 获取交易哈希链接
     // @ts-expect-error
     const chainHost = paymentMethod?.settings?.[paymentMethod?.type]?.api_host;
@@ -152,6 +165,7 @@ export class SubscriptionRefundSucceededEmailTemplate extends BaseSubscriptionEm
       refund,
       customActions,
       isCreditSubscription,
+      viewInvoiceLink,
     };
   }
 
@@ -174,6 +188,7 @@ export class SubscriptionRefundSucceededEmailTemplate extends BaseSubscriptionEm
       viewTxHashLink,
       refund,
       isCreditSubscription,
+      viewInvoiceLink,
     } = context;
 
     // 如果是质押返还类型，使用特殊模板
@@ -266,11 +281,16 @@ export class SubscriptionRefundSucceededEmailTemplate extends BaseSubscriptionEm
 
     // 构建操作按钮
     const actions = [
-      {
+      viewSubscriptionLink && {
         name: translate('notification.common.viewSubscription', locale),
         title: translate('notification.common.viewSubscription', locale),
         link: viewSubscriptionLink,
       },
+      viewInvoiceLink && {
+        name: translate('notification.common.viewInvoice', locale),
+        title: translate('notification.common.viewInvoice', locale),
+        link: viewInvoiceLink,
+      },
       viewTxHashLink && {
         name: translate('notification.common.viewTxHash', locale),
         title: translate('notification.common.viewTxHash', locale),
@@ -331,7 +351,7 @@ export class SubscriptionRefundSucceededEmailTemplate extends BaseSubscriptionEm
 
     // 构建操作按钮
     const actions = [
-      {
+      viewSubscriptionLink && {
         name: translate('notification.common.viewSubscription', locale),
         title: translate('notification.common.viewSubscription', locale),
         link: viewSubscriptionLink,

package/api/src/libs/notification/template/subscription-will-renew.ts

@@ -10,6 +10,7 @@ import { translate } from '../../../locales';
 import { Invoice, Price, SubscriptionItem } from '../../../store/models';
 import type { PaymentDetail } from '../../payment';
 import { getSubscriptionPaymentAddress, getPaymentAmountForCycleSubscription } from '../../subscription';
+
 import { formatTime, getSimplifyDuration } from '../../time';
 import { formatCurrencyInfo, getCustomerRechargeLink } from '../../util';
 import { BaseSubscriptionEmailTemplate, BaseEmailTemplateType } from './base';
@@ -38,6 +39,7 @@ interface SubscriptionWillRenewEmailTemplateContext {
   customActions: any[];
   isCreditSubscription: boolean;
   isStripe: boolean;
+  isMetered: boolean;
 }
 
 export class SubscriptionWillRenewEmailTemplate extends BaseSubscriptionEmailTemplate<SubscriptionWillRenewEmailTemplateContext> {
@@ -102,17 +104,24 @@ export class SubscriptionWillRenewEmailTemplate extends BaseSubscriptionEmailTem
 
     // 获取支付类型和周期信息
     const { isPrePaid, interval } = await this.getPaymentCategory(subscription.id);
+    const isMetered = !isPrePaid; // 按量计费就是后付费
+
     const paidType = isPrePaid
       ? translate('notification.common.prepaid', locale)
       : translate('notification.common.postpaid', locale);
 
-    const paymentInfo = formatCurrencyInfo(
+    // 对于按量计费，在金额后添加预估说明
+    const basePaymentInfo = formatCurrencyInfo(
       paymentDetail?.price || '0',
       paymentCurrency,
       paymentInfoResult.paymentMethod,
       true
     );
 
+    const paymentInfo = isMetered
+      ? translate('notification.subscriptionWillRenew.estimatedAmountNote', locale, { amount: basePaymentInfo })
+      : basePaymentInfo;
+
     // 计算周期时间 - 使用安全的回退机制
     const periodStart = invoice?.period_start || subscription.current_period_start;
     const periodInfo = this.formatSubscriptionPeriod(
@@ -148,6 +157,7 @@ export class SubscriptionWillRenewEmailTemplate extends BaseSubscriptionEmailTem
       customActions: links.customActions,
       isCreditSubscription,
       isStripe,
+      isMetered: !isPrePaid,
     };
   }
 
@@ -198,6 +208,7 @@ export class SubscriptionWillRenewEmailTemplate extends BaseSubscriptionEmailTem
       customActions,
       isCreditSubscription,
       isStripe,
+      isMetered,
     } = context;
 
     // 如果当前时间大于预计扣费时间，那么不发送通知
@@ -206,7 +217,9 @@ export class SubscriptionWillRenewEmailTemplate extends BaseSubscriptionEmailTem
     }
 
     const canPay = paymentDetail.balance >= paymentDetail.price;
-    if (canPay && !this.options.required) {
+    // 如果是按量付费的预估金额，余额充足，不发送通知
+    // 如果是预付费，余额充足，非必要不发送通知
+    if (canPay && (!this.options.required || isMetered)) {
       return null;
     }
 

package/api/src/libs/session.ts

@@ -1,6 +1,6 @@
 import { env } from '@blocklet/sdk/lib/config';
 import type { TransactionInput } from '@ocap/client';
-import { BN } from '@ocap/util';
+import { BN, fromTokenToUnit } from '@ocap/util';
 import cloneDeep from 'lodash/cloneDeep';
 import isEqual from 'lodash/isEqual';
 import pAll from 'p-all';
@@ -983,3 +983,72 @@ export function isCreditMetered(price: TPrice | TPriceExpanded) {
 export function isCreditMeteredLineItems(lineItems: TLineItemExpanded[]) {
   return lineItems.every((item) => item.price && isCreditMetered(item.price));
 }
+
+/**
+ * Validates payment amounts meet minimum requirements
+ * @param lineItems Line items to validate
+ * @param currencyId Currency ID for validation
+ * @param mode Checkout mode
+ * @returns Validation result with error message if any
+ */
+export function validatePaymentAmounts(
+  lineItems: TLineItemExpanded[],
+  currency: PaymentCurrency,
+  checkoutSession: CheckoutSession
+): { valid: boolean; error?: string } {
+  const enableGrouping = checkoutSession.enable_subscription_grouping;
+  const oneTimeItems = getOneTimeLineItems(lineItems);
+  const recurringItems = getRecurringLineItems(lineItems);
+
+  const minAmountInUnits = fromTokenToUnit(0.5, currency.decimal);
+
+  // Case 1: All one-time items - validate total payment amount
+  if (recurringItems.length === 0 && oneTimeItems.length > 0) {
+    const { total } = getCheckoutAmount(lineItems, currency.id);
+    if (new BN(total).lt(new BN(minAmountInUnits))) {
+      return {
+        valid: false,
+        error: 'Total payment amount must be greater or equal to 0.5 USD',
+      };
+    }
+    return { valid: true };
+  }
+
+  // Case 2: Mixed or subscription only - validate subscription pricing
+  if (recurringItems.length > 0) {
+    if (enableGrouping) {
+      // When grouping is enabled, validate each subscription product's unit price
+      const priceGroups = groupLineItemsByPrice(lineItems);
+
+      for (const [priceId, items] of Object.entries(priceGroups)) {
+        // Calculate total unit price for this subscription product
+        let totalUnitPrice = new BN(0);
+
+        items.forEach((item) => {
+          const price = item.upsell_price || item.price;
+          const unitPrice = getPriceUintAmountByCurrency(price, currency.id);
+          totalUnitPrice = totalUnitPrice.add(new BN(unitPrice).mul(new BN(item.quantity)));
+        });
+
+        if (totalUnitPrice.lt(new BN(minAmountInUnits))) {
+          const productName = items[0]?.price?.product?.name || `Product ${priceId}`;
+          return {
+            valid: false,
+            error: `product "${productName}" unit price must be greater or equal to 0.5 USD`,
+          };
+        }
+      }
+    } else {
+      // When grouping is disabled, validate total subscription amount
+      const { renew } = getCheckoutAmount(lineItems, currency.id);
+      if (new BN(renew).lt(new BN(minAmountInUnits))) {
+        return {
+          valid: false,
+          error: 'Total subscription amount must be greater or equal to 0.5 USD',
+        };
+      }
+    }
+  }
+
+  return { valid: true };
+}

package/api/src/locales/en.ts

@@ -49,6 +49,7 @@ export default flat({
       shouldPayAmount: 'Should pay amount',
       billedAmount: 'Billed amount',
       viewCreditGrant: 'View Credit Balance',
+      invoiceNumber: 'Invoice Number',
     },
 
     billingDiscrepancy: {
@@ -112,6 +113,7 @@ export default flat({
       unableToPayReason:
         'The estimated payment amount is {price}, but the current balance is insufficient ({balance}), please ensure that your account has enough balance to avoid payment failure.',
       renewAmount: 'Payment amount',
+      estimatedAmountNote: 'Estimate {amount}, billed based on final usage',
     },
 
     subscriptionRenewed: {
@@ -145,6 +147,14 @@ export default flat({
       body: 'Your subscription to {productName} has been successfully refunded on {at}, with a refund amount of {refundInfo}. If you have any questions, please feel free to contact us.',
     },
 
+    oneTimePaymentRefundSucceeded: {
+      title: '{productName} refund successful',
+      body: 'Your purchase of {productName} has been successfully refunded on {at}, with a refund amount of {refundInfo}. If you have any questions, please feel free to contact us.',
+      titleNoProduct: 'You have a refund from invoice {invoiceNumber}',
+      bodyNoProduct:
+        'You have a refund from invoice {invoiceNumber} that has been successfully processed on {at}, with a refund amount of {refundInfo}. If you have any questions, please feel free to contact us.',
+    },
+
     subscriptionStakeReturnSucceeded: {
       title: '{productName} stake return successful',
       body: 'The stake for your subscription to {productName} has been returned on {at}, with a return amount of {refundInfo}. If you have any questions, please feel free to contact us.',

package/api/src/locales/zh.ts

@@ -49,6 +49,7 @@ export default flat({
       shouldPayAmount: '应收金额',
       billedAmount: '实缴金额',
       viewCreditGrant: '查看额度',
+      invoiceNumber: '账单编号',
     },
 
     sendTo: '发送给',
@@ -111,6 +112,7 @@ export default flat({
       unableToPayReason:
         '预计扣款金额为 {price}，但当前余额不足(余额为 {balance})，请确保您的账户余额充足，避免扣费失败。',
       renewAmount: '扣费金额',
+      estimatedAmountNote: '预估 {amount}，按最终用量计费',
     },
 
     subscriptionRenewed: {
@@ -141,6 +143,14 @@ export default flat({
       body: '您订阅的 {productName} 在 {at} 已退款成功，退款金额为 {refundInfo}。如有任何疑问，请随时与我们联系。',
     },
 
+    oneTimePaymentRefundSucceeded: {
+      title: '{productName} 退款成功',
+      body: '您购买的 {productName} 在 {at} 已退款成功，退款金额为 {refundInfo}。如有任何疑问，请随时与我们联系。',
+      titleNoProduct: '您有一笔来自 {invoiceNumber} 账单的退款',
+      bodyNoProduct:
+        '您有一笔来自 {invoiceNumber} 账单的退款在 {at} 已退款成功，退款金额为 {refundInfo}。如有任何疑问，请随时与我们联系。',
+    },
+
     subscriptionStakeReturnSucceeded: {
       title: '{productName} 质押退还成功',
       body: '您订阅的 {productName} 在 {at} 已退还押金，退还金额为 {refundInfo}。如有任何疑问，请随时与我们联系。',

package/api/src/queues/credit-consume.ts

@@ -334,10 +334,13 @@ async function createCreditTransaction(
     meterEventId: context.meterEvent.id,
   });
 
-  let description = `Consume ${fromUnitToToken(consumeAmount, context.meter.paymentCurrency.decimal)}${context.meter.paymentCurrency.symbol}`;
+  let description = `Consume ${fromUnitToToken(consumeAmount, context.meter.paymentCurrency.decimal)} ${context.meter.paymentCurrency.symbol}`;
   if (context.meterEvent.getSubscriptionId()) {
     description += 'for Subscription';
   }
+  if (context.meterEvent.metadata?.description) {
+    description = context.meterEvent.metadata.description;
+  }
 
   try {
     const transaction = await CreditTransaction.create({

package/api/src/queues/notification.ts

@@ -21,6 +21,10 @@ import {
   SubscriptionRefundSucceededEmailTemplate,
   SubscriptionRefundSucceededEmailTemplateOptions,
 } from '../libs/notification/template/subscription-refund-succeeded';
+import {
+  OneTimePaymentRefundSucceededEmailTemplate,
+  OneTimePaymentRefundSucceededEmailTemplateOptions,
+} from '../libs/notification/template/one-time-payment-refund-succeeded';
 import {
   SubscriptionRenewFailedEmailTemplate,
   SubscriptionRenewFailedEmailTemplateOptions,
@@ -187,7 +191,7 @@ function calculateNextNotificationTime(preference: NotificationPreference): numb
   return Math.floor(nextTime.valueOf() / 1000);
 }
 
-function getNotificationTemplate(job: NotificationQueueJob): BaseEmailTemplate {
+async function getNotificationTemplate(job: NotificationQueueJob): Promise<BaseEmailTemplate> {
   if (job.type === 'usage.report.empty') {
     return new UsageReportEmptyEmailTemplate(job.options as UsageReportEmptyEmailTemplateOptions);
   }
@@ -225,7 +229,16 @@ function getNotificationTemplate(job: NotificationQueueJob): BaseEmailTemplate {
     return new SubscriptionCanceledEmailTemplate(job.options as SubscriptionCanceledEmailTemplateOptions);
   }
   if (job.type === 'refund.succeeded') {
-    return new SubscriptionRefundSucceededEmailTemplate(job.options as SubscriptionRefundSucceededEmailTemplateOptions);
+    const { refundId } = job.options as { refundId: string };
+    const refund = await Refund.findByPk(refundId);
+    if (refund?.subscription_id) {
+      return new SubscriptionRefundSucceededEmailTemplate(
+        job.options as SubscriptionRefundSucceededEmailTemplateOptions
+      );
+    }
+    return new OneTimePaymentRefundSucceededEmailTemplate(
+      job.options as OneTimePaymentRefundSucceededEmailTemplateOptions
+    );
   }
   if (job.type === 'customer.reward.succeeded') {
     return new CustomerRewardSucceededEmailTemplate(job.options as CustomerRewardSucceededEmailTemplateOptions);
@@ -264,7 +277,7 @@ function getNotificationTemplate(job: NotificationQueueJob): BaseEmailTemplate {
 
 async function handleNotificationJob(job: NotificationQueueJob): Promise<void> {
   try {
-    const template = getNotificationTemplate(job);
+    const template = await getNotificationTemplate(job);
 
     await new Notification(template, job.type).send();
     logger.info('handleImmediateNotificationJob.success', { job });

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

@@ -41,6 +41,7 @@ import {
   getCheckoutSessionSubscriptionIds,
   getSubscriptionLineItems,
   isCreditMeteredLineItems,
+  validatePaymentAmounts,
 } from '../libs/session';
 import { getDaysUntilCancel, getDaysUntilDue, getSubscriptionTrialSetup } from '../libs/subscription';
 import {
@@ -1074,6 +1075,14 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
       true
     );
 
+    // Validate payment amounts meet minimum requirements
+    if (paymentMethod.type === 'stripe') {
+      const result = validatePaymentAmounts(lineItems, paymentCurrency, checkoutSession);
+      if (!result.valid) {
+        return res.status(400).json({ error: result.error });
+      }
+    }
+
     let customer = await Customer.findOne({ where: { did: req.user.did } });
     if (!customer) {
       const { user: userInfo } = await blocklet.getUser(req.user.did);

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.19.10
+version: 1.19.12
 logo: logo.png
 files:
   - dist
@@ -72,11 +72,11 @@ capabilities:
   clusterMode: false
   component: true
 screenshots:
-  - setting.png
-  - payment.png
-  - checkout.png
-  - subscription_detail.png
-  - customer.png
+  - 3a4cab81c52c29662db8794b05ccc7c7.png
+  - 77ac49b79ae920f0f253ce8c694ffd65.png
+  - 1ef9e15ac36d4af5bef34941000ba3af.png
+  - 7ea8ef758865ecf6edb712d3534d2974.png
+  - 0ffe164ebe4aa2eb43f8d87f87683f7f.png
 components:
   - name: image-bin
     source:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.19.10",
+  "version": "1.19.12",
   "scripts": {
     "dev": "blocklet dev --open",
     "lint": "tsc --noEmit && eslint src api/src --ext .mjs,.js,.jsx,.ts,.tsx",
@@ -44,31 +44,31 @@
   },
   "dependencies": {
     "@abtnode/cron": "^1.16.46",
-    "@arcblock/did": "^1.21.0",
+    "@arcblock/did": "^1.21.1",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
-    "@arcblock/did-connect": "^3.0.36",
-    "@arcblock/did-util": "^1.21.0",
-    "@arcblock/jwt": "^1.21.0",
-    "@arcblock/ux": "^3.0.36",
-    "@arcblock/validator": "^1.21.0",
-    "@blocklet/did-space-js": "^1.1.10",
+    "@arcblock/did-connect": "^3.0.39",
+    "@arcblock/did-util": "^1.21.1",
+    "@arcblock/jwt": "^1.21.1",
+    "@arcblock/ux": "^3.0.39",
+    "@arcblock/validator": "^1.21.1",
+    "@blocklet/did-space-js": "^1.1.13",
     "@blocklet/error": "^0.2.5",
     "@blocklet/js-sdk": "^1.16.46",
     "@blocklet/logger": "^1.16.46",
-    "@blocklet/payment-react": "1.19.10",
+    "@blocklet/payment-react": "1.19.12",
     "@blocklet/sdk": "^1.16.46",
-    "@blocklet/ui-react": "^3.0.36",
-    "@blocklet/uploader": "^0.2.4",
-    "@blocklet/xss": "^0.2.2",
+    "@blocklet/ui-react": "^3.0.39",
+    "@blocklet/uploader": "^0.2.5",
+    "@blocklet/xss": "^0.2.3",
     "@mui/icons-material": "^7.1.2",
     "@mui/lab": "7.0.0-beta.14",
     "@mui/material": "^7.1.2",
     "@mui/system": "^7.1.1",
-    "@ocap/asset": "^1.21.0",
-    "@ocap/client": "^1.21.0",
-    "@ocap/mcrypto": "^1.21.0",
-    "@ocap/util": "^1.21.0",
-    "@ocap/wallet": "^1.21.0",
+    "@ocap/asset": "^1.21.1",
+    "@ocap/client": "^1.21.1",
+    "@ocap/mcrypto": "^1.21.1",
+    "@ocap/util": "^1.21.1",
+    "@ocap/wallet": "^1.21.1",
     "@stripe/react-stripe-js": "^2.9.0",
     "@stripe/stripe-js": "^2.4.0",
     "ahooks": "^3.8.5",
@@ -124,7 +124,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.16.46",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.19.10",
+    "@blocklet/payment-types": "1.19.12",
     "@types/cookie-parser": "^1.4.9",
     "@types/cors": "^2.8.19",
     "@types/debug": "^4.1.12",
@@ -170,5 +170,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "96665501b84f130e074df9a3d70f9b6f48cc3309"
+  "gitHead": "2496138990f95bb979125127a06c5e9d731877c9"
 }

package/src/components/customer/credit-overview.tsx

@@ -190,8 +190,8 @@ export default function CreditOverview({ customerId, settings, mode = 'portal' }
           },
         }}>
         <Tab label={t('admin.creditGrants.overview')} value={CreditTab.OVERVIEW} />
-        <Tab label={t('admin.creditGrants.title')} value={CreditTab.GRANTS} />
-        <Tab label={t('admin.creditTransactions.title')} value={CreditTab.TRANSACTIONS} />
+        <Tab label={t('admin.creditGrants.tab')} value={CreditTab.GRANTS} />
+        <Tab label={t('admin.creditTransactions.tab')} value={CreditTab.TRANSACTIONS} />
       </Tabs>
       {/* 概览标签页 */}
       {creditTab === CreditTab.OVERVIEW && (

package/src/components/meter/actions.tsx

@@ -66,7 +66,7 @@ export default function MeterActions({ data, variant = 'compact', onChange }: Me
   if (variant === 'compact') {
     actions.push({
       label: t('admin.meter.view'),
-      handler: () => navigate(`/admin/billing/meters/${data.id}`),
+      handler: () => navigate(`/admin/billing/${data.id}`),
       color: 'primary',
     });
   }

package/src/components/price/form.tsx

@@ -15,7 +15,6 @@ import type {
   TMeter,
   TMeterExpanded,
   TPaymentCurrency,
-  TPaymentCurrencyExpanded,
   TPaymentMethodExpanded,
   TPrice,
   TPriceExpanded,
@@ -102,16 +101,6 @@ const hasMoreCurrency = (methods: TPaymentMethodExpanded[] = []) => {
   return methods.every((method) => method.payment_currencies.length > 1) || methods.length > 1;
 };
 
-function stripeCurrencyValidate(v: number, currency: TPaymentCurrencyExpanded | null) {
-  if (!currency) {
-    return true;
-  }
-  if (currency.paymentMethod?.type === 'stripe') {
-    return v >= 0.5;
-  }
-  return true;
-}
-
 const fetchMeters = (): Promise<{ list: TMeterExpanded[]; count: number }> => {
   return api.get('/api/meters?status=active&limit=100').then((res: any) => res.data);
 };
@@ -397,10 +386,6 @@ export default function PriceForm({ prefix = '', simple = false, productType = u
                   required: t('admin.price.unit_amount.required'),
                   validate: (v) => {
                     const currency = findCurrency(settings.paymentMethods, defaultCurrencyId);
-                    const hasStripError = !stripeCurrencyValidate(v, currency);
-                    if (hasStripError) {
-                      return t('admin.price.unit_amount.stripeTip');
-                    }
                     return validateAmount(v, currency ?? {});
                   },
                 }}
@@ -482,10 +467,6 @@ export default function PriceForm({ prefix = '', simple = false, productType = u
                             rules={{
                               required: t('admin.price.unit_amount.required'),
                               validate: (v) => {
-                                const hasStripError = !stripeCurrencyValidate(v, currency);
-                                if (hasStripError) {
-                                  return t('admin.price.unit_amount.stripeTip');
-                                }
                                 return validateAmount(v, currency ?? {});
                               },
                             }}

package/src/locales/en.tsx

@@ -1144,11 +1144,12 @@ export default flat({
       appBalance: 'App Balance',
     },
     creditGrants: {
-      title: 'Credit Grants',
+      tab: 'Grants',
+      title: 'Credits',
       summary: 'Credit Summary',
       noGrants: 'No credit grants found',
       grantDetail: 'Credit Grant Details',
-      overview: 'Credit Overview',
+      overview: 'Overview',
       overviewDescription: 'Monitor credit balances, usage, and outstanding debt across all currencies.',
       availableBalance: 'Available Balance',
       usage: 'Usage',
@@ -1180,7 +1181,8 @@ export default flat({
       viewDetails: 'View Details',
     },
     creditTransactions: {
-      title: 'Credit Transactions',
+      tab: 'Transactions',
+      title: 'Transactions',
       summary: 'Transaction Summary',
       noTransactions: 'No credit transactions found',
       totalTransactions: 'Total Transactions',

package/src/locales/zh.tsx

@@ -927,11 +927,12 @@ export default flat({
         postal_code: '邮政编码',
       },
       creditGrants: {
+        tab: '信用额度',
         title: '信用额度',
         summary: '额度汇总',
         noGrants: '未找到信用额度',
         grantDetail: '信用额度详情',
-        overview: '额度概览',
+        overview: '概览',
         overviewDescription: '监控所有货币的信用余额、使用情况和未偿债务。',
         availableBalance: '可用余额',
         usage: '使用情况',
@@ -1103,7 +1104,8 @@ export default flat({
       appBalance: '热钱包余额',
     },
     creditGrants: {
-      title: '信用额度',
+      tab: '信用额度',
+      title: '额度',
       summary: '额度汇总',
       noGrants: '未找到信用额度',
       grantDetail: '信用额度详情',
@@ -1139,6 +1141,7 @@ export default flat({
       viewDetails: '查看详情',
     },
     creditTransactions: {
+      tab: '账单',
       title: '额度账单',
       summary: '账单汇总',
       noTransactions: '未找到额度账单',