Merge pull request #1 from dercoder/master

returnUrl, cancelUrl and notifyUrl added for API 2.0.6

Author: Alex-Sh

.coveralls.yml

@@ -0,0 +1,2 @@
+coverage_clover: ./clover.xml
+json_path: ./coveralls-upload.json

.travis.yml

@@ -5,9 +5,12 @@ php:
   - 5.4
   - 5.5
   - 5.6
+  - 7.0
   - hhvm
 
 before_script:
   - composer install -n --dev --prefer-source
 
 script: vendor/bin/phpcs --standard=PSR2 src && vendor/bin/phpunit --coverage-text
+
+after_script: vendor/bin/coveralls -v

README.md

@@ -3,6 +3,7 @@
 **Ecopayz driver for the Omnipay PHP payment processing library**
 
 [![Build Status](https://travis-ci.org/dercoder/omnipay-ecopayz.png?branch=master)](https://travis-ci.org/dercoder/omnipay-ecopayz)
+[![Coverage Status](https://coveralls.io/repos/dercoder/omnipay-ecopayz/badge.svg?branch=master&service=github)](https://coveralls.io/github/dercoder/omnipay-ecopayz?branch=master)
 [![Dependency Status](https://www.versioneye.com/user/projects/54366b4be993e89c45000137/badge.png)](https://www.versioneye.com/user/projects/54366b4be993e89c45000137)
 
 [![Latest Stable Version](https://poser.pugx.org/dercoder/omnipay-ecopayz/v/stable.png)](https://packagist.org/packages/dercoder/omnipay-ecopayz)

composer.json

@@ -19,7 +19,8 @@
         "omnipay/common": "~2.3"
     },
     "require-dev": {
-        "omnipay/tests": "~2.0"
+        "omnipay/tests": "~2.0",
+        "satooshi/php-coveralls": "1.0.0"
     },
     "extra": {
         "branch-alias": {

src/Omnipay/Ecopayz/Message/PurchaseRequest.php

@@ -12,7 +12,7 @@
  * @author Alexander Fedra <contact@dercoder.at>
  * @copyright 2015 DerCoder
  * @license http://opensource.org/licenses/mit-license.php MIT
- * @version 2.0.3 Ecopayz API Specification
+ * @version 2.0.6 Ecopayz API Specification
  */
 class PurchaseRequest extends AbstractRequest
 {
@@ -65,8 +65,20 @@ public function getData()
         $data['Amount'] = $this->getAmount();
         $data['Currency'] = $this->getCurrency();
         $data['MerchantFreeText'] = $this->getDescription();
-        $data['Checksum'] = $this->calculateArrayChecksum($data);
 
+        if ($returnUrl = $this->getReturnUrl()) {
+            $data['OnSuccessUrl'] = $returnUrl;
+        }
+
+        if ($cancelUrl = $this->getCancelUrl()) {
+            $data['OnFailureUrl'] = $cancelUrl;
+        }
+
+        if ($notifyUrl = $this->getNotifyUrl()) {
+            $data['TransferUrl'] = $notifyUrl;
+        }
+
+        $data['Checksum'] = $this->calculateArrayChecksum($data);
         return $data;
     }
 

tests/Omnipay/Ecopayz/Message/FetchTransactionResponseTest.php

@@ -37,6 +37,7 @@ public function testSuccess()
         $this->assertSame('OK', $response->getMessage());
         $this->assertSame('2064', $response->getTransactionId());
         $this->assertSame('1865010000008316336', $response->getTransactionReference());
+        $this->assertSame('', $response->getTransactionDescription());
         $this->assertSame('7.91', $response->getAmount());
         $this->assertSame('EUR', $response->getCurrency());
         $this->assertSame('110355', $response->getMerchantAccountNumber());

tests/Omnipay/Ecopayz/Message/PurchaseRequestTest.php

@@ -18,7 +18,10 @@ public function setUp()
             'transactionId'             => 'TX4567890',
             'description'               => 'Free Text Description',
             'amount'                    => '12.34',
-            'currency'                  => 'EUR'
+            'currency'                  => 'EUR',
+            'returnUrl'                 => 'http://example.com/return',
+            'cancelUrl'                 => 'http://example.com/cancel',
+            'notifyUrl'                 => 'http://example.com/notify',
         ));
     }
 
@@ -33,6 +36,16 @@ public function testGetData()
         $this->assertSame('12.34', $data['Amount']);
         $this->assertSame('EUR', $data['Currency']);
         $this->assertSame('Free Text Description', $data['MerchantFreeText']);
-        $this->assertSame('84bbad2a636aa9226c03f17ff813a181', $data['Checksum']);
+        $this->assertSame('7320d93a3daa1e296f56fa7f40d6fb8b', $data['Checksum']);
+        $this->assertSame('http://example.com/return', $data['OnSuccessUrl']);
+        $this->assertSame('http://example.com/cancel', $data['OnFailureUrl']);
+        $this->assertSame('http://example.com/notify', $data['TransferUrl']);
+    }
+
+    public function testSendData()
+    {
+        $data = $this->request->getData();
+        $response = $this->request->sendData($data);
+        $this->assertSame('Omnipay\Ecopayz\Message\PurchaseResponse', get_class($response));
     }
 }

tests/Omnipay/Ecopayz/Message/PurchaseResponseTest.php

@@ -19,6 +19,7 @@ public function testResult()
         ));
 
         $this->assertFalse($response->isSuccessful());
+        $this->assertTrue($response->isRedirect());
         $this->assertNull($response->getCode());
         $this->assertNull($response->getMessage());
         $this->assertSame('https://secure.ecopayz.com/PrivateArea/WithdrawOnlineTransfer.aspx?PaymentPageID=100&MerchantAccountNumber=100001&CustomerIdAtMerchant=1123456789&TxID=TX4567890&Amount=12.34&Currency=EUR&MerchantFreeText=Free+Text+Description&Checksum=84bbad2a636aa9226c03f17ff813a181', $response->getRedirectUrl());