payment-kit 1.13.86 → 1.13.88

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/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.86
+version: 1.13.88
 logo: logo.png
 files:
   - dist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.86",
+  "version": "1.13.88",
   "scripts": {
     "dev": "COMPONENT_STORE_URL=https://test.store.blocklet.dev blocklet dev",
     "eject": "vite eject",
@@ -110,7 +110,7 @@
     "@abtnode/types": "1.16.21-beta-e828f413",
     "@arcblock/eslint-config": "^0.2.4",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@did-pay/types": "1.13.86",
+    "@did-pay/types": "1.13.88",
     "@types/cookie-parser": "^1.4.6",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
@@ -149,5 +149,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "b4d9216898b45bed485ee7dc6451a8357bdd3fa2"
+  "gitHead": "1c1c92c77043c0c77f0cda969a299b31d06f70e5"
 }