payment-kit 1.20.14 → 1.20.16

package/api/src/queues/vendors/fulfillment-coordinator.ts

@@ -12,12 +12,13 @@ import { Product } from '../../store/models/product';
 import { Refund } from '../../store/models/refund';
 import { sequelize } from '../../store/sequelize';
 import { depositVaultQueue } from '../payment';
+import { Invoice } from '../../store/models';
 
 export type VendorInfo = NonNullable<CheckoutSession['vendor_info']>[number];
 
 interface CoordinatorJob {
   checkoutSessionId: string;
-  paymentIntentId: string;
+  invoiceId: string;
   triggeredBy: string;
 }
 
@@ -28,11 +29,11 @@ export const fulfillmentCoordinatorQueue = createQueue({
   onJob: handleFulfillmentCoordination,
 });
 
-export async function startVendorFulfillment(checkoutSessionId: string, paymentIntentId: string): Promise<void> {
+export async function startVendorFulfillment(checkoutSessionId: string, invoiceId: string): Promise<void> {
   try {
     logger.info('Starting vendor fulfillment process', {
       checkoutSessionId,
-      paymentIntentId,
+      invoiceId,
     });
 
     const vendorConfigs = await getVendorConfigurations(checkoutSessionId);
@@ -43,7 +44,7 @@ export async function startVendorFulfillment(checkoutSessionId: string, paymentI
         checkoutSessionId,
       });
 
-      await triggerCommissionProcess(checkoutSessionId, paymentIntentId);
+      await triggerCommissionProcess(checkoutSessionId, invoiceId);
       return;
     }
 
@@ -65,7 +66,7 @@ export async function startVendorFulfillment(checkoutSessionId: string, paymentI
 
       events.emit('vendor.fulfillment.queued', vendorFulfillmentJobId, {
         checkoutSessionId,
-        paymentIntentId,
+        invoiceId,
         vendorId: vendorConfig.vendor_id,
         vendorConfig,
         retryOnError: true,
@@ -79,7 +80,7 @@ export async function startVendorFulfillment(checkoutSessionId: string, paymentI
   } catch (error: any) {
     logger.error('Failed to start vendor fulfillment', {
       checkoutSessionId,
-      paymentIntentId,
+      invoiceId,
       error: error.message,
     });
     throw error;
@@ -88,7 +89,7 @@ export async function startVendorFulfillment(checkoutSessionId: string, paymentI
 
 export async function updateVendorFulfillmentStatus(
   checkoutSessionId: string,
-  paymentIntentId: string,
+  invoiceId: string,
   vendorId: string,
   result: 'completed' | 'failed' | 'max_retries_exceeded' | 'return_requested' | 'sent',
   details?: {
@@ -110,11 +111,11 @@ export async function updateVendorFulfillmentStatus(
     lastAttemptAt: new Date().toISOString(),
   });
 
-  await triggerCoordinatorCheck(checkoutSessionId, paymentIntentId, `vendor_${vendorId}_${result}`);
+  await triggerCoordinatorCheck(checkoutSessionId, invoiceId, `vendor_${vendorId}_${result}`);
 }
 
 export async function handleFulfillmentCoordination(job: CoordinatorJob) {
-  const { checkoutSessionId, paymentIntentId, triggeredBy } = job;
+  const { checkoutSessionId, invoiceId, triggeredBy } = job;
 
   logger.info('Processing fulfillment coordination', {
     checkoutSessionId,
@@ -129,7 +130,7 @@ export async function handleFulfillmentCoordination(job: CoordinatorJob) {
       logger.info('No vendors to coordinate, triggering commission directly', {
         checkoutSessionId,
       });
-      await triggerCommissionProcess(checkoutSessionId, paymentIntentId);
+      await triggerCommissionProcess(checkoutSessionId, invoiceId);
       return;
     }
 
@@ -146,7 +147,7 @@ export async function handleFulfillmentCoordination(job: CoordinatorJob) {
         successfulVendors: analysis.successfulVendors.length,
       });
 
-      await triggerCommissionProcess(checkoutSessionId, paymentIntentId);
+      await triggerCommissionProcess(checkoutSessionId, invoiceId);
     } else if (analysis.anyMaxRetriesExceeded || analysis.shouldTimeout || analysis.failedVendors.length > 0) {
       logger.warn('Some vendors failed, initiating full refund', {
         checkoutSessionId,
@@ -155,7 +156,7 @@ export async function handleFulfillmentCoordination(job: CoordinatorJob) {
         timeoutVendors: analysis.shouldTimeout ? 'detected' : 'none',
       });
 
-      await initiateFullRefund(paymentIntentId, 'vendor_failure_detected');
+      await initiateFullRefund(invoiceId, 'vendor_failure_detected');
     } else {
       logger.info('Some vendors still in progress, waiting for completion', {
         checkoutSessionId,
@@ -170,7 +171,7 @@ export async function handleFulfillmentCoordination(job: CoordinatorJob) {
       error: error.message,
     });
 
-    await initiateFullRefund(paymentIntentId, 'coordination_failed');
+    await initiateFullRefund(invoiceId, 'coordination_failed');
   }
 }
 
@@ -355,74 +356,94 @@ function analyzeVendorStates(vendorInfo: VendorInfo[], vendorConfigs: any[]) {
   };
 }
 
-export function triggerCoordinatorCheck(checkoutSessionId: string, paymentIntentId: string, triggeredBy: string) {
+export function triggerCoordinatorCheck(checkoutSessionId: string, invoiceId: string, triggeredBy: string) {
   const jobId = `coordinator-${checkoutSessionId}-${Date.now()}`;
 
   return fulfillmentCoordinatorQueue.push({
     id: jobId,
     job: {
       checkoutSessionId,
-      paymentIntentId,
+      invoiceId,
       triggeredBy,
     },
   });
 }
 
-export async function triggerCommissionProcess(checkoutSessionId: string, paymentIntentId: string): Promise<void> {
-  logger.info('Triggering commission process', {
-    checkoutSessionId,
-    paymentIntentId,
+export async function triggerCommissionProcess(checkoutSessionId: string, invoiceId: string): Promise<void> {
+  logger.info('Triggering commission process', { checkoutSessionId });
+
+  const checkoutSession = await CheckoutSession.findByPk(checkoutSessionId);
+  if (!checkoutSession) {
+    logger.error('Checkout session not found[triggerCommissionProcess]', { checkoutSessionId });
+    return;
+  }
+  const invoice = await Invoice.findByPk(invoiceId);
+  if (!invoice) {
+    logger.error('Invoice not found[triggerCommissionProcess]', { invoiceId });
+    return;
+  }
+  const paymentIntent = await PaymentIntent.findOne({
+    where: {
+      [Op.or]: [{ id: invoice.payment_intent_id || checkoutSession.payment_intent_id }, { invoice_id: invoiceId }],
+    },
   });
 
-  await VendorFulfillmentService.createVendorPayouts(checkoutSessionId);
-  await CheckoutSession.update({ fulfillment_status: 'completed' }, { where: { id: checkoutSessionId } });
+  if (!paymentIntent) {
+    logger.error('Payment intent not found[triggerCommissionProcess]', { checkoutSessionId });
+    return;
+  }
+
+  await VendorFulfillmentService.createVendorPayouts(checkoutSession, paymentIntent);
+  await checkoutSession.update({ fulfillment_status: 'completed' });
 
-  const paymentIntent = await PaymentIntent.findByPk(paymentIntentId);
   if (paymentIntent) {
     const jobId = `deposit-vault-${paymentIntent.currency_id}`;
     const existingJob = await depositVaultQueue.get(jobId);
 
     if (!existingJob) {
-      await depositVaultQueue.push({
+      depositVaultQueue.push({
         id: jobId,
         job: { currencyId: paymentIntent.currency_id },
       });
     }
+  } else {
+    logger.error('Payment intent not found for invoice', { invoiceId });
   }
 
   logger.info('Commission process triggered successfully', {
     checkoutSessionId,
-    paymentIntentId,
   });
 }
 
-export async function initiateFullRefund(paymentIntentId: string, reason: string): Promise<void> {
+export async function initiateFullRefund(invoiceId: string, reason: string): Promise<void> {
   logger.warn('Initiating full refund with compensation', {
-    paymentIntentId,
+    invoiceId,
     reason,
   });
 
   try {
-    const paymentIntent = await PaymentIntent.findByPk(paymentIntentId);
-    const checkoutSession = await CheckoutSession.findByPaymentIntentId(paymentIntentId);
+    const paymentIntent = await PaymentIntent.findOne({ where: { invoice_id: invoiceId } });
+    const checkoutSession = await CheckoutSession.findByInvoiceId(invoiceId);
 
     if (!checkoutSession || !paymentIntent) {
       logger.error('Missing data for full refund', {
-        paymentIntentId,
+        invoiceId,
+        paymentIntentId: paymentIntent?.id,
+        checkoutSessionId: checkoutSession?.id,
         hasCheckoutSession: !!checkoutSession,
         hasPaymentIntent: !!paymentIntent,
       });
       return;
     }
 
-    await CheckoutSession.update({ fulfillment_status: 'cancelled' }, { where: { id: checkoutSession.id } });
-    await requestReturnsFromCompletedVendors(checkoutSession.id, paymentIntentId, reason);
+    await checkoutSession.update({ fulfillment_status: 'cancelled' });
+    await requestReturnsFromCompletedVendors(checkoutSession, reason);
 
     // Calculate remaining amount using the same logic as subscription createProration
     const refunds = await Refund.findAll({
       where: {
         status: { [Op.not]: 'canceled' },
-        payment_intent_id: paymentIntentId,
+        payment_intent_id: paymentIntent.id,
         type: 'refund',
       },
     });
@@ -437,7 +458,7 @@ export async function initiateFullRefund(paymentIntentId: string, reason: string
     // If no remaining amount or already fully refunded, skip
     if (new BN(remaining).lte(new BN('0'))) {
       logger.info('Payment already fully refunded, skipping', {
-        paymentIntentId,
+        invoiceId,
         paymentAmount: paymentIntent.amount,
         totalRefundAmount: refundAmount.toString(),
         remaining,
@@ -478,52 +499,41 @@ export async function initiateFullRefund(paymentIntentId: string, reason: string
     logger.info('Full refund created, triggering refund processing', {
       refundId: refund.id,
       checkoutSessionId: checkoutSession.id,
-      paymentIntentId,
+      invoiceId,
       amount: refund.amount,
       reason,
     });
   } catch (error: any) {
     logger.error('Failed to create full refund', {
-      paymentIntentId,
+      invoiceId,
       reason,
       error: error.message,
     });
   }
 }
 
-async function requestReturnsFromCompletedVendors(
-  checkoutSessionId: string,
-  paymentIntentId: string,
-  reason: string
-): Promise<void> {
+async function requestReturnsFromCompletedVendors(checkoutSession: CheckoutSession, reason: string): Promise<void> {
   logger.info('Starting return request process', {
-    checkoutSessionId,
-    paymentIntentId,
+    checkoutSessionId: checkoutSession.id,
     reason,
   });
 
   try {
-    const checkoutSession = await CheckoutSession.findByPk(checkoutSessionId);
-    if (!checkoutSession) {
-      logger.error('CheckoutSession not found for return request', { checkoutSessionId });
-      return;
-    }
-
     const vendorInfos = (checkoutSession.vendor_info as VendorInfo[]) || [];
     const completedVendors = vendorInfos.filter((vendor) => vendor.status === 'completed');
 
     if (completedVendors.length === 0) {
-      logger.info('No completed vendors to request returns from', { checkoutSessionId });
+      logger.info('No completed vendors to request returns from', { checkoutSessionId: checkoutSession.id });
       return;
     }
 
     logger.info(`Found ${completedVendors.length} completed vendors requiring return requests`, {
-      checkoutSessionId,
+      checkoutSessionId: checkoutSession.id,
       completedVendorIds: completedVendors.map((v) => v.vendor_id),
     });
 
     const returnRequestPromises = completedVendors.map((vendor) => {
-      return requestReturnFromSingleVendor(checkoutSessionId, paymentIntentId, vendor, reason);
+      return requestReturnFromSingleVendor(checkoutSession, vendor, reason);
     });
 
     const returnResults = await Promise.allSettled(returnRequestPromises);
@@ -547,27 +557,26 @@ async function requestReturnsFromCompletedVendors(
     });
 
     logger.info('Return request process completed', {
-      checkoutSessionId,
+      checkoutSessionId: checkoutSession.id,
       totalVendors: completedVendors.length,
       successful: returnResults.filter((r) => r.status === 'fulfilled').length,
       failed: returnResults.filter((r) => r.status === 'rejected').length,
     });
   } catch (error: any) {
     logger.error('Return request process failed', {
-      checkoutSessionId,
-      paymentIntentId,
+      checkoutSessionId: checkoutSession.id,
       error: error.message,
     });
   }
 }
 
 async function requestReturnFromSingleVendor(
-  checkoutSessionId: string,
-  paymentIntentId: string,
+  checkoutSession: CheckoutSession,
   vendor: VendorInfo,
   reason: string
 ): Promise<void> {
   logger.info('Requesting return for vendor', {
+    checkoutSessionId: checkoutSession.id,
     vendorId: vendor.vendor_id,
     orderId: vendor.order_id,
     reason,
@@ -582,7 +591,6 @@ async function requestReturnFromSingleVendor(
     const returnResult = await vendorAdapter.requestReturn({
       orderId: vendor.order_id,
       reason: `Return request due to: ${reason}`,
-      paymentIntentId,
       customParams: {
         returnType: 'order_failure',
         originalAmount: vendor.amount,
@@ -596,7 +604,7 @@ async function requestReturnFromSingleVendor(
       status = 'rejected' as 'rejected';
     }
 
-    await updateSingleVendorInfo(checkoutSessionId, vendor.vendor_id, {
+    await updateSingleVendorInfo(checkoutSession.id, vendor.vendor_id, {
       status: 'return_requested',
       returnRequest: {
         reason,
@@ -615,10 +623,10 @@ async function requestReturnFromSingleVendor(
     logger.error('Return request failed', {
       vendorId: vendor.vendor_id,
       orderId: vendor.order_id,
-      error: error.message,
+      error,
     });
 
-    await updateSingleVendorInfo(checkoutSessionId, vendor.vendor_id, {
+    await updateSingleVendorInfo(checkoutSession.id, vendor.vendor_id, {
       status: 'return_requested',
       error_message: `Return request failed: ${error.message}`,
     });

package/api/src/queues/vendors/fulfillment.ts

@@ -7,7 +7,7 @@ import { updateVendorFulfillmentStatus } from './fulfillment-coordinator';
 
 type VendorFulfillmentJob = {
   checkoutSessionId: string;
-  paymentIntentId: string;
+  invoiceId: string;
   vendorId: string;
   vendorConfig: any;
   retryOnError?: boolean;
@@ -19,7 +19,7 @@ export const handleVendorFulfillment = async (job: VendorFulfillmentJob) => {
     jobKeys: Object.keys(job),
   });
 
-  const { checkoutSessionId, paymentIntentId, vendorId, vendorConfig } = job;
+  const { checkoutSessionId, invoiceId, vendorId, vendorConfig } = job;
 
   try {
     const checkoutSession = await CheckoutSession.findByPk(checkoutSessionId);
@@ -31,7 +31,7 @@ export const handleVendorFulfillment = async (job: VendorFulfillmentJob) => {
       checkoutSessionId,
       amount_total: checkoutSession.amount_total,
       customer_id: checkoutSession.customer_id || '',
-      payment_intent_id: checkoutSession.payment_intent_id || '',
+      invoiceId,
       currency_id: checkoutSession.currency_id,
       customer_did: checkoutSession.customer_did || '',
     };
@@ -43,7 +43,7 @@ export const handleVendorFulfillment = async (job: VendorFulfillmentJob) => {
       status: fulfillmentResult.status,
     });
 
-    await updateVendorFulfillmentStatus(checkoutSessionId, paymentIntentId, vendorId, 'sent', {
+    await updateVendorFulfillmentStatus(checkoutSessionId, invoiceId, vendorId, 'sent', {
       orderId: fulfillmentResult.orderId,
       commissionAmount: fulfillmentResult.commissionAmount,
       serviceUrl: fulfillmentResult.serviceUrl,
@@ -55,7 +55,7 @@ export const handleVendorFulfillment = async (job: VendorFulfillmentJob) => {
       error,
     });
 
-    await updateVendorFulfillmentStatus(checkoutSessionId, paymentIntentId, vendorId, 'failed', {
+    await updateVendorFulfillmentStatus(checkoutSessionId, invoiceId, vendorId, 'failed', {
       lastError: error.message,
     });
 

package/api/src/queues/vendors/return-processor.ts

@@ -157,7 +157,6 @@ async function callVendorReturn(
     const returnResult = await vendorAdapter.requestReturn({
       orderId: vendor.order_id,
       reason: 'Subscription canceled',
-      paymentIntentId: checkoutSession.payment_intent_id || '',
       customParams: {
         checkoutSessionId: checkoutSession.id,
         subscriptionId: checkoutSession.subscription_id,

package/api/src/queues/vendors/status-check.ts

@@ -83,7 +83,7 @@ export const handleVendorStatusCheck = async (job: VendorStatusCheckJob) => {
         id: `fulfillment-coordinator-${checkoutSessionId}-${vendorId}`,
         job: {
           checkoutSessionId,
-          paymentIntentId: checkoutSession?.payment_intent_id || '',
+          invoiceId: checkoutSession?.invoice_id || '',
           triggeredBy: 'vendor-status-check-timeout',
         },
       });
@@ -158,7 +158,7 @@ export const handleVendorStatusCheck = async (job: VendorStatusCheckJob) => {
       id: `fulfillment-coordinator-${checkoutSessionId}-${vendorId}`,
       job: {
         checkoutSessionId,
-        paymentIntentId: checkoutSession?.payment_intent_id || '',
+        invoiceId: checkoutSession?.invoice_id || '',
         triggeredBy: 'vendor-status-check',
       },
     });

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/routes/vendor.ts

@@ -355,9 +355,12 @@ async function getVendorStatus(sessionId: string, isDetail = false) {
     };
   }
 
+  // FIXME: will remove payment_status @pengfei
+  const paymentStatus = doc.status === 'complete' ? 'paid' : 'unpaid';
+
   if (doc.status !== 'complete') {
     return {
-      payment_status: doc.payment_status,
+      payment_status: paymentStatus,
       session_status: doc.status,
       error: 'CheckoutSession not complete',
       vendors: [],
@@ -365,7 +368,7 @@ async function getVendorStatus(sessionId: string, isDetail = false) {
   }
   if (!doc.vendor_info) {
     return {
-      payment_status: doc.payment_status,
+      payment_status: paymentStatus,
       session_status: doc.status,
       error: 'Vendor info not found',
       vendors: [],
@@ -373,7 +376,13 @@ async function getVendorStatus(sessionId: string, isDetail = false) {
   }
 
   const vendors = doc.vendor_info.map((item) => {
-    return getVendorStatusByVendorId(item.vendor_id, item.order_id, isDetail);
+    return getVendorStatusByVendorId(item.vendor_id, item.order_id, isDetail).then((status) => {
+      return {
+        error_message: item.error_message,
+        status: item.status,
+        ...status,
+      };
+    });
   });
 
   const subscriptionId = doc.subscription_id;
@@ -390,7 +399,7 @@ async function getVendorStatus(sessionId: string, isDetail = false) {
   }
 
   return {
-    payment_status: doc.payment_status,
+    payment_status: paymentStatus,
     session_status: doc.status,
     subscriptionUrl: shortSubscriptionUrl,
     vendors: await Promise.all(vendors),

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');
+};