Merge branch 'FearlessKiwis-MAGETWO-35688-FPT-Final-price-of-Simple-Product-isn-t-recalculated-after-selecting-options-on-product-page' of https://github.corp.ebay.com/magento-fearless-kiwis/magento2ce into develop

Author: Robert He

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

@@ -10,6 +10,13 @@
  */
 class Observer extends \Magento\Framework\Model\AbstractModel
 {
+    /**
+     * Tax data
+     *
+     * @var \Magento\Tax\Helper\Data
+     */
+    protected $_taxData;
+
     /**
      * @var \Magento\Catalog\Model\Product\Type
      */
@@ -43,6 +50,7 @@ class Observer extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\View\LayoutInterface $layout
      * @param Tax $weeeTax
      * @param \Magento\Weee\Helper\Data $weeeData
+     * @param \Magento\Tax\Helper\Data $taxData
      * @param \Magento\Catalog\Model\Product\Type $productType
      * @param \Magento\Catalog\Model\ProductTypes\ConfigInterface $productTypeConfig
      * @param \Magento\Framework\Model\Resource\AbstractResource $resource
@@ -56,6 +64,7 @@ public function __construct(
         \Magento\Framework\View\LayoutInterface $layout,
         Tax $weeeTax,
         \Magento\Weee\Helper\Data $weeeData,
+        \Magento\Tax\Helper\Data $taxData,
         \Magento\Catalog\Model\Product\Type $productType,
         \Magento\Catalog\Model\ProductTypes\ConfigInterface $productTypeConfig,
         \Magento\Framework\Model\Resource\AbstractResource $resource = null,
@@ -64,6 +73,7 @@ public function __construct(
     ) {
         $this->_layout = $layout;
         $this->_weeeTax = $weeeTax;
+        $this->_taxData = $taxData;
         $this->_productType = $productType;
         $this->_weeeData = $weeeData;
         $this->productTypeConfig = $productTypeConfig;
@@ -200,30 +210,43 @@ public function updateElementTypes(\Magento\Framework\Event\Observer $observer)
      *
      * @param   \Magento\Framework\Event\Observer $observer
      * @return  $this
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function getPriceConfiguration(\Magento\Framework\Event\Observer $observer)
     {
         if ($this->_weeeData->isEnabled()) {
             $priceConfigObj=$observer->getData('configObj');
             $priceConfig=$priceConfigObj->getConfig();
-            if (is_array($priceConfig)) {
-                foreach ($priceConfig as $keyConfigs => $configs) {
-                    if (is_array($configs)) {
-                        if (array_key_exists('prices', $configs)) {
-                            $priceConfig[$keyConfigs]['prices']['weeePrice'] = [
-                                'amount' => $configs['prices']['finalPrice']['amount'],
-                            ];
-                        } else {
+            try {
+                if (is_array($priceConfig)) {
+                    foreach ($priceConfig as $keyConfigs => $configs) {
+                        if (is_array($configs)) {
                             foreach ($configs as $keyConfig => $config) {
-                                $priceConfig[$keyConfigs][$keyConfig]['prices']['weeePrice'] = [
-                                    'amount' => $config['prices']['finalPrice']['amount'],
-                                ];
+                                $calcPrice = 'finalPrice';
+                                if ($this->_taxData->priceIncludesTax() &&
+                                    $this->_taxData->displayPriceExcludingTax()
+                                ) {
+                                    $calcPrice = 'basePrice';
+                                }
+                                if (array_key_exists('prices', $configs)) {
+                                    $priceConfig[$keyConfigs]['prices']['weeePrice'] = [
+                                        'amount' => $configs['prices'][$calcPrice]['amount'],
+                                    ];
+                                } else {
+                                    foreach ($configs as $keyConfig => $config) {
+                                        $priceConfig[$keyConfigs][$keyConfig]['prices']['weeePrice'] = [
+                                            'amount' => $config['prices'][$calcPrice]['amount'],
+                                        ];
+                                    }
+                                }
                             }
                         }
                     }
                 }
+                $priceConfigObj->setConfig($priceConfig);
+            } catch (Exception $e) {
+                return $this;
             }
-            $priceConfigObj->setConfig($priceConfig);
         }
         return $this;
     }