payment-kit 1.15.20 → 1.15.21

package/api/src/routes/subscriptions.ts

@@ -38,7 +38,6 @@ import { PaymentMethod } from '../store/models/payment-method';
 import { Price } from '../store/models/price';
 import { PricingTable } from '../store/models/pricing-table';
 import { Product } from '../store/models/product';
-import { Refund } from '../store/models/refund';
 import { SetupIntent } from '../store/models/setup-intent';
 import { Subscription, TSubscription } from '../store/models/subscription';
 import { SubscriptionItem } from '../store/models/subscription-item';
@@ -46,6 +45,8 @@ import type { LineItem, ServiceAction, SubscriptionUpdateItem } from '../store/m
 import { UsageRecord } from '../store/models/usage-record';
 import { cleanupInvoiceAndItems, ensureInvoiceAndItems } from './connect/shared';
 import { createUsageRecordQueryFn } from './usage-records';
+import { SubscriptionWillCanceledSchedule } from '../crons/subscription-will-canceled';
+import { getTokenByAddress } from '../integrations/arcblock/stake';
 
 const router = Router();
 const auth = authenticate<Subscription>({ component: true, roles: ['owner', 'admin'] });
@@ -377,57 +378,35 @@ router.put('/:id/cancel', authPortal, async (req, res) => {
     }
   }
 
