-
Check-Out
+
Check-Out
+
@@ -68,7 +71,7 @@ $Epi = new Epirent();
-
+
@@ -77,7 +80,12 @@ $Epi = new Epirent();
-
Check-In
+
Check-In
+
@@ -88,8 +96,8 @@ $Epi = new Epirent();
Dispo-Ende
RP-Ende |
-
-
+
+
diff --git a/config.php b/config.php
index 80b318e..22ad038 100644
--- a/config.php
+++ b/config.php
@@ -1,20 +1,29 @@
diff --git a/sources/getCheckInTable.php b/sources/getCheckInTable.php
index 822608e..65d40eb 100644
--- a/sources/getCheckInTable.php
+++ b/sources/getCheckInTable.php
@@ -10,6 +10,8 @@ use chillerlan\QRCode\{
require('../vendor/autoload.php');
+
+
$options = new QROptions([
'imageBase64' => false,
'qrCodeHeight' => 75,
@@ -50,7 +52,9 @@ foreach ($data_output as $packingjob) {
//End Of get Order Details
- if (CheckIn_UseDispoEndForRowMarking || ($NachbereitungsTimeDetail->date_start==null)) {
+
+
+ if (CheckIn_UseDispoEndForRowMarking || ($NachbereitungsTimeDetail->date_start == null)) {
$date = new DateTime($packingjob->date_end);
} else {
$date = new DateTime($NachbereitungsTimeDetail->date_start);
@@ -58,32 +62,38 @@ foreach ($data_output as $packingjob) {
$date->setTime(0, 0, 0);
$today = new DateTime();
$today->setTime(0, 0, 0);
- if ($date == $today) {
+ $todayFilter = new DateTime();
+ $todayFilter->setTime(0,0,0);
+ if (CheckIn_FutureDays == -1 || $date <= ($todayFilter->modify('+'.CheckIn_FutureDays.' day'))) {
+ //prüfe, ob entweder unbegrenzte (-1) Anzeige Aktiv ist, oder das Datum kleiner oder Gleich heute + Zukunftsspanne ist
+
+ if ($date == $today) {
- echo "
";
- } else if ($date < $today) {
- echo "
";
- } else {
- echo "
";
+ echo "
";
+ } else if ($date < $today) {
+ echo "
";
+ } else {
+ echo "
";
+ }
+ if (Enable_QR_Code_CheckIn) {
+ echo "| " . ' ' . (new QRCode($options))->render($packingjob->packingnote_no) . " | ";
+ } else {
+ echo "" . $packingjob->packingnote_no . " | ";
+ }
+ echo "" . $packingjob->contact->name . " | ";
+ echo "" . $packingjob->event . " | ";
+ if ($NachbereitungsTimeDetail->date_start != null) {
+ echo "" . date_format(new \DateTime($packingjob->date_start), 'd.m.Y') . " " . getTimeFromSeconds($packingjob->time_start) . "
" . date_format(new \DateTime($NachbereitungsTimeDetail->date_start), 'd.m.Y') . " " . getTimeFromSeconds($NachbereitungsTimeDetail->time_start) . " | ";
+ } else {
+ echo "" . date_format(new \DateTime($packingjob->date_start), 'd.m.Y') . " " . getTimeFromSeconds($packingjob->time_start) . " | ";
+ }
+ if ($NachbereitungsTimeDetail->date_end != null) {
+ echo "" . date_format(new \DateTime($packingjob->date_end), 'd.m.Y') . " " . getTimeFromSeconds($packingjob->time_end) . "
" . date_format(new \DateTime($NachbereitungsTimeDetail->date_end), 'd.m.Y') . " " . getTimeFromSeconds($NachbereitungsTimeDetail->time_end) . " | ";
+ } else {
+ echo "" . date_format(new \DateTime($packingjob->date_end), 'd.m.Y') . " " . getTimeFromSeconds($packingjob->time_end) . " | ";
+ }
+ echo "
";
}
- if (Enable_QR_Code_CheckIn) {
- echo "
" . ' ' . (new QRCode($options))->render($packingjob->packingnote_no) . " | ";
- } else {
- echo "
" . $packingjob->packingnote_no . " | ";
- }
- echo "
" . $packingjob->contact->name . " | ";
- echo "
" . $packingjob->event . " | ";
- if ($NachbereitungsTimeDetail->date_start != null) {
- echo "
" . date_format(new \DateTime($packingjob->date_start), 'd.m.Y') . " " . getTimeFromSeconds($packingjob->time_start) . "
" . date_format(new \DateTime($NachbereitungsTimeDetail->date_start), 'd.m.Y') . " " . getTimeFromSeconds($NachbereitungsTimeDetail->time_start) . " | ";
- } else {
- echo "
" . date_format(new \DateTime($packingjob->date_start), 'd.m.Y') . " " . getTimeFromSeconds($packingjob->time_start) . " | ";
- }
- if ($NachbereitungsTimeDetail->date_end != null) {
- echo "
" . date_format(new \DateTime($packingjob->date_end), 'd.m.Y') . " " . getTimeFromSeconds($packingjob->time_end) . "
" . date_format(new \DateTime($NachbereitungsTimeDetail->date_end), 'd.m.Y') . " " . getTimeFromSeconds($NachbereitungsTimeDetail->time_end) . " | ";
- } else {
- echo "
" . date_format(new \DateTime($packingjob->date_end), 'd.m.Y') . " " . getTimeFromSeconds($packingjob->time_end) . " | ";
- }
- echo "";
}
}
diff --git a/sources/getCheckOutTable.php b/sources/getCheckOutTable.php
index 6f6397e..1051fcb 100644
--- a/sources/getCheckOutTable.php
+++ b/sources/getCheckOutTable.php
@@ -49,48 +49,50 @@ foreach ($data_output as $packingjob) {
$VorbereitungsTimeDetail = $scheduledetail;
}
}
-
-
//End Of get Order Details
if (CheckOut_UseDispoStartForRowMarking || ($VorbereitungsTimeDetail->date_start == null)) {
$date = new DateTime($packingjob->date_start);
-
} else {
$date = new DateTime($VorbereitungsTimeDetail->date_start);
-
}
-
+
$date->setTime(0, 0, 0);
$today = new DateTime();
$today->setTime(0, 0, 0);
- if ($date == $today) {
- echo "
";
- } else if ($date < $today) {
- echo "
";
- } else {
- echo "
";
- }
+ $todayFilter = new DateTime();
+ $todayFilter->setTime(0, 0, 0);
+ if (CheckOut_FutureDays == -1 || $date <= ($todayFilter->modify('+' . CheckOut_FutureDays . ' day'))) {
+ //prüfe, ob entweder unbegrenzte (-1) Anzeige Aktiv ist, oder das Datum kleiner oder Gleich heute + Zukunftsspanne ist
+ if ($date == $today) {
- if (Enable_QR_Code_CheckOut) {
- echo "| " . ' ' . (new QRCode($options))->render($packingjob->packingnote_no) . " | ";
- } else {
- echo "" . $packingjob->packingnote_no . " | ";
+ echo "
";
+ } else if ($date < $today) {
+ echo "
";
+ } else {
+ echo "
";
+ }
+
+ if (Enable_QR_Code_CheckOut) {
+ echo "| " . ' ' . (new QRCode($options))->render($packingjob->packingnote_no) . " | ";
+ } else {
+ echo "" . $packingjob->packingnote_no . " | ";
+ }
+ echo "" . $packingjob->contact->name . " | ";
+ echo "" . $packingjob->event . " | ";
+ if ($VorbereitungsTimeDetail->date_start != null) {
+ echo "" . date_format(new \DateTime($packingjob->date_start), 'd.m.Y') . " " . getTimeFromSeconds($packingjob->time_start) . "
" . date_format(new \DateTime($VorbereitungsTimeDetail->date_start), 'd.m.Y') . " " . getTimeFromSeconds($VorbereitungsTimeDetail->time_start) . " | ";
+ } else {
+ echo "" . date_format(new \DateTime($packingjob->date_start), 'd.m.Y') . " " . getTimeFromSeconds($packingjob->time_start) . " | ";
+ }
+ if ($VorbereitungsTimeDetail->date_end != null) {
+ echo "" . date_format(new \DateTime($packingjob->date_end), 'd.m.Y') . " " . getTimeFromSeconds($packingjob->time_end) . "
" . date_format(new \DateTime($VorbereitungsTimeDetail->date_end), 'd.m.Y') . " " . getTimeFromSeconds($VorbereitungsTimeDetail->time_end) . " | ";
+ } else {
+ echo "" . date_format(new \DateTime($packingjob->date_end), 'd.m.Y') . " " . getTimeFromSeconds($packingjob->time_end) . " | ";
+ }
+ echo "
";
}
- echo "
" . $packingjob->contact->name . " | ";
- echo "
" . $packingjob->event . " | ";
- if ($VorbereitungsTimeDetail->date_start != null) {
- echo "
" . date_format(new \DateTime($packingjob->date_start), 'd.m.Y') . " " . getTimeFromSeconds($packingjob->time_start) . "
" . date_format(new \DateTime($VorbereitungsTimeDetail->date_start), 'd.m.Y') . " " . getTimeFromSeconds($VorbereitungsTimeDetail->time_start) . " | ";
- } else {
- echo "
" . date_format(new \DateTime($packingjob->date_start), 'd.m.Y') . " " . getTimeFromSeconds($packingjob->time_start) . " | ";
- }
- if ($VorbereitungsTimeDetail->date_end != null) {
- echo "
" . date_format(new \DateTime($packingjob->date_end), 'd.m.Y') . " " . getTimeFromSeconds($packingjob->time_end) . "
" . date_format(new \DateTime($VorbereitungsTimeDetail->date_end), 'd.m.Y') . " " . getTimeFromSeconds($VorbereitungsTimeDetail->time_end) . " | ";
- } else {
- echo "
" . date_format(new \DateTime($packingjob->date_end), 'd.m.Y') . " " . getTimeFromSeconds($packingjob->time_end) . " | ";
- }
- echo "";
}
}