get payment info

Author: recca0120

src/Gateway.php

@@ -7,8 +7,8 @@
 use Omnipay\Common\Message\RequestInterface;
 use Omnipay\Payware\Message\AcceptNotificationRequest;
 use Omnipay\Payware\Message\CompletePurchaseRequest;
+use Omnipay\Payware\Message\GetPaymentInfoRequest;
 use Omnipay\Payware\Message\PurchaseRequest;
-use Omnipay\Payware\Message\ReceiveTransactionInfoRequest;
 use Omnipay\Payware\Traits\HasMerchant;
 
 /**
@@ -137,8 +137,8 @@ public function acceptNotification(array $options = [])
     /**
      * @return RequestInterface
      */
-    public function receiveTransactionInfo(array $options = [])
+    public function getPaymentInfo(array $options = [])
     {
-        return $this->createRequest(ReceiveTransactionInfoRequest::class, $options);
+        return $this->createRequest(GetPaymentInfoRequest::class, $options);
     }
 }

src/Message/ReceiveTransactionInfoRequest.php renamed to src/Message/GetPaymentInfoRequest.php

@@ -4,7 +4,7 @@
 
 use Omnipay\Common\Message\ResponseInterface;
 
-class ReceiveTransactionInfoRequest extends AbstractRequest
+class GetPaymentInfoRequest extends AbstractRequest
 {
     /**
      * @return array
@@ -20,6 +20,6 @@ public function getData()
      */
     public function sendData($data)
     {
-        return $this->response = new ReceiveTransactionInfoResponse($this, $data);
+        return $this->response = new GetPaymentInfoResponse($this, $data);
     }
 }

src/Message/ReceiveTransactionInfoResponse.php renamed to src/Message/GetPaymentInfoResponse.php

@@ -4,7 +4,7 @@
 
 use Omnipay\Common\Message\AbstractResponse;
 
-class ReceiveTransactionInfoResponse extends AbstractResponse
+class GetPaymentInfoResponse extends AbstractResponse
 {
     /**
      * Is the response successful?

src/Message/PurchaseRequest.php

@@ -6,11 +6,13 @@
 use Omnipay\Payware\Support\Helper;
 use Omnipay\Payware\Traits\HasAmount;
 use Omnipay\Payware\Traits\HasMerchant;
+use Omnipay\Payware\Traits\HasPaymentInfo;
 
 class PurchaseRequest extends AbstractRequest
 {
     use HasMerchant;
     use HasAmount;
+    use HasPaymentInfo;
 
     /**
      * @param  string  $orderNo
@@ -30,20 +32,20 @@ public function getOrderNo()
     }
 
     /**
-     * @param  string  $receiveUrl
+     * @param  string  $value
      * @return PurchaseRequest
      */
-    public function setReceiveUrl($receiveUrl)
+    public function setReceiveUrl($value)
     {
-        return $this->setParameter('ReceiveUrl', $receiveUrl);
+        return $this->setPaymentInfoUrl($value);
     }
 
     /**
      * @return string
      */
     public function getReceiveUrl()
     {
-        return $this->getParameter('ReceiveUrl');
+        return $this->getPaymentInfoUrl();
     }
 
     /**
@@ -240,7 +242,7 @@ public function getData()
             'Amount' => $this->getAmount(),
             'OrderNo' => $this->getTransactionId(),
             'ReturnURL' => $this->getReturnUrl(),
-            'ReceiveURL' => $this->getReceiveUrl(),
+            'ReceiveURL' => $this->getPaymentInfoUrl(),
             'OrderDesc' => $this->getDescription(),
             'PayType' => $this->getPayType() ?: 1,
             'ValidateKey' => $this->getValidateKey(),

src/Traits/HasBooking.php

@@ -6,7 +6,7 @@ trait HasBooking
 {
     /**
      * @param  string  $bookingId
-     * @return $this
+     * @return self
      */
     public function setBookingId($bookingId)
     {
@@ -23,7 +23,7 @@ public function getBookingId()
 
     /**
      * @param  string  $custOrderNo
-     * @return $this
+     * @return self
      */
     public function setCustOrderNo($custOrderNo)
     {
@@ -40,7 +40,7 @@ public function getCustOrderNo()
 
     /**
      * @param  string  $sendType
-     * @return $this
+     * @return self
      */
     public function setSendType($sendType)
     {

src/Traits/HasCVS.php

@@ -6,7 +6,7 @@ trait HasCVS
 {
     /**
      * @param  string  $barcode
-     * @return $this
+     * @return self
      */
     public function setBarcode1_3($barcode)
     {
@@ -23,7 +23,7 @@ public function getBarcode1_3()
 
     /**
      * @param  string  $paymentNo
-     * @return $this
+     * @return self
      */
     public function setPaymentNo($paymentNo)
     {

src/Traits/HasCreditCard.php

@@ -6,7 +6,7 @@ trait HasCreditCard
 {
     /**
      * @param  string  $card4No
-     * @return $this
+     * @return self
      */
     public function setCard4No($card4No)
     {

src/Traits/HasMerchant.php

@@ -7,7 +7,7 @@
 trait HasMerchant
 {
     /**
-     * @return $this
+     * @return self
      */
     public function setEndpoint($endpoint)
     {
@@ -24,7 +24,7 @@ public function getEndpoint()
 
     /**
      * @param  string  $merchantId
-     * @return $this
+     * @return self
      */
     public function setMerchantId($merchantId)
     {
@@ -41,7 +41,7 @@ public function getMerchantId()
 
     /**
      * @param  string  $terminalId
-     * @return $this
+     * @return self
      */
     public function setTerminalId($terminalId)
     {
@@ -58,7 +58,7 @@ public function getTerminalId()
 
     /**
      * @param  string  $merchantName
-     * @return $this
+     * @return self
      */
     public function setMerchantName($merchantName)
     {

src/Traits/HasPaymentInfo.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Omnipay\Payware\Traits;
+
+trait HasPaymentInfo
+{
+    /**
+     * @param  string  $value
+     * @return self
+     */
+    public function setPaymentInfoUrl($value)
+    {
+        return $this->setParameter('paymentInfoUrl', $value);
+    }
+
+    /**
+     * @return string
+     */
+    public function getPaymentInfoUrl()
+    {
+        return $this->getParameter('paymentInfoUrl');
+    }
+}

src/Traits/HasWebATM.php

@@ -6,7 +6,7 @@ trait HasWebATM
 {
     /**
      * @param  string  $bankCode
-     * @return $this
+     * @return self
      */
     public function setBankCode($bankCode)
     {
@@ -23,7 +23,7 @@ public function getBankCode()
 
     /**
      * @param  string  $atmNo
-     * @return $this
+     * @return self
      */
     public function setAtmNo($atmNo)
     {