payment-kit 1.20.7 → 1.20.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.20.7",
+  "version": "1.20.9",
   "scripts": {
     "dev": "blocklet dev --open",
     "lint": "tsc --noEmit && eslint src api/src --ext .mjs,.js,.jsx,.ts,.tsx",
@@ -10,6 +10,7 @@
     "coverage": "pnpm run test --coverage",
     "start": "tsx watch api/dev.ts",
     "clean": "node scripts/build-clean.js",
+    "prebundle": "npm run types",
     "bundle": "tsc --noEmit && pnpm run bundle:client && pnpm run bundle:api",
     "bundle:client": "vite build",
     "bundle:analyze": "cross-env ANALYZE=true vite build",
@@ -43,33 +44,33 @@
     ]
   },
   "dependencies": {
-    "@abtnode/cron": "^1.16.52-beta-20250908-085420-224a58fa",
-    "@arcblock/did": "^1.24.8",
-    "@arcblock/did-connect-react": "^3.1.37",
+    "@abtnode/cron": "^1.16.52-beta-20250912-112002-e3499e9c",
+    "@arcblock/did": "^1.24.9",
+    "@arcblock/did-connect-react": "^3.1.40",
     "@arcblock/did-connect-storage-nedb": "^1.8.0",
-    "@arcblock/did-util": "^1.24.8",
-    "@arcblock/jwt": "^1.24.8",
-    "@arcblock/ux": "^3.1.37",
-    "@arcblock/validator": "^1.24.8",
+    "@arcblock/did-util": "^1.24.9",
+    "@arcblock/jwt": "^1.24.9",
+    "@arcblock/ux": "^3.1.40",
+    "@arcblock/validator": "^1.24.9",
     "@blocklet/did-space-js": "^1.1.23",
     "@blocklet/error": "^0.2.5",
-    "@blocklet/js-sdk": "^1.16.52-beta-20250908-085420-224a58fa",
-    "@blocklet/logger": "^1.16.52-beta-20250908-085420-224a58fa",
-    "@blocklet/payment-react": "1.20.7",
-    "@blocklet/payment-vendor": "1.20.7",
-    "@blocklet/sdk": "^1.16.52-beta-20250908-085420-224a58fa",
-    "@blocklet/ui-react": "^3.1.37",
+    "@blocklet/js-sdk": "^1.16.52-beta-20250912-112002-e3499e9c",
+    "@blocklet/logger": "^1.16.52-beta-20250912-112002-e3499e9c",
+    "@blocklet/payment-react": "1.20.9",
+    "@blocklet/payment-vendor": "1.20.9",
+    "@blocklet/sdk": "^1.16.52-beta-20250912-112002-e3499e9c",
+    "@blocklet/ui-react": "^3.1.40",
     "@blocklet/uploader": "^0.2.10",
     "@blocklet/xss": "^0.2.7",
     "@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.24.8",
-    "@ocap/client": "^1.24.8",
-    "@ocap/mcrypto": "^1.24.8",
-    "@ocap/util": "^1.24.8",
-    "@ocap/wallet": "^1.24.8",
+    "@ocap/asset": "^1.24.9",
+    "@ocap/client": "^1.24.9",
+    "@ocap/mcrypto": "^1.24.9",
+    "@ocap/util": "^1.24.9",
+    "@ocap/wallet": "^1.24.9",
     "@stripe/react-stripe-js": "^2.9.0",
     "@stripe/stripe-js": "^2.4.0",
     "ahooks": "^3.8.5",
@@ -123,9 +124,9 @@
     "web3": "^4.16.0"
   },
   "devDependencies": {
-    "@abtnode/types": "^1.16.52-beta-20250908-085420-224a58fa",
+    "@abtnode/types": "^1.16.52-beta-20250912-112002-e3499e9c",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.20.7",
+    "@blocklet/payment-types": "1.20.9",
     "@types/cookie-parser": "^1.4.9",
     "@types/cors": "^2.8.19",
     "@types/debug": "^4.1.12",
@@ -172,5 +173,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "4ceda9d8cf6413d3c28514d774eb653ba5145f1b"
+  "gitHead": "e89c0a9b6a3f3b7f7cb3cc0845b1775c1f587f6e"
 }

