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

@@ -51,16 +51,16 @@ public function process(Select $select)
         $select->joinLeft(
             ['status_global_attr' => $statusAttribute->getBackendTable()],
             "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,
+            . ' 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 . ".child_id"
-                . ' AND status_attr.attribute_id = ' . (int)$statusAttribute->getAttributeId()
-                . ' AND status_attr.store_id = ' . $this->storeResolver->getCurrentStoreId(),
+            . ' 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,9 +80,9 @@ public function testProcess()
             ->with(
                 ['status_global_attr' => $backendTable],
                 "status_global_attr.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,
+                . BaseSelectProcessorInterface::PRODUCT_RELATION_ALIAS . ".child_id"
+                . " AND status_global_attr.attribute_id = {$attributeId}"
+                . ' AND status_global_attr.store_id = ' . Store::DEFAULT_STORE_ID,
                 []
             )
             ->willReturnSelf();

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

@@ -211,7 +211,8 @@ protected function _applyConfigurableOption()
             . ' AND status_attr.store_id = ' . $this->storeResolver->getCurrentStoreId(),
             []
         )->where(
-            'IFNULL(status_attr.value, status_global_attr.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']
         );