Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check return value for getProduct() in getPrice(). #7794

Merged
merged 3 commits into from
Mar 14, 2017
Merged

Check return value for getProduct() in getPrice(). #7794

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c6946f6
Check return value for getProduct() in getPrice().
pbaylies Dec 14, 2016
dfe3a59
Update Price.php
pbaylies Jan 10, 2017
cc97c1b
Update Price.php
pbaylies Mar 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,15 @@ public function getFinalPrice($qty, $product)
*/
public function getPrice($product)
{
if ($product->getCustomOption('simple_product')) {
return $product->getCustomOption('simple_product')->getProduct()->getPrice();
} else {
return 0;
if ( !empty( $product ) ) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This check is not required

$simpleProductOption = $product->getCustomOption('simple_product');
if ( !empty( $simpleProductOption ) ) {
$simpleProduct = $simpleProductOption->getProduct();
if ( !empty( $simpleProduct ) ) {
return $simpleProduct->getPrice();
}
}
}
return 0;
}
}