init test

Author: bladeroot

.hidev/config.yml

@@ -1,7 +1,7 @@
 package:
     name:           omnipay-okpay
     namespace:      Omnipay\OKPAY
-    headline:       Omnipay: OKPAY
+    headline:       "Omnipay: OKPAY"
     title:          OKPAY driver for Omnipay PHP payment library
     type:           library
     license:        MIT

composer.json

@@ -28,25 +28,30 @@
         {
             "name": "Dmitry Naumenko",
             "role": "Lead backend developer",
-            "email": "silverfire@hiqdev.com",
+            "email": "d.naumenko.a@gmail.com",
             "homepage": "http://silverfire.me/"
         },
         {
             "name": "Andrey Klochok",
             "role": "Lead frontend developer",
-            "email": "tafid@hiqdev.com",
+            "email": "andreyklochok@gmail.com",
             "homepage": "http://hiqdev.com/"
         },
         {
             "name": "Yuriy Myronchuk",
             "role": "QA Lead",
-            "email": "bladeroot@hiqdev.com",
+            "email": "bladeroot@gmail.com",
             "homepage": "http://hiqdev.com/"
         }
     ],
     "require": {
         "omnipay/common": "~2.3"
     },
+    "require-dev": {
+        "omnipay/tests": "~2.0",
+        "hiqdev/hidev-php": "*",
+        "hiqdev/hidev-hiqdev": "*"
+    },
     "autoload": {
         "psr-4": {
             "Omnipay\\OKPAY\\": "src"

src/Gateway.php

@@ -14,34 +14,14 @@ public function getName()
         return 'OKPAY';
     }
 
-    public function getAccount()
-    {
-        return $this->getParameter('account');
-    }
-
-    public function setAccount($value)
-    {
-        return $this->setParameter('account', $value);
-    }
-
     public function getPurse()
     {
-        return $this->getAccount();
+        return $this->getParameter('purse');
     }
 
     public function setPurse($value)
     {
-        return $this->setAccount($value);
-    }
-
-    public function getAccountName()
-    {
-        return $this->getParameter('account_name');
-    }
-
-    public function setAccountName($value)
-    {
-        return $this->setParameter('account_name', $value);
+        return $this->setParameter('purse', $value);
     }
 
     public function getSecret()
@@ -57,7 +37,7 @@ public function setSecret($value)
     public function getDefaultParameters()
     {
         return array(
-            'account_name' => '',
+            'purse' => '',
             'secret' => '',
         );
     }

src/Merchant.php

@@ -9,8 +9,38 @@ abstract class AbstractRequest extends OmnipayRequest
     protected $liveEndpoint = 'https://www.okpay.com/process.html';
     protected $testEndpoint = 'https://www.okpay.com/process.html';
 
-    protected function getEndpoint()
+    public function getPurse()
+    {
+        return $this->getParameter('purse');
+    }
+
+    public function setPurse($value)
+    {
+        return $this->setParameter('purse', $value);
+    }
+
+    public function getSecret()
+    {
+        return $this->getParameter('secret');
+    }
+
+    public function setSecret($value)
+    {
+        return $this->setParameter('secret', $value);
+    }
+
+    public function getEndpoint()
     {
         return $this->getTestMode() ? $this->testEndpoint : $this->liveEndpoint;
     }
+
+    public function setDescription($value)
+    {
+        return $this->setParameter('description', $value);
+    }
+
+    public function getDescriotion()
+    {
+        return $this->getParameter('description');
+    }
 }

src/Message/AbstractRequest.php

@@ -39,7 +39,7 @@ public function getRedirectData()
 
     public function getTransactionId()
     {
-        return intval($this->data['ok_invoice']);
+        return intval($this->data['ok_txn_id']);
     }
 
     public function getAmount()
@@ -52,8 +52,13 @@ public function getCurrency()
         return $this->data['ok_txn_currency'];
     }
 
-    public function getMessage()
+    public function getDescription()
     {
-        return null;
+        return $this->data['ok_item_1_name'];
+    }
+
+    public function getPurse()
+    {
+        return $this->data['ok_receiver'];
     }
 }

src/Message/CompletePurchaseResponse.php

@@ -4,41 +4,14 @@
 
 class PurchaseRequest extends AbstractRequest
 {
-    public function getAccount()
-    {
-        return $this->getParameter('account');
-    }
-
-    public function setAccount($value)
-    {
-        return $this->setParameter('account', $value);
-    }
-
-    public function getAccountName()
-    {
-        return $this->getParameter('accountName');
-    }
-
-    public function setAccountName($value)
-    {
-        return $this->setParameter('accountName', $value);
-    }
-
-    public function getEndpoint()
-    {
-        return $this->getTestMode() ? $this->testEndpoint : $this->liveEndpoint;
-    }
-
     public function getData()
     {
-        $this->validate('account', 'accountName', 'currency', 'amount');
-
-        $data['ok_receiver'] = $this->getAccount();
-        $data['ok_item_1_name'] = $this->getAccountName();
+        $this->validate('purse', 'currency', 'amount', 'description');
+        $data['ok_receiver'] = $this->getPurse();
+        $data['ok_item_1_name'] = $this->getDescription();
         $data['ok_currency'] = $this->getCurrency();
         $data['ok_item_1_price'] = $this->getAmount();
         $data['ok_invoice'] = $this->getTransactionId();
-
         return $data;
     }
 

src/Message/PurchaseRequest.php

@@ -13,6 +13,7 @@ class PurchaseResponse extends AbstractResponse implements RedirectResponseInter
     public function __construct(RequestInterface $request, $data, $redirectUrl)
     {
         parent::__construct($request, $data);
+
         $this->redirectUrl = $redirectUrl;
     }
 

src/Message/PurchaseResponse.php

@@ -8,16 +8,6 @@ class RefundRequest extends AbstractRequest
 {
     protected $endpoint = 'https://api.okpay.com/OkPayAPI?wsdl';
 
-    public function getAccount()
-    {
-        return $this->getParameter('account');
-    }
-
-    public function setAccount($value)
-    {
-        return $this->setParameter('account', $value);
-    }
-
     public function getSecret()
     {
         return $this->getParameter('secret');
@@ -40,10 +30,10 @@ public function setPayeeAccount($value)
 
     public function getData()
     {
-        $this->validate('account', 'payeeAccount', 'amount', 'secret', 'description');
+        $this->validate('purse', 'payeeAccount', 'amount', 'secret', 'description');
 
         $data['secret'] = $this->getSecret();
-        $data['walletId'] = $this->getAccount();
+        $data['walletId'] = $this->getPurse();
         $data['receiver'] = $this->getPayeeAccount();
         $data['amount'] = $this->getAmount();
         $data['currency'] = $this->getCurrency();
@@ -61,11 +51,9 @@ public function sendData($data)
 
     private function soapCall($data)
     {
-        $secWord = $data['secret'];
-        $WalletID = $data['walletId'];
         $datePart = gmdate("Ymd");
         $timePart = gmdate("H");
-        $authString = $secWord.":".$datePart.":".$timePart;
+        $authString = "{$data['secret']}:{$datePart}:{$timePart}";
 
         $sha256 = bin2hex(hash('sha256', $authString, true));
         $secToken = strtoupper($sha256);
@@ -85,7 +73,7 @@ private function soapCall($data)
                 ]
             );
 
-            $this->WalletID = $WalletID;
+            $this->WalletID = $data['walletId'];
             $this->SecurityToken = $secToken;
             $this->Currency = $data['currency'];
             $this->Receiver = $data['receiver'];