WIP

Author: vuongxuongminh

src/AbstractGateway.php

@@ -35,7 +35,6 @@ public function initialize(array $parameters = [])
     public function getDefaultParameters(): array
     {
         return [
-            'vpc_Currency' => 'VND',
             'vpc_Version' => 2,
             'vpc_Locale' => 'vn',
         ];

src/Concerns/Parameters.php

@@ -140,27 +140,6 @@ public function setVpcVersion(string $version)
         return $this->setParameter('vpc_Version', $version);
     }
 
-    /**
-     * Trả về đơn vị tiền tệ sử dụng thanh toán của khách.
-     *
-     * @return null|string
-     */
-    public function getVpcCurrency(): ?string
-    {
-        return $this->getCurrency();
-    }
-
-    /**
-     * Thiết lập đơn vị tiền tệ sử dụng thanh toán của khách.
-     *
-     * @param  string  $currency
-     * @return $this
-     */
-    public function setVpcCurrency(string $currency)
-    {
-        return $this->setCurrency($currency);
-    }
-
     /**
      * Trả giao diện ngôn ngữ khách dùng để thanh toán.
      *
@@ -181,20 +160,4 @@ public function setVpcLocale(string $locale)
     {
         return $this->setParameter('vpc_Locale', $locale);
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getCurrency(): ?string
-    {
-        return ($currency = $this->getParameter('vpc_Currency')) ? strtoupper($currency) : null;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setCurrency($value)
-    {
-        return $this->setParameter('vpc_Currency', $value);
-    }
 }

src/Message/AbstractNotificationRequest.php

@@ -21,6 +21,7 @@ public function initialize(array $parameters = [])
     {
         parent::initialize($parameters);
 
+        $this->setParameter('vpc_Command', 'pay');
         $this->setAgainLink(
             $this->getAgainLink() ?? $this->httpRequest->getUri()
         );
@@ -30,6 +31,9 @@ public function initialize(array $parameters = [])
         $this->setTitle(
             $this->getTitle() ?? ''
         );
+        $this->setCurrency(
+            $this->getCurrency() ?? 'VND'
+        );
 
         return $this;
     }
@@ -50,7 +54,7 @@ public function getData(): array
     /**
      * {@inheritdoc}
      */
-    public function sendData($data)
+    public function sendData($data): PurchaseResponse
     {
         return $this->response = new PurchaseResponse($this, $data);
     }
@@ -228,6 +232,43 @@ public function setVpcMerchTxnRef(string $ref)
         return $this->setParameter('vpc_MerchTxnRef', $ref);
     }
 
