payment-kit 1.14.1 → 1.14.3

package/api/src/libs/refund.ts

@@ -1,5 +1,5 @@
 import { BN } from '@ocap/util';
-import type { WhereOptions } from 'sequelize';
+import { Op, type WhereOptions } from 'sequelize';
 import { PaymentIntent, Refund } from '../store/models';
 
 export async function getRefundAmountSetup({
@@ -20,7 +20,9 @@ export async function getRefundAmountSetup({
     throw new Error('PaymentIntent not found');
   }
   const where: WhereOptions<Refund> = {
-    status: ['succeeded'],
+    status: {
+      [Op.not]: 'canceled',
+    },
     payment_intent_id: paymentIntentId,
   };
   if (currencyId) {

package/api/src/libs/subscription.ts

@@ -6,6 +6,7 @@ import pick from 'lodash/pick';
 import type { LiteralUnion } from 'type-fest';
 import { withQuery } from 'ufo';
 
+import { Op } from 'sequelize';
 import {
   Customer,
   Invoice,
@@ -642,7 +643,13 @@ export async function getRemainingStakes(subscriptionIds: string[], subscription
   await Promise.all(
     subscriptionIds.map(async (subscriptionId) => {
       const refund = await Refund.findOne({
-        where: { subscription_id: subscriptionId, status: 'succeeded', type: 'stake_return' },
+        where: {
+          subscription_id: subscriptionId,
+          status: {
+            [Op.not]: 'canceled',
+          },
+          type: 'stake_return',
+        },
       });
       if (!refund) {
         // this subscription not return stake

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.14.1",
+  "version": "1.14.3",
   "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.14.1",
+    "@blocklet/payment-react": "1.14.3",
     "@blocklet/sdk": "1.16.28",
     "@blocklet/ui-react": "^2.10.3",
     "@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.1",
+    "@blocklet/payment-types": "1.14.3",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -160,5 +160,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "cd7d7d1c330860cb03de37a6006f1985d8dcea58"
+  "gitHead": "23e4827487dc9e180191948a58074abfb47dee1d"
 }

package/src/pages/admin/overview.tsx

@@ -80,13 +80,12 @@ export const groupData = (data: TPaymentStat[], currencies: { [key: string]: any
 export default function Overview() {
   const { t, locale } = useLocaleContext();
   const { settings } = usePaymentContext();
-  const maxDate = dayjs().toDate();
+  const maxDate = dayjs().endOf('day').toDate();
   const [state, setState] = useSetState({
     anchorEl: null,
-    startDate: dayjs().subtract(30, 'day').toDate(),
+    startDate: dayjs().subtract(30, 'day').startOf('day').toDate(),
     endDate: maxDate,
   });
-
   const trend = useRequest<TPaymentStat[], any>(async () => {
     const result = await api.get('/api/payment-stats', {
       params: {
@@ -122,7 +121,7 @@ export default function Overview() {
   const onRangeChange = (range: any) => {
     setState({
       startDate: range.startDate,
-      endDate: range.endDate,
+      endDate: dayjs(range.endDate).endOf('day').toDate(),
       anchorEl: null,
     });
   };