MAGETWO-66746: In case something wrong with underlying products #7045

- Merge Pull Request #7045 from Will-I4M/magento2:patch-2
magento · Mar 24, 2017 · 11fcd0f · 11fcd0f
2 parents 07414c0 + aec7a82
commit 11fcd0f
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php b/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
@@ -316,9 +316,11 @@ protected function calculateDynamicBundleAmount($basePriceValue, $bundleProduct,
 
         foreach ($selectionPriceList as $selectionPrice) {
             ++$i;
-            $amountList[$i]['amount'] = $selectionPrice->getAmount();
-            // always honor the quantity given
-            $amountList[$i]['quantity'] = $selectionPrice->getQuantity();
+            if ($selectionPrice) {
+                $amountList[$i]['amount'] = $selectionPrice->getAmount();
+                // always honor the quantity given
+                $amountList[$i]['quantity'] = $selectionPrice->getQuantity();
+            }
         }
 
         /** @var  Store $store */