From 20f5e4672644ab0dd7fcdb6f19324b66185a188f Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Fri, 17 Jul 2020 06:17:55 +0000 Subject: [PATCH 1/2] Add date_accept to the responses when getting a job order. #440 --- .../RiderAPIHandler/CMBRiderAPIHandler.php | 33 ++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php b/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php index fc2b1272..19696229 100644 --- a/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php +++ b/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php @@ -444,6 +444,19 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface if (empty($trade_in_type)) $trade_in_type = 'none'; + // get time when JO was accepted by rider + $event_type = CMBJOEventType::RIDER_ACCEPT; + $rider_id = $this->session->getRider()->getID(); + $jo_id = $jo->getID(); + $date_accept = ''; + + $results = $this->em->getRepository(JOEvent::class)->findby(['type_id' => $event_type, 'rider' => $rider_id, 'job_order' => $jo_id], ['date_happen' => 'DESC']); + if ($results != null) + { + $jo_event = current($results); + $date_accept = $jo_event->getDateHappen()->format('Ymd H:i:s'); + } + $jo_data[] = [ 'job_order' => [ 'id' => $jo->getID(), @@ -486,6 +499,8 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface 'has_warranty_doc' => false, 'flag_coolant' => $jo->hasCoolant(), 'has_motolite' => $cv->hasMotoliteBattery(), + // date and time accepted + 'date_accept' => $date_accept, ] ]; } @@ -736,6 +751,19 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface else $cust_email = $jo->getMeta('customer_email'); + // get time when JO was accepted by rider + $event_type = CMBJOEventType::RIDER_ACCEPT; + $rider_id = $this->session->getRider()->getID(); + $jo_id = $jo->getID(); + $date_accept = ''; + + $results = $this->em->getRepository(JOEvent::class)->findby(['type_id' => $event_type, 'rider' => $rider_id, 'job_order' => $jo_id], ['date_happen' => 'DESC']); + if ($results != null) + { + $jo_event = current($results); + $date_accept = $jo_event->getDateHappen()->format('Ymd H:i:s'); + } + $data = [ 'id' => $jo->getID(), 'service_type' => $jo->getServiceType(), @@ -790,7 +818,10 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface // customer email 'customer_email' => $cust_email, - // END: cmb speicifc details + // date and time accepted + 'date_accept' => $date_accept, + + // END: cmb specific details ]; return $data; From 6b65e927117353e973dc20843edb959ebf958bb1 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Tue, 21 Jul 2020 07:10:45 +0000 Subject: [PATCH 2/2] Add date_start to the job order data response. #440 --- .../RiderAPIHandler/CMBRiderAPIHandler.php | 42 ++++++++++++++----- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php b/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php index 19696229..3cb0f307 100644 --- a/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php +++ b/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php @@ -445,18 +445,28 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface $trade_in_type = 'none'; // get time when JO was accepted by rider - $event_type = CMBJOEventType::RIDER_ACCEPT; + $accept_event_type = CMBJOEventType::RIDER_ACCEPT; $rider_id = $this->session->getRider()->getID(); $jo_id = $jo->getID(); $date_accept = ''; - $results = $this->em->getRepository(JOEvent::class)->findby(['type_id' => $event_type, 'rider' => $rider_id, 'job_order' => $jo_id], ['date_happen' => 'DESC']); - if ($results != null) + $accept_results = $this->em->getRepository(JOEvent::class)->findby(['type_id' => $accept_event_type, 'rider' => $rider_id, 'job_order' => $jo_id], ['date_happen' => 'DESC']); + if ($accept_results != null) { - $jo_event = current($results); + $jo_event = current($accept_results); $date_accept = $jo_event->getDateHappen()->format('Ymd H:i:s'); } + // get time when JO was started by rider + $start_event_type = CMBJOEventType::RIDER_START; + $date_start = ''; + $start_results = $this->em->getRepository(JOEvent::class)->findby(['type_id' => $start_event_type, 'rider' => $rider_id, 'job_order' => $jo_id], ['date_happen' => 'DESC']); + if ($start_results != null) + { + $jo_event = current($start_results); + $date_start = $jo_event->getDateHappen()->format('Ymd H:i:s'); + } + $jo_data[] = [ 'job_order' => [ 'id' => $jo->getID(), @@ -499,8 +509,9 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface 'has_warranty_doc' => false, 'flag_coolant' => $jo->hasCoolant(), 'has_motolite' => $cv->hasMotoliteBattery(), - // date and time accepted + // date and time accepted and started 'date_accept' => $date_accept, + 'date_start' => $date_start, ] ]; } @@ -752,18 +763,28 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface $cust_email = $jo->getMeta('customer_email'); // get time when JO was accepted by rider - $event_type = CMBJOEventType::RIDER_ACCEPT; + $accept_event_type = CMBJOEventType::RIDER_ACCEPT; $rider_id = $this->session->getRider()->getID(); $jo_id = $jo->getID(); $date_accept = ''; - $results = $this->em->getRepository(JOEvent::class)->findby(['type_id' => $event_type, 'rider' => $rider_id, 'job_order' => $jo_id], ['date_happen' => 'DESC']); - if ($results != null) + $accept_results = $this->em->getRepository(JOEvent::class)->findby(['type_id' => $accept_event_type, 'rider' => $rider_id, 'job_order' => $jo_id], ['date_happen' => 'DESC']); + if ($accept_results != null) { - $jo_event = current($results); + $jo_event = current($accept_results); $date_accept = $jo_event->getDateHappen()->format('Ymd H:i:s'); } + // get time when JO was started by rider + $start_event_type = CMBJOEventType::RIDER_START; + $date_start = ''; + $start_results = $this->em->getRepository(JOEvent::class)->findby(['type_id' => $start_event_type, 'rider' => $rider_id, 'job_order' => $jo_id], ['date_happen' => 'DESC']); + if ($start_results != null) + { + $jo_event = current($start_results); + $date_start = $jo_event->getDateHappen()->format('Ymd H:i:s'); + } + $data = [ 'id' => $jo->getID(), 'service_type' => $jo->getServiceType(), @@ -818,8 +839,9 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface // customer email 'customer_email' => $cust_email, - // date and time accepted + // date and time accepted and started 'date_accept' => $date_accept, + 'date_start' => $date_start, // END: cmb specific details ];