mfauveau · Aug 16, 2018 · Aug 16, 2018 · May 19, 2020 · May 19, 2020 · Sep 2, 2021
Showing with 33 additions and 17 deletions.

+3 −3 composer.json

+3 −3 src/DirectPostGateway.php

+18 −3 src/Message/AbstractRequest.php

+1 −3 src/Message/DirectPostAuthRequest.php

+8 −5 src/Message/DirectPostCreateCardRequest.php
diff --git a/composer.json b/composer.json
@@ -26,14 +26,14 @@
         "psr-4": { "Omnipay\\NMI\\" : "src/" }
     },
     "require": {
-        "omnipay/common": "~2.0"
+        "league/omnipay": "^3.0"
     },
     "require-dev": {
-        "omnipay/tests": "~2.0"
+        "omnipay/tests": "^3.0"
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.0.x-dev"
+            "dev-master": "3.0.x-dev"
         }
     }
 }
diff --git a/src/DirectPostGateway.php b/src/DirectPostGateway.php
@@ -363,7 +363,7 @@ public function credit(array $parameters = array())
 
     /**
      * @param array $parameters
-     * @return \Omnipay\NMI\Message\CreateCardRequest
+     * @return \Omnipay\NMI\Message\DirectPostCreateCardRequest
      */
     public function createCard(array $parameters = array())
     {
@@ -372,7 +372,7 @@ public function createCard(array $parameters = array())
 
     /**
      * @param array $parameters
-     * @return \Omnipay\NMI\Message\UpdateCardRequest
+     * @return \Omnipay\NMI\Message\DirectPostUpdateCardRequest
      */
     public function updateCard(array $parameters = array())
     {
@@ -381,7 +381,7 @@ public function updateCard(array $parameters = array())
 
     /**
      * @param array $parameters
-     * @return \Omnipay\NMI\Message\DeleteCardRequest
+     * @return \Omnipay\NMI\Message\DirectPostDeleteCardRequest
      */
     public function deleteCard(array $parameters = array())
     {

diff --git a/src/Message/AbstractRequest.php b/src/Message/AbstractRequest.php
@@ -326,9 +326,14 @@ protected function getShippingData()
 
     public function sendData($data)
     {
-        $httpResponse = $this->httpClient->post($this->getEndpoint(), null, $data)->send();
+        $httpResponse = $this->httpClient->request(
+            'POST',
+            $this->getEndpoint(),
+            ['Content-Type' => 'application/x-www-form-urlencoded'],
+            http_build_query($data)
+        );
 
-        return $this->response = new DirectPostResponse($this, $httpResponse->getBody());
+        return $this->response = new DirectPostResponse($this, $httpResponse->getBody()->getContents());
     }
 
     public function setEndpoint($value)
@@ -338,6 +343,16 @@ public function setEndpoint($value)
 
     public function getEndpoint()
     {
-        return $this->endpoint;
+        return $this->getParameter('endpoint') ?: $this->endpoint;
+    }
+
+    public function getPaymentToken()
+    {
+        return $this->getParameter('payment_token');
+    }
+
+    public function setPaymentToken($value)
+    {
+        return $this->setParameter('payment_token', $value);
     }
 }
diff --git a/src/Message/DirectPostAuthRequest.php b/src/Message/DirectPostAuthRequest.php
@@ -10,15 +10,13 @@ class DirectPostAuthRequest extends AbstractRequest
 
     public function getData()
     {
-        $this->validate('amount');
-
         $data = $this->getBaseData();
         $data['amount'] = $this->getAmount();
 
         if ($this->getCardReference()) {
             $data['customer_vault_id'] = $this->getCardReference();
 
-            return $data;
+           return array_merge($data, $this->getOrderData());
         } else {
             $this->getCard()->validate();
 

diff --git a/src/Message/DirectPostCreateCardRequest.php b/src/Message/DirectPostCreateCardRequest.php
@@ -11,13 +11,16 @@ class DirectPostCreateCardRequest extends AbstractRequest
 
     public function getData()
     {
-        $this->validate('card');
-        $this->getCard()->validate();
-
+		$this->validate('card');
         $data = $this->getBaseData();
 
-        $data['ccnumber'] = $this->getCard()->getNumber();
-        $data['ccexp'] = $this->getCard()->getExpiryDate('my');
+		if ($paymentToken = $this->getPaymentToken()) {
+			$data['payment_token'] = $paymentToken;
+		} else {
+			$this->getCard()->validate();
+			$data['ccnumber'] = $this->getCard()->getNumber();
+			$data['ccexp'] = $this->getCard()->getExpiryDate('my');
+		}
         $data['payment'] = 'creditcard';
 
         if ('update_customer' === $this->customer_vault) {