Merge pull request #4 from formapro-forks/fixes

Require credit card details, use query to get data for fingerprint.

Author: greydnls

src/Message/DirectPostAuthorizeRequest.php

@@ -11,7 +11,7 @@ class DirectPostAuthorizeRequest extends DirectPostAbstractRequest
 
     public function getData()
     {
-        $this->validate('amount', 'returnUrl');
+        $this->validate('amount', 'returnUrl', 'card');
 
         $data = array();
         $data['EPS_MERCHANT'] = $this->getMerchantId();
@@ -26,6 +26,8 @@ public function getData()
         $data['EPS_REDIRECT'] = 'TRUE';
         $data['EPS_CURRENCY'] = $this->getCurrency();
 
+        $data = array_replace($data, $this->getCardData());
+
         return $data;
     }
 
@@ -50,4 +52,17 @@ public function sendData($data)
     {
         return $this->response = new DirectPostAuthorizeResponse($this, $data, $this->getEndpoint());
     }
+
+    protected function getCardData()
+    {
+        $this->getCard()->validate();
+
+        $data = array();
+        $data['EPS_CARDNUMBER'] = $this->getCard()->getNumber();
+        $data['EPS_EXPIRYMONTH'] = $this->getCard()->getExpiryMonth();
+        $data['EPS_EXPIRYYEAR'] = $this->getCard()->getExpiryYear();
+        $data['EPS_CCV'] = $this->getCard()->getCvv();
+
+        return $data;
+    }
 }

src/Message/DirectPostCompletePurchaseRequest.php

@@ -11,9 +11,9 @@ class DirectPostCompletePurchaseRequest extends DirectPostAbstractRequest
 {
     public function getData()
     {
-        $data = $this->httpRequest->request->all();
+        $data = $this->httpRequest->query->all();
 
-        if ($this->generateResponseFingerprint($data) !== $this->httpRequest->request->get('fingerprint')) {
+        if ($this->generateResponseFingerprint($data) !== $this->httpRequest->query->get('fingerprint')) {
             throw new InvalidRequestException('Invalid fingerprint');
         }
 

tests/Message/DirectPostAuthorizeRequestTest.php

@@ -16,6 +16,12 @@ public function setUp()
                 'transactionPassword' => 'bar',
                 'amount' => '12.00',
                 'returnUrl' => 'https://www.example.com/return',
+                'card' => array(
+                    'number' => '4444333322221111',
+                    'expiryMonth' => '6',
+                    'expiryYear' => '2020',
+                    'cvv' => '123',
+                ),
             )
         );
     }

tests/Message/DirectPostCompletePurchaseRequestTest.php

@@ -35,7 +35,7 @@ public function testSuccess()
             'transactionPassword' => 'abc123',
         ));
 
-        $this->getHttpRequest()->request->replace(array(
+        $this->getHttpRequest()->query->replace(array(
             'timestamp' => '20130602112954',
             'callback_status_code' => '',
             'fingerprint' => 'd9b40fc6f841f41ef3475220fe6316406a5256ce',
@@ -68,7 +68,7 @@ public function testFailure()
             'transactionPassword' => 'abc123',
         ));
 
-        $this->getHttpRequest()->request->replace(array(
+        $this->getHttpRequest()->query->replace(array(
             'timestamp' => '20130602102927',
             'callback_status_code' => '',
             'fingerprint' => '0516a31bf96ad89c354266afb9bd4be43aaf853f',

tests/Message/DirectPostPurchaseRequestTest.php

@@ -16,6 +16,12 @@ public function setUp()
                 'transactionPassword' => 'bar',
                 'amount' => '12.00',
                 'returnUrl' => 'https://www.example.com/return',
+                'card' => array(
+                    'number' => '4444333322221111',
+                    'expiryMonth' => '6',
+                    'expiryYear' => '2020',
+                    'cvv' => '123',
+                ),
             )
         );
     }