payment-kit 1.18.24 → 1.18.26

package/api/src/libs/event.ts

@@ -13,8 +13,28 @@ export const events = new EventEmitter() as MyEventType;
 
 export const emitAsync = (event: string, ...args: any[]) => {
   return new Promise((resolve, reject) => {
+    const timeout = setTimeout(() => {
+      cleanup();
+      reject(new Error(`Event ${event} timed out after 10000ms`));
+    }, 10000);
+
+    const cleanup = () => {
+      clearTimeout(timeout);
+      events.removeListener(`${event}.done`, handleDone);
+      events.removeListener(`${event}.error`, handleError);
+    };
+
+    const handleDone = (...results: any[]) => {
+      cleanup();
+      resolve(results.length > 1 ? results : results[0]);
+    };
+
+    const handleError = (error: any) => {
+      cleanup();
+      reject(error);
+    };
+    events.once(`${event}.done`, handleDone);
+    events.once(`${event}.error`, handleError);
     events.emit(event, ...args);
-    events.once(`${event}.done`, resolve);
-    events.once(`${event}.error`, reject);
   });
 };

package/api/src/libs/invoice.ts

@@ -23,6 +23,7 @@ import {
   TInvoice,
   TLineItemExpanded,
   UsageRecord,
+  Lock,
 } from '../store/models';
 import { getConnectQueryParam } from './util';
 import { expandLineItems, getPriceUintAmountByCurrency } from './session';
@@ -37,6 +38,7 @@ import {
 import logger from './logger';
 import { ensureOverdraftProtectionPrice } from './overdraft-protection';
 import { CHARGE_SUPPORTED_CHAIN_TYPES } from './constants';
+import { emitAsync } from './event';
 
 export function getCustomerInvoicePageUrl({
   invoiceId,
@@ -930,3 +932,143 @@ export async function handleOverdraftProtectionInvoiceAfterPayment(invoice: Invo
     });
   }
 }
+
+/**
+ * retry uncollectible invoices
+ * @param options
+ */
+export async function retryUncollectibleInvoices(options: {
+  customerId?: string;
+  subscriptionId?: string;
+  invoiceId?: string;
+  invoiceIds?: string[];
+  currencyId?: string;
+}) {
+  const lockKey = `retry-uncollectible-${JSON.stringify(options)}`;
+
+  const isLocked = await Lock.isLocked(lockKey);
+  if (isLocked) {
+    logger.warn('Retry uncollectible invoices already in progress', {
+      lockKey,
+      options,
+    });
+    throw new Error('Retry already in progress');
+  }
+
+  try {
+    await Lock.acquire(lockKey, dayjs().add(5, 'minutes').unix());
+
+    const { customerId, subscriptionId, invoiceId, invoiceIds, currencyId } = options;
+
+    const where: any = {
+      status: { [Op.in]: ['uncollectible'] },
+      payment_intent_id: { [Op.ne]: null },
+    };
+
+    if (customerId) {
+      where.customer_id = customerId;
+    }
+
+    if (subscriptionId) {
+      where.subscription_id = subscriptionId;
+    }
+
+    if (invoiceId) {
+      where.id = invoiceId;
+    }
+
+    if (invoiceIds && invoiceIds.length > 0) {
+      where.id = { [Op.in]: invoiceIds };
+    }
+
+    if (currencyId) {
+      where.currency_id = currencyId;
+    }
+
+    const overdueInvoices = (await Invoice.findAll({
+      where,
+      include: [{ model: PaymentIntent, as: 'paymentIntent' }],
+      attributes: ['id', 'payment_intent_id', 'subscription_id', 'customer_id', 'created_at', 'status', 'currency_id'],
+      order: [['created_at', 'ASC']],
+    })) as (Invoice & { paymentIntent?: PaymentIntent })[];
+
+    const startTime = Date.now();
+    logger.info('Found uncollectible invoices to retry', {
+      count: overdueInvoices.length,
+      criteria: options,
+      invoiceIds: overdueInvoices.map((inv) => inv.id),
+    });
+
+    const results = {
+      processed: overdueInvoices.length,
+      successful: [] as string[],
+      failed: [] as Array<{ id: string; reason: string }>,
+    };
+
+    const settledResults = await Promise.allSettled(
+      overdueInvoices.map(async (invoice) => {
+        const { paymentIntent } = invoice;
+        if (!paymentIntent) {
+          throw new Error('No payment intent found');
+        }
+
+        await paymentIntent.update({ status: 'requires_capture' });
+        await emitAsync(
+          'payment.queued',
+          paymentIntent.id,
+          { paymentIntentId: paymentIntent.id, retryOnError: true, ignoreMaxRetryCheck: true },
+          { sync: false }
+        );
+
+        return invoice;
+      })
+    );
+
+    settledResults.forEach((result, index) => {
+      const invoice = overdueInvoices[index];
+      if (!invoice) {
+        return;
+      }
+      if (result.status === 'fulfilled') {
+        results.successful.push(invoice.id);
+        logger.info('Successfully queued uncollectible invoice retry', {
+          invoiceId: invoice.id,
+          customerId: invoice.customer_id,
+          paymentIntentId: invoice.payment_intent_id,
+        });
+      } else {
+        const error = result.reason;
+        const errorType = error.name || 'Unknown';
+        const errorCode = error.code || 'UNKNOWN_ERROR';
+
+        results.failed.push({
+          id: invoice.id,
+          reason: error.message || 'Unknown error',
+        });
+
+        logger.error('Failed to queue uncollectible invoice retry', {
+          invoiceId: invoice.id,
+          customerId: invoice.customer_id,
+          subscriptionId: invoice.subscription_id,
+          paymentIntentId: invoice.payment_intent_id,
+          errorType,
+          errorCode,
+          error,
+        });
+      }
+    });
+
+    const processingTime = Date.now() - startTime;
+    logger.info('Completed retrying uncollectible invoices', {
+      totalProcessed: results.processed,
+      successful: results.successful.length,
+      failed: results.failed.length,
+      processingTimeMs: processingTime,
+    });
+
+    return results;
+  } finally {
+    await Lock.release(lockKey);
+    logger.info('Released retry uncollectible lock', { lockKey });
+  }
+}

