payment-kit 1.14.28 → 1.14.29

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.14.28",
+  "version": "1.14.29",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -52,7 +52,7 @@
     "@arcblock/validator": "^1.18.128",
     "@blocklet/js-sdk": "1.16.28",
     "@blocklet/logger": "1.16.28",
-    "@blocklet/payment-react": "1.14.28",
+    "@blocklet/payment-react": "1.14.29",
     "@blocklet/sdk": "1.16.28",
     "@blocklet/ui-react": "^2.10.16",
     "@blocklet/uploader": "^0.1.20",
@@ -118,7 +118,7 @@
   "devDependencies": {
     "@abtnode/types": "1.16.28",
     "@arcblock/eslint-config-ts": "^0.3.2",
-    "@blocklet/payment-types": "1.14.28",
+    "@blocklet/payment-types": "1.14.29",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -160,5 +160,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "79178aa9251fb54006f6e0fe32a14619d1e8f06e"
+  "gitHead": "104f4189d9ef96c1e332ffa90824ebd3063c989d"
 }

package/src/components/invoice/list.tsx

@@ -129,7 +129,7 @@ export default function InvoiceList({
     {
       label: t('common.amount'),
       name: 'total',
-      width: 60,
+      width: 80,
       align: 'right',
       options: {
         customBodyRenderLite: (_: string, index: number) => {

package/src/components/payment-intent/actions.tsx

@@ -206,7 +206,7 @@ export function PaymentIntentActionsInner({ data, variant, onChange }: Props) {
           reset();
           const curAmount = formatBNStr(res?.amount, data.paymentCurrency.decimal);
           if (Number(curAmount) <= 0) {
-            Toast.info(t('admin.paymentIntent.refund.empty'));
+            Toast.info(t('admin.paymentIntent.refundForm.empty'));
             return;
           }
           setValue('refund.amount', curAmount);

package/src/components/pricing-table/product-settings.tsx

@@ -11,7 +11,11 @@ import ProductSelect from '../payment-link/product-select';
 import CreateProduct from '../product/create';
 import ProductItem from './product-item';
 
-export default function PricingTableProductSettings() {
+export default function PricingTableProductSettings({
+  triggerError = () => {},
+}: {
+  triggerError: (keys: { [key: string]: boolean }) => void;
+}) {
   const { t } = useLocaleContext();
   const [params, setParams] = useSearchParams();
   const { products, refresh } = useProductsContext();
@@ -98,6 +102,13 @@ export default function PricingTableProductSettings() {
 
   const grouped = groupPricingTableItems(items.fields);
 
+  useEffect(() => {
+    const hasDifferentCurrency = items.fields.some(
+      (_, index) => !isPriceCurrencyAligned(items.fields as any[], products, index)
+    );
+    triggerError({ items: hasDifferentCurrency });
+  }, [items.fields, products]);
+
   return (
     <Stack spacing={2} alignItems="flex-start">
       <Typography variant="h6" sx={{ mb: 2, fontWeight: 600 }}>

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

@@ -81,7 +81,7 @@ export default function PriceActions({ data, onChange, variant, setAsDefault }:
     try {
       setState({ loading: true });
       await api.put(`/api/products/${data.product_id}`, { default_price_id: data.id }).then((res) => res.data);
-      Toast.success(t('common.removed'));
+      Toast.success(t('common.saveAsDefaultPriceSuccess'));
       onChange(state.action);
     } catch (err) {
       console.error(err);
@@ -135,7 +135,7 @@ export default function PriceActions({ data, onChange, variant, setAsDefault }:
     { label: t('admin.pricingTable.add'), handler: onCreatePricingTable, color: 'primary', disabled: !data.recurring },
   ];
 
-  if (setAsDefault) {
+  if (!setAsDefault) {
     actions.splice(4, 0, {
       label: t('admin.price.setAsDefault'),
       handler: onSetAsDefault,

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

@@ -10,8 +10,9 @@ import { FormProvider, useForm } from 'react-hook-form';
 import { useSearchParams } from 'react-router-dom';
 import { dispatch } from 'use-bus';
 
+import { useSetState } from 'ahooks';
 import DrawerForm from '../../../../components/drawer-form';
-import PricingTableCustomerSettings from '../../../../components/pricing-table/customer-settings';
+// import PricingTableCustomerSettings from '../../../../components/pricing-table/customer-settings';
 import PricingTablePaymentSettings from '../../../../components/pricing-table/payment-settings';
 import PricingTablePreview from '../../../../components/pricing-table/preview';
 import PricingTableProductSettings from '../../../../components/pricing-table/product-settings';
@@ -25,6 +26,7 @@ export default function CreatePricingTable() {
   const [step, setStep] = useState(0); // ['products', 'payment', 'portal']
   const [stashed, setStashed] = useState(0);
   const fullScreenRef = useRef(null);
+  const [errors, triggerError] = useSetState({});
 
   const methods = useForm<TPricingTable & any>({
     shouldUnregister: false,
@@ -64,6 +66,7 @@ export default function CreatePricingTable() {
       .then(() => {
         Toast.success(t('admin.pricingTable.saved'));
         methods.reset();
+        setStep(0);
         dispatch('drawer.submitted');
         dispatch('pricingTable.created');
       })
@@ -80,7 +83,10 @@ export default function CreatePricingTable() {
   };
 
   const onContinue = () => {
-    if (step < 2) {
+    if (Object.values(errors).some((v) => v)) {
+      return;
+    }
+    if (step < 1) {
       setStep(step + 1);
     } else {
       methods.handleSubmit(async (formData: any) => {
@@ -107,9 +113,9 @@ export default function CreatePricingTable() {
             <Box flex={2} sx={{ borderRight: '1px solid #eee' }} position="relative">
               <Stack height="100%" spacing={2}>
                 <Box overflow="auto" sx={{ pr: 2 }}>
-                  {step === 0 && <PricingTableProductSettings />}
+                  {step === 0 && <PricingTableProductSettings triggerError={triggerError} />}
                   {step === 1 && <PricingTablePaymentSettings />}
-                  {step === 2 && <PricingTableCustomerSettings />}
+                  {/* {step === 2 && <PricingTableCustomerSettings />} */}
                 </Box>
                 <Stack
                   padding={2}
@@ -124,7 +130,7 @@ export default function CreatePricingTable() {
                     {t('common.previous')}
                   </Button>
                   <Button variant="contained" color="primary" onClick={onContinue}>
-                    {step === 2 ? t('common.save') : t('common.continue')}
+                    {step === 1 ? t('common.save') : t('common.continue')}
                   </Button>
                 </Stack>
               </Stack>