Merge pull request #289 from commercetools/dasanorct/SCC-2813_fix_del…

…ivery_address fix(processor): fix issue sending the delivery address to Adyen
commercetools · Jan 7, 2025 · b0cf2cd · b0cf2cd
2 parents 90a6fd7 + 92c2b47
commit b0cf2cd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/processor/src/services/converters/create-payment.converter.ts b/processor/src/services/converters/create-payment.converter.ts
@@ -12,6 +12,7 @@ export class CreatePaymentConverter {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const { paymentReference: _, ...requestData } = opts.data;
     const futureOrderNumber = getFutureOrderNumberFromContext();
+    const deliveryAddress = paymentSDK.ctCartService.getOneShippingAddress({ cart: opts.cart });
     return {
       ...requestData,
       amount: {
@@ -26,8 +27,8 @@ export class CreatePaymentConverter {
       ...(opts.cart.billingAddress && {
         billingAddress: populateCartAddress(opts.cart.billingAddress),
       }),
-      ...(opts.cart.shippingAddress && {
-        deliveryAddress: populateCartAddress(paymentSDK.ctCartService.getOneShippingAddress({ cart: opts.cart })),
+      ...(deliveryAddress && {
+        deliveryAddress: populateCartAddress(deliveryAddress),
       }),
       ...(futureOrderNumber && { merchantOrderReference: futureOrderNumber }),
       ...this.populateAddionalPaymentMethodData(opts.data, opts.cart),

diff --git a/processor/src/services/converters/create-session.converter.ts b/processor/src/services/converters/create-session.converter.ts
@@ -19,6 +19,7 @@ export class CreateSessionConverter {
   }): CreateCheckoutSessionRequest {
     const allowedPaymentMethods = convertAllowedPaymentMethodsToAdyenFormat();
     const futureOrderNumber = getFutureOrderNumberFromContext();
+    const deliveryAddress = paymentSDK.ctCartService.getOneShippingAddress({ cart: opts.cart });
     return {
       ...opts.data,
       amount: {
@@ -35,8 +36,8 @@ export class CreateSessionConverter {
       ...(opts.cart.billingAddress && {
         billingAddress: populateCartAddress(opts.cart.billingAddress),
       }),
-      ...(opts.cart.shippingAddress && {
-        deliveryAddress: populateCartAddress(paymentSDK.ctCartService.getOneShippingAddress({ cart: opts.cart })),
+      ...(deliveryAddress && {
+        deliveryAddress: populateCartAddress(deliveryAddress),
       }),
       shopperEmail: opts.cart.customerEmail,
       ...(futureOrderNumber && { merchantOrderReference: futureOrderNumber }),