Merge remote-tracking branch 'origin/MAGETWO-60327' into 2.0-prs

Author: zakdma

app/code/Magento/Braintree/Test/Unit/Model/PaymentMethodTest.php

@@ -478,7 +478,7 @@ protected function setupOrderMock(
                     'getCustomerEmail',
                     'getCustomerId',
                     'getStoreId',
-                    'getTotalDue'
+                    'getBaseTotalDue'
                 ]
             )->getMock();
 
@@ -501,7 +501,7 @@ protected function setupOrderMock(
             ->method('getStoreId')
             ->willReturn($storeId);
         $orderMock->expects(static::any())
-            ->method('getTotalDue')
+            ->method('getBaseTotalDue')
             ->willReturn(self::TOTAL_AMOUNT);
 
         $this->orderRepository->expects(static::any())
@@ -1704,7 +1704,7 @@ protected function setupPaymentObjectForCapture($paymentId)
         $order = $this->getMockBuilder('Magento\Sales\Api\Data\OrderInterface')
             ->getMockForAbstractClass();
         $order->expects(static::any())
-            ->method('getTotalDue')
+            ->method('getBaseTotalDue')
             ->willReturn(self::TOTAL_AMOUNT);
         $this->orderRepository->expects(static::any())
             ->method('get')

app/code/Magento/Sales/Model/Order/Payment.php

@@ -1260,7 +1260,7 @@ public function getAuthorizationTransaction()
      */
     public function isCaptureFinal($amountToCapture)
     {
-        $total = $this->getOrder()->getTotalDue();
+        $total = $this->getOrder()->getBaseTotalDue();
         return $this->formatAmount($total, true) == $this->formatAmount($amountToCapture, true);
     }
 

app/code/Magento/Sales/Test/Unit/Model/Order/PaymentTest.php

@@ -1521,7 +1521,7 @@ public function testIsCaptureFinal()
         $partialAmount = 12.00;
 
         $this->orderMock->expects(static::exactly(2))
-            ->method('getTotalDue')
+            ->method('getBaseTotalDue')
             ->willReturn($amount);
 
         static::assertFalse($this->payment->isCaptureFinal($partialAmount));