payment-kit 1.13.73 → 1.13.75

package/src/pages/customer/invoice.tsx

@@ -5,7 +5,8 @@ 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 { useRequest, useSetState } from 'ahooks';
-import { Link, useParams } from 'react-router-dom';
+import { useEffect } from 'react';
+import { Link, useParams, useSearchParams } from 'react-router-dom';
 
 import TxLink from '../../components/blockchain/tx';
 import Currency from '../../components/currency';
@@ -24,6 +25,7 @@ const fetchData = (id: string): Promise<TInvoiceExpanded> => {
 // TODO: download feature using: https://react-pdf.org/
 export default function CustomerHome() {
   const { t } = useLocaleContext();
+  const [searchParams] = useSearchParams();
   const { connectApi } = useSessionContext();
   const params = useParams<{ id: string }>();
   const [state, setState] = useSetState({
@@ -39,6 +41,11 @@ export default function CustomerHome() {
       connectApi.open({
         action: 'collect',
         timeout: 5 * 60 * 1000,
+        messages: {
+          title: t('customer.invoice.pay'),
+          success: t('customer.invoice.paySuccess'),
+          error: t('customer.invoice.payError'),
+        },
         extraParams: { invoiceId: params.id },
         onSuccess: async () => {
           connectApi.close();
@@ -60,6 +67,13 @@ export default function CustomerHome() {
     }
   };
 
+  useEffect(() => {
+    if (searchParams.get('action') === 'pay') {
+      onPay();
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
   if (error) {
     return <Alert severity="error">{formatError(error)}</Alert>;
   }

package/src/pages/customer/subscription/index.tsx

@@ -70,20 +70,27 @@ export default function CustomerSubscription() {
               value={formatTime(data.start_date ? data.start_date * 1000 : data.created_at)}
               divider
             />
-            {!data.cancel_at && (
+            {data.status === 'active' && !data.cancel_at && (
               <InfoMetric
                 label={t('admin.subscription.nextInvoice')}
                 value={formatTime(data.current_period_end * 1000)}
                 divider
               />
             )}
-            {data.cancel_at && (
+            {['active', 'trailing'].includes(data.status) && data.cancel_at && (
               <InfoMetric
                 label={t('admin.subscription.cancel.schedule')}
                 value={formatTime(data.cancel_at * 1000)}
                 divider
               />
             )}
+            {data.status === 'canceled' && data.canceled_at && (
+              <InfoMetric
+                label={t('admin.subscription.cancel.done')}
+                value={formatTime(data.canceled_at * 1000)}
+                divider
+              />
+            )}
           </Stack>
         </Box>
       </Box>

package/tests/api/libs/subscription.spec.ts

@@ -0,0 +1,45 @@
+import { getDaysUntilDue, getDueUnit } from '../../../api/src/libs/subscription';
+
+describe('getDueUnit', () => {
+  it('should return 60 for recurring interval of "hour"', () => {
+    const result = getDueUnit('hour');
+    expect(result).toBe(60);
+  });
+
+  it('should return 3600 for recurring interval of "day"', () => {
+    const result = getDueUnit('day');
+    expect(result).toBe(3600);
+  });
+
+  it('should return 86400 for recurring interval other than "hour" or "day"', () => {
+    expect(getDueUnit('week')).toBe(86400);
+    expect(getDueUnit('month')).toBe(86400);
+    expect(getDueUnit('year')).toBe(86400);
+  });
+});
+
+describe('getDaysUntilDue', () => {
+  it('should return the number of days from the query when days_until_due is present', () => {
+    const query = { days_until_due: '5' };
+    const result = getDaysUntilDue(query);
+    expect(result).toBe(5);
+  });
+
+  it('should return the number of days from the environment variable when days_until_due is not present in the query', () => {
+    process.env.PAYMENT_DAYS_UNTIL_DUE = '10';
+    const result = getDaysUntilDue({});
+    expect(result).toBe(10);
+    delete process.env.PAYMENT_DAYS_UNTIL_DUE;
+  });
+
+  it('should return null when days_until_due is not present in the query and the environment variable', () => {
+    const result = getDaysUntilDue({});
+    expect(result).toBe(null);
+  });
+
+  it('should return null when days_until_due is not a number', () => {
+    const query = { days_until_due: 'not a number' };
+    const result = getDaysUntilDue(query);
+    expect(result).toBe(null);
+  });
+});