@blocklet/payment-react 1.21.3 → 1.21.4

package/es/locales/en.js

@@ -181,6 +181,7 @@ export default flat({
         tip: "A payment to {payee} has been completed. You can view the details of this payment in your account."
       },
       vendor: {
+        accountRequired: "This action requires a unified account. Please switch accounts and try again.",
         processing: "Processing...",
         progress: "Progress {progress}%",
         delivered: "Installation completed",

package/es/locales/zh.js

@@ -181,6 +181,7 @@ export default flat({
         tip: "\u5411 {payee} \u7684\u4ED8\u6B3E\u5DF2\u5B8C\u6210\u3002\u60A8\u53EF\u4EE5\u5728\u60A8\u7684\u8D26\u6237\u4E2D\u67E5\u770B\u6B64\u4ED8\u6B3E\u7684\u8BE6\u7EC6\u4FE1\u606F\u3002"
       },
       vendor: {
+        accountRequired: "\u60A8\u5F53\u524D\u4F7F\u7528\u7684\u662F\u975E\u7EDF\u4E00\u8D26\u6237\u767B\u5F55\uFF0C\u6B64\u670D\u52A1\u9700\u8981\u60A8\u4F7F\u7528\u7EDF\u4E00\u8D26\u6237\u3002\u8BF7\u5207\u6362\u5230\u7EDF\u4E00\u8D26\u6237\u767B\u5F55\u540E\u91CD\u8BD5\u3002",
         processing: "\u6B63\u5728\u5B89\u88C5\u4E2D...",
         progress: "\u8FDB\u5EA6 {progress}%",
         delivered: "\u5B89\u88C5\u6210\u529F",

package/es/payment/form/index.js

@@ -386,13 +386,33 @@ export default function PaymentForm({
     }
   };
   const onFormSubmit = async (data) => {
+    const userInfo = session.user;
+    if (!userInfo.sourceAppPid) {
+      const hasVendorConfig = checkoutSession.line_items?.some(
+        (item) => !!item?.price?.product?.vendor_config?.length
+      );
+      if (hasVendorConfig) {
+        Toast.error(t("payment.checkout.vendor.accountRequired"));
+        return;
+      }
+    }
     setState({ submitting: true });
     try {
       let result;
       if (isDonationMode) {
         result = await api.put(`/api/checkout-sessions/${checkoutSession.id}/donate-submit`, data);
       } else {
-        result = await api.put(`/api/checkout-sessions/${checkoutSession.id}/submit`, data);
+        try {
+          result = await api.put(`/api/checkout-sessions/${checkoutSession.id}/submit`, data);
+        } catch (err) {
+          console.error(err);
+          if (err.response?.data?.code === "UNIFIED_APP_REQUIRED") {
+            Toast.error(t("payment.checkout.vendor.accountRequired"));
+            return;
+          }
+          Toast.error(formatError(err));
+          return;
+        }
       }
       setState({
         paymentIntent: result.data.paymentIntent,

package/lib/locales/en.js

@@ -188,6 +188,7 @@ module.exports = (0, _flat.default)({
         tip: "A payment to {payee} has been completed. You can view the details of this payment in your account."
       },
       vendor: {
+        accountRequired: "This action requires a unified account. Please switch accounts and try again.",
         processing: "Processing...",
         progress: "Progress {progress}%",
         delivered: "Installation completed",

package/lib/locales/zh.js

@@ -188,6 +188,7 @@ module.exports = (0, _flat.default)({
         tip: "\u5411 {payee} \u7684\u4ED8\u6B3E\u5DF2\u5B8C\u6210\u3002\u60A8\u53EF\u4EE5\u5728\u60A8\u7684\u8D26\u6237\u4E2D\u67E5\u770B\u6B64\u4ED8\u6B3E\u7684\u8BE6\u7EC6\u4FE1\u606F\u3002"
       },
       vendor: {
+        accountRequired: "\u60A8\u5F53\u524D\u4F7F\u7528\u7684\u662F\u975E\u7EDF\u4E00\u8D26\u6237\u767B\u5F55\uFF0C\u6B64\u670D\u52A1\u9700\u8981\u60A8\u4F7F\u7528\u7EDF\u4E00\u8D26\u6237\u3002\u8BF7\u5207\u6362\u5230\u7EDF\u4E00\u8D26\u6237\u767B\u5F55\u540E\u91CD\u8BD5\u3002",
         processing: "\u6B63\u5728\u5B89\u88C5\u4E2D...",
         progress: "\u8FDB\u5EA6 {progress}%",
         delivered: "\u5B89\u88C5\u6210\u529F",

package/lib/payment/form/index.js

@@ -447,6 +447,14 @@ function PaymentForm({
     }
   };
   const onFormSubmit = async data => {
+    const userInfo = session.user;
+    if (!userInfo.sourceAppPid) {
+      const hasVendorConfig = checkoutSession.line_items?.some(item => !!item?.price?.product?.vendor_config?.length);
+      if (hasVendorConfig) {
+        _Toast.default.error(t("payment.checkout.vendor.accountRequired"));
+        return;
+      }
+    }
     setState({
       submitting: true
     });
@@ -455,7 +463,17 @@ function PaymentForm({
       if (isDonationMode) {
         result = await _api.default.put(`/api/checkout-sessions/${checkoutSession.id}/donate-submit`, data);
       } else {
-        result = await _api.default.put(`/api/checkout-sessions/${checkoutSession.id}/submit`, data);
+        try {
+          result = await _api.default.put(`/api/checkout-sessions/${checkoutSession.id}/submit`, data);
+        } catch (err) {
+          console.error(err);
+          if (err.response?.data?.code === "UNIFIED_APP_REQUIRED") {
+            _Toast.default.error(t("payment.checkout.vendor.accountRequired"));
+            return;
+          }
+          _Toast.default.error((0, _util2.formatError)(err));
+          return;
+        }
       }
       setState({
         paymentIntent: result.data.paymentIntent,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/payment-react",
-  "version": "1.21.3",
+  "version": "1.21.4",
   "description": "Reusable react components for payment kit v2",
   "keywords": [
     "react",
@@ -94,7 +94,7 @@
     "@babel/core": "^7.27.4",
     "@babel/preset-env": "^7.27.2",
     "@babel/preset-react": "^7.27.1",
-    "@blocklet/payment-types": "1.21.3",
+    "@blocklet/payment-types": "1.21.4",
     "@storybook/addon-essentials": "^7.6.20",
     "@storybook/addon-interactions": "^7.6.20",
     "@storybook/addon-links": "^7.6.20",
@@ -125,5 +125,5 @@
     "vite-plugin-babel": "^1.3.1",
     "vite-plugin-node-polyfills": "^0.23.0"
   },
-  "gitHead": "ea1d64db9e337e2cdea02c86a0ab91b885830a11"
+  "gitHead": "d650fbb4c391c1d58bc7ebbd9dedf11901db9f89"
 }

package/src/locales/en.tsx

@@ -184,6 +184,7 @@ export default flat({
         tip: 'A payment to {payee} has been completed. You can view the details of this payment in your account.',
       },
       vendor: {
+        accountRequired: 'This action requires a unified account. Please switch accounts and try again.',
         processing: 'Processing...',
         progress: 'Progress {progress}%',
         delivered: 'Installation completed',

package/src/locales/zh.tsx

@@ -183,6 +183,7 @@ export default flat({
         tip: '向 {payee} 的付款已完成。您可以在您的账户中查看此付款的详细信息。',
       },
       vendor: {
+        accountRequired: '您当前使用的是非统一账户登录，此服务需要您使用统一账户。请切换到统一账户登录后重试。',
         processing: '正在安装中...',
         progress: '进度 {progress}%',
         delivered: '安装成功',

package/src/payment/form/index.tsx

@@ -4,7 +4,13 @@ import 'react-international-phone/style.css';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 // import { useTheme } from '@arcblock/ux/lib/Theme';
 import Toast from '@arcblock/ux/lib/Toast';
-import type { TCheckoutSession, TCustomer, TPaymentIntent, TPaymentMethodExpanded } from '@blocklet/payment-types';
+import type {
+  TCheckoutSession,
+  TCustomer,
+  TLineItemExpanded,
+  TPaymentIntent,
+  TPaymentMethodExpanded,
+} from '@blocklet/payment-types';
 import { Box, Button, CircularProgress, Divider, Fade, Stack, Tooltip, Typography } from '@mui/material';
 import { useMemoizedFn, useSetState } from 'ahooks';
 import pWaitFor from 'p-wait-for';
@@ -515,13 +521,35 @@ export default function PaymentForm({
   };
 
   const onFormSubmit = async (data: any) => {
+    const userInfo = session.user;
+
+    if (!userInfo.sourceAppPid) {
+      const hasVendorConfig = checkoutSession.line_items?.some(
+        (item: TLineItemExpanded) => !!item?.price?.product?.vendor_config?.length
+      );
+      if (hasVendorConfig) {
+        Toast.error(t('payment.checkout.vendor.accountRequired'));
+        return;
+      }
+    }
+
     setState({ submitting: true });
     try {
       let result;
       if (isDonationMode) {
         result = await api.put(`/api/checkout-sessions/${checkoutSession.id}/donate-submit`, data);
       } else {
-        result = await api.put(`/api/checkout-sessions/${checkoutSession.id}/submit`, data);
+        try {
+          result = await api.put(`/api/checkout-sessions/${checkoutSession.id}/submit`, data);
+        } catch (err: any) {
+          console.error(err);
+          if (err.response?.data?.code === 'UNIFIED_APP_REQUIRED') {
+            Toast.error(t('payment.checkout.vendor.accountRequired'));
+            return;
+          }
+          Toast.error(formatError(err));
+          return;
+        }
       }
 
       setState({