get amount directly

Author: recca0120

.gitignore

@@ -9,3 +9,4 @@ dirlist.cache
 dirlist.vendor
 
 .php-cs-fixer.cache
+.phpunit.result.cache

composer.json

@@ -1,52 +1,57 @@
 {
-    "name": "omnipay-taiwan/omnipay-payware",
-    "type": "library",
-    "description": "Payware driver for the Omnipay payment processing library",
-    "keywords": [
-        "payware",
-        "gateway",
-        "merchant",
-        "omnipay",
-        "pay",
-        "payment"
-    ],
-    "homepage": "https://github.com/omnipay-taiwan/omnipay-payware",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Adrian Macneil",
-            "email": "adrian@adrianmacneil.com"
-        },
-        {
-            "name": "Omnipay Contributors",
-            "homepage": "https://github.com/thephpleague/omnipay-dummy/contributors"
-        },
-        {
-            "name": "recca0120",
-            "email": "recca0120@gmail.com"
-        }
-    ],
-    "autoload": {
-        "psr-4": {
-            "Omnipay\\Payware\\": "src/"
-        }
+  "name": "omnipay-taiwan/omnipay-payware",
+  "type": "library",
+  "description": "Payware driver for the Omnipay payment processing library",
+  "keywords": [
+    "payware",
+    "gateway",
+    "merchant",
+    "omnipay",
+    "pay",
+    "payment"
+  ],
+  "homepage": "https://github.com/omnipay-taiwan/omnipay-payware",
+  "license": "MIT",
+  "authors": [
+    {
+      "name": "Adrian Macneil",
+      "email": "adrian@adrianmacneil.com"
     },
-    "autoload-dev": {
-        "psr-4": {
-            "Omnipay\\Payware\\Tests\\": "tests/"
-        }
+    {
+      "name": "Omnipay Contributors",
+      "homepage": "https://github.com/thephpleague/omnipay-dummy/contributors"
     },
-    "require": {
-        "omnipay/common": "~3.0"
-    },
-    "require-dev": {
-        "omnipay/tests": "~3.0|~4.0",
-        "squizlabs/php_codesniffer": "^3.0"
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "3.1.x-dev"
-        }
-    },
-    "prefer-stable": true
+    {
+      "name": "recca0120",
+      "email": "recca0120@gmail.com"
+    }
+  ],
+  "autoload": {
+    "psr-4": {
+      "Omnipay\\Payware\\": "src/"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "Omnipay\\Payware\\Tests\\": "tests/"
+    }
+  },
+  "require": {
+    "omnipay/common": "~3.0"
+  },
+  "require-dev": {
+    "omnipay/tests": "~3.0|~4.0",
+    "squizlabs/php_codesniffer": "^3.0"
+  },
+  "extra": {
+    "branch-alias": {
+      "dev-master": "3.1.x-dev"
+    }
+  },
+  "prefer-stable": true,
+  "config": {
+    "allow-plugins": {
+      "php-http/discovery": true
+    }
+  }
 }

src/Gateway.php

@@ -107,7 +107,6 @@ public function getDefaultParameters()
     }
 
     /**
-     * @param  array  $options
      * @return RequestInterface
      */
     public function purchase(array $options = [])
@@ -116,7 +115,6 @@ public function purchase(array $options = [])
     }
 
     /**
-     * @param  array  $options
      * @return RequestInterface
      */
     public function completePurchase(array $options = [])
@@ -127,7 +125,6 @@ public function completePurchase(array $options = [])
     }
 
     /**
-     * @param  array  $options
      * @return RequestInterface|NotificationInterface
      */
     public function acceptNotification(array $options = [])
@@ -136,7 +133,6 @@ public function acceptNotification(array $options = [])
     }
 
     /**
-     * @param  array  $options
      * @return RequestInterface
      */
     public function receiveTransactionInfo(array $options = [])

src/Message/CompletePurchaseRequest.php

@@ -5,6 +5,7 @@
 use Omnipay\Common\Exception\InvalidRequestException;
 use Omnipay\Common\Exception\InvalidResponseException;
 use Omnipay\Payware\Support\Helper;