-  await subscription.update(updates);
-
   // trigger refund
   if (updates.cancel_at < subscription.current_period_end && refund !== 'none') {
     if (['owner', 'admin'].includes(req.user?.role as string) === false) {
-      return res.status(403).json({ error: 'Not authorized to perform this action' });
+      return res.status(403).json({ error: 'Not authorized to refund' });
     }
-
     const result = await getSubscriptionRefundSetup(subscription, updates.cancel_at);
     if (result.unused !== '0') {
-      const item = await Refund.create({
-        type: 'refund',
-        livemode: subscription.livemode,
-        amount: refund === 'last' ? result.total : result.unused,
-        description: 'refund_transfer_on_subscription_cancel',
-        status: 'pending',
-        reason: 'requested_by_admin',
-        currency_id: subscription.currency_id,
-        customer_id: subscription.customer_id,
-        payment_method_id: subscription.default_payment_method_id,
-        payment_intent_id: result.lastInvoice.payment_intent_id as string,
-        invoice_id: result.lastInvoice.id,
-        subscription_id: subscription.id,
-        attempt_count: 0,
-        attempted: false,
-        next_attempt: 0,
-        last_attempt_error: null,
-        starting_balance: '0',
-        ending_balance: '0',
-        starting_token_balance: {},
-        ending_token_balance: {},
-        metadata: {
-          requested_by: req.user?.did,
-          unused_period_start: refund === 'last' ? subscription.current_period_start : updates.cancel_at,
-          unused_period_end: subscription.current_period_end,
-        },
-      });
-      logger.info('subscription cancel refund created', {
+      // @ts-ignore
+      updates.cancelation_details = {
+        ...(updates.cancelation_details || {}),
+        refund,
+        requested_by: req.user?.did,
+      };
+      logger.info('subscription cancel with refund', {
         ...req.params,
         ...req.body,
+        refund,
         ...pick(result, ['total', 'unused']),
-        item: item.toJSON(),
       });
     } else {
-      logger.info('subscription cancel refund skipped', {
+      logger.info('subscription cancel no refund', {
         ...req.params,
         ...req.body,
         ...pick(result, ['total', 'unused']),
       });
     }
   }
+  await subscription.update(updates);
+  await new SubscriptionWillCanceledSchedule().reScheduleSubscriptionTasks([subscription]);
 
   return res.json(subscription);
 });
@@ -455,7 +434,7 @@ router.put('/:id/recover', authPortal, async (req, res) => {
   }
 
   await doc.update({ cancel_at_period_end: false, cancel_at: 0, canceled_at: 0 });
-
+  await new SubscriptionWillCanceledSchedule().deleteScheduleSubscriptionJobs([doc]);
   // reschedule jobs
   subscriptionQueue
     .delete(`cancel-${doc.id}`)
@@ -1730,4 +1709,30 @@ router.put('/:id/slash-stake', auth, async (req, res) => {
     return res.status(400).json({ error: err.message });
   }
 });
+
+// get payer token
+router.get('/:id/payer-token', authMine, async (req, res) => {
+  const subscription = await Subscription.findByPk(req.params.id);
+  if (!subscription) {
+    return res.status(400).json({ error: `Subscription(${req.params.id}) not found` });
+  }
+  const paymentMethod = await PaymentMethod.findByPk(subscription.default_payment_method_id);
+  if (!paymentMethod) {
+    return res.status(400).json({ error: `Payment method(${subscription.default_payment_method_id}) not found` });
+  }
+
+  const paymentCurrency = await PaymentCurrency.findByPk(subscription.currency_id);
+  if (!paymentCurrency) {
+    return res.status(400).json({ error: `Payment currency(${subscription.currency_id}) not found` });
+  }
+
+  // @ts-ignore
+  const paymentAddress = subscription.payment_details?.[paymentMethod.type]?.payer ?? undefined;
+  if (!paymentAddress && ['ethereum', 'arcblock'].includes(paymentMethod.type)) {
+    return res.status(400).json({ error: `Payer not found on subscription payment detail: ${subscription.id}` });
+  }
+
+  const token = await getTokenByAddress(paymentAddress, paymentMethod, paymentCurrency);
+  return res.json({ token, paymentAddress });
+});
 export default router;

package/api/src/store/models/subscription.ts

@@ -64,6 +64,8 @@ export class Subscription extends Model<InferAttributes<Subscription>, InferCrea
     return_stake?: boolean;
     slash_stake?: boolean;
     slash_reason?: string;
+    refund?: LiteralUnion<'last' | 'proration' | 'none', string>;
+    requested_by?: string;
   };
 
   declare billing_cycle_anchor: number;

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

@@ -0,0 +1,54 @@
+import { getSimplifyDuration } from '../../src/libs/time';
+
+describe('getSimplifyDuration', () => {
+  const testCasesEn = [
+    { ms: 30 * 1000, expected: '30 seconds' },
+    { ms: 34 * 60 * 1000 + 30 * 1000, expected: '34 minutes' },
+    { ms: 59 * 60 * 1000, expected: '59 minutes' },
+    { ms: 60 * 60 * 1000, expected: '1 hour' },
+    { ms: 23 * 60 * 60 * 1000, expected: '23 hours' },
+    { ms: 24 * 60 * 60 * 1000, expected: '1 day' },
+    { ms: 24 * 60 * 60 * 1000 + 20 * 60 * 1000 + 30 * 1000, expected: '1 day' },
+    { ms: 25 * 24 * 60 * 60 * 1000 + 30 * 60 * 1000 + 10 * 1000, expected: '25 days' },
+    { ms: 32 * 24 * 60 * 60 * 1000 + 30 * 60 * 1000 + 12 * 1000, expected: '32 days' },
+    { ms: 60 * 24 * 60 * 60 * 1000 + 20 * 60 * 1000, expected: '60 days' },
+    { ms: 366 * 24 * 60 * 60 * 1000 + 20 * 60 * 1000, expected: '1 year' },
+  ];
+
+  const testCasesZh = [
+    { ms: 30 * 1000, expected: '30秒' },
+    { ms: 34 * 60 * 1000 + 30 * 1000, expected: '34分钟' },
+    { ms: 59 * 60 * 1000, expected: '59分钟' },
+    { ms: 60 * 60 * 1000, expected: '1小时' },
+    { ms: 23 * 60 * 60 * 1000, expected: '23小时' },
+    { ms: 24 * 60 * 60 * 1000, expected: '1天' },
+    { ms: 24 * 60 * 60 * 1000 + 20 * 60 * 1000 + 30 * 1000, expected: '1天' },
+    { ms: 25 * 24 * 60 * 60 * 1000 + 30 * 60 * 1000 + 10 * 1000, expected: '25天' },
+    { ms: 32 * 24 * 60 * 60 * 1000 + 30 * 60 * 1000 + 12 * 1000, expected: '32天' },
+    { ms: 60 * 24 * 60 * 60 * 1000 + 20 * 60 * 1000, expected: '60天' },
+    { ms: 366 * 24 * 60 * 60 * 1000 + 20 * 60 * 1000, expected: '1年' },
+  ];
+
+  test.each(testCasesEn)('should return $expected for $ms milliseconds in English', ({ ms, expected }) => {
+    expect(getSimplifyDuration(ms, 'en')).toBe(expected);
+  });
+
+  test.each(testCasesZh)('should return $expected for $ms milliseconds in Chinese', ({ ms, expected }) => {
+    expect(getSimplifyDuration(ms, 'zh')).toBe(expected);
+  });
+
+  test('should handle zero', () => {
+    expect(getSimplifyDuration(0, 'en')).toBe('0ms');
+    expect(getSimplifyDuration(0, 'zh')).toBe('0毫秒');
+  });
+
+  test('should handle negative values', () => {
+    expect(getSimplifyDuration(-24 * 60 * 60 * 1000, 'en')).toBe('-1 days');
+    expect(getSimplifyDuration(-24 * 60 * 60 * 1000, 'zh')).toBe('-1天');
+  });
+
+  test('should handle large number of days', () => {
+    expect(getSimplifyDuration(1000 * 24 * 60 * 60 * 1000, 'en')).toBe('2 years');
+    expect(getSimplifyDuration(1000 * 24 * 60 * 60 * 1000, 'zh')).toBe('2年');
+  });
+});

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.15.20",
+  "version": "1.15.21",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -43,29 +43,29 @@
   },
   "dependencies": {
     "@abtnode/cron": "^1.16.32",
-    "@arcblock/did": "^1.18.135",
+    "@arcblock/did": "^1.18.136",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
-    "@arcblock/did-connect": "^2.10.45",
-    "@arcblock/did-util": "^1.18.135",
-    "@arcblock/jwt": "^1.18.135",
-    "@arcblock/ux": "^2.10.45",
-    "@arcblock/validator": "^1.18.135",
+    "@arcblock/did-connect": "^2.10.51",
+    "@arcblock/did-util": "^1.18.136",
+    "@arcblock/jwt": "^1.18.136",
+    "@arcblock/ux": "^2.10.51",
+    "@arcblock/validator": "^1.18.136",
     "@blocklet/js-sdk": "^1.16.32",
     "@blocklet/logger": "^1.16.32",
-    "@blocklet/payment-react": "1.15.20",
+    "@blocklet/payment-react": "1.15.21",
     "@blocklet/sdk": "^1.16.32",
-    "@blocklet/ui-react": "^2.10.45",
-    "@blocklet/uploader": "^0.1.43",
-    "@blocklet/xss": "^0.1.9",
+    "@blocklet/ui-react": "^2.10.51",
+    "@blocklet/uploader": "^0.1.46",
+    "@blocklet/xss": "^0.1.12",
     "@mui/icons-material": "^5.16.6",
     "@mui/lab": "^5.0.0-alpha.173",
     "@mui/material": "^5.16.6",
     "@mui/system": "^5.16.6",
-    "@ocap/asset": "^1.18.135",
-    "@ocap/client": "^1.18.135",
-    "@ocap/mcrypto": "^1.18.135",
-    "@ocap/util": "^1.18.135",
-    "@ocap/wallet": "^1.18.135",
+    "@ocap/asset": "^1.18.136",
+    "@ocap/client": "^1.18.136",
+    "@ocap/mcrypto": "^1.18.136",
+    "@ocap/util": "^1.18.136",
+    "@ocap/wallet": "^1.18.136",
     "@react-pdf/renderer": "^3.4.4",
     "@stripe/react-stripe-js": "^2.7.3",
     "@stripe/stripe-js": "^2.4.0",
@@ -117,8 +117,8 @@
   },
   "devDependencies": {
     "@abtnode/types": "^1.16.32",
-    "@arcblock/eslint-config-ts": "^0.3.2",
-    "@blocklet/payment-types": "1.15.20",
+    "@arcblock/eslint-config-ts": "^0.3.3",
+    "@blocklet/payment-types": "1.15.21",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -160,5 +160,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "0499ea79c00bb48d7a2479af589c21698c6388a0"
+  "gitHead": "b27debca52a2ea7f93a2a237053b8e171f8be3a2"
 }

