payment-kit 1.18.41 → 1.18.43

package/api/src/integrations/stripe/handlers/subscription.ts

@@ -60,17 +60,20 @@ export async function handleStripeSubscriptionSucceed(subscription: Subscription
   if (checkoutSession && checkoutSession.status === 'open') {
     await checkoutSession.increment('success_subscription_count', { by: 1 });
     await checkoutSession.reload();
-    if (checkoutSession.success_subscription_count === subscriptionIds.length) {
+    if (
+      checkoutSession.success_subscription_count &&
+      checkoutSession.success_subscription_count >= subscriptionIds.length
+    ) {
       await checkoutSession.update({
         status: 'complete',
         payment_status: 'paid',
         payment_details: paymentIntent?.payment_details || null,
       });
+      logger.info('checkout session become complete on stripe event', {
+        id: checkoutSession.id,
+        subscriptionId: subscription.id,
+      });
     }
-    logger.info('checkout session become complete on stripe event', {
-      id: checkoutSession.id,
-      subscriptionId: subscription.id,
-    });
   }
 }
 

package/api/src/queues/payment.ts

@@ -312,12 +312,18 @@ export const handlePaymentSucceed = async (
         await checkoutSession.increment('success_subscription_count', { by: 1 });
         await checkoutSession.reload();
         const subscriptionIds = getCheckoutSessionSubscriptionIds(checkoutSession);
-        if (checkoutSession.success_subscription_count === subscriptionIds.length) {
+        if (
+          checkoutSession.success_subscription_count &&
+          checkoutSession.success_subscription_count >= subscriptionIds.length
+        ) {
           await checkoutSession.update({
             status: 'complete',
             payment_status: 'paid',
             payment_details: paymentIntent.payment_details,
           });
+          logger.info('checkout session become complete on payment done', {
+            id: checkoutSession.id,
+          });
         }
       } else {
         await checkoutSession.update({
@@ -325,6 +331,9 @@ export const handlePaymentSucceed = async (
           payment_status: 'paid',
           payment_details: paymentIntent.payment_details,
         });
+        logger.info('checkout session become complete on payment done', {
+          id: checkoutSession.id,
+        });
       }
       logger.info(`CheckoutSession ${checkoutSession.id} updated on payment done ${paymentIntent.id}`);
     }

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

@@ -923,7 +923,11 @@ router.get('/retrieve/:id', user, async (req, res) => {
   let subscriptions: Subscription[] = [];
   if (['subscription', 'setup'].includes(doc.mode)) {
     const subscriptionIds = getCheckoutSessionSubscriptionIds(doc);
-    if (doc.success_subscription_count === subscriptionIds.length && doc.status === 'incomplete') {
+    if (
+      doc.success_subscription_count &&
+      doc.success_subscription_count >= subscriptionIds.length &&
+      doc.status === 'incomplete'
+    ) {
       await doc.update({
         status: 'complete',
         payment_status: 'paid',

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.18.41",
+  "version": "1.18.43",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -45,30 +45,30 @@
   },
   "dependencies": {
     "@abtnode/cron": "^1.16.43",
-    "@arcblock/did": "^1.20.8",
+    "@arcblock/did": "^1.20.10",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
-    "@arcblock/did-connect": "^2.13.29",
-    "@arcblock/did-util": "^1.20.8",
-    "@arcblock/jwt": "^1.20.8",
-    "@arcblock/ux": "^2.13.29",
-    "@arcblock/validator": "^1.20.8",
-    "@blocklet/did-space-js": "^1.0.51",
+    "@arcblock/did-connect": "^2.13.32",
+    "@arcblock/did-util": "^1.20.10",
+    "@arcblock/jwt": "^1.20.10",
+    "@arcblock/ux": "^2.13.32",
+    "@arcblock/validator": "^1.20.10",
+    "@blocklet/did-space-js": "^1.0.53",
     "@blocklet/js-sdk": "^1.16.43",
     "@blocklet/logger": "^1.16.43",
-    "@blocklet/payment-react": "1.18.41",
+    "@blocklet/payment-react": "1.18.43",
     "@blocklet/sdk": "^1.16.43",
-    "@blocklet/ui-react": "^2.13.29",
+    "@blocklet/ui-react": "^2.13.32",
     "@blocklet/uploader": "^0.1.90",
     "@blocklet/xss": "^0.1.35",
     "@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.20.8",
-    "@ocap/client": "^1.20.8",
-    "@ocap/mcrypto": "^1.20.8",
-    "@ocap/util": "^1.20.8",
-    "@ocap/wallet": "^1.20.8",
+    "@ocap/asset": "^1.20.10",
+    "@ocap/client": "^1.20.10",
+    "@ocap/mcrypto": "^1.20.10",
+    "@ocap/util": "^1.20.10",
+    "@ocap/wallet": "^1.20.10",
     "@stripe/react-stripe-js": "^2.7.3",
     "@stripe/stripe-js": "^2.4.0",
     "ahooks": "^3.8.0",
@@ -123,7 +123,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.16.43",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.18.41",
+    "@blocklet/payment-types": "1.18.43",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -169,5 +169,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "4232e09576dd8aa8dcfb0e4dd5a1bbbb50480b7f"
+  "gitHead": "278c503efd49cab6413b324a4b38bf37a3456468"
 }

package/src/components/customer/link.tsx

@@ -34,6 +34,9 @@ export default function CustomerLink({
       avatarProps={{
         size: size === 'small' ? 24 : 40,
       }}
+      shortenLabelProps={{
+        maxLength: 20,
+      }}
       popupInfoType={InfoType.Minimal}
       showDid={size !== 'small'}
       {...(customer.metadata.anonymous === true

package/src/components/subscription/metrics.tsx

@@ -6,7 +6,7 @@ import { useRequest } from 'ahooks';
 import { Button, Stack, Typography, Tooltip, Avatar, Box, CircularProgress, Skeleton } from '@mui/material';
 import { BN } from '@ocap/util';
 import { useNavigate } from 'react-router-dom';
-import { AccountBalanceWalletOutlined, ArrowForward } from '@mui/icons-material';
+import { AccountBalanceWalletOutlined, ArrowForward, InfoOutlined } from '@mui/icons-material';
 import InfoMetric from '../info-metric';
 import SubscriptionStatus from './status';
 
@@ -89,7 +89,14 @@ export default function SubscriptionMetrics({ subscription, showBalance = true }
       )}
       {['active', 'trialing'].includes(subscription.status) && upcoming?.amount && upcoming.amount !== '0' && (
         <InfoMetric
-          label={t('admin.subscription.nextInvoiceAmount')}
+          label={
+            <Typography display="flex" alignItems="center" gap={0.5}>
+              {t('admin.subscription.nextInvoiceAmount')}
+              <Tooltip title={t('admin.subscription.nextInvoiceAmountTip')} placement="top" arrow>
+                <InfoOutlined fontSize="small" sx={{ color: 'text.secondary', cursor: 'pointer', fontSize: '16px' }} />
+              </Tooltip>
+            </Typography>
+          }
           value={`${formatBNStr(upcoming.amount, subscription.paymentCurrency.decimal)} ${
             subscription.paymentCurrency.symbol
           } (${t('common.estimated')})`}

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

@@ -384,17 +384,7 @@ export function SubscriptionActionsInner({
     const supportUnsubscribe = action?.action === 'cancel' && showUnsubscribe;
     const supportAction = action && (action?.action !== 'cancel' || supportUnsubscribe);
     const supportResume = isWillCanceled(subscription) && action?.action === 'recover';
-    const serviceActions = subscription.service_actions?.filter((x: any) => x?.type !== 'notification') || [
-      {
-        name: 'notification',
-        text: {
-          en: 'Application Details',
-          zh: '应用详情',
-        },
-        link: '/customer/notification',
-        color: 'primary',
-      },
-    ];
+    const serviceActions = subscription.service_actions?.filter((x: any) => x?.type !== 'notification') || [];
     const actionConfigs: ActionConfig[] = [
       {
         key: 'delegation',

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

@@ -224,10 +224,12 @@ export default function CurrentSubscriptions({
                           flexWrap: 'wrap',
                         }}>
                         <Typography variant={isMobile ? 'subtitle2' : 'subtitle1'} sx={{ whiteSpace: 'nowrap' }}>
-                          {
+                          {formatPrice(
                             // @ts-ignore
-                            formatPrice(subscription.items[0].price, subscription.paymentCurrency)
-                          }
+                            subscription.items?.[0]?.price,
+                            subscription.paymentCurrency,
+                            subscription.items?.[0]?.price?.product?.unit_label
+                          )}
                         </Typography>
                         {subscriptionTime && (
                           <Typography variant="body2" color="text.secondary">

package/src/locales/en.tsx

@@ -538,6 +538,8 @@ export default flat({
       startedAt: 'Started',
       nextInvoice: 'Next Invoice',
       nextInvoiceAmount: 'Next Invoice Amount',
+      nextInvoiceAmountTip:
+        'The next invoice amount is estimated, the actual amount will be calculated based on actual usage.',
       itemId: 'Subscription Item ID',
       update: 'Update subscription',
       resume: 'Resume payment collection',

package/src/locales/zh.tsx

@@ -527,6 +527,7 @@ export default flat({
       startedAt: '开始于',
       nextInvoice: '下次账单时间',
       nextInvoiceAmount: '下次账单金额',
+      nextInvoiceAmountTip: '下次账单金额为预估，最终金额会根据实际使用情况结算。',
       itemId: '订阅项目ID',
       update: '更新订阅',
       resume: '恢复付款',

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

@@ -583,7 +583,11 @@ export default function BalanceRechargePage() {
 
                       {subscription.items && subscription.items[0] && currency && (
                         <Typography variant="body1" sx={{ color: 'text.secondary' }}>
-                          {formatPrice(subscription.items[0].price, currency)}
+                          {formatPrice(
+                            subscription.items[0].price,
+                            currency,
+                            subscription.items[0].price?.product?.unit_label
+                          )}
                         </Typography>
                       )}
                     </Stack>