payment-kit 1.18.12 → 1.18.14

package/api/src/store/migrations/20250305-vault-config.ts

@@ -0,0 +1,21 @@
+import { DataTypes } from 'sequelize';
+
+import { Migration, safeApplyColumnChanges } from '../migrate';
+
+export const up: Migration = async ({ context }) => {
+  await safeApplyColumnChanges(context, {
+    payment_currencies: [
+      {
+        name: 'vault_config',
+        field: {
+          type: DataTypes.JSON,
+          allowNull: true,
+        },
+      },
+    ],
+  });
+};
+
+export const down: Migration = async ({ context }) => {
+  await context.removeColumn('payment_currencies', 'vault_config');
+};

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

@@ -530,7 +530,9 @@ export class Invoice extends Model<InferAttributes<Invoice>, InferCreationAttrib
     return ['paid', 'void'].includes(this.status);
   }
 
-  private static async _getUncollectibleAmount(where: WhereOptions<Invoice>): Promise<[GroupedBN, GroupedStrList]> {
+  private static async _getUncollectibleAmount(
+    where: WhereOptions<Invoice>
+  ): Promise<[GroupedBN, GroupedStrList, Invoice[]]> {
     const invoices = await Invoice.findAll({ where });
     const summary: GroupedBN = {};
     const detail: GroupedStrList = {};
@@ -548,7 +550,7 @@ export class Invoice extends Model<InferAttributes<Invoice>, InferCreationAttrib
       detail[key]!.push(invoice.id);
     });
 
-    return [summary, detail];
+    return [summary, detail, invoices];
   }
 
   public static getUncollectibleAmount({

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

@@ -11,6 +11,7 @@ import {
 } from 'sequelize';
 
 import { createIdGenerator } from '../../libs/util';
+import { VaultConfig } from './types';
 
 const nextId = createIdGenerator('pc', 12);
 
@@ -41,6 +42,7 @@ export class PaymentCurrency extends Model<InferAttributes<PaymentCurrency>, Inf
 
   declare created_at: CreationOptional<Date>;
   declare updated_at: CreationOptional<Date>;
+  declare vault_config?: VaultConfig;
 
   public static readonly GENESIS_ATTRIBUTES = {
     id: {
@@ -120,6 +122,10 @@ export class PaymentCurrency extends Model<InferAttributes<PaymentCurrency>, Inf
       defaultValue: DataTypes.NOW,
       allowNull: false,
     },
+    vault_config: {
+      type: DataTypes.JSON,
+      allowNull: true,
+    },
   };
 
   public static initialize(sequelize: any) {
@@ -129,6 +135,14 @@ export class PaymentCurrency extends Model<InferAttributes<PaymentCurrency>, Inf
       tableName: 'payment_currencies',
       createdAt: 'created_at',
       updatedAt: 'updated_at',
+      defaultScope: {
+        attributes: { exclude: ['vault_config'] },
+      },
+      scopes: {
+        withVaultConfig: {
+          attributes: { include: ['vault_config'] },
+        },
+      },
     });
   }
 

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

@@ -251,6 +251,27 @@ export class Payout extends Model<InferAttributes<Payout>, InferCreationAttribut
       raw: true,
     }).then((res) => res.rows);
   }
+
+  public static async getPayoutLockedAmount(where?: any) {
+    const payouts = await Payout.findAll({
+      where: {
+        status: {
+          [Op.in]: ['pending', 'in_transit'],
+        },
+        ...(where || {}),
+      },
+      attributes: ['amount'],
+    });
+
+    return payouts.reduce((acc: GroupedBN, payout) => {
+      const key = payout.currency_id;
+      if (!acc[key]) {
+        acc[key] = '0';
+      }
+      acc[key] = new BN(acc[key]).add(new BN(payout.amount)).toString();
+      return acc;
+    }, {});
+  }
 }
 
 export type TPayout = InferAttributes<Payout>;

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

@@ -290,6 +290,12 @@ export type PaymentMethodSettings = {
   };
 };
 
