File tree Expand file tree Collapse file tree 2 files changed +12
-3
lines changed
app/code/core/Mage/Sales/Model/Order/Status
lib/Varien/Data/Collection Expand file tree Collapse file tree 2 files changed +12
-3
lines changed Original file line number Diff line number Diff line change 38
38
* @method $this setParentId(int $value)
39
39
* @method string getStatus()
40
40
* @method $this setStatus(string $value)
41
- * @method $this setStoreId(int $value)
42
41
* @method int getIsVisibleOnFront()
43
42
* @method $this setIsVisibleOnFront(int $value)
44
43
*/
@@ -69,18 +68,27 @@ protected function _construct()
69
68
}
70
69
71
70
/**
72
- * Set order object and grab some metadata from it
71
+ * Set order object
73
72
*
74
73
* @param Mage_Sales_Model_Order $order
75
74
* @return $this
76
75
*/
77
76
public function setOrder (Mage_Sales_Model_Order $ order )
78
77
{
79
78
$ this ->_order = $ order ;
80
- $ this ->setStoreId ($ order ->getStoreId ());
81
79
return $ this ;
82
80
}
83
81
82
+ /**
83
+ * Get store id
84
+ *
85
+ * @throws Mage_Core_Model_Store_Exception
86
+ */
87
+ public function getStoreId (): int
88
+ {
89
+ return $ this ->getStore ()->getStoreId ();
90
+ }
91
+
84
92
/**
85
93
* Notification flag
86
94
*
Original file line number Diff line number Diff line change @@ -587,6 +587,7 @@ public function load($printQuery = false, $logQuery = false)
587
587
$ item ->setIdFieldName ($ this ->getIdFieldName ());
588
588
}
589
589
$ item ->addData ($ row );
590
+ $ item ->setDataChanges (false );
590
591
$ this ->addItem ($ item );
591
592
}
592
593
}
You can’t perform that action at this time.
0 commit comments