+    /**
+     * Trả về đơn vị tiền tệ sử dụng thanh toán của khách.
+     *
+     * @return null|string
+     */
+    public function getVpcCurrency(): ?string
+    {
+        return $this->getCurrency();
+    }
+
+    /**
+     * Thiết lập đơn vị tiền tệ sử dụng thanh toán của khách.
+     *
+     * @param  string  $currency
+     * @return $this
+     */
+    public function setVpcCurrency(string $currency)
+    {
+        return $this->setCurrency($currency);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getCurrency(): ?string
+    {
+        return ($currency = $this->getParameter('vpc_Currency')) ? strtoupper($currency) : null;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setCurrency($value)
+    {
+        return $this->setParameter('vpc_Currency', $value);
+    }
+
     /**
      * {@inheritdoc}
      */

src/Message/AbstractPurchaseRequest.php

@@ -0,0 +1,57 @@
+<?php
+/**
+ * @link https://github.com/phpviet/omnipay-onepay
+ *
+ * @copyright (c) PHP Viet
+ * @license [MIT](https://opensource.org/licenses/MIT)
+ */
+
+namespace Omnipay\OnePay\Message;
+
+/**
+ * @author Vuong Minh <[email protected]>
+ * @since 1.0.0
+ */
+class AbstractQueryTransactionRequest extends AbstractSignatureRequest
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function initialize(array $parameters = [])
+    {
+        parent::initialize($parameters);
+        $this->setParameter('vpc_Command', 'queryDR');
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function sendData($data): QueryTransactionResponse
+    {
+        $url = $this->getEndpoint().'?'.http_build_query($data);
+        $response = $this->httpClient->request('GET', $url);
+        $raw = $response->getBody()->getContents();
+        parse_str($raw, $responseData);
+
+        return $this->response = new QueryTransactionResponse($this, $responseData);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getSignatureParameters(): array
+    {
+        $baseParameters = array_fill_keys([
+            'vpc_Command', 'vpc_Version', 'vpc_MerchTxnRef', 'vpc_Merchant', 'vpc_AccessCode', 'vpc_User',
+            'vpc_Password',
+        ], true);
+        $parameters = array_merge($baseParameters, $this->getParameters());
+        $parameters = array_filter(array_keys($parameters), function ($parameter) {
+            return 0 === strpos($parameter, 'vpc_');
+        });
+
+        return $parameters;
+    }
+}

src/Message/AbstractQueryTransactionRequest.php

@@ -21,8 +21,10 @@ trait ResponseProperties
      */
     public function __get($name)
     {
-        if (isset($this->data[$name])) {
-            return $this->data[$name];
+        $property = $this->propertyNormalize($name);
+
+        if (isset($this->data[$property])) {
+            return $this->data[$property];
         } else {
             trigger_error(sprintf('Undefined property: %s::%s', __CLASS__, '$'.$name), E_USER_NOTICE);
 
@@ -39,10 +41,27 @@ public function __get($name)
      */
     public function __set($name, $value)
     {
-        if (isset($this->data[$name])) {
+        $property = $this->propertyNormalize($name);
+
+        if (isset($this->data[$property])) {
             trigger_error(sprintf('Undefined property: %s::%s', __CLASS__, '$'.$name), E_USER_NOTICE);
         } else {
             $this->$name = $value;
         }
     }
+
+    /**
+     * Phương thức hổ trợ chuyển đổi property `vpcAbc` thành `vpc_Abc`.
+     *
+     * @param  string  $property
+     * @return null|string
+     */
+    private function propertyNormalize(string $property): ?string
+    {
+        if (0 === strpos($property, 'vpc') && false === strpos($property, '_')) {
+            return 'vpc_'.substr($property, 3);
+        }
+
+        return null;
+    }
 }

src/Message/CompletePurchaseResponse.php

@@ -0,0 +1,22 @@
+<?php
+/**
+ * @link https://github.com/phpviet/omnipay-onepay
+ *
+ * @copyright (c) PHP Viet
+ * @license [MIT](https://opensource.org/licenses/MIT)
+ */
+
+namespace Omnipay\OnePay\Message\Domestic;
+
+use Omnipay\OnePay\Message\AbstractQueryTransactionRequest;
+
+/**
+ * @author Vuong Minh <[email protected]>
+ * @since 1.0.0
+ */
+class QueryTransactionRequest extends AbstractQueryTransactionRequest
+{
+    protected $testEndpoint = 'https://mtf.onepay.vn/onecomm-pay/Vpcdps.op';
+
+    protected $productionEndpoint = 'https://onepay.vn/onecomm-pay/Vpcdps.op';
+}

src/Message/Concerns/ResponseProperties.php

@@ -11,7 +11,7 @@
  * @author Vuong Minh <[email protected]>
  * @since 1.0.0
  */
-abstract class AbstractIncomingRequest extends AbstractRequest
+class IncomingRequest extends AbstractRequest
 {
     /**
      * {@inheritdoc}
@@ -26,18 +26,23 @@ public function getData(): array
         return $parameters;
     }
 
+    /**
+     * {@inheritdoc}
+     * @throws \Omnipay\Common\Exception\InvalidResponseException
+     */
+    public function sendData($data): IncomingResponse
+    {
+        return $this->response = new IncomingResponse($this, $data);
+    }
+
     /**
      * {@inheritdoc}
      */
     public function initialize(array $parameters = [])
     {
         parent::initialize($parameters);
 
-        $incomingParameters = $this->normalizeParameters(
-            $this->getIncomingParameters()
-        );
-
-        foreach ($incomingParameters as $parameter => $value) {
+        foreach ($this->getIncomingParameters() as $parameter => $value) {
             $this->setParameter($parameter, $value);
         }
 
@@ -49,5 +54,10 @@ public function initialize(array $parameters = [])
      *
      * @return array
      */
-    abstract protected function getIncomingParameters(): array;
+    protected function getIncomingParameters(): array
+    {
+        return $this->normalizeParameters(
+            $this->httpRequest->query->all()
+        );
+    }
 }

src/Message/Domestic/QueryTransactionRequest.php

@@ -1,8 +1,9 @@
 <?php
 /**
  * @link https://github.com/phpviet/omnipay-onepay
+ *
  * @copyright (c) PHP Viet
- * @license [MIT](http://www.opensource.org/licenses/MIT)
+ * @license [MIT](https://opensource.org/licenses/MIT)
  */
 
 namespace Omnipay\OnePay\Message;
@@ -13,7 +14,7 @@
  * @author Vuong Minh <[email protected]>
  * @since 1.0.0
  */
-abstract class AbstractSignatureResponse extends AbstractResponse
+class IncomingResponse extends Response
 {
     use Concerns\ResponseSignatureValidation;