+export type VaultConfig = {
+  enabled: boolean;
+  deposit_threshold: string; // 存入阈值
+  withdraw_threshold: string; // 提取阈值
+};
+
 export type PaymentSettings = {
   payment_method_options: PaymentMethodOptions;
   payment_method_types: string[];

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.12
+version: 1.18.14
 logo: logo.png
 files:
   - dist
@@ -113,7 +113,7 @@ navigation:
     icon: ion:receipt-outline
     link: /customer
     section:
-      - dashboard
+      - userCenter
       - sessionManager
     role:
       - owner

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.18.12",
+  "version": "1.18.14",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -44,29 +44,29 @@
   },
   "dependencies": {
     "@abtnode/cron": "^1.16.39",
-    "@arcblock/did": "^1.19.14",
+    "@arcblock/did": "^1.19.15",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
-    "@arcblock/did-connect": "^2.11.48",
-    "@arcblock/did-util": "^1.19.14",
-    "@arcblock/jwt": "^1.19.14",
-    "@arcblock/ux": "^2.11.48",
-    "@arcblock/validator": "^1.19.14",
+    "@arcblock/did-connect": "^2.12.12",
+    "@arcblock/did-util": "^1.19.15",
+    "@arcblock/jwt": "^1.19.15",
+    "@arcblock/ux": "^2.12.12",
+    "@arcblock/validator": "^1.19.15",
     "@blocklet/js-sdk": "^1.16.39",
     "@blocklet/logger": "^1.16.39",
-    "@blocklet/payment-react": "1.18.12",
+    "@blocklet/payment-react": "1.18.14",
     "@blocklet/sdk": "^1.16.39",
-    "@blocklet/ui-react": "^2.11.48",
+    "@blocklet/ui-react": "^2.12.12",
     "@blocklet/uploader": "^0.1.71",
     "@blocklet/xss": "^0.1.27",
     "@mui/icons-material": "^5.16.6",
     "@mui/lab": "^5.0.0-alpha.173",
     "@mui/material": "^5.16.6",
     "@mui/system": "^5.16.6",
-    "@ocap/asset": "^1.19.14",
-    "@ocap/client": "^1.19.14",
-    "@ocap/mcrypto": "^1.19.14",
-    "@ocap/util": "^1.19.14",
-    "@ocap/wallet": "^1.19.14",
+    "@ocap/asset": "^1.19.15",
+    "@ocap/client": "^1.19.15",
+    "@ocap/mcrypto": "^1.19.15",
+    "@ocap/util": "^1.19.15",
+    "@ocap/wallet": "^1.19.15",
     "@stripe/react-stripe-js": "^2.7.3",
     "@stripe/stripe-js": "^2.4.0",
     "ahooks": "^3.8.0",
@@ -80,7 +80,7 @@
     "dayjs": "^1.11.12",
     "debug": "^4.3.6",
     "dotenv-flow": "^3.3.0",
-    "ethers": "^6.13.2",
+    "ethers": "^6.13.5",
     "express": "^4.19.2",
     "express-async-errors": "^3.1.1",
     "express-history-api-fallback": "^2.2.1",
@@ -121,7 +121,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.16.39",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.18.12",
+    "@blocklet/payment-types": "1.18.14",
     "@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.22",
+    "vite-plugin-blocklet": "^0.9.23",
     "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": "7efd2af5c272e4928da6864edfcbd3f9054c722b"
+  "gitHead": "84cf68d98fcf1df0655e90567b98d6bab38f300e"
 }

package/src/app.tsx

@@ -13,7 +13,7 @@ import { Navigate, Route, BrowserRouter as Router, Routes } from 'react-router-d
 import { joinURL } from 'ufo';
 
 import ErrorFallback from './components/error-fallback';
-import Layout from './components/layout/admin';
+import UserLayout from './components/layout/user';
 import { TransitionProvider } from './components/progress-bar';
 import { SessionProvider } from './contexts/session';
 import { translations } from './locales';
