payment-kit 1.17.5 → 1.17.7

package/api/src/libs/product.ts

@@ -78,7 +78,7 @@ export async function checkCurrencySupportRecurring(currencyIds: string[] | stri
     include: [{ model: PaymentMethod, as: 'payment_method' }],
   })) as (PaymentCurrency & { payment_method: PaymentMethod })[];
   const notSupportCurrencies = currencies.filter(
-    (c) => EVM_CHAIN_TYPES.includes(c.payment_method?.type) && c.symbol === 'ETH'
+    (c) => EVM_CHAIN_TYPES.includes(c.payment_method?.type) && c.payment_method?.default_currency_id === c.id
   );
   return {
     notSupportCurrencies,

package/api/src/routes/payment-currencies.ts

@@ -2,6 +2,7 @@ import { fromTokenToUnit } from '@ocap/util';
 import { Router } from 'express';
 import { InferAttributes, Op, WhereOptions } from 'sequelize';
 
+import Joi from 'joi';
 import { fetchErc20Meta } from '../integrations/ethereum/token';
 import logger from '../libs/logger';
 import { authenticate } from '../libs/security';
@@ -151,4 +152,63 @@ router.get('/:id', auth, async (req, res) => {
   }
 });
 
+const updateCurrencySchema = Joi.object({
+  name: Joi.string().empty('').optional(),
+  description: Joi.string().empty('').optional(),
+  logo: Joi.string().empty('').optional(),
+}).unknown(true);
+router.put('/:id', auth, async (req, res) => {
+  const { id } = req.params;
+  const raw: Partial<TPaymentCurrency> = req.body;
+
+  const { error } = updateCurrencySchema.validate(raw);
+  if (error) {
+    return res.status(400).json({ error: error.message });
+  }
+
+  const currency = await PaymentCurrency.findByPk(id);
+  if (!currency) {
+    return res.status(404).json({ error: 'Payment currency not found' });
+  }
+  if (raw.contract && raw.contract !== currency.contract) {
+    return res.status(400).json({ error: 'contract cannot be updated' });
+  }
+
+  const method = await PaymentMethod.findByPk(currency.payment_method_id);
+  if (!method) {
+    return res.status(400).json({ error: 'Payment method not found' });
+  }
+
+  const updatedCurrency = await currency.update({
+    name: raw.name || currency.name,
+    description: raw.description || currency.description,
+    logo: raw.logo || method.logo,
+  });
+  return res.json(updatedCurrency);
+});
+
+router.delete('/:id', auth, async (req, res) => {
+  const { id } = req.params;
+
+  const currency = await PaymentCurrency.findByPk(id);
+  if (!currency) {
+    return res.status(404).json({ error: 'Payment currency not found' });
+  }
+  const isLocked = await currency.isLocked();
+  if (isLocked) {
+    return res.status(400).json({ error: 'Can not delete locked payment currency' });
+  }
+  const isUsed = await currency.isUsed();
+  if (isUsed) {
+    return res.status(400).json({ error: 'Can not delete payment currency used by other resources' });
+  }
+  try {
+    await currency.destroy();
+    return res.status(200).end();
+  } catch (err) {
+    logger.error('delete payment currency error', err);
+    return res.status(400).json({ error: 'Delete payment currency failed' });
+  }
+});
+
 export default router;

package/api/src/routes/payment-methods.ts

