Skip to content

Commit 106fe00

Browse files
committed
ENGCOM-1429: Fix order history status.
1 parent 0d2f7d4 commit 106fe00

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

app/code/Magento/Sales/Model/Order.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1562,7 +1562,10 @@ public function getStatusHistoryById($statusId)
15621562
public function addStatusHistory(\Magento\Sales\Model\Order\Status\History $history)
15631563
{
15641564
$history->setOrder($this);
1565-
$this->setStatus($history->getStatus());
1565+
$status = $history->getStatus();
1566+
if (null !== $status) {
1567+
$this->setStatus($status);
1568+
}
15661569
if (!$history->getId()) {
15671570
$this->setStatusHistories(array_merge($this->getStatusHistories(), [$history]));
15681571
$this->setDataChanges(true);

0 commit comments

Comments
 (0)