payment-kit 1.19.17 → 1.19.19

package/api/src/store/models/auto-recharge-config.ts

@@ -0,0 +1,225 @@
+/* eslint-disable @typescript-eslint/lines-between-class-members */
+import { CreationOptional, DataTypes, InferAttributes, InferCreationAttributes, Model } from 'sequelize';
+
+import { BN } from '@ocap/util';
+import { createIdGenerator } from '../../libs/util';
+import { PaymentDetails, PaymentSettings } from './types';
+
+const nextId = createIdGenerator('carc', 24);
+
+// eslint-disable-next-line prettier/prettier
+export class AutoRechargeConfig extends Model<InferAttributes<AutoRechargeConfig>, InferCreationAttributes<AutoRechargeConfig>> {
+  declare id: CreationOptional<string>;
+  declare customer_id: string;
+  declare livemode: boolean;
+
+  declare enabled: boolean;
+  declare threshold: string;
+  declare currency_id: string; // default credit currency id
+  declare recharge_currency_id?: string; // payment currency id
+  declare price_id: string;
+  declare quantity: number;
+  declare payment_method_id?: string;
+
+  declare payment_settings?: PaymentSettings;
+
+  declare payment_details?: PaymentDetails;
+
+  declare daily_limits?: {
+    max_attempts: number;
+    max_amount: string;
+  };
+
+  declare last_recharge_date?: string;
+  declare daily_stats?: {
+    attempt_count: number;
+    total_amount: string;
+  };
+
+  declare metadata?: Record<string, any>;
+  declare created_at: CreationOptional<Date>;
+  declare updated_at: CreationOptional<Date>;
+
+  public static readonly GENESIS_ATTRIBUTES = {
+    id: {
+      type: DataTypes.STRING(30),
+      primaryKey: true,
+      allowNull: false,
+      defaultValue: nextId,
+    },
+    customer_id: {
+      type: DataTypes.STRING(18),
+      allowNull: false,
+      references: {
+        model: 'customers',
+        key: 'id',
+      },
+    },
+    livemode: {
+      type: DataTypes.BOOLEAN,
+      allowNull: false,
+    },
+    enabled: {
+      type: DataTypes.BOOLEAN,
+      allowNull: false,
+      defaultValue: false,
+    },
+    threshold: {
+      type: DataTypes.STRING(32),
+      allowNull: false,
+    },
+    payment_method_id: {
+      type: DataTypes.STRING(15),
+      allowNull: true,
+    },
+    currency_id: {
+      type: DataTypes.STRING(15),
+      allowNull: false,
+    },
+    recharge_currency_id: {
+      type: DataTypes.STRING(15),
+      allowNull: true,
+    },
+    price_id: {
+      type: DataTypes.STRING(32),
+      allowNull: false,
+    },
+    quantity: {
+      type: DataTypes.INTEGER,
+      defaultValue: 1,
+      allowNull: false,
+    },
+    payment_settings: {
+      type: DataTypes.JSON,
+      allowNull: true,
+      defaultValue: {
+        payment_method_types: [],
+        payment_method_options: {},
+      },
+    },
+    payment_details: {
+      type: DataTypes.JSON,
+      allowNull: true,
+    },
+    daily_limits: {
+      type: DataTypes.JSON,
+      allowNull: true,
+      defaultValue: {
+        max_attempts: 0,
+        max_amount: '0',
+      },
+    },
+    last_recharge_date: {
+      type: DataTypes.STRING(10),
+      allowNull: true,
+    },
+    daily_stats: {
+      type: DataTypes.JSON,
+      allowNull: false,
+      defaultValue: {
+        attempt_count: 0,
+        total_amount: '0',
+      },
+    },
+    metadata: {
+      type: DataTypes.JSON,
+      allowNull: true,
+    },
+    created_at: {
+      type: DataTypes.DATE,
+      defaultValue: DataTypes.NOW,
+      allowNull: false,
+    },
+    updated_at: {
+      type: DataTypes.DATE,
+      defaultValue: DataTypes.NOW,
+      allowNull: false,
+    },
+  };
+
+  public static initialize(sequelize: any) {
+    this.init(AutoRechargeConfig.GENESIS_ATTRIBUTES, {
+      sequelize,
+      modelName: 'AutoRechargeConfig',
+      tableName: 'auto_recharge_configs',
+      createdAt: 'created_at',
+      updatedAt: 'updated_at',
+    });
+  }
+
+  public static associate(models: any) {
+    this.belongsTo(models.Customer, {
+      foreignKey: 'customer_id',
+      as: 'customer',
+    });
+
+    this.belongsTo(models.PaymentCurrency, {
+      foreignKey: 'currency_id',
+      as: 'currency',
+    });
+
+    this.belongsTo(models.PaymentCurrency, {
+      foreignKey: 'recharge_currency_id',
+      as: 'rechargeCurrency',
+    });
+
+    this.belongsTo(models.Price, {
+      foreignKey: 'price_id',
+      as: 'price',
+    });
+
+    this.belongsTo(models.PaymentMethod, {
+      foreignKey: 'payment_method_id',
+      as: 'paymentMethod',
+    });
+  }
+
+  public canRechargeToday(nextAmount: string): boolean {
+    const today = new Date().toISOString().split('T')[0];
+
+    if (this.last_recharge_date !== today) {
+      return true;
+    }
+
+    if (!this.daily_stats || !this.daily_limits) {
+      return true;
+    }
+
+    const attemptValid =
+      Number(this.daily_limits.max_attempts) === 0 ||
+      Number(this.daily_stats.attempt_count) < Number(this.daily_limits.max_attempts);
+    const amountValid =
+      new BN(this.daily_limits?.max_amount || '0').lte(new BN(0)) ||
+      new BN(this.daily_stats.total_amount || '0')
+        .add(new BN(nextAmount))
+        .lte(new BN(this.daily_limits.max_amount || '0'));
+
+    if (attemptValid && amountValid) {
+      return true;
+    }
+    return false;
+  }
+
+  public async updateDailyStats(amount: string): Promise<void> {
+    const today = new Date().toISOString().split('T')[0];
+
+    if (this.last_recharge_date !== today) {
+      await this.update({
+        last_recharge_date: today,
+        daily_stats: {
+          attempt_count: 1,
+          total_amount: amount,
+        },
+      });
+    } else {
+      await this.update({
+        daily_stats: {
+          attempt_count: (this.daily_stats?.attempt_count || 0) + 1,
+          total_amount: new BN(this.daily_stats?.total_amount || '0').add(new BN(amount)).toString(),
+        },
+      });
+    }
+  }
+}
+
+export type TAutoRechargeConfig = InferAttributes<AutoRechargeConfig>;

