payment-kit 1.18.19 → 1.18.21

package/api/src/integrations/blocklet/user.ts

@@ -21,6 +21,7 @@ const handleUserUpdate = async ({ user }: { user: any }) => {
       email: user.email,
       phone: user.phone,
       last_sync_at: now,
+      address: Customer.formatAddressFromUser(user),
     });
     logger.info(`customer info updated: ${customer.did}`);
   }

package/api/src/queues/payment.ts

@@ -125,8 +125,8 @@ export const handlePaymentSucceed = async (
               did: user.did,
               name: user.fullName,
               email: user.email,
-              phone: '',
-              address: {},
+              phone: user.phone,
+              address: Customer.formatAddressFromUser(user),
               description: user.remark,
               metadata: {},
               balance: '0',

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

@@ -76,6 +76,7 @@ import { ensureInvoiceForCheckout } from './connect/shared';
 import { isCreditSufficientForPayment, isDelegationSufficientForPayment } from '../libs/payment';
 import { handleStripeSubscriptionSucceed } from '../integrations/stripe/handlers/subscription';
 import { CHARGE_SUPPORTED_CHAIN_TYPES } from '../libs/constants';
+import { blocklet } from '../libs/auth';
 
 const router = Router();
 
@@ -838,14 +839,15 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
 
     let customer = await Customer.findOne({ where: { did: req.user.did } });
     if (!customer) {
+      const { user: userInfo } = await blocklet.getUser(req.user.did);
       customer = await Customer.create({
         livemode: !!checkoutSession.livemode,
         did: req.user.did,
         name: req.body.customer_name,
-        email: req.body.customer_email,
-        phone: req.body.customer_phone,
-        address: req.body.billing_address,
-        description: '',
+        email: req.body.customer_email || userInfo?.email || '',
+        phone: req.body.customer_phone || userInfo?.phone || '',
+        address: req.body.billing_address || Customer.formatAddressFromUser(userInfo),
+        description: userInfo?.remark || '',
         metadata: {},
         balance: '0',
         next_invoice_sequence: 1,
@@ -853,6 +855,20 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
         invoice_prefix: Customer.getInvoicePrefix(),
       });
       logger.info('customer created on checkout session submit', { did: req.user.did, id: customer.id });
+      try {
+        await blocklet.updateUserAddress({
+          did: customer.did,
+          address: Customer.formatAddressFromCustomer(customer),
+        });
+        logger.info('updateUserAddress success', {
+          did: customer.did,
+        });
+      } catch (err) {
+        logger.error('updateUserAddress failed', {
+          error: err,
+          customerId: customer.id,
+        });
+      }
     } else {
       const updates: Record<string, string> = {};
       if (checkoutSession.customer_update?.name) {
@@ -868,6 +884,22 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
       }
 
       await customer.update(updates);
+      try {
+        await blocklet.updateUserAddress({
+          did: customer.did,
+          address: Customer.formatAddressFromCustomer(customer),
+          // @ts-ignore
+          phone: customer.phone,
+        });
+        logger.info('updateUserAddress success', {
+          did: customer.did,
+        });
+      } catch (err) {
+        logger.error('updateUserAddress failed', {
+          error: err,
+          customerId: customer.id,
+        });
+      }
     }
 
     // check if customer can make new purchase

package/api/src/routes/connect/shared.ts

@@ -117,6 +117,7 @@ export async function ensurePaymentIntent(checkoutSessionId: string, userDid?: s
           metadata: { fromDonation: true },
           livemode: checkoutSession.livemode,
           phone: user.phone,
+          address: Customer.formatAddressFromUser(user),
           delinquent: false,
           balance: '0',
           next_invoice_sequence: 1,

package/api/src/routes/customers.ts

@@ -115,7 +115,7 @@ router.get('/me', sessionMiddleware(), async (req, res) => {
           name: user.fullName,
           email: user.email,
           phone: user.phone,
-          address: {},
+          address: Customer.formatAddressFromUser(user),
           description: user.remark,
           metadata: {},
           balance: '0',
@@ -169,7 +169,7 @@ router.get('/me', sessionMiddleware(), async (req, res) => {
 });
 
 // get overdue invoices
-router.get('/:id/overdue/invoices', auth, async (req, res) => {
+router.get('/:id/overdue/invoices', sessionMiddleware(), async (req, res) => {
   if (!req.user) {
     return res.status(403).json({ error: 'Unauthorized' });
   }

package/api/src/routes/settings.ts

@@ -140,7 +140,7 @@ router.post('/', async (req, res) => {
       const defaultSetting = {
         amount: {
           presets: ['1', '5', '10'],
-          preset: '1',
+          preset: '5',
           minimum: '0.01',
           maximum: '100',
           custom: true,
@@ -154,7 +154,7 @@ router.post('/', async (req, res) => {
           presets: Joi.array()
             .items(Joi.string())
             .when('custom', { is: false, then: Joi.required(), otherwise: Joi.optional() }),
-          preset: Joi.string().optional(),
+          preset: Joi.string().empty('').optional(),
           minimum: Joi.string().when('custom', { is: true, then: Joi.required() }),
           maximum: Joi.string().when('custom', { is: true, then: Joi.required() }),
           custom: Joi.boolean().required(),
@@ -238,7 +238,7 @@ router.put('/:mountLocationOrId', authAdmin, async (req, res) => {
           presets: Joi.array()
             .items(Joi.string())
             .when('custom', { is: false, then: Joi.required(), otherwise: Joi.optional() }),
-          preset: Joi.string().optional(),
+          preset: Joi.string().empty('').optional(),
           minimum: Joi.string().when('custom', { is: true, then: Joi.required() }),
           maximum: Joi.string().when('custom', { is: true, then: Joi.required() }),
           custom: Joi.boolean().required(),

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

@@ -282,6 +282,28 @@ export class Customer extends Model<InferAttributes<Customer>, InferCreationAttr
   public static getInvoicePrefix() {
     return nextInvoicePrefix();
   }
+
+  public static formatAddressFromUser(user: any) {
+    return {
+      country: user.address?.country || '',
+      state: user.address?.province || '',
+      city: user.address?.city || '',
+      line1: user.address?.line1 || '',
+      line2: user.address?.line2 || '',
+      postal_code: user.address?.postalCode || '',
+    };
+  }
+
+  public static formatAddressFromCustomer(customer: Customer) {
+    return {
+      country: customer.address?.country || '',
+      province: customer.address?.state || '',
+      city: customer.address?.city || '',
+      line1: customer.address?.line1 || '',
+      line2: customer.address?.line2 || '',
+      postalCode: customer.address?.postal_code || '',
+    };
+  }
 }
 
 export type TCustomer = InferAttributes<Customer>;

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.18.19",
+  "version": "1.18.21",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -46,16 +46,16 @@
     "@abtnode/cron": "^1.16.40",
     "@arcblock/did": "^1.19.15",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
-    "@arcblock/did-connect": "^2.12.36",
+    "@arcblock/did-connect": "^2.12.43",
     "@arcblock/did-util": "^1.19.15",
     "@arcblock/jwt": "^1.19.15",
-    "@arcblock/ux": "^2.12.36",
+    "@arcblock/ux": "^2.12.43",
     "@arcblock/validator": "^1.19.15",
     "@blocklet/js-sdk": "^1.16.40",
     "@blocklet/logger": "^1.16.40",
-    "@blocklet/payment-react": "1.18.19",
+    "@blocklet/payment-react": "1.18.21",
     "@blocklet/sdk": "^1.16.40",
-    "@blocklet/ui-react": "^2.12.36",
+    "@blocklet/ui-react": "^2.12.43",
     "@blocklet/uploader": "^0.1.79",
     "@blocklet/xss": "^0.1.30",
     "@mui/icons-material": "^5.16.6",
@@ -121,7 +121,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.16.40",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.18.19",
+    "@blocklet/payment-types": "1.18.21",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -151,7 +151,7 @@
     "vite": "^5.3.5",
     "vite-node": "^2.0.4",
     "vite-plugin-babel-import": "^2.0.5",
-    "vite-plugin-blocklet": "^0.9.25",
+    "vite-plugin-blocklet": "^0.9.27",
     "vite-plugin-node-polyfills": "^0.21.0",
     "vite-plugin-svgr": "^4.2.0",
     "vite-tsconfig-paths": "^4.3.2",
@@ -167,5 +167,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "eabd58598ad349a5177dca2e6302c82117d9b687"
+  "gitHead": "cf08902482dded20ee91402ed6d4678383965daf"
 }

package/src/components/layout/user.tsx

@@ -3,10 +3,19 @@ import { PaymentProvider } from '@blocklet/payment-react';
 import { UserCenter } from '@blocklet/ui-react';
 import { useEffect } from 'react';
 
+import { useSearchParams } from 'react-router-dom';
 import { useSessionContext } from '../../contexts/session';
 
 export default function UserLayout(props: any) {
   const { session, connectApi, events } = useSessionContext();
+  const [params] = useSearchParams();
+  const embed = params.get('embed') || sessionStorage.getItem('embed');
+
+  useEffect(() => {
+    if (embed) {
+      sessionStorage.setItem('embed', embed);
+    }
+  }, [embed]);
 
   useEffect(() => {
     events.once('logout', () => {
@@ -28,6 +37,7 @@ export default function UserLayout(props: any) {
           currentTab={`${window.blocklet.prefix}customer`}
           userDid={session.user.did}
           hideFooter
+          embed={embed === '1'}
           notLoginContent="undefined">
           {props.children}
         </UserCenter>

package/src/libs/dayjs.ts

@@ -54,8 +54,9 @@ export const formatSmartDuration = (
   { t, separator = ' ' }: FormatDurationOptions
 ): string => {
   // Format single unit
-  const formatUnit = (val: number, unitType: TimeUnit): string =>
-    `${val} ${t(`common.${unitType}${val > 1 ? 's' : ''}`).toLowerCase()}`;
+  const formatUnit = (val: number, unitType: TimeUnit): string => {
+    return `${val || 0} ${t(`common.${unitType}${val > 1 ? 's' : ''}`).toLowerCase()}`;
+  };
 
   // Convert to largest possible unit
   const convertToLargest = (val: number, fromUnit: TimeUnit): [TimeUnit, number][] => {
@@ -129,7 +130,7 @@ export const formatSmartDuration = (
 
   // Get units and filter out zero values
   const units = convertToLargest(value, unit).filter(([, val]) => val > 0);
-
+  if (units.length === 0) return formatUnit(0, unit);
   // Format all units
   return units.map(([u, val]) => formatUnit(val, u)).join(separator);
 };

package/src/pages/customer/index.tsx

@@ -35,7 +35,7 @@ import { styled } from '@mui/system';
 import { useRequest, useSetState } from 'ahooks';
 import { flatten, isEmpty } from 'lodash';
 import { memo, useEffect, useState } from 'react';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate, useSearchParams } from 'react-router-dom';
 import { joinURL } from 'ufo';
 
 import { useTransitionContext } from '../../components/progress-bar';
@@ -178,7 +178,7 @@ type CardType = 'balance' | 'spent' | 'stake' | 'refund' | 'due';
 
 // 定义一个统一的卡片配置
 const CARD_CONFIG: Record<CardType, { key: keyof typeof summaryKeyMap; alwaysShow?: boolean }> = {
-  balance: { key: 'token', alwaysShow: true },
+  balance: { key: 'token' },
   spent: { key: 'paid', alwaysShow: true },
   stake: { key: 'stake' },
   refund: { key: 'refund' },
@@ -194,16 +194,22 @@ const summaryKeyMap = {
   due: 'due',
 } as const;
 
-// 优化后的计算函数
-const getCardVisibility = (currency: any, data: any) => {
+const isCardVisible = (type: string, config: any, data: any, currency: any, method: any) => {
+  const summaryKey = config.key;
+  const hasSummaryValue =
+    data?.summary?.[summaryKey]?.[currency.id] && data?.summary?.[summaryKey]?.[currency.id] !== '0';
+
+  if (type === 'balance') {
+    return method?.type === 'arcblock' && (config.alwaysShow || hasSummaryValue);
+  }
+
+  return config.alwaysShow || hasSummaryValue;
+};
+
+const getCardVisibility = (currency: any, data: any, method: any) => {
   return Object.entries(CARD_CONFIG).reduce(
     (acc, [type, config]) => {
-      const summaryKey = config.key;
-      const isVisible =
-        config.alwaysShow ||
-        (data?.summary?.[summaryKey]?.[currency.id] && data?.summary?.[summaryKey]?.[currency.id] !== '0');
-
-      if (isVisible) {
+      if (isCardVisible(type, config, data, currency, method)) {
         acc.visibleCards.push(type as CardType);
       }
       return acc;
@@ -213,9 +219,10 @@ const getCardVisibility = (currency: any, data: any) => {
 };
 
 // 计算最大卡片数量
-const calculateMaxCardCount = (currencies: any[], data: any) => {
+const calculateMaxCardCount = (currencies: any[], data: any, settings: any) => {
   return currencies.reduce((maxCount, currency) => {
-    const { visibleCards } = getCardVisibility(currency, data);
+    const method = settings?.paymentMethods?.find((m: any) => m.id === currency.payment_method_id);
+    const { visibleCards } = getCardVisibility(currency, data, method);
     return Math.max(maxCount, visibleCards.length);
   }, 0);
 };
@@ -244,6 +251,8 @@ export default function CustomerHome() {
       }))
     )
   );
+  const [params] = useSearchParams();
+  const embed = params.get('embed') || sessionStorage.getItem('embed');
 
   const { livemode, setLivemode } = usePaymentContext();
   const [state, setState] = useSetState({
@@ -378,7 +387,7 @@ export default function CustomerHome() {
       </Box>
     );
 
-  const maxCardCount = calculateMaxCardCount(currencies, data);
+  const maxCardCount = calculateMaxCardCount(currencies, data, settings);
 
   const responsiveColumns = {
     xs: Math.min(2, maxCardCount),
@@ -397,6 +406,10 @@ export default function CustomerHome() {
           </Box>
           <Stack gap={2} mt={2}>
             {currencies.map((c) => {
+              const method = settings?.paymentMethods?.find((m) => m.id === c.payment_method_id);
+              if (method?.type !== 'arcblock') {
+                return null;
+              }
               return isSummaryEmpty(data?.summary, c.id) && c.id !== settings.baseCurrency.id ? null : (
                 <Stack
                   key={c.id}
@@ -444,12 +457,9 @@ export default function CustomerHome() {
                     }}>
                     {/* 使用配置渲染卡片 */}
                     {Object.entries(CARD_CONFIG).map(([type, config]) => {
-                      const summaryKey = config.key;
-                      const isVisible =
-                        config.alwaysShow ||
-                        (data?.summary?.[summaryKey]?.[c.id] && data?.summary?.[summaryKey]?.[c.id] !== '0');
-
-                      if (!isVisible) return null;
+                      if (!isCardVisible(type, config, data, c, method)) {
+                        return null;
+                      }
 
                       return (
                         <Box
@@ -467,7 +477,6 @@ export default function CustomerHome() {
                               backgroundColor: 'var(--stroke-border-base, #EFF1F5)',
                               zIndex: 1,
                             },
-
                             '&:has(+ .placeholder)::after': {
                               display: 'none',
                             },
@@ -477,7 +486,7 @@ export default function CustomerHome() {
                           }}>
                           <CurrencyCard
                             label={t(`admin.customer.summary.${type}`)}
-                            data={data?.summary?.[summaryKey] || emptyObject}
+                            data={data?.summary?.[config.key] || emptyObject}
                             currency={c}
                             type={type as CardType}
                             icon={getCardIcon(type as CardType)}
@@ -501,14 +510,14 @@ export default function CustomerHome() {
     <Box className="base-card section section-invoices">
       <Box className="section-header">
         <Typography variant="h3">{t('customer.invoiceHistory')}</Typography>
-        {isEmpty(data?.summary?.due) === false && (
+        {isEmpty(data?.summary?.due) !== false && (
           <Tooltip title={t('payment.customer.pastDue.warning')}>
             <Button
               variant="text"
               color="error"
               component="a"
               size="small"
-              href={joinURL(getPrefix(), '/customer/invoice/past-due')}
+              href={joinURL(getPrefix(), '/customer/invoice/past-due', `${embed === '1' ? '?embed=1' : ''}`)}
               target="_blank"
               rel="noreferrer"
               style={{ textDecoration: 'none', fontSize: 13 }}>

package/src/pages/customer/recharge/account.tsx

@@ -83,6 +83,15 @@ export default function BalanceRechargePage() {
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState('');
   const customInputRef = useRef<HTMLInputElement>(null);
+  const [unitCycle, setUnitCycle] = useState<{
+    amount: string;
+    interval: TimeUnit;
+    cycle: number;
+  }>({
+    amount: '0',
+    interval: 'month',
+    cycle: 1,
+  });
   const [payerValue, setPayerValue] = useState<{
     paymentAddress: string;
     token: string;
@@ -108,9 +117,14 @@ export default function BalanceRechargePage() {
         setCurrency(data.currency);
         setRelatedSubscriptions(data.relatedSubscriptions || []);
 
-        if (data.recommendedRecharge && data.recommendedRecharge.amount) {
+        if (data.recommendedRecharge && data.recommendedRecharge.amount && data.recommendedRecharge.amount !== '0') {
           const baseAmount = data.recommendedRecharge.amount;
           const decimal = data.currency.decimal || 0;
+          setUnitCycle({
+            amount: parseFloat(formatBNStr(baseAmount, decimal, 6, true)).toString(),
+            interval: data.recommendedRecharge.interval as TimeUnit,
+            cycle: data.recommendedRecharge.cycle,
+          });
           setPresetAmounts([
             {
               amount: Math.ceil(parseFloat(formatBNStr(baseAmount, decimal, 6, true))).toString(),
@@ -494,6 +508,19 @@ export default function BalanceRechargePage() {
                   }}
                   inputRef={customInputRef}
                 />
+                {amount && Number(amount) > 0 && Number(unitCycle.amount) > 0 && !amountError && (
+                  <Typography variant="body2" sx={{ color: 'text.lighter', mt: 1 }} fontSize={12}>
+                    {t('common.estimatedDuration', {
+                      duration: formatSmartDuration(
+                        Math.floor(Number(amount) / Number(unitCycle.amount)) < 1
+                          ? parseFloat((Number(amount) / Number(unitCycle.amount)).toFixed(1))
+                          : Math.floor(Number(amount) / Number(unitCycle.amount)),
+                        unitCycle.interval,
+                        { t }
+                      ),
+                    })}
+                  </Typography>
+                )}
               </Box>
             )}
 

package/src/pages/customer/recharge/subscription.tsx

@@ -479,7 +479,11 @@ export default function RechargePage() {
                 />
                 {amount && Number(amount) > 0 && Number(cycleAmount) > 0 && !amountError && (
                   <Typography variant="body2" sx={{ color: 'text.lighter', mt: '8px !important' }} fontSize={12}>
-                    {formatEstimatedDuration(Math.floor(Number(amount) / Number(cycleAmount)))}
+                    {formatEstimatedDuration(
+                      Math.floor(Number(amount) / Number(cycleAmount)) < 1
+                        ? parseFloat((Number(amount) / Number(cycleAmount)).toFixed(1))
+                        : Math.floor(Number(amount) / Number(cycleAmount))
+                    )}
                   </Typography>
                 )}
               </Box>