Merge remote-tracking branch 'remotes/github/MAGETWO-95809' into EPAM-PR-30

Author: VeronikaYarats

app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php

@@ -48,6 +48,8 @@ public function __construct(
     }
 
     /**
+     * Set item.
+     *
      * @param \Magento\Framework\DataObject $item
      * @return $this
      */
@@ -58,6 +60,8 @@ public function setItem(\Magento\Framework\DataObject $item)
     }
 
     /**
+     * Get item.
+     *
      * @return array|null
      */
     public function getItem()
@@ -76,6 +80,8 @@ public function getOrder()
     }
 
     /**
+     * Get order item.
+     *
      * @return array|null
      */
     public function getOrderItem()
@@ -88,6 +94,8 @@ public function getOrderItem()
     }
 
     /**
+     * Get item options.
+     *
      * @return array
      */
     public function getItemOptions()
@@ -262,6 +270,23 @@ public function getTotalAmount($item)
         return $totalAmount;
     }
 
+    /**
+     * Return the base total amount minus discount.
+     *
+     * @param OrderItem|InvoiceItem|CreditmemoItem $item
+     * @return mixed
+     */
+    public function getBaseTotalAmount($item)
+    {
+        $baseTotalAmount = $item->getBaseRowTotal()
+            + $item->getBaseTaxAmount()
+            + $item->getBaseDiscountTaxCompensationAmount()
+            + $item->getBaseWeeeTaxAppliedAmount()
+            - $item->getBaseDiscountAmount();
+
+        return $baseTotalAmount;
+    }
+
     /**
      * Return HTML for item total after discount
      *

app/code/Magento/Sales/Model/Order/Webapi/ChangeOutputArray.php

@@ -9,6 +9,7 @@
 
 use Magento\Sales\Api\Data\OrderItemInterface;
 use Magento\Sales\Block\Adminhtml\Items\Column\DefaultColumn;
+use Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer;
 
 /**
  * Class for changing row total in response.
@@ -20,13 +21,21 @@ class ChangeOutputArray
      */
     private $priceRenderer;
 
+    /**
+     * @var DefaultRenderer
+     */
+    private $defaultRenderer;
+
     /**
      * @param DefaultColumn $priceRenderer
+     * @param DefaultRenderer $defaultRenderer
      */
     public function __construct(
-        DefaultColumn $priceRenderer
+        DefaultColumn $priceRenderer,
+        DefaultRenderer $defaultRenderer
     ) {
         $this->priceRenderer = $priceRenderer;
+        $this->defaultRenderer = $defaultRenderer;
     }
 
     /**
@@ -42,6 +51,8 @@ public function execute(
     ): array {
         $result[OrderItemInterface::ROW_TOTAL] = $this->priceRenderer->getTotalAmount($dataObject);
         $result[OrderItemInterface::BASE_ROW_TOTAL] = $this->priceRenderer->getBaseTotalAmount($dataObject);
+        $result[OrderItemInterface::ROW_TOTAL_INCL_TAX] = $this->defaultRenderer->getTotalAmount($dataObject);
+        $result[OrderItemInterface::BASE_ROW_TOTAL_INCL_TAX] = $this->defaultRenderer->getBaseTotalAmount($dataObject);
 
         return $result;
     }

dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderItemGetTest.php

@@ -106,5 +106,7 @@ public function testGetOrderWithDiscount()
         $this->assertTrue(is_array($response));
         $this->assertEquals(8.00, $response['row_total']);
         $this->assertEquals(8.00, $response['base_row_total']);
+        $this->assertEquals(9.00, $response['row_total_incl_tax']);
+        $this->assertEquals(9.00, $response['base_row_total_incl_tax']);
     }
 }

dev/tests/integration/testsuite/Magento/Sales/_files/order_with_discount.php

@@ -47,7 +47,9 @@
     ->setProductType('simple')
     ->setDiscountAmount(2)
     ->setBaseRowTotal($product->getPrice())
-    ->setBaseDiscountAmount(2);
+    ->setBaseDiscountAmount(2)
+    ->setTaxAmount(1)
+    ->setBaseTaxAmount(1);
 
 /** @var Order $order */
 $order = $objectManager->create(Order::class);