package/src/components/metadata/form.tsx

@@ -151,6 +151,7 @@ export default function MetadataForm({
         color="primary"
         sx={{
           color: color === 'inherit' ? 'text.secondary' : 'primary.main',
+          minWidth: 'max-content',
         }}
         onClick={() => handleModeChange(mode === 'form' ? 'json' : 'form')}
         startIcon={<Autorenew />}>
@@ -162,7 +163,7 @@ export default function MetadataForm({
     <Box sx={{ width: '100%', height: '100%', display: 'flex', flexDirection: 'column' }}>
       {title ? (
         <Stack sx={{ flexDirection: 'row', justifyContent: 'space-between', alignItems: 'center' }}>
-          <FormLabel sx={{ color: 'text.primary', mt: 0 }}>{title}</FormLabel>
+          <FormLabel sx={{ color: 'text.primary', my: 0, '& label': { mb: 0 } }}>{title}</FormLabel>
           {toggleBtn}
         </Stack>
       ) : (
@@ -189,15 +190,17 @@ export default function MetadataForm({
                 ref={index === metadata.fields.length - 1 ? lastItemRef : null}
                 sx={{
                   mt: 2,
+                  '&:first-child': { mt: 0 },
                   spacing: 2,
-
                   alignItems: 'flex-end',
                 }}
                 spacing={2}
                 direction="row">
-                <Stack direction="row" spacing={2} sx={{ flex: 1 }}>
+                <Stack
+                  direction="row"
+                  spacing={2}
+                  sx={{ flex: 1, '& > div:first-child': { flex: 1 }, '& > div:last-child': { flex: 2 } }}>
                   <FormInput
-                    sx={{ flex: 1 }}
                     errorPosition="right"
                     size="small"
                     name={`metadata.${index}.key`}
@@ -208,19 +211,17 @@ export default function MetadataForm({
                         message: t('common.maxLength', { len: 40 }),
                       },
                     }}
+                    label="Key *"
                     placeholder="Key"
-                    label="Key"
                     // @ts-ignore
                     ref={errors?.metadata?.[index]?.key ? errorRef : null}
-                    inputProps={{
-                      maxLength: 40,
-                    }}
+                    inputProps={{ maxLength: 40 }}
                   />
                   <FormInput
-                    sx={{ flex: 2 }}
                     size="small"
                     errorPosition="right"
                     name={`metadata.${index}.value`}
+                    label="Value *"
                     placeholder="Value"
                     rules={{
                       required: t('payment.checkout.required'),
@@ -229,12 +230,9 @@ export default function MetadataForm({
                         message: t('common.maxLength', { len: 256 }),
                       },
                     }}
-                    label="Value"
                     // @ts-ignore
                     ref={errors?.metadata?.[index]?.value ? errorRef : null}
-                    inputProps={{
-                      maxLength: 256,
-                    }}
+                    inputProps={{ maxLength: 256 }}
                   />
                 </Stack>
                 <IconButton
@@ -322,12 +320,7 @@ export default function MetadataForm({
             }}
           />
           <Divider />
-          <Stack
-            direction="row"
-            sx={{
-              mt: 2,
-              justifyContent: 'flex-end',
-            }}>
+          <Stack direction="row" sx={{ mt: 2, justifyContent: 'flex-end' }}>
             {actions}
           </Stack>
         </>

package/src/components/payment-link/before-pay.tsx

@@ -239,6 +239,46 @@ export default function BeforePay({
           />
         )}
       />
+      <Controller
+        name="subscription_data.no_stake"
+        control={control}
+        render={({ field }) => (
+          <FormControlLabel
+            control={
+              <Checkbox
+                checked={getValues().subscription_data?.no_stake || false}
+                {...field}
+                onChange={(_, checked) => setValue(field.name, checked)}
+              />
+            }
+            label={t('admin.paymentLink.noStakeRequired')}
+          />
+        )}
+      />
+      <Controller
+        name="metadata"
+        control={control}
+        render={({ field }) => {
+          const metadata = field.value || {};
+          const isChecked = metadata.show_product_features === 'true';
+
+          return (
+            <FormControlLabel
+              control={
+                <Checkbox
+                  checked={isChecked}
+                  onChange={(_, checked) => {
+                    const newMetadata = { ...metadata };
+                    newMetadata.show_product_features = checked ? 'true' : 'false';
+                    field.onChange(newMetadata);
+                  }}
+                />
+              }
+              label={t('admin.paymentLink.showProductFeatures')}
+            />
+          );
+        }}
+      />
       {includeFreeTrial && (
         <Controller
           name="subscription_data.trial_period_days"

package/src/components/product/vendor-config.tsx

@@ -10,8 +10,7 @@ interface Vendor {
   name: string;
   description: string;
   vendor_key: string;
-  default_commission_rate: number;
-  default_commission_type: 'percentage' | 'fixed_amount';
+  vendor_type: string;
 }
 
 export default function VendorConfig() {
@@ -120,15 +119,9 @@ export default function VendorConfig() {
                           const vendorId = e.target.value as string;
                           field.onChange(vendorId);
 
-                          const selectedVendor = vendors.find((v) => v.id === vendorId);
-                          if (selectedVendor) {
-                            setValue(`vendor_config.${index}.commission_rate`, selectedVendor.default_commission_rate);
-                            const commissionType =
-                              selectedVendor.default_commission_type === 'fixed_amount'
-                                ? 'fixed'
-                                : selectedVendor.default_commission_type;
-                            setValue(`vendor_config.${index}.commission_type`, commissionType);
-                          }
+                          // Set default values when selecting a vendor
+                          setValue(`vendor_config.${index}.commission_rate`, 20);
+                          setValue(`vendor_config.${index}.commission_type`, 'percentage');
                         }}
                         renderValue={(value: string) => {
                           const vendor = vendors.find((v) => v.id === value);

package/src/components/subscription/description.tsx

@@ -19,12 +19,7 @@ export default function SubscriptionDescription({
   const { isMobile } = useMobile();
   if (subscription.description) {
     return (
-      <Stack
-        direction="row"
-        spacing={1}
-        sx={{
-          alignItems: 'center',
-        }}>
+      <Stack direction="row" spacing={1} sx={{ alignItems: 'center' }}>
         <Typography variant={variant} className="subscription-description">
           <TruncatedText text={subscription.description} maxLength={maxLength} useWidth />
         </Typography>

package/src/components/subscription/portal/list.tsx

@@ -38,6 +38,8 @@ const fetchData = (params: Record<string, any> = {}): Promise<SubscriptionListRe
   return api.get(`/api/subscriptions?${search.toString()}`).then((res) => res.data);
 };
 
+const TAG_COUNT = 2;
+
 type Props = {
   id: string;
   status: string;
@@ -146,6 +148,7 @@ export default function CurrentSubscriptions({
                     flexDirection: 'column',
                     justifyContent: 'space-between',
                     gap: 2,
+                    width: '100%',
 
                     '&:hover': {
                       backgroundColor: 'grey.50',
@@ -160,6 +163,7 @@ export default function CurrentSubscriptions({
                     sx={[
                       {
                         flex: 1,
+                        width: '100%',
                       },
                       ...(Array.isArray(rest.sx) ? rest.sx : [rest.sx]),
                     ]}>
@@ -170,12 +174,14 @@ export default function CurrentSubscriptions({
                       sx={{
                         alignItems: 'flex-start',
                         justifyContent: 'space-between',
+                        width: '100%',
                       }}>
                       <Stack
                         direction="row"
                         spacing={1.5}
                         sx={{
                           alignItems: 'center',
+                          width: '100%',
                         }}>
                         {subscription.metadata?.appLogo ? (
                           <Avatar
@@ -212,18 +218,88 @@ export default function CurrentSubscriptions({
                           </AvatarGroup>
                         )}
 
-                        <Stack direction="column" spacing={0.25}>
+                        <Stack direction="column" spacing={0.25} width="100%">
                           <SubscriptionDescription
                             subscription={subscription}
                             hideSubscription
                             maxLength={isMobile ? 30 : 40}
                             variant={isMobile ? 'subtitle2' : 'subtitle1'}
                           />
-                          <SubscriptionStatus
-                            subscription={subscription}
-                            sx={{ height: 18, width: 'fit-content' }}
-                            size="small"
-                          />
+                          <Box
+                            sx={{
+                              display: 'flex',
+                              alignItems: 'center',
+                              gap: 1,
+                              justifyContent: 'space-between',
+                            }}>
+                            <SubscriptionStatus
+                              subscription={subscription}
+                              sx={{ height: 18, width: 'fit-content' }}
+                              size="small"
+                            />
+                            {/* Vendor 信息显示 */}
+                            {(() => {
+                              const vendorConfig = subscription.items?.[0]?.price?.product?.vendor_config;
+                              if (!vendorConfig || vendorConfig.length === 0) return null;
+
+                              return (
+                                <Box
+                                  sx={{
+                                    display: 'flex',
+                                    alignItems: 'center',
+                                    gap: 0.5,
+                                    flexWrap: 'wrap',
+                                  }}>
+                                  {vendorConfig.slice(0, TAG_COUNT).map((vendor, index) => (
+                                    <Box
+                                      key={vendor.vendor_id || index}
+                                      sx={{
+                                        display: 'flex',
+                                        alignItems: 'center',
+                                        gap: 0.25,
+                                        px: 0.5,
+                                        py: 0.25,
+                                        bgcolor: 'action.hover',
+                                        borderRadius: 0.5,
+                                        border: '1px solid',
+                                        borderColor: 'divider',
+                                      }}>
+                                      <Box
+                                        sx={{
+                                          width: 4,
+                                          height: 4,
+                                          borderRadius: '50%',
+                                          bgcolor: 'success.main',
+                                        }}
+                                      />
+                                      <Typography
+                                        variant="caption"
+                                        sx={{
+                                          color: 'text.secondary',
+                                          fontSize: '0.7rem',
+                                          fontWeight: 500,
+                                          whiteSpace: 'nowrap',
+                                        }}>
+                                        {vendor.name || vendor.vendor_key}
+                                      </Typography>
+                                    </Box>
+                                  ))}
+                                  {vendorConfig.length > TAG_COUNT && (
+                                    <Typography
+                                      variant="caption"
+                                      sx={{
+                                        color: 'text.secondary',
+                                        fontSize: '0.7rem',
+                                        fontStyle: 'italic',
+                                        px: 0.5,
+                                      }}>
+                                      +{vendorConfig.length - TAG_COUNT} more
+                                    </Typography>
+                                  )}
+                                </Box>
+                              );
+                            })()}
+                          </Box>
                         </Stack>
                       </Stack>
                     </Stack>

package/src/components/subscription/vendor-service-list.tsx

@@ -0,0 +1,128 @@
+import { Box, Stack, Typography, IconButton, Tooltip } from '@mui/material';
+import { Home, Dashboard } from '@mui/icons-material';
+import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
+import { joinURL } from 'ufo';
+
+interface VendorConfig {
+  vendor_id: string;
+  vendor_key: string;
+  name?: string;
+  vendor_type?: string;
+}
+
+interface VendorServiceListProps {
+  vendorServices: VendorConfig[];
+  subscriptionId: string;
+}
+
+export default function VendorServiceList({ vendorServices, subscriptionId }: VendorServiceListProps) {
+  const { t } = useLocaleContext();
+
+  if (!vendorServices || vendorServices.length === 0) {
+    return null;
+  }
+
+  const prefix = window.blocklet.prefix || '/';
+
+  return (
+    <>
+      <Typography variant="h3" className="section-header" sx={{ mb: 3 }}>
+        {t('admin.subscription.includedServices')} ({vendorServices.length})
+      </Typography>
+      <Box className="section-body">
+        <Stack
+          spacing={2}
+          sx={{
+            display: 'grid',
+            gridTemplateColumns: { xs: '1fr', md: '1fr 1fr', lg: '1fr 1fr 1fr' },
+            gap: 2,
+          }}>
+          {vendorServices.map((vendor, index) => {
+            const isLauncher = vendor.vendor_type === 'launcher';
+
+            return (
+              <Box
+                key={vendor.vendor_key || index}
+                sx={{
+                  p: 2,
+                  border: '1px solid',
+                  borderColor: 'divider',
+                  borderRadius: 2,
+                  backgroundColor: 'background.paper',
+                  '&:hover': {
+                    backgroundColor: 'action.hover',
+                  },
+                  transition: 'background-color 0.2s ease',
+                }}>
+                <Stack direction="row" justifyContent="space-between" alignItems="flex-start">
+                  <Stack direction="row" alignItems="center" spacing={1} flex={1}>
+                    <Box
+                      sx={{
+                        width: 8,
+                        height: 8,
+                        borderRadius: '50%',
+                        bgcolor: 'success.main',
+                        flexShrink: 0,
+                      }}
+                    />
+                    <Typography
+                      variant="body1"
+                      sx={{
+                        fontWeight: 600,
+                        fontSize: '1rem',
+                        color: 'text.primary',
+                      }}>
+                      {vendor.name || vendor.vendor_key}
+                    </Typography>
+                  </Stack>
+                  {/* Launcher 类型的链接 */}
+                  {isLauncher && (
+                    <Stack direction="row" spacing={0.5}>
+                      <Tooltip title={t('admin.subscription.serviceHome')} placement="top">
+                        <IconButton
+                          size="small"
+                          component="a"
+                          href={joinURL(prefix, '/api/vendors/open/', subscriptionId, `?vendorId=${vendor.vendor_id}`)}
+                          target="_blank"
+                          rel="noopener noreferrer"
+                          sx={{
+                            color: 'primary.main',
+                            '&:hover': {
+                              backgroundColor: 'primary.lighter',
+                            },
+                          }}>
+                          <Home fontSize="small" />
+                        </IconButton>
+                      </Tooltip>
+                      <Tooltip title={t('admin.subscription.serviceDashboard')} placement="top">
+                        <IconButton
+                          size="small"
+                          component="a"
+                          href={joinURL(
+                            prefix,
+                            '/api/vendors/open/',
+                            subscriptionId,
+                            `?vendorId=${vendor.vendor_id}&target=dashboard`
+                          )}
+                          target="_blank"
+                          rel="noopener noreferrer"
+                          sx={{
+                            color: 'primary.main',
+                            '&:hover': {
+                              backgroundColor: 'primary.lighter',
+                            },
+                          }}>
+                          <Dashboard fontSize="small" />
+                        </IconButton>
+                      </Tooltip>
+                    </Stack>
+                  )}
+                </Stack>
+              </Box>
+            );
+          })}
+        </Stack>
+      </Box>
+    </>
+  );
+}

package/src/components/vendor/actions.tsx

@@ -10,14 +10,11 @@ import ClickBoundary from '../click-boundary';
 interface Vendor {
   id: string;
   vendor_key: string;
+  vendor_type: string;
   name: string;
   description: string;
   app_url: string;
-  webhook_path: string;
-  default_commission_rate: number;
-  default_commission_type: 'percentage' | 'fixed_amount';
   status: 'active' | 'inactive';
-  order_create_params: Record<string, any>;
   metadata: Record<string, any>;
   created_at: string;
   updated_at: string;
@@ -65,40 +62,11 @@ export default function VendorActions({ data, variant = 'compact', onChange }: V
     }
   };
 
-  // 测试发货功能
-  const onTestFulfillment = async () => {
-    try {
-      setState({ loading: true });
-      const result = await api
-        .post(`/api/vendors/${data.id}/test-fulfillment`, {
-          productCode: 'test_product',
-        })
-        .then((res: any) => res.data);
-
-      Toast.success(
-        '发货测试成功！\n' +
-          `订单号: ${result.fulfillmentResult?.orderId || 'N/A'}\n` +
-          `状态: ${result.fulfillmentResult?.status || 'N/A'}\n` +
-          `服务地址: ${result.fulfillmentResult?.serviceUrl || 'N/A'}`
-      );
-      onChange(state.action);
-    } catch (err) {
-      Toast.error(`发货测试失败: ${formatError(err)}`);
-    } finally {
-      setState({ loading: false, action: '' });
-    }
-  };
-
   return (
     <ClickBoundary>
       <Actions
         variant={variant}
         actions={[
-          {
-            label: '测试发货',
-            handler: onTestFulfillment,
-            color: 'success',
-          },
           data.status === 'active'
             ? {
                 label: t('admin.vendor.deactivate'),

package/src/locales/en.tsx

@@ -602,6 +602,8 @@ export default flat({
       allowPromotionCodes: 'Allow promotion codes',
       requireCrossSell: 'Require cross sell products selected if eligible',
       includeFreeTrial: 'Include a free trial',
+      noStakeRequired: 'No stake required',
+      showProductFeatures: 'Show product features',
       freeTrialDaysPositive: 'Free trial days must be positive',
       includeCustomFields: 'Add custom fields',
       confirmPage: 'Confirmation Page',
@@ -890,10 +892,15 @@ export default flat({
       deactivateTip: 'Are you sure you want to deactivate vendor "{name}"?',
       name: 'Vendor Name',
       nameRequired: 'Vendor name is required',
-      vendorKey: 'Vendor Type',
-      vendorKeyRequired: 'Vendor type is required',
-      vendorKeyHelp: 'Unique identifier for the vendor (e.g., launcher, did_names)',
+      vendorType: 'Vendor Type',
+      vendorTypeRequired: 'Vendor type is required',
+      launcher: 'Launcher',
+      vendorKey: 'Vendor Key',
+      vendorKeyRequired: 'Vendor key is required',
+      vendorKeyHelp: 'Unique identifier for the vendor',
       description: 'Description',
+      displayNameRequired: 'Display name is required',
+      displayNameHelp: 'This name will be displayed on the installation interface after successful payment',
       appUrl: 'App URL',
       appUrlRequired: 'App URL is required',
       appUrlInvalid: 'Please enter a valid URL starting with http:// or https://',
@@ -930,6 +937,9 @@ export default flat({
       empty: 'No subscriptions',
       viewAll: 'View all subscriptions',
       noActiveEmpty: 'You currently have no active subscriptions. You can choose to view your subscription history.',
+      includedServices: 'Included Services',
+      serviceHome: 'Visit Service Homepage',
+      serviceDashboard: 'Access Service Dashboard',
       attention: 'Past due subscriptions',
       product: 'Product',
       collectionMethod: 'Billing',

package/src/locales/zh.tsx

@@ -570,6 +570,8 @@ export default flat({
       requirePhoneNumber: '收集客户的电话号码',
       allowPromotionCodes: '允许促销代码',
       includeFreeTrial: '包含免费试用',
+      noStakeRequired: '无需质押',
+      showProductFeatures: '显示产品特性',
       freeTrialDaysPositive: '免费试用天数必须是正数',
       includeCustomFields: '添加自定义字段',
       requireCrossSell: '用户必须选择交叉销售的商品（如果有的话）',
@@ -868,10 +870,15 @@ export default flat({
       deactivateTip: '确定要停用供应商 "{name}" 吗？',
       name: '供应商名称',
       nameRequired: '供应商名称是必填项',
-      vendorKey: '供应商类型',
-      vendorKeyRequired: '供应商类型是必填项',
-      vendorKeyHelp: '供应商的唯一标识符（如：launcher、did_names）',
+      vendorType: '供应商类型',
+      vendorTypeRequired: '供应商类型是必填项',
+      launcher: '启动器',
+      vendorKey: '供应商标识',
+      vendorKeyRequired: '供应商标识是必填项',
+      vendorKeyHelp: '供应商的唯一标识符',
       description: '描述',
+      displayNameRequired: '前台展示名称是必填项',
+      displayNameHelp: '此数据会展示到付款成功后的安装界面',
       appUrl: '应用地址',
       appUrlRequired: '应用地址是必填项',
       appUrlInvalid: '请输入以http://或https://开头的有效URL',
@@ -908,6 +915,9 @@ export default flat({
       empty: '没有订阅',
       viewAll: '查看历史订阅',
       noActiveEmpty: '您当前没有服务中的订阅，您可以选择查看历史订阅',
+      includedServices: '包含的服务',
+      serviceHome: '访问服务主页',
+      serviceDashboard: '访问服务管理后台',
       product: '产品',
       attention: '将过期的订阅',
       collectionMethod: '计费',