MAGETWO-60483: Catalog broken when all child products of configurable are disabled

interio-zz · interio-zz · commit cd02ca04f557 · 2016-11-24T16:33:14.000+02:00
- Fixes after code review;
diff --git a/app/code/Magento/Catalog/Model/Product/Pricing/Renderer/SalableResolver.php b/app/code/Magento/Catalog/Model/Product/Pricing/Renderer/SalableResolver.php
@@ -19,8 +19,6 @@ class SalableResolver implements SalableResolverInterface
      */
     public function isSalable(\Magento\Framework\Pricing\SaleableInterface $salableItem)
     {
-        return ($salableItem->getCanShowPrice() === false || !$salableItem->isSalable())
-            ? false
-            : true;
+        return $salableItem->getCanShowPrice() !== false && $salableItem->isSalable();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,6 @@ class SalableResolver implements SalableResolverInterface`
`19`	`19`	`*/`
`20`	`20`	`public function isSalable(\Magento\Framework\Pricing\SaleableInterface $salableItem)`
`21`	`21`	`{`
`22`		`- return ($salableItem->getCanShowPrice() === false \|\| !$salableItem->isSalable())`
`23`		`- ? false`
`24`		`- : true;`
	`22`	`+ return $salableItem->getCanShowPrice() !== false && $salableItem->isSalable();`
`25`	`23`	`}`
`26`	`24`	`}`