Merge branch 'main' into next

Author: ThomasAFink

zmsapi/src/Zmsapi/ProcessListByClusterAndDate.php

@@ -85,7 +85,7 @@ public function readResponse(
             ]);
         }
 
-        $queueList = $queueList->toProcessList()->sortByArrivalTime()->withResolveLevel(2);
+        $queueList = $queueList->toProcessList()->sortByEstimatedWaitingTime()->withResolveLevel(2);
         foreach ($queueList as $queue) {
             if (!$queue->scope->id) {
                 continue;

zmsapi/src/Zmsapi/ProcessListByScopeAndDate.php

@@ -61,7 +61,7 @@ public function readResponse(
             (new ProcessStatusArchived())->readListByScopesAndDates([$scope->getId()], $dates);
 
         $message = Response\Message::create($request);
-        $message->data = $queueList->toProcessList()->sortByArrivalTime()->withResolveLevel(2);
+        $message->data = $queueList->toProcessList()->sortByEstimatedWaitingTime()->withResolveLevel(2);
         $message->data->addData($archivedProcesses);
 
         $response = Render::withLastModified($response, time(), '0');

zmsentities/src/Zmsentities/Collection/QueueList.php

@@ -13,9 +13,9 @@ class QueueList extends Base implements \BO\Zmsentities\Helper\NoSanitize
 
     public const FAKE_WAITINGNUMBER = -1;
 
-    public const STATUS_IGNORE = ['called', 'processing', 'missed', 'parked', 'deleted', 'pickup'];
+    public const STATUS_IGNORE = ['called', 'processing', 'missed', 'parked', 'pickup'];
 
-    public const STATUS_APPEND = ['missed', 'parked', 'deleted'];
+    public const STATUS_APPEND = ['missed', 'parked'];
 
     public const STATUS_CALLED = ['called', 'processing', 'pickup'];