payment-kit 1.13.87 → 1.13.89

package/.env

@@ -0,0 +1 @@
+COMPONENT_STORE_URL="https://test.store.blocklet.dev"

package/api/src/libs/invoice.ts

@@ -1,5 +1,10 @@
 import { component } from '@blocklet/sdk';
+import type { LiteralUnion } from 'type-fest';
 
-export function getCustomerInvoicePageUrl(invoiceId: string, locale: string = 'en') {
-  return component.getUrl(`customer/invoice/${invoiceId}?locale=${locale}`);
+export function getCustomerInvoicePageUrl(
+  invoiceId: string,
+  locale: string = 'en',
+  action: LiteralUnion<'pay', string> = ''
+) {
+  return component.getUrl(`customer/invoice/${invoiceId}?locale=${locale}&action=${action}`);
 }

package/api/src/libs/notification/template/subscription-renew-failed.ts

@@ -122,7 +122,7 @@ export class SubscriptionRenewFailedEmailTemplate
     const chainHost: string | undefined =
       paymentMethod?.settings?.[checkoutSession?.nft_mint_details?.type as 'arcblock' | 'ethereum']?.api_host;
     const viewSubscriptionLink = getCustomerSubscriptionPageUrl(subscription.id, locale);
-    const viewInvoiceLink = getCustomerInvoicePageUrl(invoice.id, locale);
+    const viewInvoiceLink = getCustomerInvoicePageUrl(invoice.id, locale, 'pay');
     const txHash: string | undefined =
       paymentIntent?.payment_details?.[checkoutSession?.nft_mint_details?.type as 'arcblock' | 'ethereum']?.tx_hash;
     const viewTxHashLink: string | undefined = hasNft && txHash ? getExplorerLink(chainHost, txHash, 'tx') : undefined;

package/api/src/queues/payment.ts

@@ -61,6 +61,13 @@ export const handlePaymentSucceed = async (paymentIntent: PaymentIntent, invoice
     if (subscription) {
       if (subscription.status === 'incomplete') {
         await subscription.update({ status: subscription.trail_end ? 'trialing' : 'active' });
+
+        if (subscription.trail_end) {
+          events.emit('customer.subscription.trial_start', subscription);
+        } else {
+          events.emit('customer.subscription.started', subscription);
+        }
+
         logger.info(`Subscription ${subscription.id} updated on payment done ${invoice.id}`);
       } else if (subscription.status === 'past_due') {
         if (subscription.cancel_at_period_end && subscription.cancelation_details?.reason === 'payment_failed') {

package/api/src/routes/subscriptions.ts

@@ -458,10 +458,6 @@ router.put('/:id', auth, async (req, res) => {
       updates.proration_behavior = req.body.proration_behavior;
     }
 
-    const lastInvoice = await Invoice.findByPk(subscription.latest_invoice_id);
-    if (!lastInvoice) {
-      throw new Error('Subscription should have latest invoice');
-    }
     const paymentCurrency = await PaymentCurrency.findByPk(subscription.currency_id);
     if (!paymentCurrency) {
       throw new Error('Subscription should have payment currency');
@@ -562,6 +558,11 @@ router.put('/:id', auth, async (req, res) => {
         // handle proration
         const prorationBehavior = updates.proration_behavior || subscription.proration_behavior || 'none';
         if (prorationBehavior === 'create_prorations') {
+          const lastInvoice = await Invoice.findByPk(subscription.latest_invoice_id);
+          if (!lastInvoice) {
+            throw new Error('Subscription should have latest invoice');
+          }
+
           // 0. get last invoice, and invoice items, filter invoice items that are in licensed recurring mode
           const invoiceItems = await InvoiceItem.findAll({ where: { invoice_id: lastInvoice.id } });
           const invoiceItemsExpanded = await Price.expand(invoiceItems.map((x) => x.toJSON()));

package/api/src/store/migrate.ts

@@ -9,15 +9,16 @@ import { sequelize } from './sequelize';
 const umzug = new Umzug({
   migrations: {
     glob: ['migrations/*.{ts,js}', { cwd: __dirname }],
-    resolve: ({ name, path, context }) => {
-      // eslint-disable-next-line import/no-dynamic-require, global-require
-      const migration = require(path!);
-      return {
-        name: name.replace(/\.ts$/, '.js'),
-        up: () => migration.up({ context }),
-        down: () => migration.down({ context }),
-      };
-    },
+    // @FIXME: @wangshijun  jianchao这边的注释了才能 blocklet dev 成功
+    // resolve: ({ name, path, context }) => {
+    //   // eslint-disable-next-line import/no-dynamic-require, global-require
+    //   const migration = require(path!);
+    //   return {
+    //     name: name.replace(/\.ts$/, '.js'),
+    //     up: () => migration.up({ context }),
+    //     down: () => migration.down({ context }),
+    //   };
+    // },
   },
   context: sequelize.getQueryInterface(),
   storage: new SequelizeStorage({ sequelize }),

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

@@ -296,9 +296,7 @@ export class Subscription extends Model<InferAttributes<Subscription>, InferCrea
             if (model.trail_start) {
               const previousLatestInvoiceId = model.previous('latest_invoice_id');
 
-              if (!previousLatestInvoiceId && model.latest_invoice_id) {
-                createEvent('Subscription', 'customer.subscription.trial_start', model, options).catch(console.error);
-              } else if (
+              if (
                 previousLatestInvoiceId &&
                 model.latest_invoice_id &&
                 previousLatestInvoiceId !== model.latest_invoice_id
@@ -313,8 +311,6 @@ export class Subscription extends Model<InferAttributes<Subscription>, InferCrea
                   createEvent('Subscription', 'customer.subscription.trial_end', model, options).catch(console.error);
                 }
               }
-            } else if (!model.previous('latest_invoice_id') && model.latest_invoice_id) {
-              createEvent('Subscription', 'customer.subscription.started', model, options).catch(console.error);
             }
 
             createStatusEvent(

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.87",
+  "version": "1.13.89",
   "scripts": {
     "dev": "COMPONENT_STORE_URL=https://test.store.blocklet.dev blocklet dev",
     "eject": "vite eject",
@@ -42,27 +42,27 @@
     ]
   },
   "dependencies": {
-    "@abtnode/cron": "1.16.21-beta-e828f413",
-    "@arcblock/did": "^1.18.106",
+    "@abtnode/cron": "1.16.21",
+    "@arcblock/did": "^1.18.108",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
-    "@arcblock/did-connect": "^2.8.23",
-    "@arcblock/did-util": "^1.18.106",
-    "@arcblock/jwt": "^1.18.106",
-    "@arcblock/ux": "^2.8.23",
-    "@blocklet/logger": "1.16.21-beta-e828f413",
-    "@blocklet/sdk": "1.16.21-beta-e828f413",
-    "@blocklet/ui-react": "^2.8.23",
-    "@blocklet/uploader": "^0.0.56",
+    "@arcblock/did-connect": "^2.9.6",
+    "@arcblock/did-util": "^1.18.108",
+    "@arcblock/jwt": "^1.18.108",
+    "@arcblock/ux": "^2.9.6",
+    "@blocklet/logger": "1.16.21",
+    "@blocklet/sdk": "1.16.21",
+    "@blocklet/ui-react": "^2.9.6",
+    "@blocklet/uploader": "^0.0.62",
     "@mui/icons-material": "^5.14.19",
     "@mui/lab": "^5.0.0-alpha.155",
     "@mui/material": "^5.14.20",
     "@mui/styles": "^5.14.20",
     "@mui/system": "^5.14.20",
-    "@ocap/asset": "^1.18.106",
-    "@ocap/client": "^1.18.106",
-    "@ocap/mcrypto": "^1.18.106",
-    "@ocap/util": "^1.18.106",
-    "@ocap/wallet": "^1.18.106",
+    "@ocap/asset": "^1.18.108",
+    "@ocap/client": "^1.18.108",
+    "@ocap/mcrypto": "^1.18.108",
+    "@ocap/util": "^1.18.108",
+    "@ocap/wallet": "^1.18.108",
     "@stripe/react-stripe-js": "^2.4.0",
     "@stripe/stripe-js": "^2.2.0",
     "ahooks": "^3.7.8",
@@ -107,10 +107,10 @@
     "validator": "^13.11.0"
   },
   "devDependencies": {
-    "@abtnode/types": "1.16.21-beta-e828f413",
+    "@abtnode/types": "1.16.21",
     "@arcblock/eslint-config": "^0.2.4",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@did-pay/types": "1.13.87",
+    "@did-pay/types": "1.13.89",
     "@types/cookie-parser": "^1.4.6",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
@@ -134,7 +134,7 @@
     "type-fest": "^4.8.3",
     "typescript": "^4.9.5",
     "vite": "^4.5.1",
-    "vite-plugin-blocklet": "^0.6.16",
+    "vite-plugin-blocklet": "^0.7.2",
     "vite-plugin-node-polyfills": "^0.7.0",
     "vite-plugin-svgr": "^2.4.0",
     "zx": "^7.2.3"
@@ -149,5 +149,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "e56e774ed27b74caa9b6ecdc8e02d7e0cc8d7fce"
+  "gitHead": "309312b8ffce48cd121af0a5b75494a1ae5dada0"
 }