Pass amount as decimal instead of integer

Author: amacneil

README.md

@@ -30,7 +30,7 @@ $gateway = GatewayFactory::create('Stripe');
 $gateway->setApiKey('abc123');
 
 $formData = ['number' => '4242424242424242', 'expiryMonth' => '6', 'expiryYear' => '2016', 'cvv' => '123'];
-$response = $gateway->purchase(['amount' => 1000, 'currency' => 'USD', 'card' => $formData])->send();
+$response = $gateway->purchase(['amount' => '10.00', 'currency' => 'USD', 'card' => $formData])->send();
 
 if ($response->isSuccessful()) {
     // payment was successful: update database
@@ -252,7 +252,7 @@ Pass the options through to the method like so:
 ```php
 $card = new CreditCard($formData);
 $request = $gateway->authorize([
-    'amount' => 1000, // this represents $10.00
+    'amount' => '10.00', // this represents $10.00
     'card' => $card,
     'returnUrl' => 'https://www.example.com/return',
 ]);
@@ -281,7 +281,7 @@ For a successful responses, a reference will normally be generated, which can be
 at a later date. The following methods are always available:
 
 ```php
-$response = $gateway->purchase(['amount' => 1000, 'card' => $card])->send();
+$response = $gateway->purchase(['amount' => '10.00', 'card' => $card])->send();
 
 $response->isSuccessful(); // is the response successful?
 $response->isRedirect(); // is the response a redirect?
@@ -299,7 +299,7 @@ POST (FormRedirectResponse). These could potentially be combined into a single r
 After processing a payment, the cart should check whether the response requires a redirect, and if so, redirect accordingly:
 
 ```php
-$response = $gateway->purchase(['amount' => 1000, 'card' => $card])->send();
+$response = $gateway->purchase(['amount' => '10.00', 'card' => $card])->send();
 if ($response->isSuccessful()) {
     // payment is complete
 } elseif ($response->isRedirect()) {
@@ -332,7 +332,7 @@ You can handle both scenarios by wrapping the entire request in a try-catch bloc
 
 ```php
 try {
-    $response = $gateway->purchase(['amount' => 1000, 'card' => $card])->send();
+    $response = $gateway->purchase(['amount' => '10.00', 'card' => $card])->send();
     if ($response->isSuccessful()) {
         // mark order as complete
     } elseif ($response->isRedirect()) {
@@ -359,7 +359,7 @@ are available:
 
 Once you have a `cardReference`, you can use it instead of the `card` parameter when creating a charge:
 
-    $gateway->purchase(['amount' => 1000, 'cardReference' => 'abc']);
+    $gateway->purchase(['amount' => '10.00', 'cardReference' => 'abc']);
 
 ## Recurring Billing
 

src/Omnipay/AuthorizeNet/Message/AbstractRequest.php

@@ -77,7 +77,7 @@ protected function getBaseData()
     protected function getBillingData()
     {
         $data = array();
-        $data['x_amount'] = $this->getAmountDecimal();
+        $data['x_amount'] = $this->getAmount();
         $data['x_invoice_num'] = $this->getTransactionId();
         $data['x_description'] = $this->getDescription();
 

src/Omnipay/AuthorizeNet/Message/CaptureRequest.php

@@ -23,7 +23,7 @@ public function getData()
         $this->validate('amount', 'transactionReference');
 
         $data = $this->getBaseData();
-        $data['x_amount'] = $this->getAmountDecimal();
+        $data['x_amount'] = $this->getAmount();
         $data['x_trans_id'] = $this->getTransactionReference();
 
         return $data;

src/Omnipay/AuthorizeNet/Message/SIMCompleteAuthorizeRequest.php

@@ -29,7 +29,7 @@ public function getData()
 
     public function getHash()
     {
-        return md5($this->getApiLoginId().$this->getTransactionId().$this->getAmountDecimal());
+        return md5($this->getApiLoginId().$this->getTransactionId().$this->getAmount());
     }
 
     public function send()

src/Omnipay/CardSave/Message/PurchaseRequest.php

@@ -53,7 +53,7 @@ public function getData()
 
         $data->PaymentMessage->MerchantAuthentication['MerchantID'] = $this->getMerchantId();
         $data->PaymentMessage->MerchantAuthentication['Password'] = $this->getPassword();
-        $data->PaymentMessage->TransactionDetails['Amount'] = $this->getAmount();
+        $data->PaymentMessage->TransactionDetails['Amount'] = $this->getAmountInteger();
         $data->PaymentMessage->TransactionDetails['CurrencyCode'] = $this->getCurrencyNumeric();
         $data->PaymentMessage->TransactionDetails->OrderID = $this->getTransactionId();
         $data->PaymentMessage->TransactionDetails->OrderDescription = $this->getDescription();

src/Omnipay/Common/Message/AbstractRequest.php

@@ -163,22 +163,31 @@ public function setCardReference($value)
 
     public function getAmount()
     {
-        return $this->getParameter('amount');
+        $amount = $this->getParameter('amount');
+        if ($amount) {
+            if (!is_float($amount) &&
+                $this->getCurrencyDecimalPlaces() > 0 &&
+                false === strpos((string) $amount, '.')) {
+                throw new InvalidRequestException("Please specify amount as a string or float, with decimal places (e.g. '10.00' to represent $10.00).");
+            }
+
+            return number_format(
+                $amount,
+                $this->getCurrencyDecimalPlaces(),
+                '.',
+                ''
+            );
+        }
     }
 
     public function setAmount($value)
     {
-        return $this->setParameter('amount', (int) $value);
+        return $this->setParameter('amount', $value);
     }
 
-    public function getAmountDecimal()
+    public function getAmountInteger()
     {
-        return number_format(
-            $this->getAmount() / $this->getCurrencyDecimalFactor(),
-            $this->getCurrencyDecimalPlaces(),
-            '.',
-            ''
-        );
+        return (int) round($this->getAmount() * $this->getCurrencyDecimalFactor());
     }
 
     public function getCurrency()

src/Omnipay/GoCardless/Message/PurchaseRequest.php

@@ -28,7 +28,7 @@ public function getData()
         $data['cancel_uri'] = $this->getCancelUrl();
         $data['bill'] = array();
         $data['bill']['merchant_id'] = $this->getMerchantId();
-        $data['bill']['amount'] = $this->getAmountDecimal();
+        $data['bill']['amount'] = $this->getAmount();
         $data['bill']['name'] = $this->getDescription();
 
         if ($this->getCard()) {

src/Omnipay/Migs/Message/AbstractRequest.php

@@ -56,7 +56,7 @@ protected function getBaseData()
         $data['vpc_Version']    = '1';
         $data['vpc_Locale']     = 'en';
         $data['vpc_Command']    = $this->action;
-        $data['vpc_Amount']      = $this->getAmount();
+        $data['vpc_Amount']      = $this->getAmountInteger();
         $data['vpc_MerchTxnRef'] = $this->getTransactionId();
         $data['vpc_OrderInfo']   = $this->getDescription();
         $data['vpc_ReturnURL']   = $this->getReturnUrl();

src/Omnipay/Mollie/Message/PurchaseRequest.php

@@ -26,7 +26,7 @@ public function getData()
         $data['returnurl'] = $this->getReturnUrl();
         $data['reporturl'] = $this->getNotifyUrl();
         $data['bank_id'] = $this->getIssuer();
-        $data['amount'] = $this->getAmount();
+        $data['amount'] = $this->getAmountInteger();
         $data['description'] = $this->getDescription();
 
         return $data;

src/Omnipay/NetBanx/Gateway.php

@@ -19,7 +19,7 @@
 class Gateway extends AbstractGateway
 {
     const DECISION_ACCEPTED = 'ACCEPTED';
-    const CREATE_CARD_AMOUNT = 100;
+    const CREATE_CARD_AMOUNT = '1.00';
     const CODE_OK = '0';
 
     /**