Merge remote-tracking branch 'origin/FearlessKiwis-MAGETWO-18521-Incorrect-tax-calculation-with-discount2' into develop

Author: Yu Tang

app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items/Grid.php

@@ -286,9 +286,12 @@ public function getSubtotalWithDiscount()
     {
         $address = $this->getQuoteAddress();
         if ($this->displayTotalsIncludeTax()) {
-            return $address->getSubtotal() + $address->getTaxAmount() + $this->getDiscountAmount();
+            return $address->getSubtotal()
+                + $address->getTaxAmount()
+                + $address->getDiscountAmount()
+                + $address->getHiddenTaxAmount();
         } else {
-            return $address->getSubtotal() + $this->getDiscountAmount();
+            return $address->getSubtotal() + $address->getDiscountAmount();
         }
     }
 

app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/Items/GridTest.php

@@ -339,6 +339,7 @@ public function testGetItemRowTotalHtml()
 
         $this->assertEquals($html, $grid->getItemRowTotalHtml($this->itemMock));
     }
+
     public function testGetItemRowTotalWithDiscountHtml()
     {
         $html = '$34.28';
@@ -360,4 +361,81 @@ public function testGetItemRowTotalWithDiscountHtml()
 
         $this->assertEquals($html, $grid->getItemRowTotalWithDiscountHtml($this->itemMock));
     }
+
+    /**
+     * @param array $orderData
+     * @param bool $displayTotalsIncludeTax
+     * @param float $expected
+     * @dataProvider getSubtotalWithDiscountDataProvider
+     */
+    public function testGetSubtotalWithDiscount($orderData, $displayTotalsIncludeTax, $expected)
+    {
+        $quoteAddressMock = $this->getMock(
+            '\Magento\Quote\Model\Quote\Address',
+            ['getSubtotal', 'getTaxAmount','getHiddenTaxAmount','getDiscountAmount'],
+            [],
+            '',
+            false
+        );
+        $gridMock = $this->getMock(
+            'Magento\Sales\Block\Adminhtml\Order\Create\Items\Grid',
+            ['getQuoteAddress','displayTotalsIncludeTax'],
+            [],
+            '',
+            false
+        );
+
+        $gridMock->expects($this->any())->method('getQuoteAddress')
+            ->will($this->returnValue($quoteAddressMock));
+        $gridMock->expects($this->any())->method('displayTotalsIncludeTax')
+            ->will($this->returnValue($displayTotalsIncludeTax));
+
+        $quoteAddressMock->expects($this->once())
+            ->method('getSubtotal')
+            ->will($this->returnValue($orderData['subTotal']));
+
+        $quoteAddressMock->expects($this->any())
+            ->method('getTaxAmount')
+            ->will($this->returnValue($orderData['taxAmount']));
+
+        $quoteAddressMock->expects($this->any())
+            ->method('getHiddenTaxAmount')
+            ->will($this->returnValue($orderData['hiddenTaxAmount']));
+
+        $quoteAddressMock->expects($this->once())
+            ->method('getDiscountAmount')
+            ->will($this->returnValue($orderData['discountAmount']));
+
+        $this->assertEquals($expected, $gridMock->getSubtotalWithDiscount());
+    }
+
+    /**
+     * @return array
+     */
+    public function getSubtotalWithDiscountDataProvider()
+    {
+        $result = [];
+        $result['displayTotalsIncludeTaxTrue'] = [
+            'orderData' => [
+                'subTotal' => 32.59,
+                'taxAmount' => 8.2,
+                'hiddenTaxAmount' => 1.72,
+                'discountAmount' => -10.24
+            ],
+            'displayTotalsIncludeTax'=> true,
+            'expected' => 32.27
+        ];
+        $result['displayTotalsIncludeTaxFalse'] = [
+            'orderData' => [
+                'subTotal' => 66.67,
+                'taxAmount' => 20,
+                'hiddenTaxAmount' => 8,
+                'discountAmount' => -34.67
+            ],
+            'displayTotalsIncludeTax'=> false,
+            'expected' => 32
+        ];
+        return $result;
+    }
+
 }

app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml

@@ -64,7 +64,7 @@
                     <td class="col-price"><strong><?php echo $block->formatPrice($block->getDiscountAmount()) ?></strong></td>
                     <td class="col-price"><strong>
                     <?php
-                        echo $block->formatPrice($block->getSubtotal() + $block->getDiscountAmount());
+                        echo $block->formatPrice($block->getSubtotalWithDiscount());
                     ?></strong></td>
                     <td colspan="2">&nbsp;</td>
                 </tr>

app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/total.phtml

@@ -26,6 +26,6 @@ $_item = $block->getItem();
     <?php if ($block->displayBothPrices($block->getStore())): ?>
         <br /><span class="label"><?php echo __('Incl. Tax'); ?>:</span>
     <?php endif; ?>
-    <?php $_incl = $_item->getPriceInclTax() * $_item->getQty() - $_item->getTotalDiscountAmount(); ?>
+    <?php $_incl = $block->getTotalAmount($_item); ?>
     <?php echo $block->formatPrice($_incl) ?>
 <?php endif; ?>

app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/total.phtml

@@ -46,7 +46,7 @@ $_item = $block->getItem();
     <?php if ($block->displayBothPrices()): ?>
         <br /><span class="label"><?php echo __('Incl. Tax'); ?>:</span>
     <?php endif; ?>
-    <?php $_incl = $block->getRowDisplayPriceInclTax() - $_item->getTotalDiscountAmount(); ?>
+    <?php $_incl = $block->getTotalAmount($_item); ?>
     <?php echo $block->formatPrice(max(0, $_incl)) ?>
     <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
         <br />