payment-kit 1.13.302 → 1.13.304

package/api/src/routes/connect/collect.ts

@@ -166,7 +166,7 @@ export default {
       } catch (err) {
         logger.error('Failed to finalize collect on arcblock', { paymentIntent: paymentIntent.id, error: err });
         await paymentIntent.update({ status: 'requires_capture' });
-        return {};
+        throw err;
       }
     }
 

package/api/src/routes/connect/pay.ts

@@ -136,7 +136,7 @@ export default {
         console.error(err);
         logger.error('Failed to finalize paymentIntent on arcblock', { paymentIntent: paymentIntent.id, error: err });
         await paymentIntent.update({ status: 'requires_capture' });
-        return {};
+        throw err;
       }
     }
 
@@ -166,7 +166,7 @@ export default {
         console.error(err);
         logger.error('Failed to finalize paymentIntent on ethereum', { paymentIntent: paymentIntent.id, error: err });
         await paymentIntent.update({ status: 'requires_capture' });
-        return {};
+        throw err;
       }
     }
 

package/api/src/routes/connect/setup.ts

@@ -182,7 +182,7 @@ export default {
       } catch (err) {
         logger.error('Failed to finalize setup', { setupIntent: setupIntent.id, error: err });
         await setupIntent.update({ status: 'requires_capture' });
-        return {};
+        throw err;
       }
     }
 

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.302",
+  "version": "1.13.304",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -52,7 +52,7 @@
     "@arcblock/validator": "^1.18.124",
     "@blocklet/js-sdk": "1.16.28",
     "@blocklet/logger": "1.16.28",
-    "@blocklet/payment-react": "1.13.302",
+    "@blocklet/payment-react": "1.13.304",
     "@blocklet/sdk": "1.16.28",
     "@blocklet/ui-react": "^2.10.3",
     "@blocklet/uploader": "^0.1.18",
@@ -118,7 +118,7 @@
   "devDependencies": {
     "@abtnode/types": "1.16.28",
     "@arcblock/eslint-config-ts": "^0.3.2",
-    "@blocklet/payment-types": "1.13.302",
+    "@blocklet/payment-types": "1.13.304",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -160,5 +160,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "366468bdbb1c5e8837a3baff852067fa041609a1"
+  "gitHead": "c4b50c470fd96da9ac17e5c29bf351bdb2403ee5"
 }

package/src/components/payment-method/form.tsx

@@ -20,7 +20,14 @@ export default function PaymentMethodForm() {
         name="type"
         control={control}
         render={({ field }) => (
-          <ToggleButtonGroup {...field} onChange={(_, value: string) => setValue(field.name, value)} exclusive>
+          <ToggleButtonGroup
+            {...field}
+            onChange={(_, value: string) => {
+              if (value !== null) {
+                setValue(field.name, value);
+              }
+            }}
+            exclusive>
             <ToggleButton value="arcblock">ArcBlock</ToggleButton>
             <ToggleButton value="stripe">Stripe</ToggleButton>
             <ToggleButton value="ethereum">Ethereum</ToggleButton>

package/src/components/price/form.tsx

@@ -95,6 +95,7 @@ export default function PriceForm({ prefix, simple }: PriceFormProps) {
   const model = useWatch({ control, name: getFieldName('model') });
   const positive = (v: number) => v >= 0;
   const quantityPositive = (v: number | undefined) => !v || v.toString().match(/^(0|[1-9]\d*)$/);
+  const intervalCountPositive = (v: number) => Number.isInteger(Number(v)) && v > 0;
 
   const basePaymentMethod = settings.paymentMethods.find((x) =>
     x.payment_currencies.some((c) => c.id === settings.baseCurrency.id)
@@ -251,7 +252,14 @@ export default function PriceForm({ prefix, simple }: PriceFormProps) {
         control={control}
         disabled={isLocked}
         render={({ field }) => (
-          <ToggleButtonGroup {...field} onChange={(_, value: string) => setValue(field.name, value)} exclusive>
+          <ToggleButtonGroup
+            {...field}
+            onChange={(_, value: string) => {
+              if (value !== null) {
+                setValue(field.name, value);
+              }
+            }}
+            exclusive>
             <ToggleButton value="recurring">{t('admin.price.types.recurring')}</ToggleButton>
             <ToggleButton value="one_time">{t('admin.price.types.onetime')}</ToggleButton>
           </ToggleButtonGroup>
@@ -301,6 +309,8 @@ export default function PriceForm({ prefix, simple }: PriceFormProps) {
                     type="number"
                     size="small"
                     sx={{ width: INPUT_WIDTH }}
+                    error={!intervalCountPositive(field.value)}
+                    helperText={!intervalCountPositive(field.value) && t('admin.price.recurring.intervalCountTip')}
                     InputProps={{
                       startAdornment: <InputAdornment position="start">{t('common.every')}</InputAdornment>,
                       endAdornment: (

package/src/locales/en.tsx

@@ -138,6 +138,7 @@ export default flat({
         meteredTip:
           'Metered billing lets you charge customers based on reported usage at the end of each billing period.',
         aggregate: 'Charge for metered usage by',
+        intervalCountTip: 'Billing interval must be a positive integer',
       },
       currency: {
         add: 'Add more currencies',

package/src/locales/zh.tsx

@@ -134,6 +134,7 @@ export default flat({
         metered: '使用量按计量收费？',
         meteredTip: '计量计费允许您根据每个计费周期结束时的报告的使用情况向客户收费。',
         aggregate: '按何种方式收费计量使用',
+        intervalCountTip: '计费周期必须是正整数',
       },
       currency: {
         add: '添加更多货币',

package/src/pages/admin/products/links/index.tsx

@@ -146,7 +146,11 @@ function PaymentLinks() {
         <div className="table-toolbar-left">
           <ToggleButtonGroup
             value={search.active}
-            onChange={(_, value) => setSearch((x) => ({ ...x, active: value }))}
+            onChange={(_, value) => {
+              if (value !== null) {
+                setSearch((x) => ({ ...x, active: value }));
+              }
+            }}
             exclusive>
             <ToggleButton value="">All</ToggleButton>
             <ToggleButton value="true">Active</ToggleButton>

package/src/pages/admin/products/pricing-tables/index.tsx

@@ -130,7 +130,11 @@ function PricingTables() {
         <div className="table-toolbar-left">
           <ToggleButtonGroup
             value={search.active}
-            onChange={(_, value) => setSearch((x) => ({ ...x, active: value }))}
+            onChange={(_, value) => {
+              if (value !== null) {
+                setSearch((x) => ({ ...x, active: value }));
+              }
+            }}
             exclusive>
             <ToggleButton value="">All</ToggleButton>
             <ToggleButton value="true">Active</ToggleButton>