@@ -43,119 +43,113 @@ const IntegrationsPage = React.lazy(() => import('./pages/integrations'));
 
 function App() {
   return (
-    <PaymentThemeProvider>
-      <TransitionProvider>
-        <LocaleProvider translations={translations} fallbackLocale="en">
-          <ErrorBoundary FallbackComponent={ErrorFallback} onReset={window.location.reload}>
-            <Suspense
-              fallback={
-                <Center>
-                  <CircularProgress />
-                </Center>
-              }>
-              <Routes>
-                <Route path="/" element={<HomePage />} />
-                <Route path="/checkout/:action/:id" element={<CheckoutPage />} />
-                <Route key="admin-index" path="/admin" element={<AdminPage />} />,
-                <Route key="admin-tabs" path="/admin/:group" element={<AdminPage />} />,
-                <Route key="admin-sub" path="/admin/:group/:page" element={<AdminPage />} />,
-                <Route key="admin-fallback" path="/admin/*" element={<AdminPage />} />,
-                <Route key="integrations-index" path="/integrations" element={<IntegrationsPage />} />
-                <Route key="integrations-tabs" path="/integrations/:group" element={<IntegrationsPage />} />
-                <Route key="integrations-sub" path="/integrations/:group/:page" element={<IntegrationsPage />} />
-                <Route key="integrations-fallback" path="/integrations/*" element={<IntegrationsPage />} />
-                <Route
-                  key="customer-home"
-                  path="/customer"
-                  element={
-                    <Layout padding="0">
-                      <CustomerHome />
-                    </Layout>
-                  }
-                />
-                <Route
-                  key="customer-subscription"
-                  path="/customer/subscription/:id"
-                  element={
-                    <Layout>
-                      <CustomerSubscriptionDetail />
-                    </Layout>
-                  }
-                />
-                <Route
-                  key="customer-subscription-change-plan"
-                  path="/customer/subscription/:id/change-plan"
-                  element={
-                    <Layout>
-                      <CustomerSubscriptionChangePlan />
-                    </Layout>
-                  }
-                />
-                <Route
-                  key="customer-subscription-change-payment"
-                  path="/customer/subscription/:id/change-payment"
-                  element={
-                    <Layout>
-                      <CustomerSubscriptionChangePayment />
-                    </Layout>
-                  }
-                />
-                <Route
-                  key="customer-recharge"
-                  path="/customer/subscription/:id/recharge"
-                  element={
-                    <Layout>
-                      <CustomerRecharge />
-                    </Layout>
-                  }
-                />
-                <Route
-                  key="customer-embed"
-                  path="/customer/embed/subscription"
-                  element={<CustomerSubscriptionEmbed />}
-                />
-                ,
-                <Route
-                  key="subscription-embed"
-                  path="/embed/customer/subscription"
-                  element={<CustomerSubscriptionEmbed />}
-                />
-                ,
-                <Route
-                  key="customer-due"
-                  path="/customer/invoice/past-due"
-                  element={
-                    <Layout>
-                      <CustomerInvoicePastDue />
-                    </Layout>
-                  }
-                />
-                <Route
-                  key="customer-invoice"
-                  path="/customer/invoice/:id"
-                  element={
-                    <Layout>
-                      <CustomerInvoiceDetail />
-                    </Layout>
-                  }
-                />
-                <Route
-                  key="customer-payout"
-                  path="/customer/payout/:id"
-                  element={
-                    <Layout>
-                      <CustomerPayoutDetail />
-                    </Layout>
-                  }
-                />
-                <Route key="customer-fallback" path="/customer/*" element={<Navigate to="/customer" />} />,
-                <Route path="*" element={<Navigate to="/" />} />
-              </Routes>
-            </Suspense>
-          </ErrorBoundary>
-        </LocaleProvider>
-      </TransitionProvider>
-    </PaymentThemeProvider>
+    <TransitionProvider>
+      <LocaleProvider translations={translations} fallbackLocale="en">
+        <ErrorBoundary FallbackComponent={ErrorFallback} onReset={window.location.reload}>
+          <Suspense
+            fallback={
+              <Center>
+                <CircularProgress />
+              </Center>
+            }>
+            <Routes>
+              <Route path="/" element={<HomePage />} />
+              <Route path="/checkout/:action/:id" element={<CheckoutPage />} />
+              <Route key="admin-index" path="/admin" element={<AdminPage />} />,
+              <Route key="admin-tabs" path="/admin/:group" element={<AdminPage />} />,
+              <Route key="admin-sub" path="/admin/:group/:page" element={<AdminPage />} />,
+              <Route key="admin-fallback" path="/admin/*" element={<AdminPage />} />,
+              <Route key="integrations-index" path="/integrations" element={<IntegrationsPage />} />
+              <Route key="integrations-tabs" path="/integrations/:group" element={<IntegrationsPage />} />
+              <Route key="integrations-sub" path="/integrations/:group/:page" element={<IntegrationsPage />} />
+              <Route key="integrations-fallback" path="/integrations/*" element={<IntegrationsPage />} />
+              <Route
+                key="customer-home"
+                path="/customer"
+                element={
+                  <UserLayout>
+                    <CustomerHome />
+                  </UserLayout>
+                }
+              />
+              <Route
+                key="customer-subscription"
+                path="/customer/subscription/:id"
+                element={
+                  <UserLayout>
+                    <CustomerSubscriptionDetail />
+                  </UserLayout>
+                }
+              />
+              <Route
+                key="customer-subscription-change-plan"
+                path="/customer/subscription/:id/change-plan"
+                element={
+                  <UserLayout>
+                    <CustomerSubscriptionChangePlan />
+                  </UserLayout>
+                }
+              />
+              <Route
+                key="customer-subscription-change-payment"
+                path="/customer/subscription/:id/change-payment"
+                element={
+                  <UserLayout>
+                    <CustomerSubscriptionChangePayment />
+                  </UserLayout>
+                }
+              />
+              <Route
+                key="customer-recharge"
+                path="/customer/subscription/:id/recharge"
+                element={
+                  <UserLayout>
+                    <CustomerRecharge />
+                  </UserLayout>
+                }
+              />
+              <Route key="customer-embed" path="/customer/embed/subscription" element={<CustomerSubscriptionEmbed />} />
+              ,
+              <Route
+                key="subscription-embed"
+                path="/embed/customer/subscription"
+                element={<CustomerSubscriptionEmbed />}
+              />
+              ,
+              <Route
+                key="customer-due"
+                path="/customer/invoice/past-due"
+                element={
+                  <UserLayout>
+                    <CustomerInvoicePastDue />
+                  </UserLayout>
+                }
+              />
+              <Route
+                key="customer-invoice"
+                path="/customer/invoice/:id"
+                element={
+                  <UserLayout>
+                    <CustomerInvoiceDetail />
+                  </UserLayout>
+                }
+              />
+              <Route
+                key="customer-payout"
+                path="/customer/payout/:id"
+                element={
+                  <UserLayout>
+                    <CustomerPayoutDetail />
+                  </UserLayout>
+                }
+              />
+              <Route key="customer-fallback" path="/customer/*" element={<Navigate to="/customer" />} />,
+              <Route path="*" element={<Navigate to="/" />} />
+            </Routes>
+          </Suspense>
+        </ErrorBoundary>
+      </LocaleProvider>
+    </TransitionProvider>
   );
 }
 
