payment-kit 1.13.30 → 1.13.32

package/src/locales/zh.tsx

@@ -149,6 +149,7 @@ export default flat({
       amountTip: '对于订阅选择周期，对于其他所有选择一次性。',
       duplicate: '复制价格',
       edit: '编辑价格',
+      find: '选择或新建价格',
       archive: '存档价格',
       archiveTip: '存档将隐藏此价格不再允许新购买。确定要存档此价格吗？',
       remove: '删除价格',
@@ -192,6 +193,11 @@ export default flat({
         last_during_period: '周期内的最近使用值',
         last_ever: '最近的使用值',
       },
+      upsell: {
+        title: '升级选项',
+        to: '可升级至',
+        tip: '',
+      },
     },
     coupon: {
       create: '创建优惠券',
@@ -465,48 +471,54 @@ export default flat({
     processing: '处理中',
     payment: '支付',
     try: '免费试用',
-    include: '包括',
-    promo: '在开始之前免费试用{percent}%的套餐！',
-    promoInfo: '您可以随时取消，取消后无需付款。未来的计费将按月',
-    subtotal: '小计',
-    coupon: '优惠券',
-    complete: '完成支付',
-    details: '订单详情',
-    total: '总计',
-    billing: '账单',
-    first_name: '名',
-    last_name: '姓',
-    country: '国家',
-    state: '州',
-    city: '城市',
-    address: '地址',
-    postal_code: '邮政编码',
-    phone: '电话',
-    credit_card: {
-      info: '信用卡信息',
-      name: '卡片姓名',
-      number: '卡号',
-      expires: '过期日期',
-      expiresPlaceholder: 'MM/YY',
-      cvc: 'CVC',
+    include: '包括：',
+    subscription: '订阅',
+    noPricing: '没有可购买的物品',
+    setup: '订阅',
+    continue: '确认{action}',
+    connect: '连接并{action}',
+    login: '登录以加载并保存联系信息',
+    portal: '管理订阅',
+    cardPay: '使用卡片{action}',
+    completed: {
+      payment: '感谢您的购买',
+      subscription: '感谢您的订阅',
+      setup: '感谢您的订阅',
+      tip: '向{payee}的付款已完成。您可以在您的账户中查看此付款的详细信息。',
     },
-    pay: '付款',
-    paymentFailed: '付款失败',
-    subscribe: '购买套餐',
-    cancel: '取消',
-    thanks: '感谢您的付款！',
-    subscriptionDetails: '订阅详情',
-    transaction: {
-      subscription: '订阅',
-      date: '日期',
-      amount: '金额',
+    confirm: '通过确认您的订阅，您允许{payee}按照其条款对您的账户进行付款。您随时可以取消您的订阅。',
+    required: '必填项',
+    invalid: '无效',
+    billing: {
+      auto: '国家/地区',
+      required: '账单地址',
+      country: '国家/地区',
+      state: '州或省',
+      city: '城市或镇',
+      line1: '地址',
+      line2: '地址2',
+      postal_code: '邮政编码',
+    },
+    customer: {
+      name: '姓名',
+      email: '电子邮件',
+      phone: '电话',
+      phonePlaceholder: '电话号码',
+      phoneTip: '以防需要与您联系有关您的订单',
+    },
+    upsell: {
+      save: '使用{recurring}计费方式节省',
+      revert: '切换到{recurring}计费方式',
+      off: '{saving}%折扣',
+    },
+    expired: {
+      title: '链接已过期',
+      description: '此链接已过期。这意味着您的付款已经处理完成或会话已过期。',
+    },
+    complete: {
+      title: '结账已完成',
+      description: '此结账会话已完成。这意味着您的付款已成功处理完成。',
     },
-    nextPaymentOn: '下一次付款日期：{date}',
-    productCount: '1个产品',
-    productCount_plural: '{count}个产品',
-    currencyMismatch: '此订阅与选择的货币不匹配',
-    lockedProduct: '此产品无法购买',
-    notFound: '支付链接不存在',
   },
   customer: {
     subscriptions: '当前订阅',

package/src/pages/admin/billing/index.tsx

@@ -8,14 +8,14 @@ const SubscriptionDetail = React.lazy(() => import('./subscriptions/detail'));
 const InvoiceDetail = React.lazy(() => import('./invoices/detail'));
 
 const pages = {
-  subscriptions: React.lazy(() => import('./subscriptions')),
   invoices: React.lazy(() => import('./invoices')),
+  subscriptions: React.lazy(() => import('./subscriptions')),
 };
 
 export default function BillingIndex() {
   const navigate = useNavigate();
   const { t } = useLocaleContext();
-  const { page = 'subscriptions' } = useParams();
+  const { page = 'invoices' } = useParams();
 
   if (page.startsWith('sub_')) {
     return <SubscriptionDetail id={page} />;
@@ -32,8 +32,8 @@ export default function BillingIndex() {
   // @ts-ignore
   const TabComponent = pages[page] || pages.subscriptions;
   const tabs = [
-    { label: t('admin.subscriptions'), value: 'subscriptions' },
     { label: t('admin.invoices'), value: 'invoices' },
+    { label: t('admin.subscriptions'), value: 'subscriptions' },
   ];
 
   return (

package/src/pages/admin/customers/customers/detail.tsx

@@ -150,6 +150,7 @@ export default function CustomerDetail(props: { id: string }) {
           <InfoRow label={t('common.createdAt')} value={formatTime(data.created_at)} />
           <InfoRow label={t('common.updatedAt')} value={formatTime(data.updated_at)} />
           <InfoRow
+            alignItems="flex-start"
             label={t('admin.customer.address.label')}
             value={
               <Stack direction="column">

package/src/pages/admin/index.tsx

@@ -83,6 +83,7 @@ function Admin() {
             style={{
               fontSize: 14,
               fontWeight: 600,
+              cursor: 'pointer',
               color: settings.livemode ? 'text.primary' : 'warning.light',
             }}>
             {t('common.livemode')}

package/src/pages/admin/products/prices/detail.tsx

@@ -14,6 +14,7 @@ import EventList from '../../../../components/event/list';
 import InfoMetric from '../../../../components/info-metric';
 import InfoRow from '../../../../components/info-row';
 import MetadataEditor from '../../../../components/metadata/editor';
+import PriceUpsell from '../../../../components/price/upsell';
 import EditPrice from '../../../../components/product/edit-price';
 import SectionHeader from '../../../../components/section/header';
 import Table from '../../../../components/table';
@@ -234,6 +235,12 @@ export default function PriceDetail(props: { id: string }) {
           />
         </Box>
       </Box>
+      <Box className="section">
+        <SectionHeader title={t('admin.price.upsell.title')} />
+        <Box className="section-body">
+          <PriceUpsell data={data} onChange={runAsync} />
+        </Box>
+      </Box>
       <Box className="section">
         <SectionHeader title={t('admin.events')} />
         <Box className="section-body">

package/src/pages/customer/invoice.tsx

@@ -3,10 +3,10 @@ import Toast from '@arcblock/ux/lib/Toast';
 import type { TInvoiceExpanded } from '@did-pay/types';
 import { ArrowBackOutlined } from '@mui/icons-material';
 import { Alert, Box, Button, CircularProgress, Grid, Stack, Typography } from '@mui/material';
-import { fromUnitToToken } from '@ocap/util';
 import { useRequest, useSetState } from 'ahooks';
 import { Link, useParams } from 'react-router-dom';
 
+import TxLink from '../../components/blockchain/tx';
 import Currency from '../../components/currency';
 import InfoRow from '../../components/info-row';
 import InvoiceTable from '../../components/invoice/table';
@@ -108,12 +108,13 @@ export default function CustomerHome() {
                 value={<Currency logo={data.paymentCurrency.logo} name={data.paymentCurrency.symbol} />}
               />
               <InfoRow
-                label={t('common.total')}
+                label={t('common.txHash')}
                 value={
-                  <Typography component="span" fontWeight="bold">
-                    {fromUnitToToken(data.total, data.paymentCurrency.decimal)}&nbsp;
-                    {data.paymentCurrency.symbol}
-                  </Typography>
+                  data.paymentIntent?.payment_details ? (
+                    <TxLink details={data.paymentIntent.payment_details} method={data.paymentMethod} />
+                  ) : (
+                    ''
+                  )
                 }
               />
             </Stack>