@@ -718,10 +718,10 @@ public function getOrderOptions($product = null)
718718 {
719719 $ options = parent ::getOrderOptions ($ product );
720720 $ options ['attributes_info ' ] = $ this ->getSelectedAttributesInfo ($ product );
721- /** @var Mage_Sales_Model_Quote_Item_Option $simpleOption */
721+ /** @var Mage_Sales_Model_Quote_Item_Option|Mage_Catalog_Model_Product_Configuration_Item_Option $simpleOption */
722722 if ($ simpleOption = $ this ->getProduct ($ product )->getCustomOption ('simple_product ' )) {
723- $ options ['simple_name ' ] = $ simpleOption ->getProduct ($ product )->getName ();
724- $ options ['simple_sku ' ] = $ simpleOption ->getProduct ($ product )->getSku ();
723+ $ options ['simple_name ' ] = $ simpleOption ->getProduct ()->getName ();
724+ $ options ['simple_sku ' ] = $ simpleOption ->getProduct ()->getSku ();
725725 }
726726
727727 $ options ['product_calculations ' ] = self ::CALCULATE_PARENT ;
@@ -784,8 +784,8 @@ public function getWeight($product = null)
784784 if ($ this ->getProduct ($ product )->hasCustomOptions () &&
785785 ($ simpleProductOption = $ this ->getProduct ($ product )->getCustomOption ('simple_product ' ))
786786 ) {
787- /** @var Mage_Sales_Model_Quote_Item_Option $simpleProductOption */
788- $ simpleProduct = $ simpleProductOption ->getProduct ($ product );
787+ /** @var Mage_Sales_Model_Quote_Item_Option|Mage_Catalog_Model_Product_Configuration_Item_Option $simpleProductOption */
788+ $ simpleProduct = $ simpleProductOption ->getProduct ();
789789 if ($ simpleProduct ) {
790790 return $ simpleProduct ->getWeight ();
791791 }
@@ -837,10 +837,10 @@ public function getSku($product = null)
837837 /** @var Mage_Sales_Model_Quote_Item_Option $simpleOption */
838838 $ simpleOption = $ this ->getProduct ($ product )->getCustomOption ('simple_product ' );
839839 if ($ simpleOption ) {
840- $ optionProduct = $ simpleOption ->getProduct ($ product );
840+ $ optionProduct = $ simpleOption ->getProduct ();
841841 $ simpleSku = null ;
842842 if ($ optionProduct ) {
843- $ simpleSku = $ simpleOption ->getProduct ($ product )->getSku ();
843+ $ simpleSku = $ simpleOption ->getProduct ()->getSku ();
844844 }
845845 $ sku = parent ::getOptionSku ($ product , $ simpleSku );
846846 } else {
0 commit comments