package/api/src/libs/notification/template/aggregated-subscription-renewed.ts

@@ -0,0 +1,165 @@
+import { BN } from '@ocap/util';
+import { translate } from '../../../locales';
+import { BaseEmailTemplate, BaseEmailTemplateType } from './base';
+import { Subscription, Invoice, Customer, PaymentCurrency, PaymentMethod } from '../../../store/models';
+import { getCustomerSubscriptionPageUrl } from '../../subscription';
+import { getUserLocale } from '../../../integrations/blocklet/notification';
+import { formatTime } from '../../time';
+import { formatCurrencyInfo } from '../../util';
+
+export interface AggregatedSubscriptionRenewedEmailTemplateOptions {
+  customer_id: string;
+  items: Array<{
+    event_id: string;
+    occurred_at: number;
+    data: {
+      subscriptionId: string;
+      invoiceId: string;
+    };
+  }>;
+  time_range: {
+    start: number;
+    end: number;
+  };
+}
+
+interface SubscriptionWithAmount {
+  subscription: Subscription;
+  amounts: Record<string, string>;
+}
+
+interface Context {
+  locale: string;
+  startTime: string;
+  endTime: string;
+  totalAmountStr: string;
+  subscriptionData: SubscriptionWithAmount[];
+  userDid: string;
+}
+
+export class AggregatedSubscriptionRenewedEmailTemplate implements BaseEmailTemplate {
+  options: AggregatedSubscriptionRenewedEmailTemplateOptions;
+
+  constructor(options: AggregatedSubscriptionRenewedEmailTemplateOptions) {
+    this.options = options;
+  }
+
+  async getContext(): Promise<Context> {
+    const { items, customer_id: customerId, time_range: timeRange } = this.options;
+
+    const customer = await Customer.findByPk(customerId);
+    if (!customer) {
+      throw new Error(`Customer not found: ${customerId}`);
+    }
+    const locale = await getUserLocale(customer.did);
+
+    const subscriptions = await Subscription.findAll({
+      where: { id: [...new Set(items.map((item) => item.data.subscriptionId))] },
+    });
+
+    const invoices = await Invoice.findAll({
+      where: { id: [...new Set(items.map((item) => item.data.invoiceId))] },
+    });
+
+    const currencyIds = [...new Set(invoices.map((invoice) => invoice.currency_id))];
+    const paymentCurrencies = (await PaymentCurrency.findAll({
+      where: { id: currencyIds },
+      include: [{ model: PaymentMethod, as: 'payment_method' }],
+    })) as (PaymentCurrency & { payment_method: PaymentMethod })[];
+    const currencyMap = paymentCurrencies.reduce(
+      (acc, curr) => {
+        acc[curr.id] = curr;
+        return acc;
+      },
+      {} as Record<string, PaymentCurrency & { payment_method: PaymentMethod }>
+    );
+
+    const { totalAmounts, subscriptionAmounts } = invoices.reduce(
+      (acc, invoice) => {
+        const currency = invoice.currency_id;
+        const amount = new BN(invoice.amount_paid || '0');
+
+        acc.totalAmounts[currency] = (acc.totalAmounts[currency] || new BN('0')).add(amount);
+
+        if (invoice.subscription_id) {
+          if (!acc.subscriptionAmounts[invoice.subscription_id]) {
+            acc.subscriptionAmounts[invoice.subscription_id] = {};
+          }
+          const subAmounts = acc.subscriptionAmounts[invoice.subscription_id] || {};
+          subAmounts[currency] = (subAmounts[currency] || new BN('0')).add(amount);
+          acc.subscriptionAmounts[invoice.subscription_id] = subAmounts;
+        }
+        return acc;
+      },
+      {
+        totalAmounts: {} as Record<string, BN>,
+        subscriptionAmounts: {} as Record<string, Record<string, BN>>,
+      }
+    );
+
+    const totalAmountStr = Object.entries(totalAmounts)
+      .map(([currencyId, amount]) => {
+        const currency = currencyMap[currencyId];
+        if (!currency) {
+          return undefined;
+        }
+        return formatCurrencyInfo(amount.toString(), currency, currency.payment_method);
+      })
+      .filter((amountStr) => amountStr !== undefined)
+      .join('、');
+
+    const subscriptionData = subscriptions.map((subscription) => ({
+      subscription,
+      amounts: Object.entries(subscriptionAmounts[subscription.id] || {}).reduce(
+        (acc, [currencyId, amount]) => {
+          const currency = currencyMap[currencyId];
+          if (!currency) {
+            return acc;
+          }
+          acc[currencyId] = formatCurrencyInfo(amount.toString(), currency, currency.payment_method);
+          return acc;
+        },
+        {} as Record<string, string>
+      ),
+    }));
+
+    return {
+      locale,
+      startTime: formatTime(timeRange.start * 1000),
+      endTime: formatTime(timeRange.end * 1000),
+      totalAmountStr,
+      subscriptionData,
+      userDid: customer.did,
+    };
+  }
+
+  async getTemplate(): Promise<BaseEmailTemplateType> {
+    const { locale, startTime, endTime, totalAmountStr, subscriptionData, userDid } = await this.getContext();
+
+    const subscriptionList = subscriptionData
+      .map(({ subscription, amounts }) => {
+        const amountStr = Object.values(amounts).join('、');
+        const description = subscription.description || subscription.id;
+        const link = getCustomerSubscriptionPageUrl({
+          subscriptionId: subscription.id,
+          locale,
+          userDid,
+        });
+        return `<${description} - ${amountStr}(link:${link})>`;
+      })
+      .join('\n');
+
+    return {
+      title: translate('notification.aggregatedSubscriptionRenewed.title', locale, {
+        count: subscriptionData.length,
+      }),
+      body: translate('notification.aggregatedSubscriptionRenewed.body', locale, {
+        startTime,
+        endTime,
+        count: subscriptionData.length,
+        totalAmount: totalAmountStr,
+        subscriptionList,
+      }),
+    };
+  }
+}

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

