Merge remote-tracking branch 'origin/MAGETWO-71771-Impossible-full-refund-paypal' into BundledPR-Sep7b

Author: pdohogne-magento

app/code/Magento/Paypal/Model/Api/Nvp.php

@@ -991,7 +991,7 @@ public function callRefundTransaction()
     {
         $request = $this->_exportToRequest($this->_refundTransactionRequest);
         if ($this->getRefundType() === \Magento\Paypal\Model\Config::REFUND_TYPE_PARTIAL) {
-            $request['AMT'] = $this->getAmount();
+            $request['AMT'] = $this->formatPrice($this->getAmount());
         }
         $response = $this->call(self::REFUND_TRANSACTION, $request);
         $this->_importFromResponse($this->_refundTransactionResponse, $response);

dev/tests/integration/testsuite/Magento/Paypal/Model/Api/NvpTest.php

@@ -118,6 +118,48 @@ public function testRequestTotalsAndLineItemsWithFPT()
         $this->nvpApi->callSetExpressCheckout();
     }
 
+    /**
+     * Test that the refund request to Paypal sends the correct data
+     *
+     * @magentoDataFixture Magento/Paypal/_files/order_express_with_tax.php
+     */
+    public function testCallRefundTransaction()
+    {
+        /** @var \Magento\Sales\Model\Order $order */
+        $order = $this->objectManager->create(\Magento\Sales\Model\Order::class);
+        $order->loadByIncrementId('100000001');
+
+        /** @var \Magento\Sales\Model\Order\Payment $payment */
+        $payment = $order->getPayment();
+
+        $this->nvpApi->setPayment(
+            $payment
+        )->setTransactionId(
+            'fooTransactionId'
+        )->setAmount(
+            $payment->formatAmount($order->getBaseGrandTotal())
+        )->setCurrencyCode(
+            $order->getBaseCurrencyCode()
+        )->setRefundType(
+            Config::REFUND_TYPE_PARTIAL
+        );
+
+        $httpQuery = 'TRANSACTIONID=fooTransactionId&REFUNDTYPE=Partial'
+            .'&CURRENCYCODE=USD&AMT=145.98&METHOD=RefundTransaction'
+            .'&VERSION=72.0&BUTTONSOURCE=Magento_Cart_';
+
+        $this->httpClient->expects($this->once())->method('write')
+            ->with(
+                'POST',
+                'https://api-3t.paypal.com/nvp',
+                '1.1',
+                [],
+                $httpQuery
+            );
+
+        $this->nvpApi->callRefundTransaction();
+    }
+
     /**
      * Gets quote by reserved order id.
      *

dev/tests/integration/testsuite/Magento/Paypal/_files/order_express_with_tax.php

@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Sales\Model\OrderRepository;
+use Magento\TestFramework\Helper\Bootstrap;
+
+require __DIR__ . '/order_express.php';
+
+/** @var ObjectManagerInterface $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+$subTotal = 121;
+$taxRate = .0825;
+$taxAmount = $subTotal * $taxRate;
+$shippingAmount = 15;
+$totalAmount =  $subTotal + $taxAmount + $shippingAmount;
+
+$order->setSubtotal($subTotal);
+$order->setBaseSubtotal($subTotal);
+$order->setGrandTotal($totalAmount);
+$order->setBaseGrandTotal($totalAmount);
+$order->setTaxAmount($taxAmount);
+
+/** @var OrderRepository $orderRepository */
+$orderRepository = $objectManager->get(OrderRepository::class);
+$orderRepository->save($order);