add merchant_ip to MitPaymentRequest (#6)

Author: aozisik

src/Concerns/Parameters.php

@@ -2,6 +2,8 @@
 
 namespace Omnipay\EveryPay\Concerns;
 
+use RuntimeException;
+
 trait Parameters
 {
     public function getDefaultParameters()
@@ -105,6 +107,27 @@ public function setClientIp($ip)
         return $this->setParameter('user_ip', $ip);
     }
 
+    /**
+     * The IP of the Merchant server.
+     * This is only used for MIT payments (as Customer is not involved in the payment process).
+     * If no IP is set, it will default to
+     */
+    public function getMerchantIp()
+    {
+        if ($ip = $this->getParameter('merchant_ip')) {
+            return $ip;
+        } elseif (isset($_SERVER['SERVER_ADDR'])) {
+            return $_SERVER['SERVER_ADDR'];
+        } else {
+            throw new RuntimeException('Unable to determine merchant_ip.');
+        }
+    }
+
+    public function setMerchantIp($ip)
+    {
+        return $this->setParameter('merchant_ip', $ip);
+    }
+
     public function getSaveCard()
     {
         return $this->getParameter('saveCard');

src/Messages/MitPaymentRequest.php

@@ -36,16 +36,14 @@ public function getData()
             'amount' => $this->getAmount(),
             'order_reference' => $this->getTransactionId(),
             'token_agreement' => TokenAgreement::UNSCHEDULED,
+
+            'merchant_ip' => $this->getMerchantIp(),
         ];
 
         if ($this->getEmail()) {
             $data['email'] = $this->getEmail();
         }
 
-        if ($this->getClientIp()) {
-            $data['customer_ip'] = $this->getClientIp();
-        }
-
         return array_merge($baseData, $data);
     }
 

tests/EveryPayTest.php

@@ -29,6 +29,21 @@ public function testEmail()
         $this->assertSame('[email protected]', $this->gateway->getEmail());
     }
 
+    public function testClientIp()
+    {
+        $this->assertSame($this->gateway, $this->gateway->setClientIp('1.1.1.1'));
+        $this->assertSame('1.1.1.1', $this->gateway->getClientIp());
+    }
+
+    public function testMerchantIp()
+    {
+        $_SERVER['SERVER_ADDR'] = '1.1.1.1';
+
+        $this->assertSame('1.1.1.1', $this->gateway->getMerchantIp());
+        $this->assertSame($this->gateway, $this->gateway->setMerchantIp('2.2.2.2'));
+        $this->assertSame('2.2.2.2', $this->gateway->getMerchantIp());
+    }
+
     public function testSaveCard()
     {
         // Default is false