package/api/src/store/models/credit-grant.ts

@@ -198,7 +198,7 @@ export class CreditGrant extends Model<InferAttributes<CreditGrant>, InferCreati
   // consume credit
   public async consumeCredit(
     amount: string,
-    context: {
+    _context: {
       subscription_id?: string;
       meter_event_id?: string;
     },
@@ -242,15 +242,6 @@ export class CreditGrant extends Model<InferAttributes<CreditGrant>, InferCreati
       await this.save();
 
       await createEvent('CreditGrant', 'customer.credit_grant.consumed', this).catch(console.error);
-
-      // check low balance warning
-      const originalAmount = new BN(this.amount);
-      const threshold = originalAmount.mul(new BN(10)).div(new BN(100)); // 10%
-      if (newRemainingAmount.gt(new BN(0)) && newRemainingAmount.lte(threshold)) {
-        await createEvent('CreditGrant', 'customer.credit_grant.low_balance', this, {
-          metadata: context,
-        }).catch(console.error);
-      }
     }
 
     return {
@@ -438,7 +429,7 @@ export class CreditGrant extends Model<InferAttributes<CreditGrant>, InferCreati
 
     await Promise.all(
       targetCurrencyIds.map(async (currencyId: string) => {
-        const paymentCurrency = await PaymentCurrency.findByPk(currencyId);
+        const paymentCurrency = await PaymentCurrency.scope('withRechargeConfig').findByPk(currencyId);
         if (!paymentCurrency) {
           return null;
         }

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

@@ -157,6 +157,7 @@ export class Customer extends Model<InferAttributes<Customer>, InferCreationAttr
   public async getInvoiceNumber() {
     const lock = getLock(`${this.id}-invoice-number`);
     await lock.acquire();
+    await this.reload();
     const sequence = this.next_invoice_sequence || 1;
     await this.increment('next_invoice_sequence', { by: 1 });
     lock.release();

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

@@ -31,6 +31,7 @@ import { CreditGrant, TCreditGrant } from './credit-grant';
 import { CreditTransaction, TCreditTransaction } from './credit-transaction';
 import { Meter, TMeter } from './meter';
 import { MeterEvent, TMeterEvent } from './meter-event';
+import { AutoRechargeConfig } from './auto-recharge-config';
 
 const models = {
   CheckoutSession,
@@ -65,6 +66,7 @@ const models = {
   CreditTransaction,
   Meter,
   MeterEvent,
+  AutoRechargeConfig,
 };
 
 export function initialize(sequelize: any) {
@@ -113,6 +115,7 @@ export * from './credit-grant';
 export * from './credit-transaction';
 export * from './meter';
 export * from './meter-event';
+export * from './auto-recharge-config';
 
 export type TPriceExpanded = TPrice & {
   object: 'price';

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

@@ -63,7 +63,8 @@ export class Invoice extends Model<InferAttributes<Invoice>, InferCreationAttrib
     | 'stake'
     | 'overdraft_protection'
     | 'stake_overdraft_protection'
-    | 'recharge',
+    | 'recharge'
+    | 'auto_recharge',
     string
   >;
 

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

@@ -12,7 +12,7 @@ import {
 import { getUrl } from '@blocklet/sdk';
 import type { LiteralUnion } from 'type-fest';
 import { createIdGenerator } from '../../libs/util';
-import { VaultConfig } from './types';
+import { RechargeConfig, VaultConfig } from './types';
 
 const nextId = createIdGenerator('pc', 12);
 
@@ -45,6 +45,7 @@ export class PaymentCurrency extends Model<InferAttributes<PaymentCurrency>, Inf
   declare updated_at: CreationOptional<Date>;
   declare vault_config?: VaultConfig;
   declare type: LiteralUnion<'standard' | 'credit', string>;
+  declare recharge_config?: RechargeConfig;
 
   public static readonly GENESIS_ATTRIBUTES = {
     id: {
@@ -139,6 +140,10 @@ export class PaymentCurrency extends Model<InferAttributes<PaymentCurrency>, Inf
           defaultValue: 'standard',
           allowNull: false,
         },
+        recharge_config: {
+          type: DataTypes.JSON,
+          allowNull: true,
+        },
       },
       {
         sequelize,
@@ -147,12 +152,15 @@ export class PaymentCurrency extends Model<InferAttributes<PaymentCurrency>, Inf
         createdAt: 'created_at',
         updatedAt: 'updated_at',
         defaultScope: {
-          attributes: { exclude: ['vault_config'] },
+          attributes: { exclude: ['vault_config', 'recharge_config'] },
         },
         scopes: {
           withVaultConfig: {
             attributes: { include: ['vault_config'] },
           },
+          withRechargeConfig: {
+            attributes: { include: ['recharge_config'] },
+          },
         },
       }
     );

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

@@ -339,6 +339,7 @@ export type PaymentDetails = {
     subscription_id?: string;
     customer_id?: string;
     refund_id?: string;
+    payment_method_id?: string;
   };
   ethereum?: {
     tx_hash: string;
@@ -725,8 +726,8 @@ export type EventType = LiteralUnion<
   | 'billing.discrepancy'
   | 'usage.report.empty'
   | 'customer.credit.insufficient'
+  | 'customer.credit.low_balance'
   | 'customer.credit_grant.granted'
-  | 'customer.credit_grant.low_balance'
   | 'customer.credit_grant.depleted',
   string
 >;
@@ -777,3 +778,13 @@ export type MeterEventPayload = {
   value: string;
   subscription_id?: string;
 };
+
+export type RechargeConfig = {
+  base_price_id: string;
+  payment_link_id?: string;
+  checkout_url?: string;
+  settings?: {
+    min_recharge_amount?: number;
+    max_recharge_amount?: number;
+  };
+};

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.17
+version: 1.19.19
 logo: logo.png
 files:
   - dist
@@ -171,9 +171,9 @@ events:
     description: Application will send notification to user manually
   - type: customer.credit_grant.granted
     description: Credit grant has been successfully granted
-  - type: customer.credit_grant.low_balance
-    description: Credit grant has low balance
   - type: customer.credit_grant.depleted
     description: Credit grant has been depleted
   - type: customer.credit.insufficient
     description: Customer has insufficient credit
+  - type: customer.credit.low_balance
+    description: Customer has low credit balance

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.19.17",
+  "version": "1.19.19",
   "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.48",
-    "@arcblock/did": "^1.21.2",
-    "@arcblock/did-connect-react": "^3.1.5",
+    "@arcblock/did": "^1.23.1",
+    "@arcblock/did-connect-react": "^3.1.31",
     "@arcblock/did-connect-storage-nedb": "^1.8.0",
-    "@arcblock/did-util": "^1.21.2",
-    "@arcblock/jwt": "^1.21.2",
-    "@arcblock/ux": "^3.1.5",
-    "@arcblock/validator": "^1.21.2",
-    "@blocklet/did-space-js": "^1.1.14",
+    "@arcblock/did-util": "^1.23.1",
+    "@arcblock/jwt": "^1.23.1",
+    "@arcblock/ux": "^3.1.31",
+    "@arcblock/validator": "^1.23.1",
+    "@blocklet/did-space-js": "^1.1.18",
     "@blocklet/error": "^0.2.5",
     "@blocklet/js-sdk": "^1.16.48",
     "@blocklet/logger": "^1.16.48",
-    "@blocklet/payment-react": "1.19.17",
+    "@blocklet/payment-react": "1.19.19",
     "@blocklet/sdk": "^1.16.48",
-    "@blocklet/ui-react": "^3.1.5",
+    "@blocklet/ui-react": "^3.1.31",
     "@blocklet/uploader": "^0.2.7",
-    "@blocklet/xss": "^0.2.4",
+    "@blocklet/xss": "^0.2.5",
     "@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.2",
-    "@ocap/client": "^1.21.2",
-    "@ocap/mcrypto": "^1.21.2",
-    "@ocap/util": "^1.21.2",
-    "@ocap/wallet": "^1.21.2",
+    "@ocap/asset": "^1.23.1",
+    "@ocap/client": "^1.23.1",
+    "@ocap/mcrypto": "^1.23.1",
+    "@ocap/util": "^1.23.1",
+    "@ocap/wallet": "^1.23.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.48",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.19.17",
+    "@blocklet/payment-types": "1.19.19",
     "@types/cookie-parser": "^1.4.9",
     "@types/cors": "^2.8.19",
     "@types/debug": "^4.1.12",
@@ -170,5 +170,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "718d307a13b0c11e11316cdd28fff2f335e23de7"
+  "gitHead": "76facca620eda1132f8c6d5b8f42d8fd9ef78b05"
 }

package/src/components/currency.tsx

@@ -11,9 +11,11 @@ export default function Currency({ logo, name, sx = {}, size = 20 }: Props) {
   return (
     <Stack
       direction="row"
-      alignItems="center"
       spacing={0.5}
       sx={[
+        {
+          alignItems: 'center',
+        },
         {
           alignItems: 'center',
         },

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

@@ -1,9 +1,14 @@
-import { formatBNStr, CreditGrantsList, CreditTransactionsList, api } from '@blocklet/payment-react';
+import { formatBNStr, CreditGrantsList, CreditTransactionsList, api, AutoTopupModal } from '@blocklet/payment-react';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
-import { Box, Card, CardContent, Stack, Typography, Tabs, Tab } from '@mui/material';
-import { useMemo, useState } from 'react';
+import { Box, Card, CardContent, Stack, Typography, Tabs, Tab, Button } from '@mui/material';
+import { useMemo, useState, useEffect } from 'react';
+import { useSearchParams } from 'react-router-dom';
 import type { TPaymentCurrency } from '@blocklet/payment-types';
 import { useRequest } from 'ahooks';
+import { AddOutlined, AutoModeOutlined } from '@mui/icons-material';
+import { Toast } from '@arcblock/ux';
+import { formatError } from '@blocklet/error';
+import SplitButton from '@arcblock/ux/lib/SplitButton';
 import { useConditionalSection } from '../conditional-section';
 
 enum CreditTab {
@@ -43,8 +48,29 @@ const fetchCreditSummary = async (customerId: string) => {
 
 export default function CreditOverview({ customerId, settings, mode = 'portal' }: CreditOverviewProps) {
   const { t } = useLocaleContext();
-  const [creditTab, setCreditTab] = useState<CreditTab>(CreditTab.OVERVIEW);
+  const [searchParams, setSearchParams] = useSearchParams();
+
+  const getInitialTab = (): CreditTab => {
+    const tabParam = searchParams.get('creditTab');
+    if (tabParam && Object.values(CreditTab).includes(tabParam as CreditTab)) {
+      return tabParam as CreditTab;
+    }
+    return CreditTab.OVERVIEW;
+  };
+
+  const [creditTab, setCreditTab] = useState<CreditTab>(getInitialTab);
   const conditionalSection = useConditionalSection();
+  const [autoRecharge, setAutoRecharge] = useState({
+    currencyId: '',
+    open: false,
+  });
+
+  useEffect(() => {
+    const tabParam = searchParams.get('creditTab');
+    if (tabParam && Object.values(CreditTab).includes(tabParam as CreditTab)) {
+      setCreditTab(tabParam as CreditTab);
+    }
+  }, [searchParams]);
 
   const creditCurrencies = useMemo(() => {
     return (
@@ -61,15 +87,42 @@ export default function CreditOverview({ customerId, settings, mode = 'portal' }
     defaultParams: [customerId],
     refreshDeps: [creditTab === CreditTab.OVERVIEW],
     onSuccess: (data) => {
-      if (creditTab === CreditTab.OVERVIEW) {
-        const filteredCurrencies = creditCurrencies.filter((currency: TPaymentCurrency) => {
-          return data.grants?.[currency.id];
-        });
-        conditionalSection?.hideRender(filteredCurrencies.length === 0);
-      }
+      const filteredCurrencies = creditCurrencies.filter((currency: TPaymentCurrency) => {
+        return data.grants?.[currency.id];
+      });
+      conditionalSection?.hideRender(filteredCurrencies.length === 0);
     },
   });
 
+  const handleRecharge = async (currency: TPaymentCurrency) => {
+    try {
+      const response = await api.get(`/api/payment-currencies/${currency.id}/recharge-config`).then((res) => res.data);
+      if (response.recharge_config && response.recharge_config.payment_url) {
+        window.open(response.recharge_config.payment_url, '_blank');
+      } else {
+        Toast.error(t('customer.recharge.unsupported'));
+      }
+    } catch (error) {
+      console.error('Failed to fetch recharge config:', error);
+      Toast.error(formatError(error));
+    }
+  };
+
+  const handleAutoRecharge = (currency: TPaymentCurrency) => {
+    setAutoRecharge({ currencyId: currency.id, open: true });
+  };
+
+  const handleTabChange = (newValue: CreditTab) => {
+    setCreditTab(newValue);
+    const newParams = new URLSearchParams(searchParams);
+    if (newValue === CreditTab.OVERVIEW) {
+      newParams.delete('creditTab');
+    } else {
+      newParams.set('creditTab', newValue);
+    }
+    setSearchParams(newParams);
+  };
+
   // 渲染信用概览卡片
   const renderCreditOverviewCard = (currency: any) => {
     const method = settings?.paymentMethods?.find((m: any) => m.id === currency.payment_method_id);
@@ -85,6 +138,8 @@ export default function CreditOverview({ customerId, settings, mode = 'portal' }
       return null;
     }
 
+    const showRecharge = grantData.paymentCurrency.recharge_config?.base_price_id;
+
     const totalAmount = grantData.totalAmount || '0';
     const remainingAmount = grantData.remainingAmount || '0';
 
@@ -106,10 +161,11 @@ export default function CreditOverview({ customerId, settings, mode = 'portal' }
             {/* 货币信息 */}
 
             <Stack
-              direction="column"
+              direction="row"
               spacing={0.5}
               sx={{
-                alignItems: 'flex-start',
+                alignItems: 'center',
+                justifyContent: 'space-between',
                 borderBottom: '1px solid',
                 borderColor: 'divider',
                 pb: 2,
@@ -117,6 +173,32 @@ export default function CreditOverview({ customerId, settings, mode = 'portal' }
               <Typography variant="h6" component="div">
                 {currency.name}
               </Typography>
+              {showRecharge && (
+                <SplitButton
+                  variant="outlined"
+                  size="small"
+                  color="primary"
+                  menu={[
+                    <SplitButton.Item
+                      key="autoRecharge"
+                      onClick={() => handleAutoRecharge(currency)}
+                      sx={{
+                        color: 'primary.main',
+                      }}>
+                      <AutoModeOutlined fontSize="small" sx={{ mr: 0.5 }} />
+                      <Typography variant="body2" className="recharge-title">
+                        {t('customer.credit.autoRecharge')}
+                      </Typography>
+                    </SplitButton.Item>,
+                  ]}>
+                  <Button variant="text" color="primary" size="small" onClick={() => handleRecharge(currency)}>
+                    <AddOutlined fontSize="small" />
+                    <Typography variant="body2" className="recharge-title">
+                      {t('customer.credit.recharge')}
+                    </Typography>
+                  </Button>
+                </SplitButton>
+              )}
             </Stack>
 
             {/* 可用额度 / 总额度 */}
@@ -133,10 +215,7 @@ export default function CreditOverview({ customerId, settings, mode = 'portal' }
                 {totalAmount === '0' && remainingAmount === '0' ? (
                   <>0 </>
                 ) : (
-                  <>
-                    {formatBNStr(remainingAmount, currency.decimal, 6, true)} /{' '}
-                    {formatBNStr(totalAmount, currency.decimal, 6, true)}
-                  </>
+                  <>{formatBNStr(remainingAmount, currency.decimal, 6, true)}</>
                 )}
               </Typography>
             </Box>
@@ -177,8 +256,7 @@ export default function CreditOverview({ customerId, settings, mode = 'portal' }
     <Stack sx={{ width: '100%' }}>
       <Tabs
         value={creditTab}
-        onChange={(_, newValue) => setCreditTab(newValue as CreditTab)}
-        // sx={{ borderBottom: 1, borderColor: 'divider', }}
+        onChange={(_, newValue) => handleTabChange(newValue as CreditTab)}
         sx={{
           flex: '1 0 auto',
           maxWidth: '100%',
@@ -247,6 +325,13 @@ export default function CreditOverview({ customerId, settings, mode = 'portal' }
           <CreditTransactionsList customer_id={customerId} mode={mode} key={creditTab} />
         )}
       </Box>
+      {autoRecharge.open && (
+        <AutoTopupModal
+          open
+          onClose={() => setAutoRecharge({ currencyId: '', open: false })}
+          currencyId={autoRecharge.currencyId}
+        />
+      )}
     </Stack>
   );
 }