package/src/app.tsx

@@ -27,6 +27,7 @@ const CustomerSubscriptionDetail = React.lazy(() => import('./pages/customer/sub
 const CustomerSubscriptionEmbed = React.lazy(() => import('./pages/customer/subscription/embed'));
 const CustomerSubscriptionChangePlan = React.lazy(() => import('./pages/customer/subscription/change-plan'));
 const CustomerSubscriptionChangePayment = React.lazy(() => import('./pages/customer/subscription/change-payment'));
+const CustomerRecharge = React.lazy(() => import('./pages/customer/recharge'));
 
 // const theme = createTheme({
 //   typography: {
@@ -92,6 +93,15 @@ function App() {
                     </Layout>
                   }
                 />
+                <Route
+                  key="customer-recharge"
+                  path="/customer/subscription/:id/recharge"
+                  element={
+                    <Layout>
+                      <CustomerRecharge />
+                    </Layout>
+                  }
+                />
                 <Route
                   key="customer-embed"
                   path="/customer/embed/subscription"

package/src/components/subscription/actions/cancel.tsx

@@ -1,9 +1,9 @@
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
-import { api, formatAmount, formatTime } from '@blocklet/payment-react';
+import { api, dayjs, formatAmount, formatTime } from '@blocklet/payment-react';
 import type { TSubscriptionExpanded } from '@blocklet/payment-types';
 import { Box, Divider, FormControlLabel, Radio, RadioGroup, Stack, TextField, Typography, styled } from '@mui/material';
 import { useRequest } from 'ahooks';
-import { useEffect } from 'react';
+import { useEffect, useMemo } from 'react';
 import { Controller, useFormContext, useWatch } from 'react-hook-form';
 
 const fetchData = (id: string, time: string): Promise<{ total: string; unused: string }> => {
@@ -21,13 +21,23 @@ export default function SubscriptionCancelForm({ data }: { data: TSubscriptionEx
   const cancelTime = useWatch({ control, name: 'cancel.time' });
   const refundType = useWatch({ control, name: 'cancel.refund' });
   const stakingType = useWatch({ control, name: 'cancel.staking' });
-  const {
-    loading,
-    data: refund,
-    refresh,
-  } = useRequest(() => fetchData(data.id, cancelAt === 'custom' ? cancelTime : ''));
+  const actualCancelAt = useMemo(() => {
+    if (cancelAt === 'custom') {
+      return cancelTime;
+    }
+    if (cancelAt === 'current_period_end') {
+      return new Date(data.current_period_end * 1000);
+    }
+    return '';
+  }, [cancelAt, cancelTime]);
+  const { loading, data: refund, refresh } = useRequest(() => fetchData(data.id, actualCancelAt));
 
-  const { data: staking } = useRequest(() => fetchStakingData(data.id, cancelAt === 'custom' ? cancelTime : ''));
+  const { data: staking } = useRequest(() => {
+    if (data.paymentMethod?.type === 'arcblock') {
+      return fetchStakingData(data.id, actualCancelAt);
+    }
+    return Promise.resolve({ return_amount: '0', slash_amount: '0' });
+  });
   useEffect(() => {
     if (data) {
       refresh();
@@ -71,7 +81,18 @@ export default function SubscriptionCancelForm({ data }: { data: TSubscriptionEx
           {isCustom && (
             <Controller
               name="cancel.time"
-              rules={{ required: isCustom }}
+              rules={{
+                required: isCustom,
+                validate: (value) => {
+                  const now = dayjs();
+                  const selectedTime = dayjs(value);
+                  const periodEndTime = dayjs.unix(data.current_period_end);
+                  if (selectedTime.isBefore(now) || selectedTime.isAfter(periodEndTime)) {
+                    return t('admin.subscription.cancel.at.timeError');
+                  }
+                  return true;
+                },
+              }}
               control={control}
               render={({ field }) => (
                 <TextField

package/src/components/subscription/actions/index.tsx

@@ -44,9 +44,17 @@ function SubscriptionActionsInner({ data, variant, onChange }: Props) {
       slash_amount: '0',
     },
     runAsync: fetchStakeResultAsync,
-  } = useRequest(() => fetchStakingData(data.id, ''), {
-    manual: true,
-  });
+  } = useRequest(
+    () => {
+      if (data.paymentMethod?.type === 'arcblock') {
+        return fetchStakingData(data.id, '');
+      }
+      return Promise.resolve({ return_amount: '0', slash_amount: '0', total: '0' });
+    },
+    {
+      manual: true,
+    }
+  );
 
   const stakeValue = useMemo(() => {
     return formatBNStr(stakeResult?.slash_amount, data?.paymentCurrency?.decimal);

package/src/locales/en.tsx

@@ -457,6 +457,7 @@ export default flat({
           now: 'Immediately ({date})',
           current_period_end: 'End of current period ({date})',
           custom: 'On a custom date',
+          timeError: 'Cancel time must be within the current period',
         },
         refund: {
           title: 'Refund',
@@ -616,5 +617,17 @@ export default flat({
     product: {
       empty: 'No Product',
     },
+    recharge: {
+      title: 'Recharge',
+      amount: 'Amount',
+      submit: 'Submit',
+      unsupported: 'Unsupported currency, please select another one',
+      receiveAddress: 'Receive Address',
+      view: 'View Subscription',
+      success: 'Recharge successfully',
+      custom: 'Custom',
+      estimatedDuration: '{duration} {unit} est.',
+      intervals: 'intervals',
+    },
   },
 });

package/src/locales/zh.tsx

@@ -447,6 +447,7 @@ export default flat({
           now: '立即取消({date})',
           current_period_end: '本周期结束后({date})',
           custom: '自定义取消日期',
+          timeError: '取消时间必须在当前周期内',
         },
         refund: {
           title: '退款',
@@ -604,5 +605,17 @@ export default flat({
     product: {
       empty: '没有订阅产品',
     },
+    recharge: {
+      title: '充值',
+      amount: '金额',
+      submit: '提交',
+      unsupported: '暂不支持该货币充值，请选择其他货币',
+      receiveAddress: '收款地址',
+      view: '查看订阅',
+      success: '充值成功',
+      estimatedDuration: '预计可用 {duration} {unit}',
+      custom: '自定义',
+      intervals: '个周期',
+    },
   },
 });