MAGETWO-61120: Tax and Order total not correct when discount is applied

- Added tests for AdminPriceExcludingTax Notification

Author: Alex Paliarush

app/code/Magento/Tax/Model/Config.php

@@ -70,6 +70,7 @@ class Config
 
     const XML_PATH_DISPLAY_CART_SHIPPING = 'tax/cart_display/shipping';
 
+    /** @deprecated */
     const XML_PATH_DISPLAY_CART_DISCOUNT = 'tax/cart_display/discount';
 
     const XML_PATH_DISPLAY_CART_GRANDTOTAL = 'tax/cart_display/grandtotal';
@@ -87,6 +88,7 @@ class Config
 
     const XML_PATH_DISPLAY_SALES_SHIPPING = 'tax/sales_display/shipping';
 
+    /** @deprecated */
     const XML_PATH_DISPLAY_SALES_DISCOUNT = 'tax/sales_display/discount';
 
     const XML_PATH_DISPLAY_SALES_GRANDTOTAL = 'tax/sales_display/grandtotal';
@@ -470,6 +472,7 @@ public function displayCartShippingBoth($store = null)
     /**
      * @param null|string|bool|int|Store $store
      * @return bool
+     * @deprecated
      */
     public function displayCartDiscountInclTax($store = null)
     {
@@ -483,6 +486,7 @@ public function displayCartDiscountInclTax($store = null)
     /**
      * @param null|string|bool|int|Store $store
      * @return bool
+     * @deprecated
      */
     public function displayCartDiscountExclTax($store = null)
     {
@@ -496,6 +500,7 @@ public function displayCartDiscountExclTax($store = null)
     /**
      * @param null|string|bool|int|Store $store
      * @return bool
+     * @deprecated
      */
     public function displayCartDiscountBoth($store = null)
     {
@@ -665,6 +670,7 @@ public function displaySalesShippingBoth($store = null)
     /**
      * @param null|string|bool|int|Store $store
      * @return bool
+     * @deprecated
      */
     public function displaySalesDiscountInclTax($store = null)
     {
@@ -678,6 +684,7 @@ public function displaySalesDiscountInclTax($store = null)
     /**
      * @param null|string|bool|int|Store $store
      * @return bool
+     * @deprecated
      */
     public function displaySalesDiscountExclTax($store = null)
     {
@@ -691,6 +698,7 @@ public function displaySalesDiscountExclTax($store = null)
     /**
      * @param null|string|bool|int|Store $store
      * @return bool
+     * @deprecated
      */
     public function displaySalesDiscountBoth($store = null)
     {

app/code/Magento/Tax/Model/System/Message/Notification/AdminPriceExcludingTax.php

@@ -54,6 +54,7 @@ public function __construct(
 
     /**
      * {@inheritdoc}
+     * @codeCoverageIgnore
      */
     public function getIdentity()
     {
@@ -97,6 +98,7 @@ public function getText()
 
     /**
      * {@inheritdoc}
+     * @codeCoverageIgnore
      */
     public function getSeverity()
     {
@@ -134,49 +136,47 @@ private function checkSettings($store = null)
     {
         $adminCatalogPricesExcludeTax = !$this->taxConfig->priceIncludesTax($store)
             || !$this->taxConfig->shippingPriceIncludesTax($store);
-        $displayPricesWhichIncludeTax = $this->hasCatalogDisplaySettingsNotIncludingTax($store)
-            || $this->hasCartDisplaySettingsNotIncludingTax($store)
-            || $this->hasSalesDisplaySettingsNotIncludingTax($store);
+        $displayPricesWhichIncludeTax = $this->hasCatalogDisplaySettingsWhichIncludeTax($store)
+            || $this->hasCartDisplaySettingsWhichIncludeTax($store)
+            || $this->hasSalesDisplaySettingsWhichIncludeTax($store);
         return !($adminCatalogPricesExcludeTax && $displayPricesWhichIncludeTax);
     }
 
     /**
-     * Check if there are any price display settings for catalog with values other than "Including tax"
+     * Check if there are any price display settings for catalog with values other than "Excluding tax"
      *
      * @param null|int|bool|string|\Magento\Store\Model\Store $store $store
      * @return bool
      */
-    private function hasCatalogDisplaySettingsNotIncludingTax($store = null)
+    private function hasCatalogDisplaySettingsWhichIncludeTax($store = null)
     {
         return $this->taxConfig->getPriceDisplayType($store) !== Config::DISPLAY_TYPE_EXCLUDING_TAX
             || $this->taxConfig->getShippingPriceDisplayType($store) !== Config::DISPLAY_TYPE_EXCLUDING_TAX;
     }
 
     /**
-     * Check if there are any price display settings for cart with values other than "Including tax"
+     * Check if there are any price display settings for cart with values other than "Excluding tax"
      *
      * @param null|int|bool|string|\Magento\Store\Model\Store $store $store
      * @return bool
      */
-    private function hasCartDisplaySettingsNotIncludingTax($store = null)
+    private function hasCartDisplaySettingsWhichIncludeTax($store = null)
     {
-        return !$this->taxConfig->displayCartPricesInclTax($store)
-            || !$this->taxConfig->displayCartSubtotalInclTax($store)
-            || !$this->taxConfig->displayCartShippingInclTax($store)
-            || !$this->taxConfig->displayCartDiscountInclTax($store);
+        return !$this->taxConfig->displayCartPricesExclTax($store)
+            || !$this->taxConfig->displayCartSubtotalExclTax($store)
+            || !$this->taxConfig->displayCartShippingExclTax($store);
     }
 
     /**
-     * Check if there are any price display settings for orders, invoices, credit memos with values not "Including tax"
+     * Check if there are any price display settings for orders, invoices, credit memos with values not "Excluding tax"
      *
      * @param null|int|bool|string|\Magento\Store\Model\Store $store $store
      * @return bool
      */
-    private function hasSalesDisplaySettingsNotIncludingTax($store = null)
+    private function hasSalesDisplaySettingsWhichIncludeTax($store = null)
     {
-        return !$this->taxConfig->displaySalesPricesInclTax($store)
-            || !$this->taxConfig->displaySalesSubtotalInclTax($store)
-            || !$this->taxConfig->displaySalesShippingInclTax($store)
-            || !$this->taxConfig->displaySalesDiscountInclTax($store);
+        return !$this->taxConfig->displaySalesPricesExclTax($store)
+            || !$this->taxConfig->displaySalesSubtotalExclTax($store)
+            || !$this->taxConfig->displaySalesShippingExclTax($store);
     }
 }