MAGETWO-59950: Configurable product option price is displayed incorrectly per website - for 2.0.x

- fix builds

Author: vnayda

app/code/Magento/Catalog/Model/ResourceModel/Product/StatusBaseSelectProcessor.php

@@ -50,15 +50,15 @@ public function process(Select $select)
 
         $select->joinLeft(
             ['status_global_attr' => $statusAttribute->getBackendTable()],
-            "status_global_attr.entity_id = " . self::PRODUCT_RELATION_ALIAS . ".entity_id"
+            "status_global_attr.entity_id = " . self::PRODUCT_RELATION_ALIAS . ".child_id"
                 . ' AND status_global_attr.attribute_id = ' . (int)$statusAttribute->getAttributeId()
                 . ' AND status_global_attr.store_id = ' . Store::DEFAULT_STORE_ID,
             []
         );
 
         $select->joinLeft(
             ['status_attr' => $statusAttribute->getBackendTable()],
-            "status_attr.entity_id = " . self::PRODUCT_RELATION_ALIAS . ".entity_id"
+            "status_attr.entity_id = " . self::PRODUCT_RELATION_ALIAS . ".child_id"
                 . ' AND status_attr.attribute_id = ' . (int)$statusAttribute->getAttributeId()
                 . ' AND status_attr.store_id = ' . $this->storeResolver->getCurrentStoreId(),
             []

app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/StatusBaseSelectProcessorTest.php

@@ -80,7 +80,7 @@ public function testProcess()
             ->with(
                 ['status_global_attr' => $backendTable],
                 "status_global_attr.entity_id = "
-                    . BaseSelectProcessorInterface::PRODUCT_RELATION_ALIAS . ".entity_id"
+                    . BaseSelectProcessorInterface::PRODUCT_RELATION_ALIAS . ".child_id"
                     . " AND status_global_attr.attribute_id = {$attributeId}"
                     . ' AND status_global_attr.store_id = ' . Store::DEFAULT_STORE_ID,
                 []
@@ -90,7 +90,7 @@ public function testProcess()
             ->method('joinLeft')
             ->with(
                 ['status_attr' => $backendTable],
-                "status_attr.entity_id = " . BaseSelectProcessorInterface::PRODUCT_RELATION_ALIAS . ".entity_id"
+                "status_attr.entity_id = " . BaseSelectProcessorInterface::PRODUCT_RELATION_ALIAS . ".child_id"
                     . " AND status_attr.attribute_id = {$attributeId}"
                     . " AND status_attr.store_id = {$currentStoreId}",
                 []

app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php

@@ -211,7 +211,7 @@ protected function _applyConfigurableOption()
             . ' AND status_attr.store_id = ' . $this->storeResolver->getCurrentStoreId(),
             []
         )->where(
-            'product_status.value=' . ProductStatus::STATUS_ENABLED
+            'IFNULL(status_attr.value, status_global_attr.value) = ?', ProductStatus::STATUS_ENABLED
         )->group(
             ['l.parent_id', 'i.customer_group_id', 'i.website_id', 'l.product_id']
         );

dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/ConfigurableTest.php

@@ -14,7 +14,7 @@
 use Magento\TestFramework\Helper\Bootstrap;
 
 /**
- * @magentoAppArea adminhtml
+ * @magentoAppIsolation enabled
  */
 class ConfigurableTest extends \PHPUnit_Framework_TestCase
 {