Merge branch 'FearlessKiwis-MAGETWO-43908-rename_weee_functions' of https://github.corp.magento.com/magento-fearless-kiwis/magento2ce into develop-PR

Conflicts:
	app/code/Magento/Weee/Observer/UpdateProductOptionsObserver.php
	app/code/Magento/Weee/Test/Unit/Observer/UpdateProductOptionsObserverTest.php

Author: Robert He

app/code/Magento/Weee/Helper/Data.php

@@ -739,12 +739,12 @@ public function getTotalAmounts($items, $store = null)
     }
 
     /**
-     * get FPT DISPLAY_INCL setting
+     * Get FPT DISPLAY_INCL setting
      *
      * @param  int|null $storeId
      * @return bool
      */
-    public function geDisplayIncl($storeId = null)
+    public function isDisplayIncl($storeId = null)
     {
         return $this->typeOfDisplay(
             WeeeDisplayConfig::DISPLAY_INCL,
@@ -754,12 +754,27 @@ public function geDisplayIncl($storeId = null)
     }
 
     /**
-     * get FPT DISPLAY_EXCL_DESCR_INCL setting
+     * Get FPT DISPLAY_INCL_DESCR setting
      *
      * @param  int|null $storeId
      * @return bool
      */
-    public function geDisplayExlDescIncl($storeId = null)
+    public function isDisplayInclDesc($storeId = null)
+    {
+        return $this->typeOfDisplay(
+            WeeeDisplayConfig::DISPLAY_INCL_DESCR,
+            \Magento\Framework\Pricing\Render::ZONE_ITEM_VIEW,
+            $storeId
+        );
+    }
+
+    /**
+     * Get FPT DISPLAY_EXCL_DESCR_INCL setting
+     *
+     * @param  int|null $storeId
+     * @return bool
+     */
+    public function isDisplayExclDescIncl($storeId = null)
     {
         return $this->typeOfDisplay(
             WeeeDisplayConfig::DISPLAY_EXCL_DESCR_INCL,
@@ -769,12 +784,12 @@ public function geDisplayExlDescIncl($storeId = null)
     }
 
     /**
-     * get FPT DISPLAY_EXCL setting
+     * Get FPT DISPLAY_EXCL setting
      *
      * @param  int|null $storeId
      * @return bool
      */
-    public function geDisplayExcl($storeId = null)
+    public function isDisplayExcl($storeId = null)
     {
         return $this->typeOfDisplay(
             WeeeDisplayConfig::DISPLAY_EXCL,

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

@@ -142,8 +142,8 @@ private function insertWeeePrice($holder, $key, $weeeAttributes)
     protected function getWhichCalcPriceToUse($storeId = null)
     {
         $calcPrice = 'finalPrice';
-        if ($this->weeeData->geDisplayExcl($storeId) ||
-            $this->weeeData->geDisplayExlDescIncl($storeId) ||
+        if ($this->weeeData->isDisplayExcl($storeId) ||
+            $this->weeeData->isDisplayExclDescIncl($storeId) ||
             ($this->taxData->priceIncludesTax() && $this->taxData->displayPriceExcludingTax())
         ) {
             $calcPrice = 'basePrice';

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

@@ -75,8 +75,8 @@ public function execute(\Magento\Framework\Event\Observer $observer)
                     . '<% } %>';
             }
 
-            if (!$this->weeeData->geDisplayIncl($product->getStoreId()) &&
-                !$this->weeeData->geDisplayExcl($product->getStoreId())) {
+            if (!$this->weeeData->isDisplayIncl($product->getStoreId()) &&
+                !$this->weeeData->isDisplayExcl($product->getStoreId())) {
                 // we need to display the individual Weee amounts
                 foreach ($this->weeeData->getWeeeAttributesForBundle($product) as $weeeAttributes) {
                     foreach ($weeeAttributes as $weeeAttribute) {
@@ -93,7 +93,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
                 }
             }
 
-            if ($this->weeeData->geDisplayExlDescIncl($product->getStoreId())) {
+            if ($this->weeeData->isDisplayExclDescIncl($product->getStoreId())) {
                 $options['optionTemplate'] .= sprintf(
                     ' <%% if (data.weeePrice) { %%>'
                     . '<%%- data.weeePrice.formatted %%>'
@@ -114,9 +114,9 @@ public function execute(\Magento\Framework\Event\Observer $observer)
     protected function getWhichCalcPriceToUse($storeId = null)
     {
         $calcPrice = 'finalPrice';
-        if ($this->weeeData->geDisplayExlDescIncl($storeId)) {
-            $calcPrice = 'basePrice';
-        } elseif ($this->weeeData->geDisplayExcl($storeId) && $this->taxData->displayPriceExcludingTax()) {
+
+        if ($this->weeeData->isDisplayExclDescIncl($storeId) ||
+            ($this->weeeData->isDisplayExcl($storeId) && $this->taxData->displayPriceExcludingTax())) {
             $calcPrice = 'basePrice';
         }
         return $calcPrice;

app/code/Magento/Weee/Test/Unit/Observer/UpdateProductOptionsObserverTest.php

@@ -50,13 +50,13 @@ public function testUpdateProductOptions($initialArray, $weeeEnabled, $weeeDispl
             ->method('isEnabled')
             ->will($this->returnValue($weeeEnabled));
         $weeeHelper->expects($this->any())
-            ->method('geDisplayIncl')
+            ->method('isDisplayIncl')
             ->will($this->returnValue($weeeDisplay == WeeeDisplayConfig::DISPLAY_INCL));
         $weeeHelper->expects($this->any())
-            ->method('geDisplayExlDescIncl')
+            ->method('isDisplayExclDescIncl')
             ->will($this->returnValue($weeeDisplay == WeeeDisplayConfig::DISPLAY_EXCL_DESCR_INCL));
         $weeeHelper->expects($this->any())
-            ->method('geDisplayExcl')
+            ->method('isDisplayExcl')
             ->will($this->returnValue($weeeDisplay == WeeeDisplayConfig::DISPLAY_EXCL));
         $weeeHelper->expects($this->any())
             ->method('getWeeeAttributesForBundle')