Skip to content

Commit

Permalink
fix(payments-plugin): Use default channel in Stripe webhook calls to …
Browse files Browse the repository at this point in the history
…reach all orders (#3076)
  • Loading branch information
yasserlens authored Sep 26, 2024
1 parent d04f5a5 commit 8434111
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions packages/payments-plugin/src/stripe/stripe.controller.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Controller, Headers, HttpStatus, Post, Req, Res } from '@nestjs/common';
import type { PaymentMethod, RequestContext } from '@vendure/core';
import { ChannelService } from '@vendure/core';
import {
InternalServerError,
LanguageCode,
Expand Down Expand Up @@ -31,6 +32,7 @@ export class StripeController {
private stripeService: StripeService,
private requestContextService: RequestContextService,
private connection: TransactionalConnection,
private channelService: ChannelService,
) {}

@Post('stripe')
Expand All @@ -57,7 +59,7 @@ export class StripeController {
const { metadata: { channelToken, orderCode, orderId } = {} } = paymentIntent;
const outerCtx = await this.createContext(channelToken, request);

await this.connection.withTransaction(outerCtx, async ctx => {
await this.connection.withTransaction(outerCtx, async (ctx: RequestContext) => {
const order = await this.orderService.findOneByCode(ctx, orderCode);

if (!order) {
Expand Down Expand Up @@ -90,8 +92,13 @@ export class StripeController {
}

if (order.state !== 'ArrangingPayment') {
// Orders can switch channels (e.g., global to UK store), causing lookups by the original
// channel to fail. Using a default channel avoids "entity-with-id-not-found" errors.
// See https://github.com/vendure-ecommerce/vendure/issues/3072
const defaultChannel = await this.channelService.getDefaultChannel(ctx);
const ctxWithDefaultChannel = await this.createContext(defaultChannel.token, request);
const transitionToStateResult = await this.orderService.transitionToState(
ctx,
ctxWithDefaultChannel,
orderId,
'ArrangingPayment',
);
Expand Down

0 comments on commit 8434111

Please sign in to comment.