Merge pull request #121 from academe/master

Fix for issue #120

Author: judgej

src/Message/Response.php

@@ -61,7 +61,7 @@ public function getTransactionReference()
         // if not already in the response (it will be for Sage Pay Form).
 
         if (! array_key_exists('VendorTxCode', $reference)) {
-            $reference['VendorTxCode'] = $this->getRequest()->getTransactionId();
+            $reference['VendorTxCode'] = $this->getTransactionId();
         }
 
         ksort($reference);

src/Message/ServerCompleteAuthorizeResponse.php

@@ -20,7 +20,7 @@ public function getTransactionReference()
     {
         if (isset($this->data['TxAuthNo'])) {
             $reference = json_decode($this->getRequest()->getTransactionReference(), true);
-            $reference['VendorTxCode'] = $this->getRequest()->getTransactionId();
+            $reference['VendorTxCode'] = $this->getTransactionId();
             $reference['TxAuthNo'] = $this->data['TxAuthNo'];
 
             return json_encode($reference);

src/Message/ServerNotifyRequest.php

@@ -214,4 +214,13 @@ public function sendResponse($status, $nextUrl, $detail = null)
             exit;
         }
     }
+
+    /**
+     * Overrides the Form/Server/Direct method since there is no
+     * getRequest() to inspect in a notification.
+     */
+    public function getTransactionId()
+    {
+        return $this->getDataItem('VendorTxCode');
+    }
 }

src/Traits/ResponseFieldsTrait.php

@@ -254,4 +254,16 @@ public function getExpiryYear()
             return (int)$dateTime->format('Y');
         }
     }
+
+    /**
+     * The transaction ID will be returned in the data for the Form API, or
+     * we will have to refer to the request for the Server and Direct APIs.
+     *
+     * @return @inherit
+     */
+    public function getTransactionId()
+    {
+        return $this->getDataItem('VendorTxCode')
+            ?: $this->getRequest()->getTransactionId();
+    }
 }

src/Traits/ServerNotifyTrait.php

@@ -150,15 +150,6 @@ public function getVPSTxId()
         return $this->getDataItem('VPSTxId');
     }
 
-    /**
-     * The VendorTxCode is POSTed - we will need this for looking up the transaction
-     * locally.
-     */
-    public function getTransactionId()
-    {
-        return $this->getDataItem('VendorTxCode');
-    }
-
     /**
      * Gateway Reference.
      *
@@ -188,7 +179,7 @@ public function getTransactionReference()
 
         $reference['SecurityKey'] = $this->getSecurityKey();
 
-        $reference['VendorTxCode'] = $this->getDataItem('VendorTxCode');
+        $reference['VendorTxCode'] = $this->getTransactionId();
 
         ksort($reference);
 

tests/Message/ServerCompleteAuthorizeResponseTest.php

@@ -28,16 +28,49 @@ public function testServerCompleteAuthorizeResponseSuccess()
                 'DeclineCode' => '00',
                 'ExpiryDate' => '0722',
                 'BankAuthCode' => '999777',
+                //'VendorTxCode' => '123', <-- Not in response
             )
         );
 
+        // The transaction ID is set in the original request only.
+
         $this->getMockRequest()->shouldReceive('getTransactionId')->once()->andReturn('123');
         $this->getMockRequest()->shouldReceive('getTransactionReference')->once()->andReturn('{"SecurityKey":"JEUPDN1N7E","TxAuthNo":"4255","VPSTxId":"{F955C22E-F67B-4DA3-8EA3-6DAC68FA59D2}","VendorTxCode":"438791"}');
 
         $this->assertTrue($response->isSuccessful());
         $this->assertFalse($response->isRedirect());
         $this->assertSame('{"SecurityKey":"JEUPDN1N7E","TxAuthNo":"b","VPSTxId":"{F955C22E-F67B-4DA3-8EA3-6DAC68FA59D2}","VendorTxCode":"123"}', $response->getTransactionReference());
         $this->assertNull($response->getMessage());
+
+        //$this->assertSame('123', $response->getTransactionId());
+    }
+
+    public function testFormCompleteAuthorizeResponseSuccess()
+    {
+        $response = new ServerCompleteAuthorizeResponse(
+            $this->getMockRequest(),
+            array(
+                'Status' => 'OK',
+                'TxAuthNo' => 'b',
+                'AVSCV2' => 'c',
+                'AddressResult' => 'd',
+                'PostCodeResult' => 'e',
+                'CV2Result' => 'f',
+                'GiftAid' => 'g',
+                '3DSecureStatus' => 'h',
+                'CAVV' => 'i',
+                'AddressStatus' => 'j',
+                'PayerStatus' => 'k',
+                'CardType' => 'l',
+                'Last4Digits' => 'm',
+                'DeclineCode' => '00',
+                'ExpiryDate' => '0722',
+                'BankAuthCode' => '999777',
+                'VendorTxCode' => '123', // In response
+            )
+        );
+
+        $this->assertSame('123', $response->getTransactionId());
     }
 
     public function testServerCompleteAuthorizeResponseFailure()