Merge pull request #11 from TransactPRO/merchant_transaction_id_response

Add merchant-transaction-id to payment response parsing

Author: OlegGS

src/Gateway/Http/Transport/Curl.php

@@ -136,17 +136,20 @@ public function execute(string $method, string $url, string $authorizationHeader
             ->setOption(CURLOPT_POSTFIELDS, $body)
             ->setOption(CURLOPT_HTTPHEADER, $headers)
             ->setOption(CURLOPT_URL, $url)
+            ->setOption(CURLOPT_RETURNTRANSFER, 1)
+            ->setOption(CURLOPT_HEADER, 1)
             ->applyOptions();
 
         $result = curl_exec($this->ch);
         if (!$result) {
             return false;
         }
 
-        list($header, $body) = explode("\r\n\r\n", $result, 2);
-        $this->body = $body;
+        $headerSize = curl_getinfo($this->ch, CURLINFO_HEADER_SIZE);
+        $header = substr($result, 0, $headerSize);
 
         $this->status = (int) curl_getinfo($this->ch, CURLINFO_HTTP_CODE);
+        $this->body = substr($result, $headerSize);
         $this->headers = $this->headersToArray($header);
 
         return true;
@@ -174,7 +177,7 @@ private function headersToArray(string $header): array
         $headers = [];
 
         foreach (explode("\r\n", $header) as $i => $line) {
-            if ($i === 0) {
+            if (strlen($line) === 0 || stripos($line, 'HTTP') === 0) {
                 continue;
             }
 

src/Gateway/Responses/Parts/Payment/GW.php

@@ -14,6 +14,7 @@
 class GW
 {
     public $gatewayTransactionId;
+    public $merchantTransactionId;
     public $originalGatewayTransactionId;
     public $parentGatewayTransactionId;
     public $redirectUrl;
@@ -23,6 +24,7 @@ class GW
     public function __construct(array $rawDecoded = null)
     {
         $this->gatewayTransactionId = strval($rawDecoded['gateway-transaction-id'] ?? null);
+        $this->merchantTransactionId = strval($rawDecoded['merchant-transaction-id'] ?? null);
         $this->originalGatewayTransactionId = strval($rawDecoded['original-gateway-transaction-id'] ?? null);
         $this->parentGatewayTransactionId = strval($rawDecoded['parent-gateway-transaction-id'] ?? null);
         $this->redirectUrl = strval($rawDecoded['redirect-url'] ?? null);

tests/Gateway/Operations/Transactions/SmsTest.php

@@ -92,8 +92,8 @@ public function testParsePaymentResponseSuccessfulAPI()
     {
         $body = "{\"acquirer-details\":{\"dynamic-descriptor\":\"test\",\"eci-sli\":\"648\",\"result-code\":\"000\",\"status-description\":\"Approved\"," .
             "\"status-text\":\"Approved\",\"terminal-mid\":\"5800978\",\"transaction-id\":\"1899493845214315\"},\"error\":{}," .
-            "\"gw\":{\"gateway-transaction-id\":\"8a9bed66-8412-494f-9866-2c26b5ceee62\",\"status-code\":7,\"status-text\":\"SUCCESS\"," .
-            "\"original-gateway-transaction-id\":\"orig-aaa\",\"parent-gateway-transaction-id\":\"parent-aaa\"}," .
+            "\"gw\":{\"gateway-transaction-id\":\"8a9bed66-8412-494f-9866-2c26b5ceee62\",\"merchant-transaction-id\":\"87d53472ba27fde33ec03e2f5ca6137a\",".
+            "\"status-code\":7,\"status-text\":\"SUCCESS\",\"original-gateway-transaction-id\":\"orig-aaa\",\"parent-gateway-transaction-id\":\"parent-aaa\"}," .
             "\"warnings\":[\"Soon counters will be exceeded for the merchant\",\"Soon counters will be exceeded for the account\"," .
             "\"Soon counters will be exceeded for the terminal group\",\"Soon counters will be exceeded for the terminal\"]}\n";
 
@@ -111,6 +111,7 @@ public function testParsePaymentResponseSuccessfulAPI()
 
         $this->assertNotNull($parsedResponse->gw);
         $this->assertEquals("8a9bed66-8412-494f-9866-2c26b5ceee62", $parsedResponse->gw->gatewayTransactionId);
+        $this->assertEquals("87d53472ba27fde33ec03e2f5ca6137a", $parsedResponse->gw->merchantTransactionId);
         $this->assertEquals("orig-aaa", $parsedResponse->gw->originalGatewayTransactionId);
         $this->assertEquals("parent-aaa", $parsedResponse->gw->parentGatewayTransactionId);
         $this->assertEquals(Status::SUCCESS, $parsedResponse->gw->statusCode);