Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 11 additions & 3 deletions app/code/core/Mage/Sales/Model/Order/Status/History.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
* @method $this setParentId(int $value)
* @method string getStatus()
* @method $this setStatus(string $value)
* @method $this setStoreId(int $value)
* @method int getIsVisibleOnFront()
* @method $this setIsVisibleOnFront(int $value)
*/
Expand Down Expand Up @@ -69,18 +68,27 @@ protected function _construct()
}

/**
* Set order object and grab some metadata from it
* Set order object
*
* @param Mage_Sales_Model_Order $order
* @return $this
*/
public function setOrder(Mage_Sales_Model_Order $order)
{
$this->_order = $order;
$this->setStoreId($order->getStoreId());
return $this;
}

/**
* Get store id
*
* @throws Mage_Core_Model_Store_Exception
*/
public function getStoreId(): int
{
return $this->getStore()->getStoreId();
}

/**
* Notification flag
*
Expand Down
1 change: 1 addition & 0 deletions lib/Varien/Data/Collection/Db.php
Original file line number Diff line number Diff line change
Expand Up @@ -587,6 +587,7 @@ public function load($printQuery = false, $logQuery = false)
$item->setIdFieldName($this->getIdFieldName());
}
$item->addData($row);
$item->setDataChanges(false);
$this->addItem($item);
}
}
Expand Down