Merge pull request #502 from Adyen/bug/PW-1628-wrong-shopper-ip

[PW-1628] Use getXForwardedFor instead of getRemoteIp to retrieve the…

Gateway/Request/CustomerIpDataBuilder.php

@@ -52,8 +52,8 @@ class CustomerIpDataBuilder implements BuilderInterface
     {
         /** @var \Magento\Payment\Gateway\Data\PaymentDataObject $paymentDataObject */
         $paymentDataObject = \Magento\Payment\Gateway\Helper\SubjectReader::readPayment($buildSubject);
-        $order = $paymentDataObject->getOrder();
+        $shopperIp = $paymentDataObject->getPayment()->getOrder()->getXForwardedFor();
 
-        return $this->adyenRequestsHelper->buildCustomerIpData([], $order->getRemoteIp());
+        return $this->adyenRequestsHelper->buildCustomerIpData([], $shopperIp);
     }
 }

Model/AdyenPaymentProcess.php

@@ -134,7 +134,7 @@ class AdyenPaymentProcess implements AdyenPaymentProcessInterface
         $request = $this->adyenRequestHelper->buildCustomerData($request, $customerId, $billingAddress, $storeId);
 
         // Customer Ip data builder
-        $shopperIp = $quote->getRemoteIp();
+        $shopperIp = $quote->getXForwardedFor();
         $request = $this->adyenRequestHelper->buildCustomerIpData($request, $shopperIp);
 
         // AddressDataBuilder