payment-kit 1.18.29 → 1.18.31

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

@@ -5,7 +5,6 @@ import {
   getDueUnit,
   getMaxRetryCount,
   getMinRetryMail,
-  getSubscriptionCreateSetup,
   getSubscriptionStakeSetup,
   getSubscriptionTrialSetup,
   shouldCancelSubscription,
@@ -114,115 +113,6 @@ describe('getMinRetryMail', () => {
   });
 });
 
-describe('getSubscriptionCreateSetup', () => {
-  const currencies = [
-    {
-      currency_id: 'usd',
-      unit_amount: '1',
-    },
-  ];
-
-  it('should calculate setup for recurring licensed price type', () => {
-    const items = [
-      {
-        price: { type: 'one_time', currency_options: currencies },
-        quantity: 1,
-      },
-      {
-        price: {
-          type: 'recurring',
-          currency_options: currencies,
-          recurring: { interval: 'day', interval_count: '1', usage_type: 'licensed' },
-        },
-        quantity: 2,
-      },
-    ];
-    const result = getSubscriptionCreateSetup(items as any, 'usd');
-    expect(result.amount.setup).toBe('3');
-  });
-
-  it('should not calculate setup for recurring metered price type', () => {
-    const items = [
-      {
-        price: { type: 'one_time', currency_options: currencies },
-        quantity: 1,
-      },
-      {
-        price: {
-          type: 'recurring',
-          currency_options: currencies,
-          recurring: { interval: 'day', interval_count: '1', usage_type: 'metered' },
-        },
-        quantity: 2,
-      },
-    ];
-    const result = getSubscriptionCreateSetup(items as any, 'usd');
-    expect(result.amount.setup).toBe('1');
-  });
-
-  it('should calculate cycle duration for recurring price type', () => {
-    const items = [
-      {
-        price: { type: 'recurring', currency_options: currencies, recurring: { interval: 'day', interval_count: '1' } },
-        quantity: 2,
-      },
-    ];
-    const result = getSubscriptionCreateSetup(items as any, 'usd');
-    expect(result.cycle.duration).toBe(24 * 60 * 60 * 1000);
-  });
-
-  it('should calculate trial period when only trialInDays is provided', () => {
-    const items = [
-      {
-        price: { type: 'recurring', currency_options: currencies, recurring: { interval: 'day', interval_count: '1' } },
-        quantity: 2,
-      },
-    ];
-    const result = getSubscriptionCreateSetup(items as any, 'usd', 7);
-    const now = dayjs().unix();
-    expect(result.trial.start).toBe(now);
-    expect(result.trial.end).toBe(
-      dayjs()
-        .add(7 * 24 * 60 * 60 * 1000, 'millisecond')
-        .unix()
-    );
-  });
-
-  it('should trialEnd overwrite trialInDays', () => {
-    const items = [
-      {
-        price: { type: 'recurring', currency_options: currencies, recurring: { interval: 'day', interval_count: '1' } },
-        quantity: 2,
-      },
-    ];
-    const result = getSubscriptionCreateSetup(items as any, 'usd', 1, dayjs().add(7, 'day').unix());
-    const now = dayjs().unix();
-    expect(result.trial.start).toBe(now);
-    expect(result.trial.end).toBe(
-      dayjs()
-        .add(7 * 24 * 60 * 60 * 1000, 'millisecond')
-        .unix()
-    );
-  });
-
-  it('should calculate trial period when only trialEnd is provided', () => {
-    const items = [
-      {
-        price: { type: 'recurring', currency_options: currencies, recurring: { interval: 'day', interval_count: '1' } },
-        quantity: 2,
-      },
-    ];
-    const result = getSubscriptionCreateSetup(items as any, 'usd', 0, dayjs().add(7, 'day').unix());
-    const now = dayjs().unix();
-    expect(result.trial.start).toBe(now);
-    expect(result.trial.end).toBe(
-      dayjs()
-        .add(7 * 24 * 60 * 60 * 1000, 'millisecond')
-        .unix()
-    );
-  });
-});
-
 describe('getDaysUntilCancel', () => {
   it('should return the number of days from the query when days_until_cancel is present', () => {
     const query = { days_until_cancel: '5' };

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.18.29
+version: 1.18.31
 logo: logo.png
 files:
   - dist
@@ -167,3 +167,5 @@ events:
     description: Invoice has been fully paid and settled
   - type: refund.succeeded
     description: Refund has been successfully processed and completed
+  - type: manual.notification
+    description: Application will send notification to user manually

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.18.29",
+  "version": "1.18.31",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -19,7 +19,8 @@
     "types": "rm -rf types && tsc -p tsconfig.types.json && rm -f ../../packages/types/lib/*.d.ts && cp -f types/store/models/*.d.ts ../../packages/types/lib",
     "deploy": "pnpm run bundle && blocklet deploy .blocklet/bundle",
     "upload": "pnpm run bundle && blocklet upload .blocklet/release/blocklet.json",
-    "bump-version": "zx --quiet scripts/bump-version.mjs"
+    "bump-version": "zx --quiet scripts/bump-version.mjs",
+    "sdk-test": "node scripts/sdk.js"
   },
   "lint-staged": {
     "*.{mjs,js,jsx,ts,tsx}": [
@@ -43,30 +44,30 @@
     ]
   },
   "dependencies": {
-    "@abtnode/cron": "^1.16.41",
-    "@arcblock/did": "^1.19.19",
+    "@abtnode/cron": "^1.16.42",
+    "@arcblock/did": "^1.20.1",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
-    "@arcblock/did-connect": "^2.12.70",
-    "@arcblock/did-util": "^1.19.19",
-    "@arcblock/jwt": "^1.19.19",
-    "@arcblock/ux": "^2.12.70",
-    "@arcblock/validator": "^1.19.19",
-    "@blocklet/js-sdk": "^1.16.41",
-    "@blocklet/logger": "^1.16.41",
-    "@blocklet/payment-react": "1.18.29",
-    "@blocklet/sdk": "^1.16.41",
-    "@blocklet/ui-react": "^2.12.70",
-    "@blocklet/uploader": "^0.1.82",
-    "@blocklet/xss": "^0.1.31",
+    "@arcblock/did-connect": "^2.13.5",
+    "@arcblock/did-util": "^1.20.1",
+    "@arcblock/jwt": "^1.20.1",
+    "@arcblock/ux": "^2.13.5",
+    "@arcblock/validator": "^1.20.1",
+    "@blocklet/js-sdk": "^1.16.42",
+    "@blocklet/logger": "^1.16.42",
+    "@blocklet/payment-react": "1.18.31",
+    "@blocklet/sdk": "^1.16.42",
+    "@blocklet/ui-react": "^2.13.5",
+    "@blocklet/uploader": "^0.1.83",
+    "@blocklet/xss": "^0.1.32",
     "@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.19.19",
-    "@ocap/client": "^1.19.19",
-    "@ocap/mcrypto": "^1.19.19",
-    "@ocap/util": "^1.19.19",
-    "@ocap/wallet": "^1.19.19",
+    "@ocap/asset": "^1.20.1",
+    "@ocap/client": "^1.20.1",
+    "@ocap/mcrypto": "^1.20.1",
+    "@ocap/util": "^1.20.1",
+    "@ocap/wallet": "^1.20.1",
     "@stripe/react-stripe-js": "^2.7.3",
     "@stripe/stripe-js": "^2.4.0",
     "ahooks": "^3.8.0",
@@ -119,9 +120,9 @@
     "web3": "^4.16.0"
   },
   "devDependencies": {
-    "@abtnode/types": "^1.16.41",
+    "@abtnode/types": "^1.16.42",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.18.29",
+    "@blocklet/payment-types": "1.18.31",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -167,5 +168,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "bb8d03a1da62822cbc2ae57d7c5f2912aaebc0da"
+  "gitHead": "c9b1eff248ecd07bc1f606df039464dafa786914"
 }