From 371aa3e4f8a083a5f5baf34f20881cf5ff7fb006 Mon Sep 17 00:00:00 2001 From: Kawlll Maxso Date: Fri, 12 Apr 2019 19:23:21 +0800 Subject: [PATCH] Git date etd eta and validation --- .../Dashboard/OrdersStatusReportLogic.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/app/Classes/Modules/ControllersLogic/Dashboard/OrdersStatusReportLogic.php b/app/Classes/Modules/ControllersLogic/Dashboard/OrdersStatusReportLogic.php index 8a28a93..590ff99 100644 --- a/app/Classes/Modules/ControllersLogic/Dashboard/OrdersStatusReportLogic.php +++ b/app/Classes/Modules/ControllersLogic/Dashboard/OrdersStatusReportLogic.php @@ -28,12 +28,15 @@ class OrdersStatusReportLogic $completedArray = ["COMPLETED" => $completed->count()]; $combine = $statusMap + $completedArray; - return [ - $combine['PS_PROCESSING'], - $combine['MS_WAREHOUSE_RECEIVING'], - $combine['PS_SHIPPING'], - $completedArray['COMPLETED'] +// $combine['PS_PROCESSING'], +// $combine['MS_WAREHOUSE_RECEIVING'], +// $combine['PS_SHIPPING'], +// $combine['COMPLETED'] + (isset($combine['PS_PROCESSING'])) ? $combine['PS_PROCESSING'] : 0, + (isset($combine['MS_WAREHOUSE_RECEIVING'])) ? $combine['MS_WAREHOUSE_RECEIVING'] : 0, + (isset($combine['PS_SHIPPING'])) ? $combine['PS_SHIPPING'] : 0, + (isset($combine['COMPLETED'])) ? $combine['COMPLETED'] : 0 ]; } } \ No newline at end of file