payment-kit 1.18.0 → 1.18.1

package/api/src/routes/invoices.ts

@@ -5,12 +5,13 @@ import Joi from 'joi';
 import pick from 'lodash/pick';
 import { Op } from 'sequelize';
 
+import { BN } from '@ocap/util';
 import { syncStripeInvoice } from '../integrations/stripe/handlers/invoice';
 import { syncStripePayment } from '../integrations/stripe/handlers/payment-intent';
 import { createListParamSchema, getWhereFromKvQuery, MetadataSchema } from '../libs/api';
 import { authenticate } from '../libs/security';
 import { expandLineItems } from '../libs/session';
-import { formatMetadata } from '../libs/util';
+import { formatMetadata, getBlockletJson, getUserOrAppInfo } from '../libs/util';
 import { Customer } from '../store/models/customer';
 import { Invoice } from '../store/models/invoice';
 import { InvoiceItem } from '../store/models/invoice-item';
@@ -21,6 +22,7 @@ import { Price } from '../store/models/price';
 import { Product } from '../store/models/product';
 import { Subscription } from '../store/models/subscription';
 import { getReturnStakeInvoices, getStakingInvoices } from '../libs/invoice';
+import { CheckoutSession, PaymentLink, TInvoiceExpanded } from '../store/models';
 
 const router = Router();
 const authAdmin = authenticate<Subscription>({ component: true, roles: ['owner', 'admin'] });
