Parameter "email" changed to "account"

Author: dercoder

src/Message/PayoutRequest.php

@@ -3,6 +3,7 @@
 namespace Omnipay\Neteller\Message;
 
 use Guzzle\Http\Exception\BadResponseException;
+use Omnipay\Common\Exception\InvalidRequestException;
 
 /**
  * Neteller Payout Request.
@@ -16,45 +17,55 @@ class PayoutRequest extends AbstractRequest
     /**
      * @return string|null
      */
-    public function getEmail()
+    public function getAccount()
     {
-        return $this->getParameter('email');
+        return $this->getParameter('account');
     }
 
     /**
      * @param string $value
      *
      * @return self
      */
-    public function setEmail($value)
+    public function setAccount($value)
     {
-        return $this->setParameter('email', $value);
+        return $this->setParameter('account', $value);
     }
 
     /**
      * @return array request data
+     * @throws InvalidRequestException
      */
     public function getData()
     {
         $this->validate(
-            'email',
+            'account',
             'description',
             'transactionId',
             'amount',
             'currency'
         );
 
-        return array(
-            'payeeProfile' => array(
-                'email' => (string) $this->getEmail()
-            ),
+        $account = $this->getAccount();
+        $data = array(
+            'payeeProfile' => array(),
             'transaction'  => array(
                 'merchantRefId' => (string) $this->getTransactionId(),
                 'amount'        => (int) $this->getAmountInteger(),
                 'currency'      => (string) $this->getCurrency(),
             ),
             'message'      => (string) $this->getDescription()
         );
+
+        if (is_numeric($account)) {
+            $data['payeeProfile']['accountId'] = (string) $account;
+        } elseif (filter_var($account, FILTER_VALIDATE_EMAIL)) {
+            $data['payeeProfile']['email'] = (string) $account;
+        } else {
+            throw new InvalidRequestException('The account parameter must be an email or numeric value');
+        }
+
+        return $data;
     }
 
     /**

src/Message/PurchaseRequest.php

@@ -16,19 +16,19 @@ class PurchaseRequest extends AbstractRequest
     /**
      * @return string|null
      */
-    public function getEmail()
+    public function getAccount()
     {
-        return $this->getParameter('email');
+        return $this->getParameter('account');
     }
 
     /**
      * @param string $value
      *
      * @return self
      */
-    public function setEmail($value)
+    public function setAccount($value)
     {
-        return $this->setParameter('email', $value);
+        return $this->setParameter('account', $value);
     }
 
     /**
@@ -55,7 +55,7 @@ public function setVerificationCode($value)
     public function getData()
     {
         $this->validate(
-            'email',
+            'account',
             'verificationCode',
             'transactionId',
             'amount',
@@ -65,7 +65,7 @@ public function getData()
         return array(
             'paymentMethod'    => array(
                 'type'  => 'neteller',
-                'value' => (string) $this->getEmail()
+                'value' => (string) $this->getAccount()
             ),
             'transaction'      => array(
                 'merchantRefId' => (string) $this->getTransactionId(),

tests/Omnipay/Neteller/GatewayTest.php

@@ -22,13 +22,13 @@ public function setUp()
     public function testPurchase()
     {
         $request = $this->gateway->purchase(array(
-            'email'         => '[email protected]',
+            'account'       => '[email protected]',
             'transactionId' => 'TX9997888',
             'amount'        => '14.65',
             'currency'      => 'USD'
         ));
 
-        $this->assertSame('[email protected]', $request->getEmail());
+        $this->assertSame('[email protected]', $request->getAccount());
         $this->assertSame('TX9997888', $request->getTransactionId());
         $this->assertSame('14.65', $request->getAmount());
         $this->assertSame('USD', $request->getCurrency());
@@ -37,13 +37,13 @@ public function testPurchase()
     public function testPayout()
     {
         $request = $this->gateway->payout(array(
-            'email'         => '[email protected]',
+            'account'       => '[email protected]',
             'transactionId' => 'TX8889777',
             'amount'        => '12.43',
             'currency'      => 'USD'
         ));
 
-        $this->assertSame('[email protected]', $request->getEmail());
+        $this->assertSame('[email protected]', $request->getAccount());
         $this->assertSame('TX8889777', $request->getTransactionId());
         $this->assertSame('12.43', $request->getAmount());
         $this->assertSame('USD', $request->getCurrency());

tests/Omnipay/Neteller/Message/PayoutRequestTest.php

@@ -15,7 +15,7 @@ public function setUp()
         parent::setUp();
         $this->request = new PayoutRequest($this->getHttpClient(), $this->getHttpRequest());
         $this->request->initialize(array(
-            'email'            => '[email protected]',
+            'account'          => '[email protected]',
             'verificationCode' => 270955,
             'transactionId'    => 4567890,
             'description'      => 'Free Text Description',
@@ -32,6 +32,14 @@ public function testGetData()
         $this->assertSame(1234, $data['transaction']['amount']);
         $this->assertSame('USD', $data['transaction']['currency']);
         $this->assertSame('Free Text Description', $data['message']);
+
+        $this->request->setAccount(454651018446);
+        $data = $this->request->getData();
+        $this->assertSame('454651018446', $data['payeeProfile']['accountId']);
+
+        $this->request->setAccount('SomeInvalidAccount');
+        $this->setExpectedException('Omnipay\Common\Exception\InvalidRequestException', 'The account parameter must be an email or numeric value');
+        $this->request->getData();
     }
 
     public function testSendDataSuccess()

tests/Omnipay/Neteller/Message/PurchaseRequestTest.php

@@ -15,7 +15,7 @@ public function setUp()
         parent::setUp();
         $this->request = new PurchaseRequest($this->getHttpClient(), $this->getHttpRequest());
         $this->request->initialize(array(
-            'email'            => '[email protected]',
+            'account'          => '[email protected]',
             'verificationCode' => 270955,
             'transactionId'    => 4567890,
             'amount'           => 12.34,