Merge pull request #8 from alegraio/dev

Fixed complete purchase.

Author: cansozeri

src/Messages/AbstractRequest.php

@@ -242,6 +242,18 @@ protected function getTransactionHash(): string
             $this->getSecurityHash())));
     }
 
+    /**
+     * @return string
+     */
+    protected function getCompletePurchaseTransactionHash(): string
+    {
+        return strtoupper(SHA1(sprintf('%s%s%s%s',
+            $this->getOrderId(),
+            $this->getTerminalId(),
+            $this->getAmountInteger(),
+            $this->getSecurityHash())));
+    }
+
     /**
      * @return string
      */
@@ -259,10 +271,7 @@ protected function getRefundOrVoidHash(): string
      */
     protected function getSalesRequestParams(): array
     {
-        $data['Version'] = $this->version;
-        $data['Mode'] = $this->getTestMode() ? 'TEST' : 'PROD';
-
-
+        $data = $this->getInfo();
         $data['Card'] = array(
             'Number' => $this->getCard()->getNumber(),
             'ExpireDate' => $this->getCard()->getExpiryDate('my'),
@@ -298,13 +307,44 @@ protected function getSalesRequestParams(): array
         return $data;
     }
 
+    /**
+     * @return array
+     */
+    protected function getCompleteSalesRequestParams(): array
+    {
+        $data = $this->getInfo();
+        $data['Order'] = array(
+            'OrderID' => $this->getOrderId()
+        );
+
+        $data['Customer'] = array(
+            'IPAddress' => $this->getClientIp(),
+        );
+
+        $data['Terminal'] = [
+            'ProvUserID' => $this->getUserName(),
+            'HashData' => $this->getCompletePurchaseTransactionHash(),
+            'UserID' => $this->getUserName(),
+            'ID' => $this->getTerminalId(),
+            'MerchantID' => $this->getMerchantId()
+        ];
+
+        $data['Transaction'] = array(
+            'Type' => 'sales',
+            'Amount' => $this->getAmountInteger(),
+            'CurrencyCode' => $this->currency_list[$this->getCurrency()],
+            'MotoInd' => "N"
+        );
+
+        return $data;
+    }
+
     /**
      * @return array
      */
     protected function getAuthorizeRequestParams(): array
     {
-        $data['Version'] = $this->version;
-        $data['Mode'] = $this->getTestMode() ? 'TEST' : 'PROD';
+        $data = $this->getInfo();
         $data['Terminal'] = [
             'ProvUserID' => $this->getUserName(),
             'HashData' => $this->getTransactionHash(),
@@ -377,4 +417,15 @@ private function getSecurityHash(): string
 
         return strtoupper(SHA1(sprintf('%s%s', $this->getPassword(), $terminalId)));
     }
+
+    /**
+     * @return array
+     */
+    private function getInfo(): array
+    {
+        $data['Version'] = $this->version;
+        $data['Mode'] = $this->getTestMode() ? 'TEST' : 'PROD';
+
+        return $data;
+    }
 }

src/Messages/CompletePurchaseRequest.php

@@ -20,7 +20,7 @@ public function getData()
             throw new RuntimeException('3DSecure verification error');
         }
 
-        $data = $this->getSalesRequestParams();
+        $data = $this->getCompleteSalesRequestParams();
         $data['Transaction']['CardholderPresentCode'] = "13";
         $secure3d = [
             "AuthenticationCode" => $this->getCavv(),

tests/GatewayTest.php

@@ -32,6 +32,25 @@ public function setUp()
     }
 
 
+    public function testCompletePurchase()
+    {
+        $this->options = [
+            'orderId' => '234567',
+            'amount' => "300",
+            'currency' => 'TRY',
+            'cavv' => 'jCm0m+u/0hUfAREHBAMBcfN+pSo=',
+            'eci' => '02',
+            'xid' => 'RszfrwEYe/8xb7rnrPuh6C9pZSQ=',
+            'md' => 'SbEsOKX7ObDWDySsIxdAWk+S+OBRqtO9JhbzBb2vwcwcMfMi8VJcrKYBp01awsE1igb80xCyNEI/BNFWrX8oWwIKPyiRfx+dQIiKnFFIkyv1ZIVKeQ27LLFEx62qjVpSI31fondWTP98n7pChG/Jmg==',
+            'mdStatus' => '1',
+            'clientIp' => '172.18.0.1'
+        ];
+
+        /** @var CompletePurchaseResponse $response */
+        $response = $this->gateway->completePurchase($this->options)->send();
+        $this->assertTrue($response->isSuccessful());
+    }
+
     public function testCapture()
     {
         $this->options = [
@@ -84,26 +103,6 @@ public function testPurchase()
         $this->assertTrue($response->isSuccessful());
     }
 
-    public function testCompletePurchase()
-    {
-        $this->options = [
-            'card' => $this->getCardInfo(),
-            'orderId' => '234567',
-            'amount' => "300",
-            'currency' => 'TRY',
-            'installment' => "",
-            'cavv' => 'jCm0m+u/0hUfAREHBAMBcfN+pSo=',
-            'eci' => '02',
-            'xid' => 'RszfrwEYe/8xb7rnrPuh6C9pZSQ=',
-            'md' => '1',
-            'mdStatus' => '1',
-            'clientIp' => '172.18.0.1'
-        ];
-
-        /** @var CompletePurchaseResponse $response */
-        $response = $this->gateway->completePurchase($this->options)->send();
-        $this->assertTrue($response->isSuccessful());
-    }
 
     public function testVoid()
     {