payment-kit 1.19.1 → 1.19.3

package/api/src/libs/notification/template/customer-credit-grant-low-balance.ts

@@ -52,7 +52,7 @@ export class CustomerCreditGrantLowBalanceEmailTemplate
     // 计算百分比
     const available = new BN(creditGrant.remaining_amount);
     const total = new BN(creditGrant.amount);
-    const percentage = total.gt(0) ? available.mul(new BN(100)).div(total).toString() : '0';
+    const percentage = total.gt(new BN(0)) ? available.mul(new BN(100)).div(total).toString() : '0';
 
     return {
       locale,

package/api/src/libs/notification/template/customer-credit-insufficient.ts

@@ -58,7 +58,7 @@ export class CustomerCreditInsufficientEmailTemplate
     const at = formatTime(Date.now());
 
     // 检查是否完全耗尽（可用额度为0或负数）
-    const isExhausted = new BN(this.options.availableAmount).lte(0);
+    const isExhausted = new BN(this.options.availableAmount).lte(new BN(0));
 
     // 如果有订阅ID，获取订阅信息
     let productName: string | undefined;

package/api/src/libs/security.ts

@@ -17,6 +17,7 @@ type PermissionSpec<T extends Model> = {
     // allow record owner
     model: T;
     field: string;
+    findById?: (id: string) => Promise<T | null>;
   };
   mine?: boolean;
   embed?: boolean;
@@ -105,9 +106,11 @@ export function authenticate<T extends Model>({ component, roles, record, mine,
 
       // authenticate by record owner
       if (record) {
-        const { model, field = 'customer_id' } = record;
-        // @ts-ignore
-        const doc: T | null = await model.findByPk(req.params.id);
+        const { model, field = 'customer_id', findById } = record;
+        const doc: T | null =
+          findById && typeof findById === 'function'
+            ? await findById(req.params.id as string)
+            : await (model as any).findByPk(req.params.id);
         if (doc && doc[field as keyof T]) {
           const customer = await Customer.findOne({ where: { did: req.user.did } });
           req.doc = doc;

package/api/src/libs/util.ts

@@ -12,6 +12,7 @@ import { joinURL, withQuery, withTrailingSlash } from 'ufo';
 import axios from 'axios';
 import { ethers } from 'ethers';
 import { fromUnitToToken } from '@ocap/util';
+import get from 'lodash/get';
 import dayjs from './dayjs';
 import { blocklet, wallet } from './auth';
 import type { PaymentCurrency, PaymentMethod, Subscription } from '../store/models';
@@ -268,11 +269,12 @@ export async function getUserOrAppInfo(
   }
   const { user } = await blocklet.getUser(address);
   if (user) {
+    const locale = get(user, 'locale', 'en');
     return {
       name: user?.fullName,
       avatar: joinURL(process.env.BLOCKLET_APP_URL!, user?.avatar),
       type: 'user',
-      url: getCustomerProfileUrl({ userDid: address, locale: 'en' }),
+      url: getCustomerProfileUrl({ userDid: address, locale }),
     };
   }
   return {

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

@@ -227,9 +227,9 @@ async function consumeAvailableCredits(
         metadata: {
           meter_event_id: context.meterEvent.id,
           meter_event_name: context.meterEvent.event_name,
-          required_amount: totalRequiredAmount,
+          required_amount: remainingToConsume.toString(),
           available_amount: totalAvailable.toString(),
-          consumed_amount: totalConsumed.toString(),
+          consumed_amount: consumed.toString(),
           pending_amount: pendingAmount,
           currency_id: currencyId,
           subscription_id: context.subscription?.id,
@@ -258,6 +258,19 @@ async function consumeAvailableCredits(
         },
       });
     }
+  } else if (remainingBalance === '0') {
+    await createEvent('Customer', 'customer.credit.insufficient', context.customer, {
+      metadata: {
+        meter_event_id: context.meterEvent.id,
+        meter_event_name: context.meterEvent.event_name,
+        required_amount: remainingToConsume.toString(),
+        available_amount: '0',
+        consumed_amount: consumed.toString(),
+        pending_amount: pendingAmount,
+        currency_id: currencyId,
+        subscription_id: context.subscription?.id,
+      },
+    }).catch(console.error);
   }
 
   return {

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

@@ -1010,7 +1010,6 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
     }
 
     const checkoutSession = req.doc as CheckoutSession;
-    logger.info('---checkoutSession---', checkoutSession.line_items);
     if (checkoutSession.line_items) {
       try {
         await validateInventory(checkoutSession.line_items);
@@ -1091,9 +1090,15 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
     } else {
       const updates: Record<string, any> = {};
       if (checkoutSession.customer_update?.name) {
-        updates.name = req.body.customer_name;
-        updates.email = req.body.customer_email;
-        updates.phone = req.body.customer_phone;
+        if (req.body.customer_name) {
+          updates.name = req.body.customer_name;
+        }
+        if (req.body.customer_email) {
+          updates.email = req.body.customer_email;
+        }
+        if (req.body.customer_phone) {
+          updates.phone = req.body.customer_phone;
+        }
       }
       if (checkoutSession.customer_update?.address) {
         updates.address = Customer.formatUpdateAddress(req.body.billing_address, customer);

package/api/src/routes/credit-grants.ts

@@ -10,6 +10,7 @@ import { authenticate } from '../libs/security';
 import { CreditGrant, Customer, PaymentCurrency, Price, Subscription } from '../store/models';
 import { createCreditGrant } from '../libs/credit-grant';
 import { getMeterPriceIdsFromSubscription } from '../libs/subscription';
+import { blocklet } from '../libs/auth';
 
 const router = Router();
 const auth = authenticate<CreditGrant>({ component: true, roles: ['owner', 'admin'] });
@@ -179,9 +180,30 @@ router.post('/', auth, async (req, res) => {
       return res.status(404).json({ error: `PaymentCurrency ${currencyId} not found` });
     }
 
-    const customer = await Customer.findByPkOrDid(req.body.customer_id);
+    let customer = await Customer.findByPkOrDid(req.body.customer_id);
     if (!customer) {
-      return res.status(404).json({ error: `Customer ${req.body.customer_id} not found` });
+      const { user: userInfo } = await blocklet.getUser(req.body.customer_id);
+      if (!userInfo) {
+        return res.status(404).json({ error: `User ${req.body.customer_id} not found` });
+      }
+      customer = await Customer.create({
+        livemode: true,
+        did: userInfo.did,
+        name: userInfo.fullName,
+        email: userInfo.email || '',
+        phone: userInfo.phone || '',
+        address: Customer.formatAddressFromUser(userInfo),
+        description: userInfo.remark || '',
+        metadata: {},
+        balance: '0',
+        next_invoice_sequence: 1,
+        delinquent: false,
+        invoice_prefix: Customer.getInvoicePrefix(),
+      });
+      logger.info('Customer created on credit grant', {
+        customerId: customer.id,
+        customer: customer.toJSON(),
+      });
     }
 
     const unitAmount = fromTokenToUnit(req.body.amount, paymentCurrency.decimal).toString();

package/api/src/routes/customers.ts

@@ -37,6 +37,7 @@ const authPortal = authenticate<Customer>({
     // @ts-ignore
     model: Customer,
     field: 'id',
+    findById: (id: string) => Customer.findByPkOrDid(id),
   },
 });
 
@@ -45,9 +46,6 @@ router.get('/', auth, async (req, res) => {
   const { page, pageSize, ...query } = await schema.validateAsync(req.query, { stripUnknown: true });
   const where = getWhereFromKvQuery(query.q);
 
-  if (typeof query.livemode === 'boolean') {
-    where.livemode = query.livemode;
-  }
   if (query.did) {
     where.did = query.did;
   }
@@ -220,18 +218,12 @@ router.post('/sync-to-space', sessionMiddleware(), async (req, res) => {
 });
 
 // get overdue invoices
-router.get('/:id/overdue/invoices', sessionMiddleware(), async (req, res) => {
-  if (!req.user) {
-    return res.status(403).json({ error: 'Unauthorized' });
-  }
+router.get('/:id/overdue/invoices', authPortal, async (req, res) => {
   try {
     const doc = await Customer.findByPkOrDid(req.params.id as string);
     if (!doc) {
       return res.status(404).json({ error: 'Customer not found' });
     }
-    if (doc.did !== req.user.did && !['admin', 'owner'].includes(req.user?.role)) {
-      return res.status(403).json({ error: 'You are not allowed to access this customer invoices' });
-    }
     const { rows: invoices, count } = await Invoice.findAndCountAll({
       where: {
         customer_id: doc.id,
@@ -386,16 +378,48 @@ router.get('/payer-token', sessionMiddleware({ accessKey: true }), async (req, r
 });
 
 router.get('/:id', auth, async (req, res) => {
+  if (!req.params.id) {
+    return res.status(400).json({ error: 'Customer ID is required' });
+  }
   try {
     const doc = await Customer.findByPkOrDid(req.params.id as string);
     if (doc) {
       res.json(doc);
     } else {
-      res.status(404).json(null);
+      if (req.body.create) {
+        if (!req.user) {
+          return res.status(403).json({ error: 'Unauthorized' });
+        }
+        const { user } = await blocklet.getUser(req.params.id);
+        if (!user) {
+          return res.status(404).json({ error: 'User not found' });
+        }
+        const customer = await Customer.create({
+          livemode: true,
+          did: user.did,
+          name: user.fullName,
+          email: user.email,
+          phone: user.phone,
+          address: Customer.formatAddressFromUser(user),
+          description: user.remark,
+          metadata: {},
+          balance: '0',
+          next_invoice_sequence: 1,
+          delinquent: false,
+          invoice_prefix: Customer.getInvoicePrefix(),
+        });
+        logger.info('customer created', {
+          customerId: customer.id,
+          did: customer.did,
+        });
+        return res.json(customer);
+      }
+      return res.status(404).json(null);
     }
+    return res.status(404).json(null);
   } catch (err) {
     logger.error(err);
-    res.status(500).json({ error: `Failed to get customer: ${err.message}` });
+    return res.status(500).json({ error: `Failed to get customer: ${err.message}` });
   }
 });
 

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

@@ -84,6 +84,7 @@ router.post('/', auth, async (req, res) => {
         symbol: info.symbol,
         decimal: info.decimal,
         type: 'standard',
+        maximum_precision: 6,
 
         // FIXME: make these configurable
         minimum_payment_amount: fromTokenToUnit(0.000001, info.decimal).toString(),
@@ -121,6 +122,7 @@ router.post('/', auth, async (req, res) => {
         symbol: state.symbol,
         decimal: state.decimal,
         type: 'standard',
+        maximum_precision: 6,
 
         // FIXME: make these configurable
         minimum_payment_amount: fromTokenToUnit(0.000001, state.decimal).toString(),
@@ -148,6 +150,12 @@ router.get('/', auth, async (req, res) => {
   if (typeof query.livemode === 'string') {
     where.livemode = JSON.parse(query.livemode);
   }
+  where.type = 'standard';
+  if (query.credit) {
+    where.type = {
+      [Op.in]: ['standard', 'credit'],
+    };
+  }
   const list = await PaymentCurrency.findAll({
     where,
     order: [['created_at', 'DESC']],

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

@@ -173,6 +173,7 @@ router.post('/', auth, async (req, res) => {
       decimal: 18,
 
       minimum_payment_amount: fromTokenToUnit(0.000001, 18).toString(),
+      maximum_precision: 6,
       maximum_payment_amount: fromTokenToUnit(100000000, 18).toString(),
 
       contract: '',

package/api/src/routes/webhook-endpoints.ts

@@ -43,9 +43,6 @@ router.get('/', auth, async (req, res) => {
   const { page, pageSize, status, ...query } = await schema.validateAsync(req.query, { stripUnknown: true });
   const where: WhereOptions<WebhookEndpoint> = {};
 
-  if (typeof query.livemode === 'boolean') {
-    where.livemode = query.livemode;
-  }
   if (status) {
     where.status = status
       .split(',')

package/api/src/store/migrations/20250610-billing-credit.ts

@@ -21,9 +21,6 @@ export const up: Migration = async ({ context }) => {
       },
     ],
   });
-  await context.sequelize.query(`
-    UPDATE payment_currencies SET maximum_precision = 2 WHERE type = 'standard';
-  `);
 
   await context.sequelize.query(`
     UPDATE payment_currencies 

package/api/src/store/migrations/20250708-currency-precision.ts

@@ -0,0 +1,14 @@
+import { Migration } from '../migrate';
+
+export const up: Migration = async ({ context }) => {
+  await context.sequelize.query(`
+    UPDATE payment_currencies 
+    SET maximum_precision = 6
+    WHERE payment_method_id IN (
+      SELECT id FROM payment_methods WHERE type IN ('arcblock', 'ethereum', 'base')
+    )
+    AND type != 'credit';
+  `);
+};
+
+export const down = () => {};

package/api/src/store/models/webhook-attempt.ts

@@ -42,7 +42,7 @@ export class WebhookAttempt extends Model<InferAttributes<WebhookAttempt>, Infer
       allowNull: false,
     },
     status: {
-      type: DataTypes.ENUM('enabled', 'disabled'),
+      type: DataTypes.ENUM('succeeded', 'failed'),
       allowNull: false,
     },
     response_status: {

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.19.1",
+  "version": "1.19.3",
   "scripts": {
     "dev": "blocklet dev --open",
     "lint": "tsc --noEmit && eslint src api/src --ext .mjs,.js,.jsx,.ts,.tsx",
@@ -43,31 +43,31 @@
     ]
   },
   "dependencies": {
-    "@abtnode/cron": "^1.16.44",
-    "@arcblock/did": "^1.20.14",
+    "@abtnode/cron": "^1.16.45",
+    "@arcblock/did": "^1.20.15",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
-    "@arcblock/did-connect": "^3.0.1",
-    "@arcblock/did-util": "^1.20.14",
-    "@arcblock/jwt": "^1.20.14",
-    "@arcblock/ux": "^3.0.1",
-    "@arcblock/validator": "^1.20.14",
-    "@blocklet/did-space-js": "^1.0.62",
-    "@blocklet/js-sdk": "^1.16.44",
-    "@blocklet/logger": "^1.16.44",
-    "@blocklet/payment-react": "1.19.1",
-    "@blocklet/sdk": "^1.16.44",
-    "@blocklet/ui-react": "^3.0.1",
-    "@blocklet/uploader": "^0.1.97",
-    "@blocklet/xss": "^0.1.36",
+    "@arcblock/did-connect": "^3.0.22",
+    "@arcblock/did-util": "^1.20.15",
+    "@arcblock/jwt": "^1.20.15",
+    "@arcblock/ux": "^3.0.22",
+    "@arcblock/validator": "^1.20.15",
+    "@blocklet/did-space-js": "^1.1.5",
+    "@blocklet/js-sdk": "^1.16.45",
+    "@blocklet/logger": "^1.16.45",
+    "@blocklet/payment-react": "1.19.3",
+    "@blocklet/sdk": "^1.16.45",
+    "@blocklet/ui-react": "^3.0.22",
+    "@blocklet/uploader": "^0.2.4",
+    "@blocklet/xss": "^0.2.2",
     "@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.20.14",
-    "@ocap/client": "^1.20.14",
-    "@ocap/mcrypto": "^1.20.14",
-    "@ocap/util": "^1.20.14",
-    "@ocap/wallet": "^1.20.14",
+    "@ocap/asset": "^1.20.15",
+    "@ocap/client": "^1.20.15",
+    "@ocap/mcrypto": "^1.20.15",
+    "@ocap/util": "^1.20.15",
+    "@ocap/wallet": "^1.20.15",
     "@stripe/react-stripe-js": "^2.9.0",
     "@stripe/stripe-js": "^2.4.0",
     "ahooks": "^3.8.5",
@@ -120,9 +120,9 @@
     "web3": "^4.16.0"
   },
   "devDependencies": {
-    "@abtnode/types": "^1.16.44",
+    "@abtnode/types": "^1.16.45",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.19.1",
+    "@blocklet/payment-types": "1.19.3",
     "@types/cookie-parser": "^1.4.9",
     "@types/cors": "^2.8.19",
     "@types/debug": "^4.1.12",
@@ -152,7 +152,7 @@
     "vite": "^7.0.0",
     "vite-node": "^3.2.4",
     "vite-plugin-babel-import": "^2.0.5",
-    "vite-plugin-blocklet": "^0.9.33",
+    "vite-plugin-blocklet": "^0.10.1",
     "vite-plugin-node-polyfills": "^0.23.0",
     "vite-plugin-svgr": "^4.3.0",
     "vite-tsconfig-paths": "^5.1.4",
@@ -168,5 +168,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "48d5719c8ce4e89a16f8dd576ff8f72072e3909e"
+  "gitHead": "f274edb338c8f5a23ae46d9f7fea8458a6001cf7"
 }

package/src/components/conditional-section.tsx

@@ -0,0 +1,87 @@
+import { Box } from '@mui/material';
+import { useState, ReactNode, useEffect, createContext, useContext, useMemo, useRef, useCallback } from 'react';
+
+const ConditionalSectionContext = createContext<{
+  hideRender: (hide?: boolean) => void;
+} | null>(null);
+
+// 导出hook供子组件使用
+export const useConditionalSection = () => {
+  const context = useContext(ConditionalSectionContext);
+  return context;
+};
+
+interface ConditionalSectionProps {
+  skeleton: boolean;
+  children: ReactNode;
+  skeletonComponent?: ReactNode;
+}
+
+/**
+ * 条件渲染组件 - 完全防闪现版本
+ *
+ * 彻底解决闪现问题的方案：
+ * 1. skeleton=true 时显示骨架屏组件
+ * 2. skeleton=false 时完全隐藏(display: none)渲染子组件，让其执行逻辑
+ * 3. 等待子组件执行完毕，如果没有调用hideRender则显示
+ * 4. 整个过程用户看不到任何闪现
+ *
+ * 使用方式：
+ * - 在任意深度的子组件中调用 useConditionalSection()?.hideRender()
+ */
+export default function ConditionalSection({ skeleton, children, skeletonComponent = null }: ConditionalSectionProps) {
+  const [renderState, setRenderState] = useState<'hidden' | 'visible' | 'none'>('hidden');
+  const timerRef = useRef<NodeJS.Timeout | null>(null);
+
+  const handleHideRender = useCallback((hide: boolean = true) => {
+    if (timerRef.current) {
+      clearTimeout(timerRef.current);
+      timerRef.current = null;
+    }
+    setRenderState(hide ? 'none' : 'visible');
+  }, []);
+
+  const contextValue = useMemo(() => ({ hideRender: handleHideRender }), [handleHideRender]);
+
+  useEffect(() => {
+    if (!skeleton) {
+      timerRef.current = setTimeout(() => {
+        setRenderState('visible');
+        timerRef.current = null;
+      }, 3000);
+    }
+
+    // 清理定时器
+    return () => {
+      if (timerRef.current) {
+        clearTimeout(timerRef.current);
+        timerRef.current = null;
+      }
+    };
+  }, [skeleton]);
+
+  if (skeleton) {
+    return skeletonComponent;
+  }
+
+  if (renderState === 'none') {
+    return null;
+  }
+
+  return (
+    <ConditionalSectionContext.Provider value={contextValue}>
+      <Box
+        sx={{
+          position: renderState === 'hidden' ? 'absolute' : 'static',
+          left: renderState === 'hidden' ? '-9999px' : 'auto',
+          top: renderState === 'hidden' ? '-9999px' : 'auto',
+          visibility: renderState === 'hidden' ? 'hidden' : 'visible',
+          width: renderState === 'hidden' ? '0' : 'auto',
+          height: renderState === 'hidden' ? '0' : 'auto',
+          overflow: 'hidden',
+        }}>
+        {children}
+      </Box>
+    </ConditionalSectionContext.Provider>
+  );
+}

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

@@ -1,9 +1,10 @@
 import { formatBNStr, CreditGrantsList, CreditTransactionsList, api } from '@blocklet/payment-react';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import { Avatar, Box, Card, CardContent, Stack, Typography, Tabs, Tab } from '@mui/material';
-import { useState } from 'react';
+import { useMemo, useState } from 'react';
 import type { TPaymentCurrency } from '@blocklet/payment-types';
 import { useRequest } from 'ahooks';
+import { useConditionalSection } from '../conditional-section';
 
 enum CreditTab {
   OVERVIEW = 'overview',
@@ -43,9 +44,30 @@ 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 conditionalSection = useConditionalSection();
+
+  const creditCurrencies = useMemo(() => {
+    return (
+      settings?.paymentMethods
+        ?.filter((method: any) => method.type === 'arcblock')
+        ?.flatMap((method: any) => method.payment_currencies)
+        ?.filter((currency: TPaymentCurrency) => {
+          return currency.type === 'credit';
+        }) || []
+    );
+  }, [settings]);
+
   const { data: creditSummary } = useRequest(fetchCreditSummary, {
     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);
+      }
+    },
   });
 
   // 渲染信用概览卡片
@@ -141,20 +163,11 @@ export default function CreditOverview({ customerId, settings, mode = 'portal' }
     );
   };
 
-  // 获取有信用额度的货币
-  const creditCurrencies =
-    settings?.paymentMethods
-      ?.filter((method: any) => method.type === 'arcblock')
-      ?.flatMap((method: any) => method.payment_currencies)
-      ?.filter((currency: TPaymentCurrency) => {
-        const currencyId = currency.id as string;
-        const grantData = creditSummary?.grants?.[currencyId];
-        return grantData;
-      }) || [];
-
-  if (creditCurrencies.length === 0) {
-    return null;
-  }
+  const filteredCreditCurrencies = useMemo(() => {
+    return creditCurrencies.filter((currency: TPaymentCurrency) => {
+      return creditSummary?.grants?.[currency.id];
+    });
+  }, [creditCurrencies, creditSummary?.grants]);
 
   return (
     <Stack sx={{ width: '100%' }}>
@@ -192,10 +205,10 @@ export default function CreditOverview({ customerId, settings, mode = 'portal' }
                 gridTemplateColumns: 'repeat(1, 1fr)',
               },
             }}>
-            {creditCurrencies.map(renderCreditOverviewCard)}
+            {filteredCreditCurrencies.map(renderCreditOverviewCard)}
           </Box>
 
-          {creditCurrencies.length === 0 && (
+          {filteredCreditCurrencies.length === 0 && (
             <Box
               sx={{
                 display: 'flex',

package/src/components/customer/form.tsx

@@ -8,8 +8,9 @@ import {
   validatePhoneNumber,
   getPhoneUtil,
   validatePostalCode,
+  FormLabel,
 } from '@blocklet/payment-react';
-import { FormLabel, Stack } from '@mui/material';
+import { Stack } from '@mui/material';
 import { Controller, useFormContext, useWatch } from 'react-hook-form';
 import isEmail from 'validator/es/lib/isEmail';
 import { useMount } from 'ahooks';