diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml index 98cf677..072f37b 100644 --- a/nbproject/private/private.xml +++ b/nbproject/private/private.xml @@ -3,22 +3,33 @@ + file:/C:/xampp/htdocs/EpiWebview/sources/getCheckOutCards.php + file:/C:/xampp/htdocs/EpiWebview/dist/index.html file:/C:/xampp/htdocs/EpiWebview/.git/config - file:/C:/xampp/htdocs/EpiWebview/PackAufgabenMonitor.php - file:/C:/xampp/htdocs/EpiWebview/sources/getSidenav.php file:/C:/xampp/htdocs/EpiWebview/dist/index.php file:/C:/xampp/htdocs/EpiWebview/sources/getOrderDetails.php - file:/C:/xampp/htdocs/EpiWebview/config.php - file:/C:/xampp/htdocs/EpiWebview/EpiApi.php - file:/C:/xampp/htdocs/EpiWebview/sources/getOrders.php + file:/C:/xampp/htdocs/EpiWebview/dist/css/styles.css file:/C:/xampp/htdocs/EpiWebview/Aufgabenmonitor.php + file:/C:/xampp/htdocs/EpiWebview/dist/editconfig.php file:/C:/xampp/htdocs/EpiWebview/composer.json file:/C:/xampp/htdocs/EpiWebview/sources/getCheckInTable.php file:/C:/xampp/htdocs/EpiWebview/CrewbrainApi.php + file:/C:/xampp/htdocs/EpiWebview/example.config.php file:/C:/xampp/htdocs/EpiWebview/composer.lock file:/C:/xampp/htdocs/EpiWebview/info.php file:/C:/xampp/htdocs/EpiWebview/Packmonitor.php file:/C:/xampp/htdocs/EpiWebview/index.php + file:/C:/xampp/htdocs/EpiWebview/.gitignore + file:/C:/xampp/htdocs/EpiWebview/PackAufgabenMonitor.php + file:/C:/xampp/htdocs/EpiWebview/sources/getSidenav.php + file:/C:/xampp/htdocs/EpiWebview/README.MD + file:/C:/xampp/htdocs/EpiWebview/config.php + file:/C:/xampp/htdocs/EpiWebview/EpiApi.php + file:/C:/xampp/htdocs/EpiWebview/sources/getOrders.php + file:/C:/xampp/htdocs/EpiWebview/sources/getCheckInCards.php + file:/C:/xampp/htdocs/EpiWebview/dist/orders.php + file:/C:/xampp/htdocs/EpiWebview/LICENSE.MD + file:/C:/xampp/htdocs/EpiWebview/vendor/autoload.php file:/C:/xampp/htdocs/EpiWebview/sources/getAufgabenTable.php file:/C:/xampp/htdocs/EpiWebview/sources/getCheckOutTable.php diff --git a/sources/getCheckOutTable.php b/sources/getCheckOutTable.php index e1cbecb..1e06823 100644 --- a/sources/getCheckOutTable.php +++ b/sources/getCheckOutTable.php @@ -175,13 +175,30 @@ if ( if (ShowCheckoutTimeOnCheckout) { echo "
"; } - echoMarkedTimeLine($VorbereitungsTimeDetail->date_start, (int) $VorbereitungsTimeDetail->time_start, $today, ShowTimesOnCheckout); + + if($packingjob->is_all_out != 0){ + echoMarkedTimeLine($VorbereitungsTimeDetail->date_start, (int) $VorbereitungsTimeDetail->time_start, $today, ShowTimesOnCheckout); + }else{ + echo ""; + echo date_format(new \DateTime($VorbereitungsTimeDetail->date_start), 'd.m.Y'); + if($VorbereitungsTimeDetail->time_start){echo " ".getTimeFromSeconds((string) $VorbereitungsTimeDetail->time_start);} + echo ""; + } + + } if (ShowPackagingTimeOnCheckout && $PackingNoteDetail && $PackingNoteDetail->date_packing != null) { if (ShowCheckoutTimeOnCheckout || ShowVorbereitungTimeOnCheckout) { echo "
"; } + if($packingjob->is_all_out != 0){ echoMarkedTimeLine($PackingNoteDetail->date_packing, (int) $PackingNoteDetail->time_packing, $today, ShowTimesOnCheckout); + }else{ + echo ""; + echo date_format(new \DateTime($PackingNoteDetail->date_packing), 'd.m.Y'); + if($PackingNoteDetail->time_packing){echo " ".getTimeFromSeconds((string) $PackingNoteDetail->time_packing);} + echo ""; + } } if (ShowDeliveryTimeOnCheckout && $PackingNoteDetail && $PackingNoteDetail->date_delivery != null) { if (ShowCheckoutTimeOnCheckout || ShowVorbereitungTimeOnCheckout || ShowPackagingTimeOnCheckout) {