@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/brace-style */
 /* eslint-disable @typescript-eslint/indent */
-import { fromUnitToToken } from '@ocap/util';
 import pWaitFor from 'p-wait-for';
 
 import { getUserLocale } from '../../../integrations/blocklet/notification';
@@ -9,7 +8,7 @@ import { CheckoutSession, Customer, NftMintItem, PaymentIntent, PaymentMethod }
 import { PaymentCurrency } from '../../../store/models/payment-currency';
 import { getMainProductNameByCheckoutSession } from '../../product';
 import { formatTime } from '../../time';
-import { getExplorerLink } from '../../util';
+import { formatCurrencyInfo, getExplorerLink } from '../../util';
 import type { BaseEmailTemplate, BaseEmailTemplateType } from './base';
 
 export interface OneTimePaymentSucceededEmailTemplateOptions {
@@ -96,9 +95,7 @@ export class OneTimePaymentSucceededEmailTemplate
     const paymentIntent = await PaymentIntent.findByPk(checkoutSession!.payment_intent_id);
     const paymentMethod: PaymentMethod | null = await PaymentMethod.findByPk(paymentIntent!.payment_method_id);
 
-    const paymentInfo: string = `${fromUnitToToken(checkoutSession?.amount_total, paymentCurrency.decimal)} ${
-      paymentCurrency.symbol
-    }${paymentMethod ? ` (${paymentMethod.name})` : ''}`;
+    const paymentInfo = formatCurrencyInfo(checkoutSession?.amount_total, paymentCurrency, paymentMethod);
 
     // @ts-expect-error
     const chainHost: string | undefined = paymentMethod?.settings?.[paymentMethod.type]?.api_host;

package/api/src/libs/notification/template/subscription-canceled.ts

@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/brace-style */
 /* eslint-disable @typescript-eslint/indent */
-import { fromUnitToToken } from '@ocap/util';
 import prettyMsI18n from 'pretty-ms-i18n';
 
 import { Op } from 'sequelize';
@@ -13,7 +12,7 @@ import { getMainProductName } from '../../product';
 import { getCustomerSubscriptionPageUrl, getSubscriptionStakeCancellation } from '../../subscription';
 import { formatTime, getPrettyMsI18nLocale } from '../../time';
 import type { BaseEmailTemplate, BaseEmailTemplateType } from './base';
-import { getSubscriptionNotificationCustomActions } from '../../util';
+import { formatCurrencyInfo, getSubscriptionNotificationCustomActions } from '../../util';
 
 export interface SubscriptionCanceledEmailTemplateOptions {
   subscriptionId: string;
@@ -87,7 +86,7 @@ export class SubscriptionCanceledEmailTemplate implements BaseEmailTemplate<Subs
     const paymentMethod: PaymentMethod | null = await PaymentMethod.findByPk(invoice.default_payment_method_id);
 
     // @ts-ignore
-    const paymentInfo: string = `${fromUnitToToken(invoice.total, invoice?.paymentCurrency?.decimal)} ${invoice?.paymentCurrency?.symbol}${paymentMethod ? ` (${paymentMethod.name})` : ''}`;
+    const paymentInfo: string = formatCurrencyInfo(invoice.total, invoice?.paymentCurrency, paymentMethod);
 
     const customerCancelRequest = subscription.cancelation_details?.reason === 'cancellation_requested';
     let cancellationReason = '';

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

@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/brace-style */
 /* eslint-disable @typescript-eslint/indent */
-import { fromUnitToToken } from '@ocap/util';
 import prettyMsI18n from 'pretty-ms-i18n';
 
 import { getUserLocale } from '../../../integrations/blocklet/notification';
@@ -11,7 +10,7 @@ import { PaymentCurrency } from '../../../store/models/payment-currency';
 import { getMainProductName } from '../../product';
 import { getCustomerSubscriptionPageUrl } from '../../subscription';
 import { formatTime, getPrettyMsI18nLocale } from '../../time';
-import { getExplorerLink, getSubscriptionNotificationCustomActions } from '../../util';
+import { formatCurrencyInfo, getExplorerLink, getSubscriptionNotificationCustomActions } from '../../util';
 import type { BaseEmailTemplate, BaseEmailTemplateType } from './base';
 
 export interface SubscriptionRefundSucceededEmailTemplateOptions {
@@ -103,8 +102,12 @@ export class SubscriptionRefundSucceededEmailTemplate
       refund.payment_method_id || invoice?.default_payment_method_id
     );
 
-    const paymentInfo: string = `${fromUnitToToken(paymentIntent?.amount_received || '0', paymentCurrency.decimal)} ${paymentCurrency.symbol}${paymentMethod ? ` (${paymentMethod.name})` : ''}`;
-    const refundInfo: string = `${fromUnitToToken(refund.amount, paymentCurrency.decimal)} ${paymentCurrency.symbol}${paymentMethod ? ` (${paymentMethod.name})` : ''}`;
+    const paymentInfo: string = formatCurrencyInfo(
+      paymentIntent?.amount_received || '0',
+      paymentCurrency,
+      paymentMethod
+    );
+    const refundInfo: string = formatCurrencyInfo(refund.amount, paymentCurrency, paymentMethod);
 
     // @ts-expect-error
     const chainHost: string | undefined = paymentMethod?.settings?.[paymentMethod.type]?.api_host;

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

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/brace-style */
 /* eslint-disable @typescript-eslint/indent */
-import { fromUnitToToken, toDid } from '@ocap/util';
+import { toDid } from '@ocap/util';
 import camelCase from 'lodash/camelCase';
 import prettyMsI18n from 'pretty-ms-i18n';
 
@@ -22,7 +22,7 @@ import { SufficientForPaymentResult, getPaymentDetail } from '../../payment';
 import { getMainProductName } from '../../product';
 import { getCustomerSubscriptionPageUrl } from '../../subscription';
 import { formatTime, getPrettyMsI18nLocale } from '../../time';
-import { getExplorerLink, getSubscriptionNotificationCustomActions } from '../../util';
+import { formatCurrencyInfo, getExplorerLink, getSubscriptionNotificationCustomActions } from '../../util';
 import type { BaseEmailTemplate, BaseEmailTemplateType } from './base';
 
 export interface SubscriptionRenewFailedEmailTemplateOptions {
@@ -123,9 +123,7 @@ export class SubscriptionRenewFailedEmailTemplate
     );
     const paymentMethod: PaymentMethod | null = await PaymentMethod.findByPk(invoice.default_payment_method_id);
 
-    const paymentInfo: string = `${fromUnitToToken(invoice.amount_remaining, paymentCurrency.decimal)} ${
-      paymentCurrency.symbol
-    }${paymentMethod ? ` (${paymentMethod.name})` : ''}`;
+    const paymentInfo: string = formatCurrencyInfo(invoice.amount_remaining, paymentCurrency, paymentMethod);
 
     const chainHost: string | undefined =
       paymentMethod?.settings?.[checkoutSession?.nft_mint_details?.type as NFTMintChainType]?.api_host;

package/api/src/libs/notification/template/subscription-renewed.ts

@@ -20,7 +20,7 @@ import { getCustomerInvoicePageUrl } from '../../invoice';
 import { getMainProductName } from '../../product';
 import { getCustomerSubscriptionPageUrl } from '../../subscription';
 import { formatTime, getPrettyMsI18nLocale } from '../../time';
-import { getExplorerLink, getSubscriptionNotificationCustomActions } from '../../util';
+import { formatCurrencyInfo, getExplorerLink, getSubscriptionNotificationCustomActions } from '../../util';
 import type { BaseEmailTemplate, BaseEmailTemplateType } from './base';
 
 export interface SubscriptionRenewedEmailTemplateOptions {
@@ -112,7 +112,7 @@ export class SubscriptionRenewedEmailTemplate implements BaseEmailTemplate<Subsc
     );
 
     const paymentMethod: PaymentMethod | null = await PaymentMethod.findByPk(invoice.default_payment_method_id);
-    const paymentInfo: string = `${fromUnitToToken(invoice.total, paymentCurrency.decimal)} ${paymentCurrency.symbol}${paymentMethod ? ` (${paymentMethod.name})` : ''}`;
+    const paymentInfo: string = formatCurrencyInfo(invoice.total, paymentCurrency, paymentMethod);
 
     const chainHost: string | undefined =
       paymentMethod?.settings?.[checkoutSession?.nft_mint_details?.type as NFTMintChainType]?.api_host;

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

@@ -1,5 +1,4 @@
 /* eslint-disable prettier/prettier */
-import { fromUnitToToken } from '@ocap/util';
 import { getUserLocale } from '../../../integrations/blocklet/notification';
 import { translate } from '../../../locales';
 import { Customer, PaymentIntent, PaymentMethod, Subscription } from '../../../store/models';
@@ -8,7 +7,7 @@ import { PaymentCurrency } from '../../../store/models/payment-currency';
 import { getMainProductName } from '../../product';
 import { getCustomerSubscriptionPageUrl } from '../../subscription';
 import { formatTime } from '../../time';
-import { getExplorerLink, getSubscriptionNotificationCustomActions } from '../../util';
+import { formatCurrencyInfo, getExplorerLink, getSubscriptionNotificationCustomActions } from '../../util';
 import type { BaseEmailTemplate, BaseEmailTemplateType } from './base';
 
 export interface SubscriptionStakeSlashSucceededEmailTemplateOptions {
@@ -84,7 +83,7 @@ export class SubscriptionStakeSlashSucceededEmailTemplate
 
     const paymentMethod: PaymentMethod | null = await PaymentMethod.findByPk(paymentIntent.payment_method_id);
 
-    const slashInfo: string = `${fromUnitToToken(paymentIntent?.amount_received || '0', paymentCurrency.decimal)} ${paymentCurrency.symbol}${paymentMethod ? ` (${paymentMethod.name})` : ''}`;
+    const slashInfo: string = formatCurrencyInfo(paymentIntent?.amount_received || '0', paymentCurrency, paymentMethod);
 
     // @ts-expect-error
     const chainHost: string | undefined = paymentMethod?.settings?.[paymentMethod.type]?.api_host;

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

@@ -21,7 +21,7 @@ import {
 import { getCustomerInvoicePageUrl, getOneTimeProductInfo } from '../../invoice';
 import { getMainProductName } from '../../product';
 import { formatTime, getPrettyMsI18nLocale } from '../../time';
-import { getExplorerLink, getSubscriptionNotificationCustomActions } from '../../util';
+import { formatCurrencyInfo, getExplorerLink, getSubscriptionNotificationCustomActions } from '../../util';
 import type { BaseEmailTemplate, BaseEmailTemplateType } from './base';
 
 export interface SubscriptionSucceededEmailTemplateOptions {
@@ -134,7 +134,7 @@ export class SubscriptionSucceededEmailTemplate
     );
 
     const paymentMethod: PaymentMethod | null = await PaymentMethod.findByPk(invoice.default_payment_method_id);
-    const paymentInfo: string = `${paymentAmount} ${paymentCurrency.symbol}${paymentMethod ? ` (${paymentMethod.name})` : ''}`;
+    const paymentInfo: string = formatCurrencyInfo(paymentAmount, paymentCurrency, paymentMethod, true);
 
     // @FIXME: 获取 chainHost 困难的一批?
     const chainHost: string | undefined =

package/api/src/libs/notification/template/subscription-upgraded.ts

@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/brace-style */
 /* eslint-disable @typescript-eslint/indent */
-import { fromUnitToToken } from '@ocap/util';
 import prettyMsI18n from 'pretty-ms-i18n';
 
 import { getUserLocale } from '../../../integrations/blocklet/notification';
@@ -20,7 +19,7 @@ import { getCustomerInvoicePageUrl } from '../../invoice';
 import { getMainProductName } from '../../product';
 import { getCustomerSubscriptionPageUrl } from '../../subscription';
 import { formatTime, getPrettyMsI18nLocale } from '../../time';
-import { getExplorerLink, getSubscriptionNotificationCustomActions } from '../../util';
+import { formatCurrencyInfo, getExplorerLink, getSubscriptionNotificationCustomActions } from '../../util';
 import type { BaseEmailTemplate, BaseEmailTemplateType } from './base';
 
 export interface SubscriptionUpgradedEmailTemplateOptions {
@@ -107,10 +106,11 @@ export class SubscriptionUpgradedEmailTemplate implements BaseEmailTemplate<Subs
 
     const paymentMethod: PaymentMethod | null = await PaymentMethod.findByPk(invoice.default_payment_method_id);
 
-    const paymentInfo: string = `${fromUnitToToken(
+    const paymentInfo: string = formatCurrencyInfo(
       paymentIntent?.amount || invoice.amount_paid,
-      paymentCurrency.decimal
-    )} ${paymentCurrency.symbol}${paymentMethod ? ` (${paymentMethod.name})` : ''}`;
+      paymentCurrency,
+      paymentMethod
+    );
 
     // @ts-expect-error
     const chainHost: string | undefined = paymentMethod?.settings?.[paymentMethod.type]?.api_host;

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

@@ -26,7 +26,7 @@ import {
   getPaymentAmountForCycleSubscription,
 } from '../../subscription';
 import { formatTime, getPrettyMsI18nLocale, getSimplifyDuration } from '../../time';
-import { getCustomerRechargeLink, getSubscriptionNotificationCustomActions } from '../../util';
+import { formatCurrencyInfo, getCustomerRechargeLink, getSubscriptionNotificationCustomActions } from '../../util';
 import type { BaseEmailTemplate, BaseEmailTemplateType } from './base';
 
 export interface SubscriptionWillRenewEmailTemplateOptions {
@@ -117,7 +117,7 @@ export class SubscriptionWillRenewEmailTemplate
     const paidType: string = isPrePaid
       ? translate('notification.common.prepaid', locale)
       : translate('notification.common.postpaid', locale);
-    const paymentInfo: string = `${paymentDetail?.price || '0'} ${paymentCurrency.symbol}${paymentMethod ? ` (${paymentMethod.name})` : ''}`;
+    const paymentInfo: string = formatCurrencyInfo(paymentDetail?.price || '0', paymentCurrency, paymentMethod, true);
     const currentPeriodStart: string = isPrePaid
       ? formatTime(invoice.period_end * 1000)
       : formatTime(invoice.period_start * 1000);

package/api/src/libs/queue/index.ts

@@ -270,6 +270,11 @@ export default function createQueue<T = any>({ name, onJob, options = defaults }
     }
   };
 
+  const updateJob = async (id: string, updates: any) => {
+    const updatedJob = await store.updateJob(id, updates);
+    return updatedJob;
+  };
+
   // Populate the queue on startup
   process.nextTick(async () => {
     try {
@@ -335,6 +340,7 @@ export default function createQueue<T = any>({ name, onJob, options = defaults }
     get: getJob,
     delete: deleteJob,
     cancel,
+    update: updateJob,
     options: {
       concurrency,
       maxRetries,

package/api/src/libs/queue/store.ts

@@ -1,4 +1,4 @@
-import { Op } from 'sequelize';
+import { Op, type WhereOptions } from 'sequelize';
 
 import { Job, TJob } from '../../store/models/job';
 import CustomError from '../error';
@@ -26,6 +26,18 @@ export default function createQueueStore(queue: string) {
         transaction: null,
       });
     },
+    findJobs(predicate: WhereOptions<TJob>): Promise<TJob[]> {
+      return Job.findAll({
+        where: {
+          queue,
+          cancelled: false,
+          ...predicate,
+        },
+        order: [['created_at', 'ASC']],
+        transaction: null,
+      });
+    },
+
     async updateJob(id: string, updates: Partial<TJob>): Promise<TJob> {
       const job = await Job.findOne({ where: { queue, id }, transaction: null });
       if (!job) {

package/api/src/libs/util.ts

@@ -10,9 +10,10 @@ import { joinURL, withQuery, withTrailingSlash } from 'ufo';
 
 import axios from 'axios';
 import { ethers } from 'ethers';
+import { fromUnitToToken } from '@ocap/util';
 import dayjs from './dayjs';
 import { blocklet, wallet } from './auth';
-import type { PaymentMethod, Subscription } from '../store/models';
+import type { PaymentCurrency, PaymentMethod, Subscription } from '../store/models';
 import logger from './logger';
 
 export const OCAP_PAYMENT_TX_TYPE = 'fg:t:transfer_v2';
@@ -524,3 +525,23 @@ export function resolveAddressChainTypes(address: string): LiteralUnion<'ethereu
   }
   return ['arcblock'];
 }
+
+export function formatCurrencyInfo(
+  amount: string | number,
+  paymentCurrency: PaymentCurrency,
+  paymentMethod?: PaymentMethod | null,
+  isToken?: boolean
+) {
+  let amountStr = '';
+  const defaultPaymentCurrency = {
+    symbol: '',
+    decimal: 18,
+  };
+
+  if (isToken) {
+    amountStr = `${amount || '0'} ${paymentCurrency.symbol ?? defaultPaymentCurrency.symbol}`;
+  } else {
+    amountStr = `${fromUnitToToken(amount || '0', paymentCurrency.decimal ?? defaultPaymentCurrency.decimal)} ${paymentCurrency.symbol ?? defaultPaymentCurrency.symbol}`;
+  }
+  return paymentMethod && paymentMethod.type !== 'arcblock' ? `${amountStr} (${paymentMethod.name})` : amountStr;
+}