From a55fe79fd6599e8be3229e180b566f1c5db076b9 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Tue, 21 Apr 2020 06:44:27 +0000 Subject: [PATCH 1/5] Set start time of advance job order to 2 PM. #382 --- src/Controller/APIController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php index 050d1bc5..7b362a9b 100644 --- a/src/Controller/APIController.php +++ b/src/Controller/APIController.php @@ -992,7 +992,7 @@ class APIController extends Controller implements LoggedController // check if advance order // check for time when request came in $request_time_in_int = time(); - $start = '17:00'; + $start = '14:00'; $end = '08:00'; $start_time = strtotime($start); From b4c234e5ddfe916bc27759b4e6b335bcade769ce Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Tue, 21 Apr 2020 08:12:46 +0000 Subject: [PATCH 2/5] Fix issue of wrong JO status set. Add descriptive notes for JOStatus. #382 --- src/Controller/APIController.php | 4 ++-- src/Ramcar/JOStatus.php | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php index 7b362a9b..578dfca7 100644 --- a/src/Controller/APIController.php +++ b/src/Controller/APIController.php @@ -1021,7 +1021,7 @@ class APIController extends Controller implements LoggedController if (!empty($nearest_hub)) { $jo->setHub($nearest_hub); - $jo->setStatus(JOStatus::ASSIGNED); + $jo->setStatus(JOStatus::RIDER_ASSIGN); } $em->persist($jo); @@ -1035,7 +1035,7 @@ class APIController extends Controller implements LoggedController $em->persist($event); // check JO status - if ($jo->getStatus() == JOStatus::ASSIGNED) + if ($jo->getStatus() == JOStatus::RIDER_ASSIGNED) { // add event logs for hub and rider assignments $hub_assign_event = new JOEvent(); diff --git a/src/Ramcar/JOStatus.php b/src/Ramcar/JOStatus.php index d31447db..5ba8f5d1 100644 --- a/src/Ramcar/JOStatus.php +++ b/src/Ramcar/JOStatus.php @@ -4,13 +4,13 @@ namespace App\Ramcar; class JOStatus extends NameValue { - const PENDING = 'pending'; - const RIDER_ASSIGN = 'rider_assign'; - const ASSIGNED = 'assigned'; - const IN_TRANSIT = 'in_transit'; - const IN_PROGRESS = 'in_progress'; - const CANCELLED = 'cancelled'; - const FULFILLED = 'fulfilled'; + const PENDING = 'pending'; // NOTE: JO has no hub assigned + const RIDER_ASSIGN = 'rider_assign'; // NOTE: JO has hub assigned but no rider assigned + const ASSIGNED = 'assigned'; // NOTE: JO has hub and rider assigned + const IN_TRANSIT = 'in_transit'; // NOTE: JO's rider is on his way + const IN_PROGRESS = 'in_progress'; // NOTE: JO fulfillment in progress + const CANCELLED = 'cancelled'; // NOTE: JO is cancelled + const FULFILLED = 'fulfilled'; // NOTE: JO is fulfilled const COLLECTION = [ 'pending' => 'For Dispatch', From a0c4c2f136275aa9011e3fbb82de24b017da7117 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Tue, 21 Apr 2020 08:23:55 +0000 Subject: [PATCH 3/5] Set start time of advance order to 5 PM. #383 --- src/Controller/APIController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php index 578dfca7..4e80e342 100644 --- a/src/Controller/APIController.php +++ b/src/Controller/APIController.php @@ -992,7 +992,7 @@ class APIController extends Controller implements LoggedController // check if advance order // check for time when request came in $request_time_in_int = time(); - $start = '14:00'; + $start = '17:00'; $end = '08:00'; $start_time = strtotime($start); From da151245c9a06b3c77cdf7fde6086cf0d597f77c Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Tue, 21 Apr 2020 08:29:05 +0000 Subject: [PATCH 4/5] Fix typo in JO status. #383 --- src/Controller/APIController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php index 4e80e342..b30ca225 100644 --- a/src/Controller/APIController.php +++ b/src/Controller/APIController.php @@ -1021,7 +1021,7 @@ class APIController extends Controller implements LoggedController if (!empty($nearest_hub)) { $jo->setHub($nearest_hub); - $jo->setStatus(JOStatus::RIDER_ASSIGN); + $jo->setStatus(JOStatus::RIDER_ASSIGNED); } $em->persist($jo); From 175b5855d3fa40b6dea7ef267ca7376f9d5900ca Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Tue, 21 Apr 2020 08:33:15 +0000 Subject: [PATCH 5/5] Fix typo in JO status. #383 --- src/Controller/APIController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php index b30ca225..f8c7ac1b 100644 --- a/src/Controller/APIController.php +++ b/src/Controller/APIController.php @@ -1021,7 +1021,7 @@ class APIController extends Controller implements LoggedController if (!empty($nearest_hub)) { $jo->setHub($nearest_hub); - $jo->setStatus(JOStatus::RIDER_ASSIGNED); + $jo->setStatus(JOStatus::RIDER_ASSIGN); } $em->persist($jo); @@ -1035,7 +1035,7 @@ class APIController extends Controller implements LoggedController $em->persist($event); // check JO status - if ($jo->getStatus() == JOStatus::RIDER_ASSIGNED) + if ($jo->getStatus() == JOStatus::RIDER_ASSIGN) { // add event logs for hub and rider assignments $hub_assign_event = new JOEvent();