MAGETWO-57610: [Backport] - User unable to do a full payment with gift card for the order containing gift wrap - for 2.0

Author: ameysar

app/code/Magento/Quote/Model/Quote/Address/Total/Grand.php

@@ -5,38 +5,52 @@
  */
 namespace Magento\Quote\Model\Quote\Address\Total;
 
+/**
+ * Class Grand
+ *
+ * @package Magento\Quote\Model\Quote\Address\Total
+ */
 class Grand extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
 {
     /**
      * Collect grand total address amount
      *
-     * @param \Magento\Quote\Model\Quote $quote
+     * @param \Magento\Quote\Model\Quote                          $quote
      * @param \Magento\Quote\Api\Data\ShippingAssignmentInterface $shippingAssignment
-     * @param \Magento\Quote\Model\Quote\Address\Total $total
+     * @param \Magento\Quote\Model\Quote\Address\Total            $total
+     *
      * @return $this
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function collect(
         \Magento\Quote\Model\Quote $quote,
         \Magento\Quote\Api\Data\ShippingAssignmentInterface $shippingAssignment,
         \Magento\Quote\Model\Quote\Address\Total $total
     ) {
+        $grandTotal = $total->getGrandTotal();
+        $baseGrandTotal = $total->getBaseGrandTotal();
         $totals = array_sum($total->getAllTotalAmounts());
         $baseTotals = array_sum($total->getAllBaseTotalAmounts());
 
-        $total->setGrandTotal($totals);
-        $total->setBaseGrandTotal($baseTotals);
+        $total->setGrandTotal($grandTotal + $totals);
+        $total->setBaseGrandTotal($baseGrandTotal + $baseTotals);
+
         return $this;
     }
 
     /**
      * Add grand total information to address
      *
-     * @param \Magento\Quote\Model\Quote $quote
+     * @param \Magento\Quote\Model\Quote               $quote
      * @param \Magento\Quote\Model\Quote\Address\Total $total
-     * @return $this
+     *
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Quote\Address\Total $total)
-    {
+    public function fetch(
+        \Magento\Quote\Model\Quote $quote,
+        \Magento\Quote\Model\Quote\Address\Total $total
+    ) {
         return [
             'code' => $this->getCode(),
             'title' => __('Grand Total'),

app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/GrandTest.php

@@ -7,6 +7,11 @@
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
+/**
+ * Class GrandTest
+ *
+ * @package Magento\Quote\Test\Unit\Model\Quote\Address\Total
+ */
 class GrandTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -17,9 +22,14 @@ class GrandTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $objectManager = new ObjectManager($this);
-        $this->model = $objectManager->getObject('Magento\Quote\Model\Quote\Address\Total\Grand');
+        $this->model = $objectManager->getObject(
+            \Magento\Quote\Model\Quote\Address\Total\Grand::class
+        );
     }
 
+    /**
+     * Test case for quote totals collect
+     */
     public function testCollect()
     {
         $totals = [1, 2, 3.4];
@@ -28,20 +38,29 @@ public function testCollect()
         $grandTotalBase = 15.7; // 4 + 5 + 6.7
 
         $totalMock = $this->getMock(
-            '\Magento\Quote\Model\Quote\Address\Total',
-            ['getAllTotalAmounts', 'getAllBaseTotalAmounts', 'setGrandTotal', 'setBaseGrandTotal'],
+            \Magento\Quote\Model\Quote\Address\Total::class,
+            [
+                'getAllTotalAmounts',
+                'getAllBaseTotalAmounts',
+                'setGrandTotal',
+                'setBaseGrandTotal',
+                'getGrandTotal',
+                'getBaseGrandTotal'
+            ],
             [],
             '',
             false
         );
+        $totalMock->expects($this->once())->method('getGrandTotal')->willReturn(2);
+        $totalMock->expects($this->once())->method('getBaseGrandTotal')->willReturn(2);
         $totalMock->expects($this->once())->method('getAllTotalAmounts')->willReturn($totals);
         $totalMock->expects($this->once())->method('getAllBaseTotalAmounts')->willReturn($totalsBase);
-        $totalMock->expects($this->once())->method('setGrandTotal')->with($grandTotal);
-        $totalMock->expects($this->once())->method('setBaseGrandTotal')->with($grandTotalBase);
+        $totalMock->expects($this->once())->method('setGrandTotal')->with($grandTotal + 2);
+        $totalMock->expects($this->once())->method('setBaseGrandTotal')->with($grandTotalBase + 2);
 
         $this->model->collect(
-            $this->getMock('\Magento\Quote\Model\Quote', [], [], '', false),
-            $this->getMock('\Magento\Quote\Api\Data\ShippingAssignmentInterface'),
+            $this->getMock(\Magento\Quote\Model\Quote::class, [], [], '', false),
+            $this->getMock(\Magento\Quote\Api\Data\ShippingAssignmentInterface::class),
             $totalMock
         );
     }