MAGETWO-43291: Incl tax prices on Product and catalog pages include tax on FPT

 -- fixed merge issues

Author: Robert He

app/code/Magento/Weee/Observer/GetPriceConfigurationObserver.php

@@ -138,20 +138,14 @@ private function insertWeeePrice($holder, $key, $weeeAttributes)
      *
      * @param  int|null $storeId
      * @return string
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     protected function getWhichCalcPriceToUse($storeId = null)
     {
         $calcPrice = 'finalPrice';
-
-        // Does catalog price include tax? (true, false)
-        $isPriceIncludesTax = $this->weeeData->displayTotalsInclTax();
-        // Price display configurations (DISPLAY_TYPE_EXCLUDING_TAX, DISPLAY_TYPE_INCLUDING_TAX, DISPLAY_TYPE_BOTH)
-        $priceDisplayConfig = $this->weeeData->getTaxDisplayConfig();
-
-        if ($isPriceIncludesTax == true &&
-            $priceDisplayConfig == \Magento\Tax\Model\Config::DISPLAY_TYPE_EXCLUDING_TAX &&
-            $this->weeeData->typeOfDisplay([\Magento\Weee\Model\Tax::DISPLAY_EXCL_DESCR_INCL])) {
+        if ($this->weeeData->isDisplayExcl($storeId) ||
+            $this->weeeData->isDisplayExclDescIncl($storeId) ||
+            ($this->taxData->priceIncludesTax() && $this->taxData->displayPriceExcludingTax())
+        ) {
             $calcPrice = 'basePrice';
         }
         return $calcPrice;