diff --git a/backend/src/modules/storefrontCheckout/services/CheckoutSessionService.ts b/backend/src/modules/storefrontCheckout/services/CheckoutSessionService.ts index 72d47f5..ba683ae 100644 --- a/backend/src/modules/storefrontCheckout/services/CheckoutSessionService.ts +++ b/backend/src/modules/storefrontCheckout/services/CheckoutSessionService.ts @@ -6,7 +6,7 @@ import type { CookieCartSummary } from '../../storefrontCart/types/CookieCartSum import { deriveCheckoutSessionState } from '../../../utils/checkout/deriveCheckoutSessionState'; import { InvoiceReason } from '../../payment/types/InvoiceReason'; import { InvoiceService } from '../../payment/services/InvoiceService'; -import { PaymentMethod } from '../../payment/types/PaymentMethod'; +import type { PaymentMethod } from '../../payment/types/PaymentMethod'; import { CheckoutSessionDiscount } from '../entities/CheckoutSessionDiscount'; import { CheckoutSessionLine } from '../entities/CheckoutSessionLine'; import { CheckoutSession } from '../entities/CheckoutSession'; @@ -26,7 +26,14 @@ export class CheckoutSessionService { async findById(id: string): Promise { return this.sessionRepo.findOne({ where: { id }, - relations: ['lines', 'discounts', 'invoice', 'invoice.moneroDetails', 'invoice.payments'] + relations: [ + 'lines', + 'discounts', + 'invoice', + 'invoice.moneroDetails', + 'invoice.btcDetails', + 'invoice.payments' + ] }); } @@ -87,7 +94,7 @@ export class CheckoutSessionService { async cancelSession(sessionId: string): Promise { const session = await this.sessionRepo.findOne({ where: { id: sessionId }, - relations: ['invoice', 'invoice.moneroDetails', 'invoice.payments'] + relations: ['invoice', 'invoice.moneroDetails', 'invoice.btcDetails', 'invoice.payments'] }); if (!session) { diff --git a/backend/src/modules/storefrontOrder/services/StorefrontOrderService.ts b/backend/src/modules/storefrontOrder/services/StorefrontOrderService.ts index 39cbc77..6789b68 100644 --- a/backend/src/modules/storefrontOrder/services/StorefrontOrderService.ts +++ b/backend/src/modules/storefrontOrder/services/StorefrontOrderService.ts @@ -68,6 +68,7 @@ export class StorefrontOrderService { .createQueryBuilder('order') .leftJoinAndSelect('order.checkoutInvoice', 'checkoutInvoice') .leftJoinAndSelect('checkoutInvoice.moneroDetails', 'moneroDetails') + .leftJoinAndSelect('checkoutInvoice.btcDetails', 'btcDetails') .leftJoinAndSelect('checkoutInvoice.payments', 'payment') .where('order.id = :orderId', { orderId }) .getOne(); diff --git a/backend/src/utils/order/createOrderDetailQuery.ts b/backend/src/utils/order/createOrderDetailQuery.ts index def4752..2f972bb 100644 --- a/backend/src/utils/order/createOrderDetailQuery.ts +++ b/backend/src/utils/order/createOrderDetailQuery.ts @@ -11,9 +11,11 @@ export const createOrderDetailQuery = (orderRepo: Repository, orderId: st .leftJoinAndSelect('order.discounts', 'orderDiscount') .leftJoinAndSelect('order.checkoutInvoice', 'checkoutInvoice') .leftJoinAndSelect('checkoutInvoice.moneroDetails', 'checkoutMoneroDetails') + .leftJoinAndSelect('checkoutInvoice.btcDetails', 'checkoutBtcDetails') .leftJoinAndSelect('checkoutInvoice.payments', 'checkoutPayment') .leftJoinAndSelect('order.shippingInvoice', 'shippingInvoice') .leftJoinAndSelect('shippingInvoice.moneroDetails', 'shippingMoneroDetails') + .leftJoinAndSelect('shippingInvoice.btcDetails', 'shippingBtcDetails') .leftJoinAndSelect('shippingInvoice.payments', 'shippingPayment') .leftJoinAndSelect('order.messages', 'message') .addSelect('order.accessToken')