From 9052f8102c9a059d76d92df3d99884a26e231c38 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Mon, 7 Sep 2020 03:00:22 +0000 Subject: [PATCH 1/4] Get name for cancel reason. #472 --- src/Service/RiderAPIHandler/CMBRiderAPIHandler.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php b/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php index ff333bb6..05f9fbd7 100644 --- a/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php +++ b/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php @@ -1086,7 +1086,9 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface // notification $notif_url = $this->router->generate('jo_onestep_edit_form', ['id' => $jo->getID()]); - $this->nm->sendNotification(0, 'Job order #' . $jo->getID() . ' has been cancelled by rider. Reason: ' . $jo->getCancelReason() . '.', $notif_url); + $this->nm->sendNotification(0, 'Job order #' . $jo->getID() . + ' has been cancelled by rider. Reason: ' . $jo->getCancelReason()->getName() . + '.', $notif_url); return $data; } From 92a7380b4fadc07d1e40ca951e59f6d5011d789e Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Mon, 7 Sep 2020 03:27:38 +0000 Subject: [PATCH 2/4] Fix display issue of cancel reason. #472 --- src/Service/RiderAPIHandler/CMBRiderAPIHandler.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php b/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php index 05f9fbd7..9a7c0b28 100644 --- a/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php +++ b/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php @@ -1086,9 +1086,8 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface // notification $notif_url = $this->router->generate('jo_onestep_edit_form', ['id' => $jo->getID()]); - $this->nm->sendNotification(0, 'Job order #' . $jo->getID() . - ' has been cancelled by rider. Reason: ' . $jo->getCancelReason()->getName() . - '.', $notif_url); + $cancel_reason = CMBCancelReason::getName($jo->getCancelReason()); + $this->nm->sendNotification(0, 'Job order #' . $jo->getID() . ' has been cancelled by rider. Reason: ' . $cancel_reason . '.', $notif_url); return $data; } From 5b70085162c854eda2623e581d66d84ceae95c43 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Mon, 7 Sep 2020 04:10:02 +0000 Subject: [PATCH 3/4] Set rider limit to 50. #472 --- src/Controller/HubController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Controller/HubController.php b/src/Controller/HubController.php index edc6e599..5f1c56a5 100644 --- a/src/Controller/HubController.php +++ b/src/Controller/HubController.php @@ -346,7 +346,7 @@ class HubController extends Controller $riders = []; // TODO: remove this later when we don't get all available riders - $riders_limit = 5; + $riders_limit = 50; $num_riders = 0; foreach ($available_riders as $rider) From 818277159cfaf73b4644b04ee910d927d98063f8 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Mon, 7 Sep 2020 04:51:35 +0000 Subject: [PATCH 4/4] Remove test hubs and riders. #472 --- utils/delete_selected_hub_riders.sql | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 utils/delete_selected_hub_riders.sql diff --git a/utils/delete_selected_hub_riders.sql b/utils/delete_selected_hub_riders.sql new file mode 100644 index 00000000..00380217 --- /dev/null +++ b/utils/delete_selected_hub_riders.sql @@ -0,0 +1,18 @@ +delete from rider_session where rider_id=12; +delete from rider_session where rider_id=2; +delete from rider_session where rider_id=13; +delete from rider_session where rider_id=11; + +delete from rider_schedule where rider_id=12; +delete from rider_schedule where rider_id=2; +delete from rider_schedule where rider_id=13; +delete from rider_schedule where rider_id=11; + +delete from rider where id=12; +delete from rider where id=2; +delete from rider where id=13; +delete from rider where id=11; + +delete from hub where id=1; +delete from hub where id=2; +delete from hub where id=4;