MAGETWO-57056: [Backport] [GitHub] Configurable product disabling low…

…est price associated product still shows its price #4419 - for 2.0 - fix builds
magento · Oct 27, 2016 · da533ee · da533ee
1 parent 482da28
commit da533ee
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 10 deletions.
diff --git a/...to/Catalog/Model/ResourceModel/Product/Indexer/LinkedProductSelectBuilderByIndexPrice.php b/...to/Catalog/Model/ResourceModel/Product/Indexer/LinkedProductSelectBuilderByIndexPrice.php
@@ -74,4 +74,4 @@ public function build($productId)
 
         return [$priceSelect];
     }
-}
+}
diff --git a/.../Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderBySpecialPrice.php b/.../Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderBySpecialPrice.php
@@ -134,4 +134,4 @@ public function build($productId)
 
         return $select;
     }
-}
+}
diff --git a/.../CatalogRule/Model/ResourceModel/Product/LinkedProductSelectBuilderByCatalogRulePrice.php b/.../CatalogRule/Model/ResourceModel/Product/LinkedProductSelectBuilderByCatalogRulePrice.php
@@ -94,4 +94,4 @@ public function build($productId)
 
         return [$priceSelect];
     }
-}
+}
diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableOptionsProvider.php b/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableOptionsProvider.php
@@ -51,4 +51,4 @@ public function getProducts(ProductInterface $product)
         }
         return $this->products[$product->getId()];
     }
-}
+}
diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurablePriceResolver.php b/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurablePriceResolver.php
@@ -72,4 +72,4 @@ public function resolvePrice(\Magento\Framework\Pricing\SaleableInterface $produ
 
         return (float)$price;
     }
-}
+}
diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableRegularPrice.php b/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableRegularPrice.php
@@ -170,4 +170,4 @@ private function getConfigurableOptionsProvider()
         }
         return $this->configurableOptionsProvider;
     }
-}
+}
diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Price/LowestPriceOptionsProvider.php b/app/code/Magento/ConfigurableProduct/Pricing/Price/LowestPriceOptionsProvider.php
@@ -58,7 +58,8 @@ public function getProducts(ProductInterface $product)
             ->addIdFilter($productIds)
             ->addAttributeToSelect('*')
             ->addPriceData()
-            ->addTierPriceData();
+            ->addTierPriceData()
+            ->getItems();
         return $lowestPriceChildProducts;
     }
 }
diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Price/LowestPriceOptionsProviderInterface.php b/app/code/Magento/ConfigurableProduct/Pricing/Price/LowestPriceOptionsProviderInterface.php
@@ -17,4 +17,4 @@ interface LowestPriceOptionsProviderInterface
      * @return \Magento\Catalog\Api\Data\ProductInterface[]
      */
     public function getProducts(\Magento\Catalog\Api\Data\ProductInterface $product);
-}
+}
diff --git a/...ode/Magento/ConfigurableProduct/Test/Unit/Pricing/Price/ConfigurablePriceResolverTest.php b/...ode/Magento/ConfigurableProduct/Test/Unit/Pricing/Price/ConfigurablePriceResolverTest.php
@@ -103,4 +103,4 @@ public function testResolvePriceDataProvider()
             'price of five' => [5],
         ];
     }
-}
+}
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Pricing/Render/FinalPriceBoxTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Pricing/Render/FinalPriceBoxTest.php
@@ -138,4 +138,4 @@ public function hasSpecialPriceDataProvider()
             [20., 10., true],
         ];
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -74,4 +74,4 @@ public function build($productId) @@
             return [$priceSelect];
         }
-    }
+    }