@@ -206,7 +208,7 @@ router.get('/search', authMine, async (req, res) => {
 
 router.get('/:id', authPortal, async (req, res) => {
   try {
-    const doc = await Invoice.findOne({
+    const doc = (await Invoice.findOne({
       where: { id: req.params.id },
       include: [
         { model: PaymentCurrency, as: 'paymentCurrency' },
@@ -216,10 +218,11 @@ router.get('/:id', authPortal, async (req, res) => {
         { model: InvoiceItem, as: 'lines' },
         { model: Customer, as: 'customer' },
       ],
-    });
+    })) as TInvoiceExpanded | null;
 
     if (doc) {
       if (doc.metadata?.stripe_id && (doc.status !== 'paid' || req.query.forceSync)) {
+        // @ts-ignore
         await syncStripeInvoice(doc);
       }
       if (doc.payment_intent_id) {
@@ -227,7 +230,37 @@ router.get('/:id', authPortal, async (req, res) => {
         await syncStripePayment(paymentIntent!);
       }
 
+      let checkoutSession = null;
+      let paymentLink = null;
+      if (doc.checkout_session_id) {
+        try {
+          checkoutSession = await CheckoutSession.findByPk(doc.checkout_session_id);
+          if (checkoutSession?.payment_link_id) {
+            paymentLink = await PaymentLink.findByPk(checkoutSession.payment_link_id);
+          }
+        } catch (err) {
+          console.error('Failed to get checkout session', err);
+        }
+      }
+      // @ts-ignore
       const json = doc.toJSON();
+      if (doc.paymentIntent?.beneficiaries) {
+        const blockletJson = await getBlockletJson();
+        let total = new BN('0');
+        const promises = doc.paymentIntent.beneficiaries?.map((x: any) => {
+          total = total.add(new BN(x.share));
+          return getUserOrAppInfo(x.address, blockletJson);
+        });
+        const users = await Promise.all(promises);
+        json.paymentIntent.beneficiaries = json.paymentIntent.beneficiaries.map((x: any, i: number) => {
+          return {
+            ...x,
+            ...(users[i] || {}),
+            percent: (parseFloat(new BN(x.share).mul(new BN('10000')).div(total).toString()) / 100).toFixed(1),
+            amount: x.share,
+          };
+        });
+      }
       const products = (await Product.findAll()).map((x) => x.toJSON());
       const prices = (await Price.findAll()).map((x) => x.toJSON());
       // @ts-ignore
@@ -236,9 +269,13 @@ router.get('/:id', authPortal, async (req, res) => {
         const relatedInvoice = await Invoice.findByPk(doc.metadata.invoice_id, {
           attributes: ['id', 'number', 'status', 'billing_reason'],
         });
-        return res.json({ ...json, relatedInvoice });
+        return res.json({ ...json, relatedInvoice, paymentLink, checkoutSession });
       }
-      return res.json(json);
+      return res.json({
+        ...json,
+        paymentLink,
+        checkoutSession,
+      });
     }
     return res.status(404).json(null);
   } catch (err) {

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

@@ -24,7 +24,7 @@ import { PaymentIntent } from '../store/models/payment-intent';
 import { PaymentMethod } from '../store/models/payment-method';
 import { Subscription } from '../store/models/subscription';
 import logger from '../libs/logger';
-import { Refund } from '../store/models';
+import { Payout, Refund } from '../store/models';
 import { getRefundAmountSetup } from '../libs/refund';
 
 const router = Router();
@@ -352,6 +352,19 @@ router.get('/:id/refundable-amount', authPortal, async (req, res) => {
         customerId: doc.customer_id,
         subscriptionId: invoice?.subscription_id,
       });
+      const payouts = await Payout.findAll({
+        where: {
+          payment_intent_id: doc.id,
+        },
+        attributes: ['id', 'amount'],
+      });
+      if (payouts.length > 0) {
+        let totalPayoutAmount = new BN('0');
+        payouts.forEach((payout) => {
+          totalPayoutAmount = totalPayoutAmount.add(new BN(payout.amount));
+        });
+        result.amount = result.amount.sub(totalPayoutAmount);
+      }
       res.json(result);
     } else {
       res.status(404).json(null);

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

@@ -12,6 +12,7 @@ import { formatMetadata } from '../libs/util';
 import { PaymentLink } from '../store/models/payment-link';
 import { Price } from '../store/models/price';
 import { Product } from '../store/models/product';
+import { getDonationBenefits } from '../libs/payment';
 
 const router = Router();
 const auth = authenticate<PaymentLink>({ component: true, roles: ['owner', 'admin'] });
@@ -426,4 +427,20 @@ router.post('/stash', auth, async (req, res) => {
   }
 });
 
+router.get('/:id/benefits', async (req, res) => {
+  try {
+    const doc = await PaymentLink.findByPk(req.params.id, {
+      attributes: ['id', 'donation_settings'],
+    });
+    if (!doc) {
+      return res.status(404).json({ error: 'payment link not found' });
+    }
+    const benefits = await getDonationBenefits(doc);
+    return res.json(benefits);
+  } catch (err) {
+    logger.error('Get donation benefits error', { error: err.message, stack: err.stack, id: req.params.id });
+    return res.status(400).json({ error: err.message });
+  }
+});
+
 export default router;

package/api/src/routes/payouts.ts

@@ -3,6 +3,7 @@ import { Router } from 'express';
 import Joi from 'joi';
 import pick from 'lodash/pick';
 
+import sessionMiddleware from '@blocklet/sdk/lib/middlewares/session';
 import { createListParamSchema, getWhereFromKvQuery, MetadataSchema } from '../libs/api';
 import { authenticate } from '../libs/security';
 import { formatMetadata } from '../libs/util';
@@ -11,6 +12,8 @@ import { PaymentCurrency } from '../store/models/payment-currency';
 import { PaymentIntent } from '../store/models/payment-intent';
 import { PaymentMethod } from '../store/models/payment-method';
 import { Payout } from '../store/models/payout';
+import { PaymentLink, TPaymentIntentExpanded } from '../store/models';
+import { CheckoutSession } from '../store/models/checkout-session';
 
 const router = Router();
 const authAdmin = authenticate<Payout>({ component: true, roles: ['owner', 'admin'] });
@@ -104,9 +107,76 @@ router.get('/', authMine, async (req, res) => {
   }
 });
 
+const mineRecordPaginationSchema = createListParamSchema<{
+  currency_id?: string;
+  status?: string;
+  customer_id?: string;
+}>({
+  currency_id: Joi.string().empty(''),
+  status: Joi.string().empty(''),
+});
+router.get('/mine', sessionMiddleware(), async (req, res) => {
+  try {
+    const {
+      page,
+      pageSize,
+      currency_id: currencyId,
+      customer_id: customerId,
+      status,
+    } = await mineRecordPaginationSchema.validateAsync(req.query, {
+      stripUnknown: true,
+      allowUnknown: true,
+    });
+    if (!req.user) {
+      return res.status(403).json({ code: 'REQUIRE_LOGIN', error: 'Please login to continue' });
+    }
+    const customer = await Customer.findOne({ where: { did: customerId || req.user?.did } });
+    if (!customer) {
+      throw new Error(`Customer not found: ${req.user?.did}`);
+    }
+
+    const where: any = { customer_id: customer.id };
+    if (currencyId) {
+      where.currency_id = currencyId;
+    }
+    if (status) {
+      where.status = status;
+    }
+
+    const { rows: list, count } = await Payout.findAndCountAll({
+      where,
+      order: [['created_at', 'DESC']],
+      offset: (page - 1) * pageSize,
+      limit: pageSize,
+      include: [
+        { model: PaymentCurrency, as: 'paymentCurrency' },
+        { model: PaymentMethod, as: 'paymentMethod' },
+        { model: Customer, as: 'customer' },
+      ],
+    });
+    const json = list.map((x) => x.toJSON());
+    const result = await Promise.all(
+      json.map(async (x) => {
+        const paymentIntent = await PaymentIntent.findByPk(x.payment_intent_id, {
+          include: [{ model: Customer, as: 'customer' }],
+        });
+        if (paymentIntent) {
+          // @ts-ignore
+          x.paymentIntent = paymentIntent.toJSON();
+        }
+        return x;
+      })
+    );
+    return res.json({ count, list: result, paging: { page, pageSize } });
+  } catch (err) {
+    console.error(err);
+    return res.status(400).json({ error: err.message });
+  }
+});
+
 router.get('/:id', authPortal, async (req, res) => {
   try {
-    const doc = await Payout.findOne({
+    const doc = (await Payout.findOne({
       where: { id: req.params.id },
       include: [
         { model: PaymentCurrency, as: 'paymentCurrency' },
@@ -114,16 +184,41 @@ router.get('/:id', authPortal, async (req, res) => {
         { model: PaymentIntent, as: 'paymentIntent' },
         { model: Customer, as: 'customer' },
       ],
-    });
-
-    if (doc) {
-      res.json({ ...doc.toJSON() });
-    } else {
-      res.status(404).json(null);
+    })) as Payout & { paymentIntent: TPaymentIntentExpanded & { customer: Customer } };
+    if (!doc) {
+      return res.status(404).json(null);
+    }
+    let checkoutSession = null;
+    let paymentLink = null;
+    if (doc.payment_intent_id) {
+      try {
+        checkoutSession = (await CheckoutSession.findOne({
+          where: { payment_intent_id: doc.payment_intent_id },
+        })) as CheckoutSession & { paymentLink: PaymentLink };
+        if (checkoutSession && checkoutSession.payment_link_id) {
+          paymentLink = await PaymentLink.findByPk(checkoutSession.payment_link_id);
+        }
+      } catch (err) {
+        console.error(err);
+      }
+    }
+    const payout = doc.toJSON();
+    if (doc.paymentIntent && doc.paymentIntent.customer_id) {
+      const paymentCustomer = await Customer.findOne({ where: { id: doc.paymentIntent.customer_id } });
+      if (paymentCustomer) {
+        // @ts-ignore
+        payout.paymentIntent.customer = paymentCustomer.toJSON();
+        return res.json({
+          ...payout,
+          checkoutSession,
+          paymentLink,
+        });
+      }
     }
+    return res.json(payout);
   } catch (err) {
     console.error(err);
-    res.status(500).json({ error: `Failed to get payout: ${err.message}` });
+    return res.status(500).json({ error: `Failed to get payout: ${err.message}` });
   }
 });
 

package/api/src/store/migrations/20250206-update-donation-products.ts

@@ -0,0 +1,56 @@
+import { QueryTypes } from 'sequelize';
+import { Migration } from '../migrate';
+
+export const up: Migration = async ({ context }) => {
+  try {
+    // 查找 submit_type 为 donate 的 payment_links 记录
+    const donateLinks = await context.sequelize.query(
+      "SELECT line_items FROM payment_links WHERE submit_type = 'donate'",
+      { type: QueryTypes.SELECT }
+    );
+
+    // 提取所有 price_id
+    const priceIds = (donateLinks as any[]).flatMap((link: any) => {
+      const lineItems = JSON.parse(link.line_items || '[]') || [];
+      return lineItems.map((item: any) => item.price_id);
+    });
+
+    const uniquePriceIds = Array.from(new Set(priceIds));
+
+    // 查询 prices 表并直接联接 products 表，过滤出符合条件的 product_id
+    const priceRecords = await context.sequelize.query(
+      `
+      SELECT p.id AS price_id, p.product_id
+      FROM prices p
+      JOIN products pr ON pr.id = p.product_id
+      WHERE p.id IN (:priceIds) AND pr.created_via != :createdVia
+      `,
+      {
+        type: QueryTypes.SELECT,
+        replacements: { priceIds: uniquePriceIds, createdVia: 'donation' },
+      }
+    );
+
+    if (!priceRecords || priceRecords.length === 0) {
+      // eslint-disable-next-line no-console
+      console.info('No price records found or no products to update, migration completed with no changes.');
+      return;
+    }
+
+    // 提取 uniqueProductIds
+    const uniqueProductIds = Array.from(new Set(priceRecords.map((record: any) => record.product_id)));
+
+    // 更新 products 表的 created_via 字段
+    await context.sequelize.query("UPDATE products SET created_via = 'donation' WHERE id IN (:productIds)", {
+      replacements: { productIds: uniqueProductIds },
+    });
+
+    // eslint-disable-next-line no-console
+    console.info('update donation products success:', uniqueProductIds);
+  } catch (error) {
+    console.error('update donation products failed:', error);
+    throw error;
+  }
+};
+
+export const down: Migration = async () => {};

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

@@ -176,8 +176,12 @@ export class Payout extends Model<InferAttributes<Payout>, InferCreationAttribut
         createdAt: 'created_at',
         updatedAt: 'updated_at',
         hooks: {
-          afterCreate: (model: Payout, options) =>
-            createEvent('Payout', 'payout.created', model, options).catch(console.error),
+          afterCreate: (model: Payout, options) => {
+            createEvent('Payout', 'payout.created', model, options).catch(console.error);
+            if (model.status === 'paid') {
+              createEvent('Payout', 'payout.paid', model, options).catch(console.error);
+            }
+          },
           afterUpdate: (model: Payout, options) =>
             createStatusEvent(
               'Payout',

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

@@ -340,6 +340,8 @@ export type PaymentDetails = {
 export type PaymentBeneficiary = {
   address: string;
   share: string;
+  name?: string;
+  avatar?: string;
   memo?: 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.0
+version: 1.18.1
 logo: logo.png
 files:
   - dist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.18.0",
+  "version": "1.18.1",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -53,7 +53,7 @@
     "@arcblock/validator": "^1.19.3",
     "@blocklet/js-sdk": "^1.16.37",
     "@blocklet/logger": "^1.16.37",
-    "@blocklet/payment-react": "1.18.0",
+    "@blocklet/payment-react": "1.18.1",
     "@blocklet/sdk": "^1.16.37",
     "@blocklet/ui-react": "^2.11.27",
     "@blocklet/uploader": "^0.1.64",
@@ -121,7 +121,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.16.37",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.18.0",
+    "@blocklet/payment-types": "1.18.1",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -167,5 +167,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "052c301e1f565558766c9346ba355f2fd072108e"
+  "gitHead": "22060b542145f7c62282ee0d3ec132ff581e13ec"
 }

package/src/app.tsx

@@ -29,6 +29,7 @@ const CustomerSubscriptionEmbed = React.lazy(() => import('./pages/customer/subs
 const CustomerSubscriptionChangePlan = React.lazy(() => import('./pages/customer/subscription/change-plan'));
 const CustomerSubscriptionChangePayment = React.lazy(() => import('./pages/customer/subscription/change-payment'));
 const CustomerRecharge = React.lazy(() => import('./pages/customer/recharge'));
+const CustomerPayoutDetail = React.lazy(() => import('./pages/customer/payout/detail'));
 
 // const theme = createTheme({
 //   typography: {
@@ -133,6 +134,15 @@ function App() {
                     </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>

package/src/components/customer/link.tsx

@@ -4,13 +4,21 @@ import { Link } from 'react-router-dom';
 import { getCustomerAvatar } from '@blocklet/payment-react';
 import InfoCard from '../info-card';
 
-export default function CustomerLink({ customer, linked }: { customer: TCustomer; linked?: boolean }) {
+export default function CustomerLink({
+  customer,
+  linked,
+  linkTo,
+}: {
+  customer: TCustomer;
+  linked?: boolean;
+  linkTo?: string;
+}) {
   if (!customer) {
     return null;
   }
   if (linked) {
     return (
-      <Link to={`/admin/customers/${customer.id}`}>
+      <Link to={linkTo || `/admin/customers/${customer.id}`}>
         <InfoCard
           logo={getCustomerAvatar(
             customer?.did,
@@ -35,4 +43,5 @@ export default function CustomerLink({ customer, linked }: { customer: TCustomer
 
 CustomerLink.defaultProps = {
   linked: true,
+  linkTo: '',
 };

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

@@ -398,7 +398,7 @@ export default function OverdraftProtectionDialog({
                             boxShadow: 3,
                           },
                           ...(amount === presetAmount && !customAmount
-                            ? { borderColor: 'primary.main', borderWidth: 2 }
+                            ? { borderColor: 'primary.main', borderWidth: 1 }
                             : {}),
                         }}>
                         <CardActionArea
@@ -430,7 +430,7 @@ export default function OverdraftProtectionDialog({
                           transform: 'translateY(-4px)',
                           boxShadow: 3,
                         },
-                        ...(customAmount ? { borderColor: 'primary.main', borderWidth: 2 } : {}),
+                        ...(customAmount ? { borderColor: 'primary.main', borderWidth: 1 } : {}),
                       }}>
                       <CardActionArea onClick={handleCustomSelect} sx={{ height: '100%', p: 2 }}>
                         <Stack spacing={1} alignItems="center">

package/src/components/info-card.tsx

@@ -4,31 +4,32 @@ import type { LiteralUnion } from 'type-fest';
 
 type Props = {
   logo?: string;
-  name: string;
+  name: string | React.ReactNode;
   description: any;
   size?: number;
   variant?: LiteralUnion<'square' | 'rounded' | 'circular', string>;
   sx?: SxProps;
 };
 
-// FIXME: @wangshijun add image filter for logo
 export default function InfoCard(props: Props) {
   const dimensions = { width: props.size, height: props.size, ...props.sx };
+  const avatarName = typeof props.name === 'string' ? props.name : props.logo;
   return (
     <Stack direction="row" alignItems="center" spacing={1}>
       {props.logo ? (
-        <Avatar src={props.logo} alt={props.name} variant={props.variant as any} sx={dimensions} />
+        <Avatar src={props.logo} alt={avatarName} variant={props.variant as any} sx={dimensions} />
       ) : (
         <Avatar variant={props.variant as any} sx={dimensions}>
-          {props.name.slice(0, 1)}
+          {avatarName?.slice(0, 1)}
         </Avatar>
       )}
       <Stack
         direction="column"
         alignItems="flex-start"
         justifyContent="space-around"
+        className="info-card"
         sx={{ wordBreak: getWordBreakStyle(props.name), minWidth: 140 }}>
-        <Typography variant="body1" color="text.primary">
+        <Typography variant="body1" color="text.primary" component="div">
           {props.name}
         </Typography>
         <Typography variant="subtitle1" color="text.secondary">

package/src/components/invoice/table.tsx

@@ -27,6 +27,8 @@ type InvoiceDetailItem = {
   price: string;
   amount: string;
   raw: TInvoiceItem;
+  price_id: string;
+  product_id: string;
 };
 
 type InvoiceSummaryItem = {
@@ -72,6 +74,8 @@ export function getInvoiceRows(invoice: TInvoiceExpanded) {
       price: !line.proration ? formatAmount(price, invoice.paymentCurrency.decimal) : '',
       amount: formatAmount(line.amount, invoice.paymentCurrency.decimal),
       raw: line,
+      price_id: line.price.id,
+      product_id: line.price.product.id,
     };
   });
 

package/src/components/payouts/list.tsx

@@ -15,10 +15,11 @@ import { useLocalStorageState } from 'ahooks';
 import { useEffect, useState } from 'react';
 import { Link } from 'react-router-dom';
 
-import { debounce } from '../../libs/util';
+import { debounce, getAppInfo } from '../../libs/util';
 import CustomerLink from '../customer/link';
 import FilterToolbar from '../filter-toolbar';
 import PayoutActions from './actions';
+import InfoCard from '../info-card';
 
 const fetchData = (params: Record<string, any> = {}): Promise<{ list: TPayoutExpanded[]; count: number }> => {
   const search = new URLSearchParams();
@@ -194,7 +195,21 @@ export default function PayoutList({ customer_id, payment_intent_id, status, fea
         filter: true,
         customBodyRenderLite: (_: string, index: number) => {
           const item = data.list[index] as TPayoutExpanded;
-          return item.customer ? <CustomerLink customer={item.customer} /> : item.destination;
+          if (item.customer) {
+            return <CustomerLink customer={item.customer} />;
+          }
+          const appInfo = getAppInfo(item.destination);
+          if (appInfo) {
+            return (
+              <InfoCard
+                name={appInfo.name}
+                description={`${item.destination.slice(0, 6)}...${item.destination.slice(-6)}`}
+                logo={appInfo.avatar}
+                size={40}
+              />
+            );
+          }
+          return item.destination;
         },
       } as any,
     });