@@ -169,13 +163,15 @@ export default function WrappedApp() {
 
   return (
     <ToastProvider>
-      <SessionProvider
-        serviceHost={prefix}
-        protectedRoutes={['/admin/*', '/customer/*', '/integrations/*'].map((item) => joinURL(prefix, item))}>
-        <Router basename={prefix}>
-          <AppWithTracker />
-        </Router>
-      </SessionProvider>
+      <PaymentThemeProvider>
+        <SessionProvider
+          serviceHost={prefix}
+          protectedRoutes={['/admin/*', '/customer/*', '/integrations/*'].map((item) => joinURL(prefix, item))}>
+          <Router basename={prefix}>
+            <AppWithTracker />
+          </Router>
+        </SessionProvider>
+      </PaymentThemeProvider>
     </ToastProvider>
   );
 }

package/src/components/actions.tsx

@@ -16,7 +16,7 @@ type ActionItem = {
 
 export type ActionsProps = {
   actions: ActionItem[];
-  variant?: LiteralUnion<'compact' | 'normal', string>;
+  variant?: LiteralUnion<'compact' | 'normal' | 'outlined', string>;
   sx?: any;
   onOpenCallback?: Function;
 };
@@ -58,17 +58,40 @@ export default function Actions(props: ActionsProps) {
     }
   };
 
