fix(payment): Swap gateway and id fields if multi-option provider

Author: davidchin

src/payment/offsite-payment-mappers/payload-mapper.js

@@ -72,11 +72,11 @@ export default class PayloadMapper {
                 amount: order.grandTotal ? order.grandTotal.integerAmount : null,
                 bc_auth_token: authToken,
                 currency: order.currency,
-                gateway: paymentMethod.gateway,
+                gateway: this.paymentMethodIdMapper.mapToId(paymentMethod),
                 notify_url: order.callbackUrl,
                 order_id: order.orderId ? toString(order.orderId) : null,
                 page_title: document.title ? document.title : null,
-                payment_method_id: this.paymentMethodIdMapper.mapToId(paymentMethod),
+                payment_method_id: paymentMethod.id,
                 reference_id: order.orderId ? toString(order.orderId) : null,
                 return_url: paymentMethod.returnUrl || (order.payment ? order.payment.returnUrl : null),
             },

src/payment/payment-method-mappers/payment-method-id-mapper.js

@@ -1,4 +1,5 @@
 import { BRAINTREE, BRAINTREE_PAYPAL } from '../payment-method-ids';
+import { MULTI_OPTION } from '../payment-method-types';
 
 export default class PaymentMethodIdMapper {
     /**
@@ -13,10 +14,16 @@ export default class PaymentMethodIdMapper {
      * @returns {string}
      */
     mapToId(paymentMethod) {
-        if (paymentMethod.id === BRAINTREE_PAYPAL) {
+        let { id } = paymentMethod;
+
+        if (paymentMethod.method === MULTI_OPTION) {
+            id = paymentMethod.gateway;
+        }
+
+        if (id === BRAINTREE_PAYPAL) {
             return BRAINTREE;
         }
 
-        return paymentMethod.id;
+        return id;
     }
 }

src/payment/payment-method-types.js

@@ -0,0 +1,2 @@
+export const CREDIT_CARD = 'credit-card';
+export const MULTI_OPTION = 'multi-option';

test/payment/offsite-payment-mappers/payload-mapper.spec.js

@@ -13,7 +13,11 @@ describe('PayloadMapper', () => {
     let storeMapper;
 
     beforeEach(() => {
-        data = paymentRequestDataMock;
+        data = merge({}, paymentRequestDataMock, {
+            paymentMethod: {
+                gateway: 'Adyen',
+            },
+        });
 
         addressMapper = {
             mapToBillingAddress: jasmine.createSpy('mapToBillingAddress').and.returnValue({ billingAddress: 'billingAddress' }),
@@ -29,7 +33,7 @@ describe('PayloadMapper', () => {
         };
 
         paymentMethodIdMapper = {
-            mapToId: jasmine.createSpy('mapToId').and.returnValue(data.paymentMethod.id),
+            mapToId: jasmine.createSpy('mapToId').and.returnValue(data.paymentMethod.gateway),
         };
 
         storeMapper = {
@@ -46,12 +50,6 @@ describe('PayloadMapper', () => {
     });
 
     it('maps the input data into a payload for submitting a payment to an offsite provider', () => {
-        data = merge({}, data, {
-            paymentMethod: {
-                gateway: 'Adyen',
-            },
-        });
-
         document.title = 'Hello world';
 
         const output = payloadMapper.mapToPayload(data);

test/payment/payment-method-mappers/payment-method-id-mapper.spec.js

@@ -1,4 +1,5 @@
 import PaymentMethodIdMapper from '../../../src/payment/payment-method-mappers/payment-method-id-mapper';
+import { MULTI_OPTION } from '../../../src/payment/payment-method-types';
 import * as PAYMENT_METHODS from '../../../src/payment/payment-method-ids';
 
 describe('PaymentMethodIdMapper', () => {
@@ -20,6 +21,16 @@ describe('PaymentMethodIdMapper', () => {
         expect(paymentMethodIdMapper.mapToId(paymentMethod)).toEqual(PAYMENT_METHODS.BRAINTREE);
     });
 
+    it('returns the "gateway" field of the payment method if it is a multi-option method', () => {
+        paymentMethod = {
+            id: PAYMENT_METHODS.BRAINTREE_PAYPAL,
+            gateway: 'Adyen',
+            method: MULTI_OPTION,
+        };
+
+        expect(paymentMethodIdMapper.mapToId(paymentMethod)).toEqual('Adyen');
+    });
+
     it('does not perform any mapping for other payment methods', () => {
         paymentMethod = { id: PAYMENT_METHODS.BRAINTREE };
         expect(paymentMethodIdMapper.mapToId(paymentMethod)).toEqual(PAYMENT_METHODS.BRAINTREE);