@blocklet/payment-react 1.18.14 → 1.18.16

package/src/locales/en.tsx

@@ -244,14 +244,14 @@ export default flat({
       pastDue: {
         button: 'Pay',
         invoices: 'Past Due Invoices',
-        warning:
-          'Past due invoices need to be paid immediately, otherwise you can not make new purchases anymore. Please pay these invoices one by one.',
+        warning: 'Past due invoices need to be paid immediately, otherwise you can not make new purchases anymore.',
         alert: {
           title: 'You have unpaid invoices',
           description:
             'Seems you have unpaid invoices from previous subscriptions, new purchases are not allowed unless you have paid all past due invoices.',
           confirm: 'Pay Now',
         },
+        view: 'View Due Invoices',
       },
       recover: {
         button: 'Resume Subscription',
@@ -305,6 +305,7 @@ export default flat({
         next: 'No invoices yet, next invoice will be generated on {date}',
         invoiceNumber: 'Invoice Number',
         emptyList: 'No Invoice',
+        noPaymentRequired: 'No Payment Required',
       },
       payment: {
         empty: 'There are no payments',
@@ -326,6 +327,12 @@ export default flat({
         trialLeft: 'Trail Left',
         owner: 'Subscription Owner',
       },
+      overdue: {
+        title:
+          'You have {count} due invoices for {subscriptionCount} subscriptions, totaling {total} {symbol}. Please pay immediately to avoid service disruption.',
+        simpleTitle: 'You have {count} due invoices. Please pay now to ensure uninterrupted service.',
+        empty: 'Great! You have no due invoices.',
+      },
     },
     invoice: {
       reason: {
@@ -367,6 +374,8 @@ export default flat({
         description: 'If you have any questions, you can choose ',
         list: 'Past Due Invoices:',
         empty: 'There are no overdue invoices for your subscription {name}.',
+        retry: 'Retry',
+        paid: 'Paid',
       },
     },
   },

package/src/locales/zh.tsx

@@ -239,12 +239,13 @@ export default flat({
       pastDue: {
         button: '续费',
         invoices: '欠费帐单',
-        warning: '请尽快支付欠费账单，否则你将无法继续使用服务或购买新服务，请逐个打开账单详情并完成支付',
+        warning: '请尽快支付欠费账单，否则你将无法继续使用服务或购买新服务。',
         alert: {
           title: '你有欠费账单',
           description: '看起来你有欠费的账单，在你支付所有欠费账单之前，新的购买或者订阅将被禁止，请不要调皮。',
           confirm: '去支付',
         },
+        view: '查看欠费明细',
       },
       recover: {
         button: '恢复订阅',
@@ -295,6 +296,7 @@ export default flat({
         next: '还没有账单，下次账单将在 {date} 生成',
         invoiceNumber: '账单编号',
         emptyList: '没有账单',
+        noPaymentRequired: '无需支付',
       },
       payment: {
         empty: '没有支付记录',
@@ -316,6 +318,12 @@ export default flat({
         trialLeft: '剩余试用时长',
         owner: '订阅拥有者',
       },
+      overdue: {
+        title:
+          '您有 {count} 张欠费账单，涉及 {subscriptionCount} 个订阅，总金额 {total} {symbol}。请立即支付，以免影响您的使用。',
+        simpleTitle: '您有 {count} 张欠费账单，请立即支付，以免影响您的使用。',
+        empty: '恭喜！您当前没有欠费账单。',
+      },
     },
     invoice: {
       reason: {
@@ -357,6 +365,8 @@ export default flat({
         description: '如果您有任何疑问，可以选择 ',
         list: '欠费账单：',
         empty: '您的【{name}】订阅当前没有欠费账单',
+        retry: '重新支付',
+        paid: '已支付',
       },
     },
   },

package/src/payment/form/address.tsx

@@ -23,45 +23,7 @@ export default function AddressForm({ mode, stripe, sx = {} }: Props) {
     return (
       <Fade in>
         <Stack className="cko-payment-address cko-payment-form" sx={sx}>
-          <FormLabel className="base-label">{t(`payment.checkout.billing.${mode}`)}</FormLabel>
           <Stack direction="column" className="cko-payment-form" spacing={0}>
-            <Stack direction="row" spacing={0}>
-              <FormInput
-                name="billing_address.postal_code"
-                rules={{ required: t('payment.checkout.required') }}
-                errorPosition="right"
-                variant="outlined"
-                placeholder={t('payment.checkout.billing.postal_code')}
-                InputProps={{
-                  startAdornment: (
-                    <InputAdornment position="start" style={{ marginRight: '2px', marginLeft: '-8px' }}>
-                      <Controller
-                        name="billing_address.country"
-                        control={control}
-                        render={({ field }) => (
-                          <CountrySelect
-                            {...field}
-                            sx={{
-                              '&.Mui-focused .MuiOutlinedInput-notchedOutline': {
-                                borderColor: 'transparent',
-                              },
-                            }}
-                          />
-                        )}
-                      />
-                    </InputAdornment>
-                  ),
-                }}
-              />
-            </Stack>
-            <FormLabel className="base-label">{t('payment.checkout.billing.state')}</FormLabel>
-            <FormInput
-              name="billing_address.state"
-              rules={{ required: t('payment.checkout.required') }}
-              errorPosition="right"
-              variant="outlined"
-              placeholder={t('payment.checkout.billing.state')}
-            />
             <FormLabel className="base-label">{t('payment.checkout.billing.line1')}</FormLabel>
             <FormInput
               name="billing_address.line1"
@@ -78,6 +40,42 @@ export default function AddressForm({ mode, stripe, sx = {} }: Props) {
               variant="outlined"
               placeholder={t('payment.checkout.billing.city')}
             />
+            <FormLabel className="base-label">{t('payment.checkout.billing.state')}</FormLabel>
+            <FormInput
+              name="billing_address.state"
+              rules={{ required: t('payment.checkout.required') }}
+              errorPosition="right"
+              variant="outlined"
+              placeholder={t('payment.checkout.billing.state')}
+            />
+            <FormLabel className="base-label">{t('payment.checkout.billing.postal_code')}</FormLabel>
+            <FormInput
+              name="billing_address.postal_code"
+              rules={{ required: t('payment.checkout.required') }}
+              errorPosition="right"
+              variant="outlined"
+              placeholder={t('payment.checkout.billing.postal_code')}
+              InputProps={{
+                startAdornment: (
+                  <InputAdornment position="start" style={{ marginRight: '2px', marginLeft: '-8px' }}>
+                    <Controller
+                      name="billing_address.country"
+                      control={control}
+                      render={({ field }) => (
+                        <CountrySelect
+                          {...field}
+                          sx={{
+                            '&.Mui-focused .MuiOutlinedInput-notchedOutline': {
+                              borderColor: 'transparent',
+                            },
+                          }}
+                        />
+                      )}
+                    />
+                  </InputAdornment>
+                ),
+              }}
+            />
           </Stack>
         </Stack>
       </Fade>