Merge remote-tracking branch 'origin/master' into bugfix/supesc-198-i…

…ncorrect-reservation-calculation
spryker · Feb 9, 2021 · dcce1b0 · dcce1b0
2 parents 9c24e1f + 4b80397
commit dcce1b0
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Spryker/Zed/Oms/Business/OrderStateMachine/OrderStateMachine.php b/src/Spryker/Zed/Oms/Business/OrderStateMachine/OrderStateMachine.php
@@ -1031,10 +1031,10 @@ protected function filterItemsWithTimeoutEvent(array $orderItems, array $process
             if ($targetState->hasTimeoutEvent()) {
                 $events = $targetState->getTimeoutEvents();
                 foreach ($events as $event) {
-                    if (array_key_exists($event->getName(), $orderItemsWithTimeoutEvent) === false) {
-                        $orderItemsWithTimeoutEvent[$event->getName()] = [];
+                    $orderItemKey = sprintf('%s_%s', $orderItem->getIdSalesOrderItem(), $orderItem->getFkOmsOrderItemState());
+                    if (!isset($orderItemsWithTimeoutEvent[$event->getName()][$orderItemKey])) {
+                        $orderItemsWithTimeoutEvent[$event->getName()][$orderItemKey] = $orderItem;
                     }
-                    $orderItemsWithTimeoutEvent[$event->getName()][] = $orderItem;
                 }
             }
         }