payment-kit 1.20.15 → 1.20.16

package/api/src/libs/discount/coupon.ts

@@ -1,10 +1,19 @@
-import { BN } from '@ocap/util';
+import { BN, fromUnitToToken } from '@ocap/util';
 
 import pick from 'lodash/pick';
-import { Coupon, Customer, Discount, PromotionCode, Subscription } from '../../store/models';
-import type { CheckoutSession, TLineItemExpanded } from '../../store/models';
+import {
+  Coupon,
+  Customer,
+  Discount,
+  PromotionCode,
+  Subscription,
+  CheckoutSession,
+  PaymentCurrency,
+} from '../../store/models';
+import type { TLineItemExpanded } from '../../store/models';
 import logger from '../logger';
 import { emitAsync } from '../event';
+import { formatNumber } from '../util';
 
 export function validCoupon(coupon: Coupon, lineItems?: TLineItemExpanded[]) {
   if (!coupon.valid) {
@@ -75,13 +84,20 @@ export async function validPromotionCode(
         ? promotionCode.restrictions?.minimum_amount
         : promotionCode.restrictions?.currency_options?.[currencyId]?.minimum_amount;
 
+    const currency = await PaymentCurrency.findByPk(currencyId);
     if (minimumAmount) {
       const amountBN = new BN(amount);
       const minimumBN = new BN(minimumAmount);
       if (amountBN.lt(minimumBN)) {
+        if (!currency) {
+          return {
+            valid: false,
+            reason: 'This promotion requires a minimum purchase amount. Please add more items to your cart.',
+          };
+        }
         return {
           valid: false,
-          reason: 'This promotion requires a minimum purchase amount. Please add more items to your cart.',
+          reason: `This promotion requires a minimum purchase amount of ${formatNumber(fromUnitToToken(minimumBN, currency?.decimal || 2))} ${currency?.symbol}. Please add more items to your cart.`,
         };
       }
     }
@@ -296,7 +312,7 @@ async function processSubscriptionDiscount({
   baseDiscountData: any;
   existingDiscountMap: Map<string, any>;
   checkoutSessionId: string;
-}): Promise<{ discountRecord: any; shouldUpdateUsage: boolean }> {
+}): Promise<{ discountRecord: Discount; shouldUpdateUsage: boolean }> {
   try {
     const existingDiscount = existingDiscountMap.get(subscriptionId);
 
@@ -342,6 +358,7 @@ async function processSubscriptionDiscount({
     const newDiscount = await Discount.create({
       ...baseDiscountData,
       subscription_id: subscriptionId,
+      confirmed: false,
       metadata: {
         ...baseDiscountData.metadata,
         subscription_id: subscriptionId,
@@ -375,7 +392,7 @@ async function processNonSubscriptionDiscount(
   baseDiscountData: any,
   existingDiscountMap: Map<string, any>,
   checkoutSessionId: string
-): Promise<{ discountRecord: any; shouldUpdateUsage: boolean }> {
+): Promise<{ discountRecord: Discount; shouldUpdateUsage: boolean }> {
   try {
     const existingDiscount = existingDiscountMap.get('no_subscription');
 
@@ -412,7 +429,10 @@ async function processNonSubscriptionDiscount(
     }
 
     // Create new discount record
-    const newDiscount = await Discount.create(baseDiscountData);
+    const newDiscount = await Discount.create({
+      ...baseDiscountData,
+      confirmed: false,
+    });
 
     // Lock coupon and promotion code when discount is created
     await lockDiscountResources(baseDiscountData.coupon_id, baseDiscountData.promotion_code_id);
@@ -710,6 +730,13 @@ export async function createDiscountRecordsForCheckout({
               updatedPromotionCodes,
               checkoutSessionId: checkoutSession.id,
             });
+            await Promise.all(
+              discountRecords.map(async (discountRecord) => {
+                await discountRecord.update({
+                  confirmed: true,
+                });
+              })
+            );
           } catch (error) {
             logger.error('Failed to update usage counts, but continuing', {
               couponId: coupon.id,

package/api/src/libs/discount/discount.ts

@@ -1,8 +1,9 @@
 import { BN } from '@ocap/util';
-import { Coupon, Discount, PaymentCurrency, PromotionCode } from '../../store/models';
+import { Coupon, Discount, PaymentCurrency, PromotionCode, CheckoutSession } from '../../store/models';
 import type { TLineItemExpanded } from '../../store/models';
 import { getPriceUintAmountByCurrency } from '../price';
 import { validCoupon, checkPromotionCodeEligibility, calculateDiscountAmount } from './coupon';
+import { emitAsync } from '../event';
 import logger from '../logger';
 
 const getItemsTotalAmount = (lineItems: TLineItemExpanded[], currencyId: string, options?: { trialing?: boolean }) => {
@@ -347,3 +348,84 @@ export async function applySubscriptionDiscount({
 
   return result;
 }
+
+async function rollbackUsageForResource<T extends Coupon | PromotionCode>(
+  resource: T,
+  resourceType: 'coupon' | 'promotion-code'
+): Promise<void> {
+  const currentUsage = resource.times_redeemed || 0;
+  if (currentUsage <= 0) return;
+
+  if (resourceType === 'coupon') {
+    await (resource as Coupon).update({
+      times_redeemed: currentUsage - 1,
+      valid: true,
+    });
+  } else {
+    await (resource as PromotionCode).update({
+      times_redeemed: currentUsage - 1,
+      active: true,
+    });
+  }
+
+  logger.info('Updated usage for resource', {
+    resourceId: resource.id,
+    resourceType,
+    currentUsage: currentUsage - 1,
+  });
+
+  emitAsync('discount-status.queued', resource, resourceType, true);
+}
+
+export async function rollbackDiscountUsageForCheckoutSession(checkoutSessionId: string): Promise<void> {
+  try {
+    const checkoutSession = await CheckoutSession.findByPk(checkoutSessionId);
+    if (!checkoutSession) {
+      logger.error('Checkout session not found', { checkoutSessionId });
+      return;
+    }
+
+    if (checkoutSession.status === 'complete') {
+      logger.error('Cannot rollback completed session', { checkoutSessionId });
+      return;
+    }
+
+    const discounts = (await Discount.findAll({
+      where: { checkout_session_id: checkoutSessionId },
+      include: [
+        { model: Coupon, as: 'coupon' },
+        { model: PromotionCode, as: 'promotionCode', required: false },
+      ],
+    })) as (Discount & { coupon: Coupon; promotionCode?: PromotionCode })[];
+
+    if (discounts.length === 0) {
+      logger.info('No discounts found for checkout session', { checkoutSessionId });
+      return;
+    }
+
+    const uniqueCoupons = new Map<string, Coupon>();
+    const uniquePromotionCodes = new Map<string, PromotionCode>();
+
+    discounts.forEach((discount) => {
+      if (discount.confirmed) {
+        if (discount.coupon?.id && !uniqueCoupons.has(discount.coupon.id)) {
+          uniqueCoupons.set(discount.coupon.id, discount.coupon);
+        }
+        if (discount.promotionCode?.id && !uniquePromotionCodes.has(discount.promotionCode.id)) {
+          uniquePromotionCodes.set(discount.promotionCode.id, discount.promotionCode);
+        }
+      }
+    });
+
+    const rollbackPromises = [
+      ...Array.from(uniquePromotionCodes.values()).map((pc) => rollbackUsageForResource(pc, 'promotion-code')),
+      ...Array.from(uniqueCoupons.values()).map((c) => rollbackUsageForResource(c, 'coupon')),
+    ];
+
+    await Promise.all(rollbackPromises);
+
+    await Promise.all(discounts.map((discount) => discount.destroy()));
+  } catch (error) {
+    logger.error('Discount rollback failed', { checkoutSessionId, error: error.message });
+  }
+}

package/api/src/libs/env.ts

@@ -21,6 +21,7 @@ export const vendorTimeoutMinutes: number = process.env.VENDOR_TIMEOUT_MINUTES
   : 10; // 默认 10 分钟超时
 
 export const shortUrlApiKey: string = process.env.SHORT_URL_API_KEY || '';
+export const shortUrlDomain: string = process.env.SHORT_URL_DOMAIN || 's.abtnet.io';
 
 // sequelize 配置相关
 export const sequelizeOptionsPoolMin: number = process.env.SEQUELIZE_OPTIONS_POOL_MIN

package/api/src/libs/payment.ts

@@ -368,7 +368,7 @@ export function isCreditSufficientForPayment(args: {
   const balance = tokens[paymentCurrency.id] || '0';
 
   if (amount === '0') {
-    return { sufficient: false, balance, reason: 'NO_REQUIREMENT' };
+    return { sufficient: true, balance };
   }
 
   if (new BN(balance).lt(new BN(amount))) {

package/api/src/libs/url.ts

@@ -1,5 +1,5 @@
 import logger from './logger';
-import { shortUrlApiKey } from './env';
+import { shortUrlApiKey, shortUrlDomain } from './env';
 
 interface ShortUrlResponse {
   shortUrl: string;
@@ -43,14 +43,14 @@ export async function formatToShortUrl({
       maxVisits,
       tags: [],
       shortCodeLength: 8,
-      domain: 's.abtnet.io',
+      domain: shortUrlDomain,
       findIfExists: true,
       validateUrl: true,
       forwardQuery: true,
       crawlable: true,
     };
 
-    const response = await fetch('https://s.abtnet.io/rest/v3/short-urls', {
+    const response = await fetch(`https://${shortUrlDomain}/rest/v3/short-urls`, {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',

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

@@ -21,6 +21,7 @@ import {
   SubscriptionItem,
 } from '../store/models';
 import { getCheckoutSessionSubscriptionIds } from '../libs/session';
+import { rollbackDiscountUsageForCheckoutSession } from '../libs/discount/discount';
 
 type CheckoutSessionJob = {
   id: string;
@@ -240,6 +241,8 @@ events.on('checkout.session.expired', async (checkoutSession: CheckoutSession) =
     );
   }
 
+  await rollbackDiscountUsageForCheckoutSession(checkoutSession.id);
+
   // update price lock status
   for (const item of checkoutSession.line_items) {
     const price = await Price.findByPk(item.price_id);

package/api/src/queues/payment.ts

@@ -914,6 +914,11 @@ export const handlePayment = async (job: PaymentJob) => {
       return;
     }
 
+    if (paymentIntent.amount === '0') {
+      await handlePaymentSucceed(paymentIntent);
+      return;
+    }
+
     await paymentIntent.update({ status: 'processing', last_payment_error: null });
 
     if (paymentMethod.type === 'arcblock') {

package/api/src/routes/checkout-sessions.ts

@@ -105,8 +105,8 @@ import {
   createDiscountRecordsForCheckout,
   updateSubscriptionDiscountReferences,
 } from '../libs/discount/coupon';
+import { rollbackDiscountUsageForCheckoutSession, applyDiscountsToLineItems } from '../libs/discount/discount';
 import { formatToShortUrl } from '../libs/url';
-import { applyDiscountsToLineItems } from '../libs/discount/discount';
 
 const router = Router();
 
@@ -2785,6 +2785,7 @@ router.delete('/:id/remove-promotion', user, ensureCheckoutSessionOpen, async (r
     const trialSetup = getSubscriptionTrialSetup(checkoutSession.subscription_data as any, currency.id);
     const isTrialing = trialSetup.trialInDays > 0 || trialSetup.trialEnd > now;
 
+    await rollbackDiscountUsageForCheckoutSession(checkoutSession.id);
     // Calculate original amounts without any discounts
     const originalResult = await applyDiscountsToLineItems({
       lineItems: originalItems,

package/api/src/routes/connect/change-plan.ts

@@ -52,7 +52,9 @@ export default {
         amount: fastCheckoutAmount,
       });
 
-      if (delegation.sufficient === false) {
+      const requiredStake = !subscription!.billing_thresholds?.no_stake;
+
+      if (delegation.sufficient === false || !requiredStake) {
         claimsList.push({
           signature: await getDelegationTxClaim({
             mode: 'subscription',
@@ -69,16 +71,22 @@ export default {
         });
       }
 
-      claimsList.push({
-        prepareTx: await getStakeTxClaim({
-          userDid,
-          userPk,
-          paymentCurrency,
-          paymentMethod,
-          items,
-          subscription: subscription!,
-        }),
-      });
+      if (requiredStake) {
+        claimsList.push({
+          prepareTx: await getStakeTxClaim({
+            userDid,
+            userPk,
+            paymentCurrency,
+            paymentMethod,
+            items,
+            subscription: subscription!,
+          }),
+        });
+      }
+
+      if (claimsList.length === 0) {
+        throw new Error('No available claims for your subscription at this time.');
+      }
 
       return claimsList;
     }
@@ -123,9 +131,12 @@ export default {
       },
     });
 
+    const requiredStake = !subscription!.billing_thresholds?.no_stake;
+
     // 判断是否为最后一步
     const staking = result.find((x: any) => x.claim?.type === 'prepareTx' && x.claim?.meta?.purpose === 'staking');
-    const isFinalStep = (paymentMethod.type === 'arcblock' && staking) || paymentMethod.type !== 'arcblock';
+    const isFinalStep =
+      (paymentMethod.type === 'arcblock' && (staking || !requiredStake)) || paymentMethod.type !== 'arcblock';
 
     if (!isFinalStep) {
       await updateSession({

package/api/src/routes/connect/collect.ts

@@ -68,6 +68,7 @@ export default {
           paymentCurrency,
           paymentMethod,
           items,
+          requiredStake: false,
         });
       }
 

package/api/src/routes/connect/delegation.ts

@@ -42,6 +42,7 @@ export default {
           trialing: true,
           billingThreshold,
           items: subscription!.items as TLineItemExpanded[],
+          requiredStake: false,
         }),
       ],
     };

package/api/src/routes/connect/shared.ts

@@ -774,6 +774,7 @@ export async function getDelegationTxClaim({
     paymentCurrency,
     requiredStake,
   });
+
   if (mode === 'delegation') {
     tokenRequirements = [];
   }
@@ -1080,9 +1081,15 @@ export async function getTokenRequirements({
   billingThreshold = 0,
   requiredStake,
 }: TokenRequirementArgs) {
-  const tokenRequirements = [];
+  const tokenRequirements: { address: string; value: string }[] = [];
   let amount = await getFastCheckoutAmount({ items, mode, currencyId: paymentCurrency.id, trialing: !!trialing });
 
+  const addStakeRequired = requiredStake && ((paymentMethod.type === 'arcblock' && mode !== 'delegation') || mode === 'setup');
+
+  if (!addStakeRequired && amount === '0') {
+    return tokenRequirements;
+  }
+
   // If the app has not staked, we need to add the gas fee to the amount
   if ((await hasStakedForGas(paymentMethod)) === false) {
     const maxGas = await estimateMaxGasForTx(paymentMethod);
@@ -1106,7 +1113,7 @@ export async function getTokenRequirements({
   }
 
   // Add stake requirement to token requirement
-  if (requiredStake && ((paymentMethod.type === 'arcblock' && mode !== 'delegation') || mode === 'setup')) {
+  if (addStakeRequired) {
     const staking = getSubscriptionStakeSetup(
       items,
       paymentCurrency.id,
@@ -1115,6 +1122,8 @@ export async function getTokenRequirements({
     const exist = tokenRequirements.find((x) => x.address === paymentCurrency.contract);
     if (exist) {
       exist.value = new BN(exist.value).add(staking.licensed).add(staking.metered).toString();
+    } else {
+      tokenRequirements.push({ address: paymentCurrency.contract as string, value: staking.licensed.add(staking.metered).toString() });
     }
   }
 

package/api/src/routes/meter-events.ts

@@ -320,7 +320,14 @@ router.get('/pending-amount', authMine, async (req, res) => {
       where['payload.subscription_id'] = req.query.subscription_id;
     }
     if (req.query.customer_id) {
-      where['payload.customer_id'] = req.query.customer_id;
+      if (typeof req.query.customer_id !== 'string') {
+        return res.status(400).json({ error: 'Customer ID must be a string' });
+      }
+      const customer = await Customer.findByPkOrDid(req.query.customer_id);
+      if (!customer) {
+        return res.status(404).json({ error: 'Customer not found' });
+      }
+      where['payload.customer_id'] = customer.id;
     }
     const [summary] = await MeterEvent.getPendingAmounts({
       subscriptionId: req.query.subscription_id as string,

package/api/src/routes/products.ts

@@ -44,6 +44,7 @@ const ProductAndPriceSchema = Joi.object({
       'string.pattern.base':
         'statement_descriptor should be at least one letter and cannot include Chinese characters and special characters such as <, >、"、’ or \\',
     })
+    .allow(null, '')
     .empty('')
     .optional(),
   unit_label: Joi.string().max(12).empty('').optional(),

package/api/src/store/migrations/20250923-add-discount-confirmed.ts

@@ -0,0 +1,21 @@
+import { DataTypes } from 'sequelize';
+import { Migration, safeApplyColumnChanges } from '../migrate';
+
+export const up: Migration = async ({ context }) => {
+  await safeApplyColumnChanges(context, {
+    discounts: [
+      {
+        name: 'confirmed',
+        field: {
+          type: DataTypes.BOOLEAN,
+          defaultValue: true,
+          allowNull: false,
+        },
+      },
+    ],
+  });
+};
+
+export const down: Migration = async ({ context }) => {
+  await context.removeColumn('discounts', 'confirmed');
+};

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.15
+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.15",
+  "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.15",
-    "@blocklet/payment-vendor": "1.20.15",
+    "@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.15",
+    "@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": "d205c3b1ec7d2b819e375ed2eb8b70c9d48f0bcb"
+  "gitHead": "ebf0677dd4414d4abc4129d6663a7e9ddb415281"
 }