-  return (
-    <>
-      {props.variant === 'compact' ? (
+  const renderButton = () => {
+    if (props.variant === 'outlined') {
+      return (
+        <Button
+          aria-label="actions"
+          sx={{
+            minWidth: 0,
+            padding: '5px',
+            ...props.sx,
+          }}
+          variant="outlined"
+          onClick={onOpen}
+          size="small">
+          <MoreHorizOutlined />
+        </Button>
+      );
+    }
+    if (props.variant === 'compact') {
+      return (
         <IconButton aria-label="actions" sx={props.sx} aria-haspopup="true" onClick={onOpen} size="small">
           <MoreHorizOutlined />
         </IconButton>
-      ) : (
-        <Button sx={props.sx} onClick={onOpen} size="small" variant="contained" color="primary">
-          {t('common.actions')} <ExpandMoreOutlined fontSize="small" />
-        </Button>
-      )}
+      );
+    }
+    return (
+      <Button sx={props.sx} onClick={onOpen} size="small" variant="contained" color="primary">
+        {t('common.actions')} <ExpandMoreOutlined fontSize="small" />
+      </Button>
+    );
+  };
+
+  return (
+    <>
+      {renderButton()}
       <Menu
         anchorEl={anchorEl}
         open={open}

package/src/components/copyable.tsx

@@ -1,7 +1,7 @@
 import { CopyButton } from '@arcblock/ux/lib/ClickToCopy';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import { getWordBreakStyle } from '@blocklet/payment-react';
-import { Box, Stack, Typography } from '@mui/material';
+import { Stack, Typography } from '@mui/material';
 import type { ReactNode } from 'react';
 
 interface CopyableProps {
@@ -35,7 +35,7 @@ export default function Copyable({ text, children, style }: CopyableProps) {
               {text}
             </Typography>
           )}
-          <Box sx={{ height: '1em', mt: '-0.4em' }}>{copyButton}</Box>
+          <Typography sx={{ display: 'inline-flex', '> span': { display: 'inline-flex' } }}>{copyButton}</Typography>
         </Stack>
       )}
     />

package/src/components/customer/overdraft-protection.tsx

@@ -227,6 +227,7 @@ export default function OverdraftProtectionDialog({
       onClose={onCancel}
       maxWidth="sm"
       fullWidth
+      className="base-dialog"
       title={t('customer.overdraftProtection.setting')}
       actions={
         <Stack direction="row" spacing={2}>

package/src/components/layout/admin.tsx

@@ -22,6 +22,12 @@ const Root = styled(Dashboard)<{ padding: string }>`
         min-width: auto;
         font-size: 0.875rem;
       }
+      .page-content .MuiTab-root {
+        font-size: 0.875rem;
+        &.Mui-selected {
+          font-size: 1.125rem;
+        }
+      }
 
       .MuiTabs-root {
         min-height: 32px;

package/src/components/layout/user.tsx

@@ -0,0 +1,38 @@
+/* eslint-disable react-hooks/exhaustive-deps */
+import { PaymentProvider } from '@blocklet/payment-react';
+import { UserCenter } from '@blocklet/ui-react';
+import { useEffect } from 'react';
+
+import { useSessionContext } from '../../contexts/session';
+
+export default function UserLayout(props: any) {
+  const { session, connectApi, events } = useSessionContext();
+
+  useEffect(() => {
+    events.once('logout', () => {
+      window.location.href = `${window.location.origin}/.well-known/service/user`;
+    });
+  }, []);
+
+  useEffect(() => {
+    if (session.initialized && !session.user) {
+      // @ts-ignore
+      session.login(() => {}, { openMode: 'redirect', redirect: window.location.href });
+    }
+  }, [session.initialized]);
+
+  if (session.user) {
+    return (
+      <PaymentProvider session={session} connect={connectApi}>
+        <UserCenter
+          currentTab={`${window.blocklet.prefix}customer`}
+          userDid={session.user.did}
+          hideFooter
+          notLoginContent="undefined">
+          {props.children}
+        </UserCenter>
+      </PaymentProvider>
+    );
+  }
+  return null;
+}

package/src/components/metadata/editor.tsx

@@ -57,7 +57,13 @@ export default function MetadataEditor({
   };
 
   return (
-    <Dialog open disableEscapeKeyDown fullWidth onClose={() => onCancel(null)} title={t('common.metadata.edit')}>
+    <Dialog
+      open
+      disableEscapeKeyDown
+      fullWidth
+      onClose={() => onCancel(null)}
+      title={t('common.metadata.edit')}
+      className="base-dialog">
       <FormProvider {...methods}>
         <MetadataForm
           actions={

package/src/components/metadata/list.tsx

@@ -36,6 +36,9 @@ export default function MetadataList({
     if (isObject(value)) {
       return <pre style={{ whiteSpace: 'break-spaces' }}>{JSON.stringify(value, null, 2)}</pre>;
     }
+    if (typeof value === 'boolean') {
+      return String(value);
+    }
     return value;
   };