Skip to content

Commit 9312e9f

Browse files
sreichelcolinmollenhour
authored andcommitted
Fixes undefined classes
1 parent 0a9a5e8 commit 9312e9f

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

app/code/core/Mage/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,11 @@ public function getOrderOptions($item = null)
179179

180180
public function getOrderItem()
181181
{
182-
if ($this->getItem() instanceof Mage_Sales_Order_Item) {
182+
if ($this->getItem() instanceof Mage_Sales_Model_Order_Invoice_Item) {
183+
return $this->getItem();
184+
} else if ($this->getItem() instanceof Mage_Sales_Model_Order_Shipment_Item) {
185+
return $this->getItem();
186+
} else if ($this->getItem() instanceof Mage_Sales_Model_Order_Creditmemo_Item) {
183187
return $this->getItem();
184188
} else {
185189
return $this->getItem()->getOrderItem();

app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Abstract.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,11 @@ public function getOrderOptions($item = null)
233233
*/
234234
public function getOrderItem()
235235
{
236-
if ($this->getItem() instanceof Mage_Sales_Order_Item) {
236+
if ($this->getItem() instanceof Mage_Sales_Model_Order_Invoice_Item) {
237+
return $this->getItem();
238+
} else if ($this->getItem() instanceof Mage_Sales_Model_Order_Shipment_Item) {
239+
return $this->getItem();
240+
} else if ($this->getItem() instanceof Mage_Sales_Model_Order_Creditmemo_Item) {
237241
return $this->getItem();
238242
} else {
239243
return $this->getItem()->getOrderItem();

app/code/core/Mage/Sales/Model/Quote/Address.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1032,15 +1032,15 @@ public function getTotals()
10321032
/**
10331033
* Add total data or model
10341034
*
1035-
* @param Mage_Sales_Model_Quote_Total|array $total
1035+
* @param Mage_Sales_Model_Quote_Address_Total|array $total
10361036
* @return Mage_Sales_Model_Quote_Address
10371037
*/
10381038
public function addTotal($total)
10391039
{
10401040
if (is_array($total)) {
10411041
$totalInstance = Mage::getModel('sales/quote_address_total')
10421042
->setData($total);
1043-
} elseif ($total instanceof Mage_Sales_Model_Quote_Total) {
1043+
} elseif ($total instanceof Mage_Sales_Model_Quote_Address_Total) {
10441044
$totalInstance = $total;
10451045
}
10461046
$totalInstance->setAddress($this);

0 commit comments

Comments
 (0)