merge with updated readme

AndrewNovikof · Jan 22, 2019 · 6301b3e · 6301b3e
1 parent c9ce0b6
commit 6301b3e
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 12 deletions.
diff --git a/src/Message/AbstractRequest.php b/src/Message/AbstractRequest.php
@@ -156,12 +156,6 @@ public function sendData($data)
     {
         $url = $this->getEndPoint() . $this->getMethod();
         $this->validate('userName', 'password');
-        if(array_key_exists('currency', $data)) {
-            $data['currency'] = $this->getCurrencyNumeric();
-        }
-        if(array_key_exists('amount', $data)) {
-            $data['amount'] = $this->getAmountInteger();
-        }
         $data = array_merge(
             [
                 'userName' => $this->getUserName(),

diff --git a/src/Message/AuthorizeRequest.php b/src/Message/AuthorizeRequest.php
@@ -228,4 +228,44 @@ public function setBindingId($value)
     {
         return $this->setParameter('bindingId', $value);
     }
+
+    /**
+     * @param mixed $data
+     * @return object|\Omnipay\Common\Message\ResponseInterface
+     * @throws \ReflectionException
+     * @throws \Omnipay\Common\Exception\InvalidRequestException
+     */
+    public function sendData($data)
+    {
+        $url = $this->getEndPoint() . $this->getMethod();
+        $this->validate('userName', 'password');
+        $data['currency'] = $this->getCurrencyNumeric();
+        $data['amount'] = $this->getAmountInteger();
+        $data = array_merge(
+            [
+                'userName' => $this->getUserName(),
+                'password' => $this->getPassword(),
+            ],
+            $data
+        );
+
+        $httpResponse = $this->httpClient->request(
+            $this->getHttpMethod(),
+            $url,
+            $this->getHeaders(),
+            http_build_query($data, '', '&')
+        );
+
+        $responseClassName = str_replace('Request', 'Response', \get_class($this));
+        $reflection = new \ReflectionClass($responseClassName);
+        if (!$reflection->isInstantiable()) {
+            throw new RuntimeException(
+                'Class ' . str_replace('Request', 'Response', \get_class($this)) . ' not found'
+            );
+        }
+
+        $content = json_decode($httpResponse->getBody()->getContents(), true);
+
+        return $reflection->newInstance($this, $content);
+    }
 }
diff --git a/src/Message/CaptureRequest.php b/src/Message/CaptureRequest.php
@@ -18,7 +18,7 @@ public function getData()
 
         $data = [
             'orderId' => $this->getOrderId(),
-            'amount' => $this->getAmount(),
+            'amount' => $this->getAmountInteger(),
         ];
 
         return $data;

diff --git a/src/Message/RefundRequest.php b/src/Message/RefundRequest.php
@@ -18,7 +18,7 @@ public function getData()
 
         $data = [
             'orderId' => $this->getOrderId(),
-            'amount' => $this->getAmount(),
+            'amount' => $this->getAmountInteger(),
         ];
 
         return $data;

diff --git a/tests/Message/AuthorizeRequestTest.php b/tests/Message/AuthorizeRequestTest.php
@@ -14,7 +14,7 @@ class AuthorizeRequestTest extends AbstractRequestTest
     /**
      * Amount to pay
      *
-     * @var string
+     * @var float
      */
     protected $amount;
 
@@ -45,7 +45,7 @@ class AuthorizeRequestTest extends AbstractRequestTest
      */
     public function setUp()
     {
-        $this->amount = strval(random_int(1000, 100000)/100);
+        $this->amount = mt_rand(1, 100);
         $this->returnUrl = 'https://test.com/' . uniqid('', true);
         $this->orderNumber = uniqid('order_number_', true);
         $this->currency = 'RUB';

diff --git a/tests/Message/CaptureRequestTest.php b/tests/Message/CaptureRequestTest.php
@@ -24,7 +24,7 @@ class CaptureRequestTest extends AbstractRequestTest
      */
     public function setUp()
     {
-        $this->amount = strval(random_int(1000, 100000)/100);
+        $this->amount = random_int(1000, 100000);
 
         parent::setUp();
     }

diff --git a/tests/Message/RefundRequestTest.php b/tests/Message/RefundRequestTest.php
@@ -29,7 +29,7 @@ class RefundRequestTest extends AbstractRequestTest
     public function setUp()
     {
         $this->orderId = mt_rand(1, 100);
-        $this->amount = strval(random_int(1000, 100000)/100);
+        $this->amount = mt_rand(1, 100500);
 
         parent::setUp();
     }