From 171fa14e409afe6a693558cd60d89327b8913de3 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Fri, 4 Sep 2020 08:41:20 +0000 Subject: [PATCH 1/3] Add job order number to notifications. Add cancel reason to notifications if JO is cancelled. #484 --- src/Service/RiderAPIHandler/CMBRiderAPIHandler.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php b/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php index 80a8301b..ff333bb6 100644 --- a/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php +++ b/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php @@ -1086,7 +1086,7 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface // notification $notif_url = $this->router->generate('jo_onestep_edit_form', ['id' => $jo->getID()]); - $this->nm->sendNotification(0, 'Job order has been cancelled by rider.', $notif_url); + $this->nm->sendNotification(0, 'Job order #' . $jo->getID() . ' has been cancelled by rider. Reason: ' . $jo->getCancelReason() . '.', $notif_url); return $data; } @@ -1174,7 +1174,7 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface $this->mclient->publish($channel, $rider_status); $notif_url = $this->router->generate('jo_onestep_edit_form', ['id' => $jo->getID()]); - $this->nm->sendNotification(0, 'Job order has been rejected by rider.', $notif_url); + $this->nm->sendNotification(0, 'Job order #' . $jo->getID() . ' has been rejected by rider.', $notif_url); return $data; } From ce8e8974bd1ad8b700ab84d641de8bfeecffd460 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Fri, 4 Sep 2020 09:48:50 +0000 Subject: [PATCH 2/3] Add rider plate number to JO. #484 --- src/Entity/JobOrder.php | 18 ++++++++++++++++++ .../JobOrderHandler/CMBJobOrderHandler.php | 3 ++- templates/job-order/cmb.form.onestep.html.twig | 9 +++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/src/Entity/JobOrder.php b/src/Entity/JobOrder.php index 7335c512..ab3ae1b5 100644 --- a/src/Entity/JobOrder.php +++ b/src/Entity/JobOrder.php @@ -352,6 +352,12 @@ class JobOrder */ protected $responsible_party; + // rider plate number since rider can change vehicles + /** + * @ORM\Column(type="string", length=10) + */ + protected $rider_plate_num; + public function __construct() { $this->date_create = new DateTime(); @@ -1013,4 +1019,16 @@ class JobOrder return $this->responsible_party; } + public function setRiderPlateNum($rider_plate_num) + { + $this->rider_plate_num = $rider_plate_num; + return $this; + } + + public function getRiderPlateNum() + { + return $this->rider_plate_num; + } + + } diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php index c004e479..769459d2 100644 --- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php +++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php @@ -632,7 +632,8 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface ->setHub($hub) ->setRider($rider) ->setPriority($priority) - ->setResponsibleParty($req->request->get('responsible_party', '')); + ->setResponsibleParty($req->request->get('responsible_party', '')) + ->setRiderPlateNum($req->request->get('rider_plate_number', '')); $jo->addMeta('discount', $discount); $jo->addMeta('service_charges', $service_charges); diff --git a/templates/job-order/cmb.form.onestep.html.twig b/templates/job-order/cmb.form.onestep.html.twig index d6d5ba20..3b08ac4a 100644 --- a/templates/job-order/cmb.form.onestep.html.twig +++ b/templates/job-order/cmb.form.onestep.html.twig @@ -333,6 +333,12 @@ +
+
+ + + +
@@ -1035,6 +1041,7 @@ $(function() { // clear rider field $('#rider-field').val(''); + $('#rider-plate-number').val(''); selected_rider = ''; // get riders of hub @@ -1084,6 +1091,8 @@ $(function() { // set rider selected_rider = id; $('#rider-field').val(selected_rider); + var rider_plate_num = $(this).find('td:nth-child(4)').text(); + $('#rider-plate-number').val(rider_plate_num); }); {% endif %} }); From 4703cd50809de33326767c14844980bf53ecea06 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Mon, 7 Sep 2020 02:06:20 +0000 Subject: [PATCH 3/3] Remove rider plate number from form. Get plate number from rider. #484 --- src/Service/JobOrderHandler/CMBJobOrderHandler.php | 7 ++++++- templates/job-order/cmb.form.onestep.html.twig | 8 ++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php index 769459d2..0b2a9b57 100644 --- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php +++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php @@ -580,6 +580,11 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface } } + // get rider plate number from rider + $rider_plate_number = ''; + if ($rider != null) + $rider_plate_number = $rider->getPlateNumber(); + // get discount and set to meta $discount = $req->request->get('invoice_discount'); @@ -633,7 +638,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface ->setRider($rider) ->setPriority($priority) ->setResponsibleParty($req->request->get('responsible_party', '')) - ->setRiderPlateNum($req->request->get('rider_plate_number', '')); + ->setRiderPlateNum($rider_plate_number); $jo->addMeta('discount', $discount); $jo->addMeta('service_charges', $service_charges); diff --git a/templates/job-order/cmb.form.onestep.html.twig b/templates/job-order/cmb.form.onestep.html.twig index 3b08ac4a..945b9e0f 100644 --- a/templates/job-order/cmb.form.onestep.html.twig +++ b/templates/job-order/cmb.form.onestep.html.twig @@ -334,11 +334,11 @@

-
+
@@ -1091,8 +1091,8 @@ $(function() { // set rider selected_rider = id; $('#rider-field').val(selected_rider); - var rider_plate_num = $(this).find('td:nth-child(4)').text(); - $('#rider-plate-number').val(rider_plate_num); + //var rider_plate_num = $(this).find('td:nth-child(4)').text(); + //$('#rider-plate-number').val(rider_plate_num); }); {% endif %} });