Functionality improvements

Author: dercoder

src/Omnipay/Paysafecard/Message/CompletePurchaseRequest.php

@@ -66,10 +66,6 @@ public function getData()
             'amount'
         );
 
-        if ($this->getDispositionState() !== 'S') {
-            throw new InvalidRequestException('Transaction state must be "Disposed"');
-        }
-
         $document = new \DOMDocument('1.0', 'utf-8');
         $document->formatOutput = false;
         $document->createElement('soapenv:Header');
@@ -118,7 +114,10 @@ public function getData()
         return $document->saveXML();
     }
 
-    protected function getDispositionState()
+    /**
+     * {@inheritdoc}
+     */
+    public function sendData($data)
     {
         if (!$this->fetchTransaction) {
             $this->fetchTransaction = new FetchTransactionRequest($this->httpClient, $this->httpRequest);
@@ -134,7 +133,11 @@ protected function getDispositionState()
             'amount' => $this->getAmount(),
         ))->send();
 
-        return $response->getDispositionState();
+        if ($response->getDispositionState() !== 'S') {
+            return $response;
+        }
+
+        return parent::sendData($data);
     }
 
     /**

tests/Omnipay/Paysafecard/Message/CompletePurchaseRequestTest.php

@@ -103,4 +103,31 @@ public function testSendData()
         $response = $this->request->sendData($data);
         $this->assertSame('Omnipay\Paysafecard\Message\CompletePurchaseResponse', get_class($response));
     }
+
+    public function testSendInvalidData()
+    {
+        $httpResponse = $this->getMockHttpResponse('FetchTransactionSuccess.txt');
+
+        $mockPlugin = new \Guzzle\Plugin\Mock\MockPlugin();
+        $mockPlugin->addResponse($httpResponse);
+
+        $httpClient = new HttpClient();
+        $httpClient->addSubscriber($mockPlugin);
+
+        $request = new CompletePurchaseRequest($httpClient, new HttpRequest());
+        $response = $request->initialize(array(
+            'username' => 'SOAP_USERNAME',
+            'password' => 'oJ2rHLBVSbD5iGfT',
+            'transactionId' => 'TX9997888',
+            'SubId' => 'shop1',
+            'amount' => '1.00',
+            'currency' => 'EUR'
+        ))->send();
+
+        $this->assertSame('Omnipay\Paysafecard\Message\FetchTransactionResponse', get_class($response));
+        $this->assertTrue($response->isSuccessful());
+        $this->assertSame(0, $response->getCode());
+        $this->assertSame('Consumed', $response->getMessage());
+        $this->assertSame('9922921184073520;1.00', $response->getSerialNumbers());
+    }
 }