payment-kit 1.20.14 → 1.20.16

package/api/src/store/models/checkout-session.ts

@@ -623,6 +623,29 @@ export class CheckoutSession extends Model<InferAttributes<CheckoutSession>, Inf
       return null;
     }
   }
+
+  public static async findByInvoiceId(invoiceId: string): Promise<CheckoutSession | null> {
+    try {
+      const invoice = await Invoice.findByPk(invoiceId);
+      if (!invoice) {
+        return null;
+      }
+
+      if (invoice.checkout_session_id) {
+        return await CheckoutSession.findByPk(invoice.checkout_session_id);
+      }
+
+      if (!invoice.subscription_id) {
+        return null;
+      }
+
+      // Find original CheckoutSession through subscription
+      const checkoutSession = await CheckoutSession.findBySubscriptionId(invoice.subscription_id);
+      return checkoutSession;
+    } catch (error: any) {
+      return null;
+    }
+  }
 }
 
 export type TCheckoutSession = InferAttributes<CheckoutSession>;

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

@@ -18,6 +18,7 @@ export class Discount extends Model<InferAttributes<Discount>, InferCreationAttr
   declare checkout_session_id?: string;
   declare invoice_id?: string;
   declare invoice_item_id?: string;
+  declare confirmed?: boolean;
 
   declare start: number;
   declare end: number | null;
@@ -101,13 +102,23 @@ export class Discount extends Model<InferAttributes<Discount>, InferCreationAttr
   };
 
   public static initialize(sequelize: any) {
-    this.init(Discount.GENESIS_ATTRIBUTES, {
-      sequelize,
-      modelName: 'Discount',
-      tableName: 'discounts',
-      createdAt: 'created_at',
-      updatedAt: 'updated_at',
-    });
+    this.init(
+      {
+        ...Discount.GENESIS_ATTRIBUTES,
+        confirmed: {
+          type: DataTypes.BOOLEAN,
+          defaultValue: true,
+          allowNull: false,
+        },
+      },
+      {
+        sequelize,
+        modelName: 'Discount',
+        tableName: 'discounts',
+        createdAt: 'created_at',
+        updatedAt: 'updated_at',
+      }
+    );
   }
 
   public static associate(models: any) {

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

@@ -1,7 +1,7 @@
 import { CheckoutSession, TCheckoutSession } from './checkout-session';
 import { Coupon, TCoupon } from './coupon';
 import { Customer, TCustomer } from './customer';
-import { Discount } from './discount';
+import { Discount, TDiscount } from './discount';
 import { Event, TEvent } from './event';
 import { Invoice, TInvoice } from './invoice';
 import { InvoiceItem, TInvoiceItem } from './invoice-item';
@@ -326,9 +326,16 @@ export type TCouponExpanded = TCoupon & {
   object: 'coupon';
   applied_products?: TProduct[];
   promotion_codes?: TPromotionCode[];
+  currency?: TPaymentCurrency;
 };
 
 export type TPromotionCodeExpanded = TPromotionCode & {
   object: 'promotion_code';
   coupon?: TCoupon;
 };
+
+export type TDiscountExpanded = TDiscount & {
+  object: 'discount';
+  coupon?: TCouponExpanded;
+  promotionCode?: TPromotionCodeExpanded;
+};

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.20.14
+version: 1.20.16
 logo: logo.png
 files:
   - dist
@@ -73,6 +73,12 @@ environments:
     default: ''
     secure: true
     shared: false
+  - name: SHORT_URL_DOMAIN
+    description: Short URL service domain
+    required: false
+    default: s.abtnet.io
+    secure: false
+    shared: false
 capabilities:
   navigation: true
   clusterMode: false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.20.14",
+  "version": "1.20.16",
   "scripts": {
     "dev": "blocklet dev --open",
     "lint": "tsc --noEmit && eslint src api/src --ext .mjs,.js,.jsx,.ts,.tsx",
@@ -45,32 +45,32 @@
   },
   "dependencies": {
     "@abtnode/cron": "^1.16.52-beta-20250912-112002-e3499e9c",
-    "@arcblock/did": "^1.25.1",
+    "@arcblock/did": "^1.25.3",
     "@arcblock/did-connect-react": "^3.1.41",
     "@arcblock/did-connect-storage-nedb": "^1.8.0",
-    "@arcblock/did-util": "^1.25.1",
-    "@arcblock/jwt": "^1.25.1",
+    "@arcblock/did-util": "^1.25.3",
+    "@arcblock/jwt": "^1.25.3",
     "@arcblock/ux": "^3.1.41",
-    "@arcblock/validator": "^1.25.1",
-    "@blocklet/did-space-js": "^1.1.24",
+    "@arcblock/validator": "^1.25.3",
+    "@blocklet/did-space-js": "^1.1.26",
     "@blocklet/error": "^0.2.5",
     "@blocklet/js-sdk": "^1.16.52-beta-20250912-112002-e3499e9c",
     "@blocklet/logger": "^1.16.52-beta-20250912-112002-e3499e9c",
-    "@blocklet/payment-react": "1.20.14",
-    "@blocklet/payment-vendor": "1.20.14",
+    "@blocklet/payment-react": "1.20.16",
+    "@blocklet/payment-vendor": "1.20.16",
     "@blocklet/sdk": "^1.16.52-beta-20250912-112002-e3499e9c",
     "@blocklet/ui-react": "^3.1.41",
-    "@blocklet/uploader": "^0.2.11",
+    "@blocklet/uploader": "^0.2.12",
     "@blocklet/xss": "^0.2.7",
     "@mui/icons-material": "^7.1.2",
     "@mui/lab": "7.0.0-beta.14",
     "@mui/material": "^7.1.2",
     "@mui/system": "^7.1.1",
-    "@ocap/asset": "^1.25.1",
-    "@ocap/client": "^1.25.1",
-    "@ocap/mcrypto": "^1.25.1",
-    "@ocap/util": "^1.25.1",
-    "@ocap/wallet": "^1.25.1",
+    "@ocap/asset": "^1.25.3",
+    "@ocap/client": "^1.25.3",
+    "@ocap/mcrypto": "^1.25.3",
+    "@ocap/util": "^1.25.3",
+    "@ocap/wallet": "^1.25.3",
     "@stripe/react-stripe-js": "^2.9.0",
     "@stripe/stripe-js": "^2.4.0",
     "ahooks": "^3.8.5",
@@ -126,7 +126,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.16.52-beta-20250912-112002-e3499e9c",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.20.14",
+    "@blocklet/payment-types": "1.20.16",
     "@types/cookie-parser": "^1.4.9",
     "@types/cors": "^2.8.19",
     "@types/debug": "^4.1.12",
@@ -157,7 +157,7 @@
     "vite": "^7.0.0",
     "vite-node": "^3.2.4",
     "vite-plugin-babel-import": "^2.0.5",
-    "vite-plugin-blocklet": "^0.11.0",
+    "vite-plugin-blocklet": "^0.11.1",
     "vite-plugin-node-polyfills": "^0.23.0",
     "vite-plugin-svgr": "^4.3.0",
     "vite-tsconfig-paths": "^5.1.4",
@@ -173,5 +173,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "365b60721b7f3a372c472f774cda290d56dad365"
+  "gitHead": "ebf0677dd4414d4abc4129d6663a7e9ddb415281"
 }