Merge remote-tracking branch 'jackalopes/MAGETWO-71765' into BundledPR-Sep7b

Author: pdohogne-magento

app/code/Magento/Paypal/Model/Payflowpro.php

@@ -7,6 +7,7 @@
 
 use Magento\Framework\DataObject;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Payment\Helper\Formatter;
 use Magento\Payment\Model\InfoInterface;
 use Magento\Payment\Model\Method\ConfigInterface;
 use Magento\Payment\Model\Method\ConfigInterfaceFactory;
@@ -27,6 +28,8 @@
  */
 class Payflowpro extends \Magento\Payment\Model\Method\Cc implements GatewayInterface
 {
+    use Formatter;
+
     /**
      * Transaction action codes
      */
@@ -83,8 +86,6 @@ class Payflowpro extends \Magento\Payment\Model\Method\Cc implements GatewayInte
 
     const PNREF = 'pnref';
 
-    /**#@-*/
-
     /**#@-*/
     protected $_responseParamsMappings = [
         'firstname' => 'billtofirstname',
@@ -391,14 +392,14 @@ public function authorize(\Magento\Payment\Model\InfoInterface $payment, $amount
      * Get capture amount
      *
      * @param float $amount
-     * @return float
+     * @return float|int
      */
     protected function _getCaptureAmount($amount)
     {
         $infoInstance = $this->getInfoInstance();
-        $amountToPay = round($amount, 2);
-        $authorizedAmount = round($infoInstance->getAmountAuthorized(), 2);
-        return $amountToPay != $authorizedAmount ? $amountToPay : 0;
+        $amountToPay = $amount;
+        $authorizedAmount = $infoInstance->getAmountAuthorized();
+        return abs($amountToPay - $authorizedAmount) < 0.00001 ? 0 : $amountToPay;
     }
 
     /**
@@ -414,7 +415,7 @@ public function capture(\Magento\Payment\Model\InfoInterface $payment, $amount)
     {
         if ($payment->getAdditionalInformation(self::PNREF)) {
             $request = $this->buildBasicRequest();
-            $request->setAmt(round($amount, 2));
+            $request->setAmt($this->formatPrice($amount));
             $request->setTrxtype(self::TRXTYPE_SALE);
             $request->setOrigid($payment->getAdditionalInformation(self::PNREF));
             $payment->unsAdditionalInformation(self::PNREF);
@@ -423,7 +424,7 @@ public function capture(\Magento\Payment\Model\InfoInterface $payment, $amount)
             $request->setOrigid($payment->getParentTransactionId());
             $captureAmount = $this->_getCaptureAmount($amount);
             if ($captureAmount) {
-                $request->setAmt($captureAmount);
+                $request->setAmt($this->formatPrice($captureAmount));
             }
             $trxType = $this->getInfoInstance()->hasAmountPaid() ? self::TRXTYPE_SALE : self::TRXTYPE_DELAYED_CAPTURE;
             $request->setTrxtype($trxType);
@@ -511,7 +512,7 @@ public function refund(\Magento\Payment\Model\InfoInterface $payment, $amount)
         $request = $this->buildBasicRequest();
         $request->setTrxtype(self::TRXTYPE_CREDIT);
         $request->setOrigid($payment->getParentTransactionId());
-        $request->setAmt(round($amount, 2));
+        $request->setAmt($this->formatPrice($amount));
         $response = $this->postRequest($request, $this->getConfig());
         $this->processErrors($response);
 
@@ -606,7 +607,7 @@ public function postRequest(DataObject $request, ConfigInterface $config)
     protected function _buildPlaceRequest(DataObject $payment, $amount)
     {
         $request = $this->buildBasicRequest();
-        $request->setAmt(round($amount, 2));
+        $request->setAmt($this->formatPrice($amount));
         $request->setAcct($payment->getCcNumber());
         $request->setExpdate(sprintf('%02d', $payment->getCcExpMonth()) . substr($payment->getCcExpYear(), -2, 2));
         $request->setCvv2($payment->getCcCid());

app/code/Magento/Paypal/Test/Unit/Model/PayflowproTest.php

@@ -267,6 +267,97 @@ public function testCaptureWithBuildPlaceRequest()
         static::assertFalse((bool)$paymentMock->getIsTransactionPending());
     }
 
+    /**
+     * @return array
+     */
+    public function dataProviderCaptureAmountRounding()
+    {
+        return [
+            [
+                'amount' => 14.13999999999999999999999999999999999999999999999999,
+                'setAmount' => 49.99,
+                'expectedResult' => 14.14
+            ],
+            [
+                'amount' => 14.13199999999999999999999999999999999999999999999999,
+                'setAmount' => 49.99,
+                'expectedResult' => 14.13,
+            ],
+            [
+                'amount' => 14.14,
+                'setAmount' => 49.99,
+                'expectedResult' => 14.14,
+            ],
+            [
+                'amount' => 14.13999999999999999999999999999999999999999999999999,
+                'setAmount' => 14.14,
+                'expectedResult' => 0,
+            ]
+        ];
+    }
+
+    /**
+     * @param float $amount
+     * @param float $setAmount
+     * @param float $expectedResult
+     * @dataProvider dataProviderCaptureAmountRounding
+     */
+    public function testCaptureAmountRounding($amount, $setAmount, $expectedResult)
+    {
+        $paymentMock = $this->getPaymentMock();
+        $orderMock = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $infoInstanceMock = $this->getMockForAbstractClass(
+            InfoInterface::class,
+            [],
+            '',
+            false,
+            false,
+            false,
+            ['getAmountAuthorized','hasAmountPaid']
+        );
+
+        $infoInstanceMock->expects($this->once())
+            ->method('getAmountAuthorized')
+            ->willReturn($setAmount);
+        $infoInstanceMock->expects($this->once())
+            ->method('hasAmountPaid')
+            ->willReturn(true);
+        $this->payflowpro->setData('info_instance', $infoInstanceMock);
+
+        // test case to build basic request
+        $paymentMock->expects($this->once())
+            ->method('getAdditionalInformation')
+            ->with('pnref')
+            ->willReturn(false);
+        $paymentMock->expects($this->any())
+            ->method('getParentTransactionId')
+            ->willReturn(true);
+
+        $paymentMock->expects($this->once())
+            ->method('getOrder')
+            ->willReturn($orderMock);
+
+        $this->initStoreMock();
+        $response = $this->getGatewayResponseObject();
+        $this->gatewayMock->expects($this->once())
+            ->method('postRequest')
+            ->with(
+                $this->callback(function ($request) use ($expectedResult) {
+                    return is_callable([$request, 'getAmt']) && $request->getAmt() == $expectedResult;
+                }),
+                $this->isInstanceOf(PayflowConfig::class)
+            )
+            ->willReturn($response);
+
+        $this->payflowpro->capture($paymentMock, $amount);
+
+        $this->assertEquals($response['pnref'], $paymentMock->getTransactionId());
+        $this->assertFalse((bool)$paymentMock->getIsTransactionPending());
+    }
+
     /**
      * @covers \Magento\Paypal\Model\Payflowpro::authorize
      */