@@ -68,7 +68,7 @@ router.post('/', auth, async (req, res) => {
     const currency = await PaymentCurrency.create({
       livemode: method.livemode,
       active: method.active,
-      locked: false,
+      locked: true,
       is_base_currency: false,
       payment_method_id: method.id,
 
@@ -144,7 +144,7 @@ router.post('/', auth, async (req, res) => {
     const currency = await PaymentCurrency.create({
       livemode: method.livemode,
       active: method.active,
-      locked: false,
+      locked: true,
       is_base_currency: false,
       payment_method_id: method.id,
 

package/api/src/store/models/payment-currency.ts

@@ -7,6 +7,7 @@ import {
   InferCreationAttributes,
   Model,
   Op,
+  QueryTypes,
 } from 'sequelize';
 
 import { createIdGenerator } from '../../libs/util';
@@ -145,6 +146,36 @@ export class PaymentCurrency extends Model<InferAttributes<PaymentCurrency>, Inf
       ...options,
     });
   }
+
+  public async isLocked(): Promise<boolean> {
+    const { PaymentMethod } = this.sequelize.models;
+    const method = (await PaymentMethod!.findByPk(this.payment_method_id)) as any;
+    return this.locked || method?.default_currency_id === this.id;
+  }
+
+  public async isUsed(): Promise<boolean> {
+    const { Price } = this.sequelize.models;
+    const price = await Price!.findOne({
+      where: {
+        currency_id: this.id,
+      },
+    });
+    if (price) {
+      return true;
+    }
+    // @ts-ignore
+    const [{ count }] = await this.sequelize.query(
+      `SELECT count(p.id) AS count 
+       FROM prices AS p 
+       JOIN json_each(p.currency_options) AS option 
+       ON json_extract(option.value, '$.currency_id') = ?`,
+      {
+        replacements: [this.id],
+        type: QueryTypes.SELECT,
+      }
+    );
+    return count > 0;
+  }
 }
 
 export type TPaymentCurrency = InferAttributes<PaymentCurrency>;

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.17.5",
+  "version": "1.17.7",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -53,7 +53,7 @@
     "@arcblock/validator": "^1.19.3",
     "@blocklet/js-sdk": "^1.16.37",
     "@blocklet/logger": "^1.16.37",
-    "@blocklet/payment-react": "1.17.5",
+    "@blocklet/payment-react": "1.17.7",
     "@blocklet/sdk": "^1.16.37",
     "@blocklet/ui-react": "^2.11.27",
     "@blocklet/uploader": "^0.1.64",
@@ -120,7 +120,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.16.37",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.17.5",
+    "@blocklet/payment-types": "1.17.7",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -166,5 +166,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "7713be8272f1056796820a9d52f742ed63899900"
+  "gitHead": "f2a439af19e405746a6663b4dbef8a96231a1076"
 }

package/src/components/payment-currency/add.tsx

@@ -1,20 +1,57 @@
-/* eslint-disable no-nested-ternary */
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Toast from '@arcblock/ux/lib/Toast';
 import { api, formatError } from '@blocklet/payment-react';
-import type { TPaymentCurrency, TPaymentMethod } from '@blocklet/payment-types';
+import type { TPaymentCurrency, TPaymentMethodExpanded } from '@blocklet/payment-types';
 import { AddOutlined } from '@mui/icons-material';
-import { Button, CircularProgress } from '@mui/material';
+import {
+  Button,
+  CircularProgress,
+  TextField,
+  Autocomplete,
+  Box,
+  Typography,
+  Avatar,
+  Stack,
+  Divider,
+} from '@mui/material';
 import { useSetState } from 'ahooks';
 import { FormProvider, useForm } from 'react-hook-form';
 import { dispatch } from 'use-bus';
-
+import { useEffect } from 'react';
 import DrawerForm from '../drawer-form';
 import PaymentCurrencyForm from './form';
 
-export default function PaymentCurrencyAdd({ method, onClose }: { method: TPaymentMethod; onClose: Function }) {
+const loadTokenList = () =>
+  import(
+    /* webpackChunkName: "payment-token-list" */
+    './tokenList.json'
+  );
+interface TokenInfo {
+  address: string;
+  chainId: number;
+  decimals: number;
+  name: string;
+  symbol: string;
+  logoURI?: string;
+}
+
+export default function PaymentCurrencyAdd({
+  method,
+  onClose,
+}: {
+  method: TPaymentMethodExpanded;
+  onClose: () => void;
+}) {
   const { t } = useLocaleContext();
-  const [state, setState] = useSetState({ loading: false });
+  const [state, setState] = useSetState<{
+    loading: boolean;
+    tokenListLoading: boolean;
+    availableTokens: TokenInfo[];
+  }>({
+    loading: false,
+    tokenListLoading: false,
+    availableTokens: [],
+  });
 
   const methods = useForm<TPaymentCurrency>({
     defaultValues: {
@@ -25,7 +62,39 @@ export default function PaymentCurrencyAdd({ method, onClose }: { method: TPayme
       contract: '',
     },
   });
-  const { handleSubmit } = methods;
+  const { handleSubmit, setValue } = methods;
+
+  const showTokenSelect = ['ethereum', 'base'].includes(method.type);
+
+  // @ts-ignore
+  const chainId = method?.settings?.[method.type]?.chain_id || '';
+
+  useEffect(() => {
+    if (showTokenSelect && !state.availableTokens.length) {
+      setState({ tokenListLoading: true });
+      loadTokenList().then((module) => {
+        const availableTokens = showTokenSelect
+          ? // @ts-ignore
+            ((module.default?.[chainId] as TokenInfo[]) || []).filter(
+              (token: TokenInfo) => !(method.payment_currencies || []).find((c: any) => c.contract === token.address)
+            )
+          : [];
+        setState({
+          availableTokens,
+          tokenListLoading: false,
+        });
+      });
+    }
+  }, [showTokenSelect, chainId]);
+
+  const handleTokenSelect = (token: TokenInfo | null) => {
+    if (token) {
+      setValue('name', token.name);
+      setValue('description', `${token.name} (${token.symbol})`);
+      setValue('logo', token.logoURI || '');
+      setValue('contract', token.address);
+    }
+  };
 
   const onSubmit = (data: TPaymentCurrency) => {
     setState({ loading: true });
@@ -54,10 +123,64 @@ export default function PaymentCurrencyAdd({ method, onClose }: { method: TPayme
       width={640}
       addons={
         <Button variant="contained" size="small" onClick={handleSubmit(onSubmit)} disabled={state.loading}>
-          {state.loading ? <CircularProgress size="small" /> : t('admin.paymentCurrency.save')}
+          {state.loading ? <CircularProgress size={20} /> : t('admin.paymentCurrency.save')}
         </Button>
       }>
       <FormProvider {...methods}>
+        {showTokenSelect && (
+          <Box sx={{ mb: 3 }}>
+            <Autocomplete
+              disablePortal
+              options={state.availableTokens}
+              loading={state.tokenListLoading}
+              getOptionLabel={(option: TokenInfo) => option.symbol}
+              onChange={(_, value) => handleTokenSelect(value)}
+              renderInput={(params) => (
+                <TextField
+                  {...params}
+                  label={t('admin.paymentCurrency.quickAdd')}
+                  placeholder={t('admin.paymentCurrency.searchToken')}
+                  fullWidth
+                />
+              )}
+              renderOption={(props, option) => (
+                <Box
+                  component="li"
+                  {...props}
+                  sx={{
+                    display: 'flex',
+                    alignItems: 'center',
+                    gap: 1,
+                    cursor: 'pointer',
+                    '&:hover': {
+                      backgroundColor: 'action.hover',
+                    },
+                  }}>
+                  <Avatar
+                    src={option.logoURI || option.symbol}
+                    alt={option.symbol}
+                    sx={{
+                      width: 24,
+                      height: 24,
+                    }}
+                  />
+                  <Stack>
+                    <Typography fontWeight={500}>{option.name}</Typography>
+                    <Typography variant="caption" color="text.secondary">
+                      {option.symbol}
+                    </Typography>
+                  </Stack>
+                </Box>
+              )}
+              isOptionEqualToValue={(option, value) => option.address === value.address}
+            />
+            <Divider sx={{ my: 3 }}>
+              <Typography variant="caption" color="text.secondary">
+                {t('admin.paymentCurrency.orManualInput')}
+              </Typography>
+            </Divider>
+          </Box>
+        )}
         <PaymentCurrencyForm />
       </FormProvider>
     </DrawerForm>

package/src/components/payment-currency/edit.tsx

@@ -0,0 +1,73 @@
+/* eslint-disable no-nested-ternary */
+import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
+import Toast from '@arcblock/ux/lib/Toast';
+import { api, formatError } from '@blocklet/payment-react';
+import type { TPaymentCurrency, TPaymentMethod } from '@blocklet/payment-types';
+import { AddOutlined } from '@mui/icons-material';
+import { Button, CircularProgress } from '@mui/material';
+import { useSetState } from 'ahooks';
+import { FormProvider, useForm } from 'react-hook-form';
+import { dispatch } from 'use-bus';
+
+import DrawerForm from '../drawer-form';
+import PaymentCurrencyForm from './form';
+
+export default function PaymentCurrencyEdit({
+  method,
+  onClose,
+  value,
+}: {
+  method: TPaymentMethod;
+  onClose: () => void;
+  value: TPaymentCurrency;
+}) {
+  const { t } = useLocaleContext();
+  const [state, setState] = useSetState({ loading: false });
+
+  const methods = useForm<TPaymentCurrency>({
+    defaultValues: {
+      payment_method_id: method.id,
+      name: value?.name,
+      description: value?.description,
+      logo: value?.logo,
+      contract: value?.contract,
+    },
+  });
+  const { handleSubmit } = methods;
+
+  const onSubmit = (data: TPaymentCurrency) => {
+    setState({ loading: true });
+    api
+      .put(`/api/payment-currencies/${value.id}`, data)
+      .then(() => {
+        setState({ loading: false });
+        Toast.success(t('admin.paymentCurrency.saved'));
+        methods.reset();
+        dispatch('drawer.submitted');
+        dispatch('paymentCurrency.updated');
+      })
+      .catch((err) => {
+        setState({ loading: false });
+        console.error(err);
+        Toast.error(formatError(err));
+      });
+  };
+
+  return (
+    <DrawerForm
+      open
+      icon={<AddOutlined />}
+      onClose={onClose}
+      text={t('admin.paymentCurrency.edit')}
+      width={640}
+      addons={
+        <Button variant="contained" size="small" onClick={handleSubmit(onSubmit)} disabled={state.loading}>
+          {state.loading ? <CircularProgress size="small" /> : t('admin.paymentCurrency.save')}
+        </Button>
+      }>
+      <FormProvider {...methods}>
+        <PaymentCurrencyForm disableKeys={['contract']} />
+      </FormProvider>
+    </DrawerForm>
+  );
+}

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

@@ -6,7 +6,15 @@ import { useFormContext, useWatch } from 'react-hook-form';
 
 import Uploader from '../uploader';
 
-export default function PaymentCurrencyForm() {
+type TPaymentCurrencyFormProps = {
+  disableKeys?: string[];
+};
+
+PaymentCurrencyForm.defaultProps = {
+  disableKeys: [],
+};
+
+export default function PaymentCurrencyForm({ disableKeys = [] }: TPaymentCurrencyFormProps) {
   const { t } = useLocaleContext();
   const { control, setValue } = useFormContext();
   const logo = useWatch({ control, name: 'logo' });
@@ -29,6 +37,7 @@ export default function PaymentCurrencyForm() {
         rules={{ required: true }}
         label={t('admin.paymentMethod.name.label')}
         placeholder={t('admin.paymentMethod.name.tip')}
+        disabled={disableKeys.includes('name')}
       />
       <FormInput
         key="description"
@@ -37,6 +46,7 @@ export default function PaymentCurrencyForm() {
         rules={{ required: true }}
         label={t('admin.paymentMethod.description.label')}
         placeholder={t('admin.paymentMethod.description.tip')}
+        disabled={disableKeys.includes('description')}
       />
       <FormInput
         key="contract"
@@ -45,6 +55,7 @@ export default function PaymentCurrencyForm() {
         rules={{ required: true }}
         label={t('admin.paymentCurrency.contract.label')}
         placeholder={t('admin.paymentCurrency.contract.tip')}
+        disabled={disableKeys.includes('contract')}
       />
       <Stack direction="column">
         <Typography mb={1}>{t('admin.paymentCurrency.logo.label')}</Typography>