+use Omnipay\Payware\Traits\HasAmount;
 use Omnipay\Payware\Traits\HasBooking;
 use Omnipay\Payware\Traits\HasCreditCard;
 use Omnipay\Payware\Traits\HasCVS;
@@ -16,6 +17,7 @@ class CompletePurchaseRequest extends AbstractRequest
     use HasBooking;
     use HasCreditCard;
     use HasCVS;
+    use HasAmount;
 
     /**
      * @param  int  $authAmount
@@ -86,7 +88,6 @@ public function getPaymentDate()
     }
 
     /**
-     * @param $transferOutAccount
      * @return CompletePurchaseRequest
      */
     public function setTransferOutAccount($transferOutAccount)
@@ -131,8 +132,8 @@ public function getData()
             'PayType' => $this->getPayType(),
             'BookingId' => $this->getTransactionReference(),
             'CustOrderNo' => $this->getTransactionId(),
-            'Amount' => (int) $this->getAmount(),
-            'AuthAmount' => (int) $this->getAuthAmount(),
+            'Amount' => $this->getAmount(),
+            'AuthAmount' => $this->getAuthAmount(),
             'RtnCode' => $this->getRtnCode(),
             'Card4no' => $this->getCard4No(),
             'Payment_no' => $this->getPaymentNo(),
@@ -169,7 +170,6 @@ private function checkMacValue($data)
     }
 
     /**
-     * @param $data
      * @return false|string
      */
     private function makeHash($data)

src/Message/PurchaseRequest.php

@@ -4,11 +4,13 @@
 
 use Omnipay\Common\Exception\InvalidRequestException;
 use Omnipay\Payware\Support\Helper;
+use Omnipay\Payware\Traits\HasAmount;
 use Omnipay\Payware\Traits\HasMerchant;
 
 class PurchaseRequest extends AbstractRequest
 {
     use HasMerchant;
+    use HasAmount;
 
     /**
      * @param  string  $orderNo
@@ -235,7 +237,7 @@ public function getData()
             'MerchantId' => $this->getMerchantId(),
             'TerminalId' => $this->getTerminalId(),
             'MerchantName' => $this->getMerchantName(),
-            'Amount' => (int) $this->getAmount(),
+            'Amount' => $this->getAmount(),
             'OrderNo' => $this->getTransactionId(),
             'ReturnURL' => $this->getReturnUrl(),
             'ReceiveURL' => $this->getReceiveUrl(),

src/Message/ReceiveTransactionInfoRequest.php

@@ -5,6 +5,7 @@
 use Omnipay\Common\Exception\InvalidRequestException;
 use Omnipay\Common\Message\ResponseInterface;
 use Omnipay\Payware\Support\Helper;
+use Omnipay\Payware\Traits\HasAmount;
 use Omnipay\Payware\Traits\HasBooking;
 use Omnipay\Payware\Traits\HasCVS;
 use Omnipay\Payware\Traits\HasMerchant;
@@ -16,6 +17,7 @@ class ReceiveTransactionInfoRequest extends AbstractRequest
     use HasBooking;
     use HasWebATM;
     use HasCVS;
+    use HasAmount;
 
     /**
      * @param  string  $payEndDate
@@ -45,7 +47,7 @@ public function getData()
             'MerchantId' => $this->getMerchantId(),
             'TerminalId' => $this->getTerminalId(),
             'PayType' => $this->getPayType(),
-            'Amount' => (int) $this->getAmount(),
+            'Amount' => $this->getAmount(),
             'BookingId' => $this->getBookingId(),
             'CustOrderNo' => $this->getTransactionId(),
             'SendType' => $this->getSendType(),

src/Traits/HasAmount.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Omnipay\Payware\Traits;
+
+trait HasAmount
+{
+    public function getAmount()
+    {
+        return $this->getParameter('amount');
+    }
+}

src/Traits/HasMerchant.php

@@ -7,7 +7,6 @@
 trait HasMerchant
 {
     /**
-     * @param $endpoint
      * @return $this
      */
     public function setEndpoint($endpoint)