payment-kit 1.20.11 → 1.20.13

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

@@ -35,7 +35,12 @@ export default {
     const items = subscription!.items as TLineItemExpanded[];
     const trialing = true;
     const billingThreshold = Number(subscription.billing_thresholds?.amount_gte || 0);
-    const fastCheckoutAmount = getFastCheckoutAmount(items, 'subscription', paymentCurrency.id, false);
+    const fastCheckoutAmount = await getFastCheckoutAmount({
+      items,
+      mode: 'subscription',
+      currencyId: paymentCurrency.id,
+      trialing: false,
+    });
 
     if (paymentMethod.type === 'arcblock') {
       const delegation = await isDelegationSufficientForPayment({

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

@@ -37,7 +37,12 @@ export default {
     const items = subscription!.items as TLineItemExpanded[];
     const trialing = false;
     const billingThreshold = Number(subscription!.billing_thresholds?.amount_gte || 0);
-    const fastCheckoutAmount = getFastCheckoutAmount(items, 'subscription', paymentCurrency.id, false);
+    const fastCheckoutAmount = await getFastCheckoutAmount({
+      items,
+      mode: 'subscription',
+      currencyId: paymentCurrency.id,
+      trialing: false,
+    });
 
     if (paymentMethod.type === 'arcblock') {
       const delegation = await isDelegationSufficientForPayment({

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

@@ -52,7 +52,12 @@ export default {
     const trialing = trialInDays > 0 || trialEnd > now;
     const billingThreshold = Number(checkoutSession.subscription_data?.billing_threshold_amount || 0);
     const minStakeAmount = Number(checkoutSession.subscription_data?.min_stake_amount || 0);
-    const fastCheckoutAmount = getFastCheckoutAmount(items, checkoutSession.mode, paymentCurrency.id, trialing);
+    const fastCheckoutAmount = await getFastCheckoutAmount({
+      items,
+      mode: checkoutSession.mode,
+      currencyId: paymentCurrency.id,
+      trialing,
+    });
 
     if (paymentMethod.type === 'arcblock') {
       const delegation = await isDelegationSufficientForPayment({

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

@@ -22,6 +22,7 @@ import {
   isDonationCheckoutSession,
   getSubscriptionLineItems,
 } from '../../libs/session';
+import { getDiscountRecordsForCheckout } from '../../libs/discount/coupon';
 import {
   expandSubscriptionItems,
   getSubscriptionPaymentAddress,
@@ -268,7 +269,26 @@ export async function ensureSetupIntent(checkoutSessionId: string, skipInvoice?:
     if (checkoutSession.invoice_id) {
       invoice = await Invoice.findByPk(checkoutSession.invoice_id);
     } else {
-      // generate empty invoice here
+      // Get discount information for this checkout session
+      let discountInfo: { appliedDiscounts: string[]; discountBreakdown: Array<{ amount: string; discount: string }> } = { 
+        appliedDiscounts: [], 
+        discountBreakdown: [] 
+      };
+      
+      try {
+        discountInfo = await getDiscountRecordsForCheckout({
+          checkoutSessionId: checkoutSession.id,
+          customerId: customer.id,
+        });
+      } catch (error) {
+        logger.warn('Failed to get discount records for setup intent checkout session', {
+          checkoutSessionId: checkoutSession.id,
+          customerId: customer.id,
+          error: error.message,
+        });
+      }
+
+      // generate empty invoice here with discount information
       const result = await ensureInvoiceAndItems({
         customer,
         currency: paymentCurrency,
@@ -294,14 +314,20 @@ export async function ensureSetupIntent(checkoutSessionId: string, skipInvoice?:
 
           default_payment_method_id: subscription.default_payment_method_id as string,
 
+          discounts: discountInfo.appliedDiscounts,
+          total_discount_amounts: discountInfo.discountBreakdown,
+
           custom_fields: checkoutSession.invoice_creation?.invoice_data?.custom_fields || [],
           footer: checkoutSession.invoice_creation?.invoice_data?.footer || '',
           metadata: checkoutSession.invoice_creation?.invoice_data?.metadata || {},
-        } as Invoice,
+        } as unknown as Invoice,
       });
       invoice = result.invoice;
 
-      logger.info(`Invoice created for checkoutSession ${checkoutSession.id} in setup mode: ${invoice.id}`);
+      logger.info(`Invoice created for checkoutSession ${checkoutSession.id} in setup mode: ${invoice.id}`, {
+        hasDiscounts: discountInfo.appliedDiscounts.length > 0,
+        discountCount: discountInfo.appliedDiscounts.length,
+      });
 
       // persist invoice id
       await checkoutSession.update({ invoice_id: invoice.id });
@@ -436,7 +462,41 @@ export async function ensureInvoiceForCheckout({
   const trialEnd = Number(checkoutSession.subscription_data?.trial_end || 0);
   const now = dayjs().unix();
   const invoiceItems = lineItems || (await Price.expand(checkoutSession.line_items, { product: true }));
-  const totalAmount = getCheckoutAmount(invoiceItems, checkoutSession.currency_id, trialInDays > 0 || trialEnd > now);
+  
+  // Get discount records for this checkout session
+  let discountInfo: { appliedDiscounts: string[]; discountBreakdown: Array<{ amount: string; discount: string }> } = { 
+    appliedDiscounts: [], 
+    discountBreakdown: [] 
+  };
+  
+  // Prepare discount configuration for getCheckoutAmount
+  let discountConfig;
+  try {
+    discountInfo = await getDiscountRecordsForCheckout({
+      checkoutSessionId: checkoutSession.id,
+      customerId: customer.id,
+    });
+    
+    // Apply discount if we have discount records
+    if (discountInfo.appliedDiscounts.length > 0 && checkoutSession.discounts?.length) {
+      const firstDiscount = checkoutSession.discounts[0];
+      if (firstDiscount?.coupon && firstDiscount?.promotion_code) {
+        discountConfig = {
+          promotionCodeId: firstDiscount.promotion_code,
+          couponId: firstDiscount.coupon,
+          customerId: customer.id,
+        };
+      }
+    }
+  } catch (error) {
+    logger.warn('Failed to get discount records for checkout session', {
+      checkoutSessionId: checkoutSession.id,
+      customerId: customer.id,
+      error: error.message,
+    });
+  }
+  
+  const totalAmount = await getCheckoutAmount(invoiceItems, checkoutSession.currency_id, trialInDays > 0 || trialEnd > now, discountConfig);
   const { invoice, items } = await ensureInvoiceAndItems({
     customer,
     currency: currency as PaymentCurrency,
@@ -461,7 +521,8 @@ export async function ensureInvoiceForCheckout({
       payment_intent_id: paymentIntent?.id,
       checkout_session_id: checkoutSession.id,
 
-      total: totalAmount.subtotal,
+      total: totalAmount.total,
+      subtotal: totalAmount.subtotal,
 
       default_payment_method_id: (subscription?.default_payment_method_id ||
         paymentIntent?.payment_method_id) as string,
@@ -469,10 +530,20 @@ export async function ensureInvoiceForCheckout({
       custom_fields: checkoutSession.invoice_creation?.invoice_data?.custom_fields || [],
       footer: checkoutSession.invoice_creation?.invoice_data?.footer || '',
       metadata,
+      
+      discounts: discountInfo.appliedDiscounts,
+      total_discount_amounts: discountInfo.discountBreakdown,
+      
       ...(props || {}),
-    } as Invoice,
+    } as unknown as Invoice,
+  });
+  
+  logger.info('Invoice created for checkoutSession', { 
+    checkoutSessionId: checkoutSession.id, 
+    invoiceId: invoice.id,
+    hasDiscounts: discountInfo.appliedDiscounts.length > 0,
+    discountCount: discountInfo.appliedDiscounts.length,
   });
-  logger.info('Invoice created for checkoutSession', { checkoutSessionId: checkoutSession.id, invoiceId: invoice.id });
 
   // only update invoice_id for single invoice
   if (!isGroupInvoice) {
@@ -691,7 +762,7 @@ export async function getDelegationTxClaim({
   requiredStake?: boolean;
   requiredAmount?: string;
 }) {
-  const amount = getFastCheckoutAmount(items, mode, paymentCurrency.id);
+  const amount = await getFastCheckoutAmount({ items, mode, currencyId: paymentCurrency.id });
   const address = toDelegateAddress(userDid, wallet.address);
   const tokenLimits = await getTokenLimitsForDelegation(items, paymentMethod, paymentCurrency, address, amount);
   let tokenRequirements = await getTokenRequirements({
@@ -1010,7 +1081,7 @@ export async function getTokenRequirements({
   requiredStake,
 }: TokenRequirementArgs) {
   const tokenRequirements = [];
-  let amount = getFastCheckoutAmount(items, mode, paymentCurrency.id, !!trialing);
+  let amount = await getFastCheckoutAmount({ items, mode, currencyId: paymentCurrency.id, trialing: !!trialing });
 
   // If the app has not staked, we need to add the gas fee to the amount
   if ((await hasStakedForGas(paymentMethod)) === false) {

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

@@ -73,7 +73,12 @@ export default {
     const trialing = trialInDays > 0 || trialEnd > now;
     const billingThreshold = Number(checkoutSession.subscription_data?.billing_threshold_amount || 0);
     const minStakeAmount = Number(checkoutSession.subscription_data?.min_stake_amount || 0);
-    const fastCheckoutAmount = getFastCheckoutAmount(items, checkoutSession.mode, paymentCurrency.id, trialing);
+    const fastCheckoutAmount = await getFastCheckoutAmount({
+      items,
+      mode: checkoutSession.mode,
+      currencyId: paymentCurrency.id,
+      trialing,
+    });
     const claimsList: any[] = [];
 
     const allSubscriptionIds = subscriptions.map((sub) => sub.id);
@@ -240,7 +245,12 @@ export default {
       paymentCurrency.id
     );
     const trialing = trialInDays > 0 || trialEnd > now;
-    const fastCheckoutAmount = getFastCheckoutAmount(items, checkoutSession.mode, paymentCurrency.id, trialing);
+    const fastCheckoutAmount = await getFastCheckoutAmount({
+      items,
+      mode: checkoutSession.mode,
+      currencyId: paymentCurrency.id,
+      trialing,
+    });
     // check token balance
     const tokenBalanceCheck = await checkTokenBalance({
       paymentMethod,