diff --git a/sources/getCheckInTable.php b/sources/getCheckInTable.php index a52d3f4..52f5d2d 100644 --- a/sources/getCheckInTable.php +++ b/sources/getCheckInTable.php @@ -59,6 +59,7 @@ function resolveRowMarkDateCheckIn( $NachbereitungsTimeDetail, $RePackagingTimeDetail, $PackingNoteDetail, + $DispoTimeDetail, int $source ): ?DateTimeImmutable { $candidate = null; @@ -67,7 +68,7 @@ function resolveRowMarkDateCheckIn( case 2: $candidate = dt($NachbereitungsTimeDetail->date_start ?? null); break; case 3: $candidate = dt($RePackagingTimeDetail->date_start ?? null); break; case 4: $candidate = dt($PackingNoteDetail->date_redelivery ?? null); break; - case 5: $candidate = dt($DispoTimeDetail->date_end ?? null); break; + case 5: $candidate = dt($DispoTimeDetail->date_end ?? null); break; default: $candidate = null; break; } @@ -151,6 +152,7 @@ foreach ($data_output as $packingjob) { $NachbereitungsTimeDetail, $RePackagingTimeDetail, $PackingNoteDetail, + $DispoTimeDetail, $source ); diff --git a/sources/getCheckOutTable.php b/sources/getCheckOutTable.php index 66aad41..2c94aa3 100644 --- a/sources/getCheckOutTable.php +++ b/sources/getCheckOutTable.php @@ -39,7 +39,7 @@ function dayStart(DateTimeImmutable $d): DateTimeImmutable { return $d->setTime(0, 0, 0); } -function resolveRowMarkDate($packingjob, $VorbereitungsTimeDetail, $PackingNoteDetail, int $source): ?DateTimeImmutable { +function resolveRowMarkDate($packingjob, $VorbereitungsTimeDetail, $PackingNoteDetail, $DispoTimeDetail, int $source): ?DateTimeImmutable { $candidate = null; switch ($source) { case 1: $candidate = dt($packingjob->date_start ?? null); @@ -152,7 +152,7 @@ if ( $limit = $todayFilter->modify('+' . (int) CheckOut_FutureDays . ' day'); } - $markDate = resolveRowMarkDate($packingjob, $VorbereitungsTimeDetail, $PackingNoteDetail, (int) CheckOutRowMarkSource); + $markDate = resolveRowMarkDate($packingjob, $VorbereitungsTimeDetail, $PackingNoteDetail, $DispoTimeDetail, (int) CheckOutRowMarkSource); if (CheckOut_FutureDays == -1 || ($markDate && $markDate <= $limit)) { $trClass = rowClassForDate($markDate, $today);