diff --git a/src/Spryker/Zed/Oms/Persistence/OmsQueryContainer.php b/src/Spryker/Zed/Oms/Persistence/OmsQueryContainer.php index b10d9346..87c62043 100644 --- a/src/Spryker/Zed/Oms/Persistence/OmsQueryContainer.php +++ b/src/Spryker/Zed/Oms/Persistence/OmsQueryContainer.php @@ -298,6 +298,7 @@ protected function buildSubQueryForSalesOrderItemsWithExpiredTimeoutsQuery( ->distinct() ->addSelectColumn(SpySalesOrderItemTableMap::COL_FK_SALES_ORDER); + $subQuery->orderByFkSalesOrder(Criteria::ASC); $subQuery = $this->addEventTimeoutFilterToSalesOrderItemQuery($subQuery, $storeName); $subQuery = $this->addStoreFilterToSalesOrderItemQuery($subQuery, $storeName); $subQuery = $this->addOmsProcessorIdentifierFilterToSalesOrderItemQuery($subQuery, $omsProcessorIdentifiers); diff --git a/tests/SprykerTest/Zed/Oms/Business/OrderStateMachine/TimeoutTest.php b/tests/SprykerTest/Zed/Oms/Business/OrderStateMachine/TimeoutTest.php index 38437575..29e0150e 100644 --- a/tests/SprykerTest/Zed/Oms/Business/OrderStateMachine/TimeoutTest.php +++ b/tests/SprykerTest/Zed/Oms/Business/OrderStateMachine/TimeoutTest.php @@ -102,8 +102,8 @@ public function testCheckTimeouts(): void public function timeoutDataProvider(): array { return [ - 'no store name, no limit' => [3, null, null], 'no store name, limit' => [1, null, 1], // Will take only first created order + 'no store name, no limit' => [3, null, null], 'US store, no limit' => [2, 'US', null], 'DE store, no limit' => [1, 'DE', null], 'US store, no limit, single processor identifier' => [2, 'US', null, [2]],