payment-kit 1.13.142 → 1.13.144

package/api/src/integrations/stripe/handlers/invoice.ts

@@ -133,6 +133,9 @@ export async function ensureStripeInvoice(stripeInvoice: any, subscription: Subs
       stripe_id: stripeInvoice.id,
     },
   });
+  if (checkoutSession) {
+    await checkoutSession.update({ invoice_id: invoice.id });
+  }
   await client.invoices.update(stripeInvoice.id, { metadata: { appPid: env.appPid, id: invoice.id } });
   logger.info('stripe invoice mirrored', { local: invoice.id, remote: stripeInvoice.id });
 

package/api/src/libs/api.ts

@@ -76,11 +76,16 @@ export const getWhereFromKvQuery = (query: string) => {
   const likes: any = [];
   query.split(' ').forEach((kv: string) => {
     const [k, v] = kv.split(':');
+
     if (v) {
       let value = decodeURIComponent(v).replace('+', ' ');
       if ((k as any).indexOf('like') > -1) {
-        // like
-        value = { [k?.slice(5) as any]: { [Op.like]: `%${v}%` } } as any;
+        let kk = k?.slice(5);
+        if (kk === 'did' || kk === 'name' || kk === 'email') {
+          kk = `$customer.${kk}$`;
+        }
+        value = { [kk as any]: { [Op.like]: `%${v}%` } } as any;
+
         likes.push(value);
       } else {
         out[k as string] = value;

package/api/src/queues/checkout-session.ts

@@ -106,6 +106,17 @@ export async function startCheckoutSessionQueue() {
         checkoutSession: checkoutSession.id,
         invoice: checkoutSession.invoice_id,
       });
+    } else {
+      // Do some reverse lookup if invoice is not related to checkout session
+      const invoice = await Invoice.findOne({ where: { checkout_session_id: checkoutSession.id } });
+      if (invoice) {
+        await InvoiceItem.destroy({ where: { invoice_id: invoice.id } });
+        await Invoice.destroy({ where: { id: invoice.id } });
+        logger.info('Invoice and InvoiceItem for checkout session deleted on expire', {
+          checkoutSession: checkoutSession.id,
+          invoice: invoice.id,
+        });
+      }
     }
     if (checkoutSession.setup_intent_id) {
       await SetupIntent.destroy({ where: { id: checkoutSession.setup_intent_id } });

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

@@ -196,12 +196,23 @@ describe('getWhereFromKvQuery', () => {
   });
 
   it('should return a likes object when the q string with like', () => {
-    const q = 'like-status:succ like-email:1533';
+    const q = 'like-status:succ like-number:1533';
     const result = getWhereFromKvQuery(q);
     expect(result).toEqual({
       [Op.or]: [
         { status: { [Op.like]: `%succ%` } },
-        { email: { [Op.like]: `%1533%` } }
+        { number: { [Op.like]: `%1533%` } }
+      ],
+    });
+  });
+
+  it('should return a customer likes object when the q string with like', () => {
+    const q = 'like-did:123 like-number:1533';
+    const result = getWhereFromKvQuery(q);
+    expect(result).toEqual({
+      [Op.or]: [
+        { '$customer.did$': { [Op.like]: `%123%` } },
+        { number: { [Op.like]: `%1533%` } }
       ],
     });
   });

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.142",
+  "version": "1.13.144",
   "scripts": {
     "dev": "cross-env COMPONENT_STORE_URL=https://test.store.blocklet.dev blocklet dev --open",
     "eject": "vite eject",
@@ -50,7 +50,7 @@
     "@arcblock/jwt": "^1.18.110",
     "@arcblock/ux": "^2.9.29",
     "@blocklet/logger": "1.16.23",
-    "@blocklet/payment-react": "1.13.142",
+    "@blocklet/payment-react": "1.13.144",
     "@blocklet/sdk": "1.16.23",
     "@blocklet/ui-react": "^2.9.29",
     "@blocklet/uploader": "^0.0.73",
@@ -110,7 +110,7 @@
   "devDependencies": {
     "@abtnode/types": "1.16.23",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@blocklet/payment-types": "1.13.142",
+    "@blocklet/payment-types": "1.13.144",
     "@types/cookie-parser": "^1.4.6",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
@@ -149,5 +149,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "99dfea2fee995b1a5a086675119585a8f23eed0a"
+  "gitHead": "ffef3d0804ed91778330d90394718922388d3403"
 }

package/src/components/invoice/list.tsx

@@ -9,6 +9,7 @@ import { useRequest } from 'ahooks';
 import { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 
+import { debounce } from '../../libs/util';
 import CustomerLink from '../customer/link';
 import Table from '../table';
 import InvoiceActions from './action';
@@ -96,7 +97,9 @@ export default function InvoiceList({ customer_id, subscription_id, features, st
 
   const { loading, error, data, refresh } = useRequest(() => fetchData(search));
   useEffect(() => {
-    refresh();
+    debounce(() => {
+      refresh();
+    }, 1000)();
   }, [search, refresh]);
 
   if (error) {
@@ -256,9 +259,9 @@ export default function InvoiceList({ customer_id, subscription_id, features, st
           if (text) {
             setSearch({
               q: {
-                'like-status': text,
-                'like-customer_email': text,
-                'like-description': text,
+                'like-did': text,
+                'like-name': text,
+                'like-number': text,
               },
               pageSize: 100,
               page: 1,

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

@@ -8,6 +8,7 @@ import { fromUnitToToken } from '@ocap/util';
 import { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 
+import { debounce } from '../../libs/util';
 import CustomerLink from '../customer/link';
 import Table from '../table';
 import PaymentIntentActions from './actions';
@@ -85,9 +86,11 @@ export default function PaymentList({ customer_id, invoice_id, features }: ListP
   const [data, setData] = useState({}) as any;
 
   useEffect(() => {
-    fetchData(search).then((res: any) => {
-      setData(res);
-    });
+    debounce(() => {
+      fetchData(search).then((res: any) => {
+        setData(res);
+      });
+    }, 1000)();
   }, [search]);
 
   if (!data) {
@@ -216,9 +219,8 @@ export default function PaymentList({ customer_id, invoice_id, features }: ListP
           if (text) {
             setSearch({
               q: {
-                'like-status': text,
-                'like-receipt_email': text,
-                'like-description': text,
+                'like-did': text,
+                'like-name': text,
               },
               pageSize: 100,
               page: 1,

package/src/components/subscription/list.tsx

@@ -8,6 +8,7 @@ import { useRequest } from 'ahooks';
 import { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 
+import { debounce } from '../../libs/util';
 import CustomerLink from '../customer/link';
 import Table from '../table';
 import SubscriptionActions from './actions';
@@ -80,7 +81,9 @@ export default function SubscriptionList({ customer_id, features, status }: List
 
   const { loading, error, data, refresh } = useRequest(() => fetchData(search));
   useEffect(() => {
-    refresh();
+    debounce(() => {
+      refresh();
+    }, 1000)();
   }, [search, refresh]);
 
   if (error) {
@@ -216,9 +219,10 @@ export default function SubscriptionList({ customer_id, features, status }: List
           if (text) {
             setSearch({
               q: {
-                'like-status': text,
-                // 'like-receipt_email': text,
-                'like-description': text,
+                'like-metadata': text,
+                'like-did': text,
+                'like-name': text,
+                // 'like-product-name': text, // 这个还没实现
               },
               pageSize: 100,
               page: 1,

package/src/libs/util.ts

@@ -191,3 +191,15 @@ export function getSupportedPaymentCurrencies(items: TLineItemExpanded[]) {
   }, []);
   return Array.from(new Set(currencies));
 }
+
+export const debounce = (fun: Function, wait: number) => {
+  let timeout: any = null;
+  return function () {
+    if (timeout) {
+      clearTimeout(timeout);
+    }
+    timeout = setTimeout(() => {
+      fun();
+    }, wait);
+  };
+};

package/src/pages/admin/customers/customers/index.tsx

@@ -10,6 +10,7 @@ import { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 
 import Table from '../../../../components/table';
+import { debounce } from '../../../../libs/util';
 
 const fetchData = (params: Record<string, any> = {}): Promise<{ list: TCustomer[]; count: number }> => {
   const search = new URLSearchParams();
@@ -41,7 +42,9 @@ export default function CustomersList() {
 
   const { loading, error, data, refresh } = useRequest(() => fetchData(search));
   useEffect(() => {
-    refresh();
+    debounce(() => {
+      refresh();
+    }, 1000)();
   }, [search, refresh]);
 
   if (error) {
@@ -119,12 +122,14 @@ export default function CustomersList() {
           const item = data.list[dataIndex] as TCustomer;
           navigate(`/admin/customers/${item.id}`);
         },
+
         onSearchChange: (text: string) => {
           if (text) {
             setSearch({
               q: {
                 'like-name': text,
                 'like-email': text,
+                'like-did': text,
               },
               pageSize: 100,
               page: 1,