From 4e5780e7cf065623d525710484cd1179677a5eec Mon Sep 17 00:00:00 2001 From: Kendrick Chan Date: Thu, 1 Mar 2018 03:50:14 +0800 Subject: [PATCH 01/10] Add customer add button in job order #33 --- templates/customer/form.html.twig | 6 +++++- templates/job-order/form.html.twig | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/templates/customer/form.html.twig b/templates/customer/form.html.twig index 68642d19..52527c8e 100644 --- a/templates/customer/form.html.twig +++ b/templates/customer/form.html.twig @@ -32,7 +32,7 @@ -
+
@@ -384,7 +384,11 @@ text: 'Your changes have been saved!', type: 'success', onClose: function() { + {% if app.request.query.get('ref') == 'jo' %} + window.location.href = "{{ url('jo_in') }}"; + {% else %} window.location.href = "{{ url('customer_list') }}"; + {% endif %} } }); }).fail(function(response) { diff --git a/templates/job-order/form.html.twig b/templates/job-order/form.html.twig index 1a5e8df7..c064c56e 100644 --- a/templates/job-order/form.html.twig +++ b/templates/job-order/form.html.twig @@ -55,6 +55,12 @@
+
+ + +
From 6997eba1625c1f0a46fd10cdeaba49ca408ead57 Mon Sep 17 00:00:00 2001 From: Kendrick Chan Date: Thu, 1 Mar 2018 03:56:31 +0800 Subject: [PATCH 02/10] Replace Jumpstart / Troubleshoot label in service type with General Service #33 --- src/Ramcar/ServiceType.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Ramcar/ServiceType.php b/src/Ramcar/ServiceType.php index 65fe5deb..0a510f13 100644 --- a/src/Ramcar/ServiceType.php +++ b/src/Ramcar/ServiceType.php @@ -14,7 +14,7 @@ class ServiceType extends NameValue const COLLECTION = [ 'battery_new' => 'Battery Replacement (New)', 'battery_warranty' => 'Battery Replacement (Under Warranty)', - 'jumpstart_troubleshoot' => 'Jumpstart or Troubleshoot', + 'jumpstart_troubleshoot' => 'General Service', 'tire' => 'Tire Repair', 'overheat' => 'Overheat Assistance', 'fuel' => 'Emergency Refuel', From 6011902239712b1be42f4c8fb3580d13adb69cb7 Mon Sep 17 00:00:00 2001 From: Kendrick Chan Date: Thu, 1 Mar 2018 04:04:03 +0800 Subject: [PATCH 03/10] Display plate number in job order form #33 --- templates/job-order/form.html.twig | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/templates/job-order/form.html.twig b/templates/job-order/form.html.twig index c064c56e..99f38a7a 100644 --- a/templates/job-order/form.html.twig +++ b/templates/job-order/form.html.twig @@ -125,22 +125,29 @@
- +
- +
- +
+
+
- + + + +
+
+
From d942299be1d111d586275f505b868a085bb62576 Mon Sep 17 00:00:00 2001 From: Kendrick Chan Date: Thu, 1 Mar 2018 04:06:52 +0800 Subject: [PATCH 04/10] Change customer active flag to default to true #33 --- src/Entity/Customer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Entity/Customer.php b/src/Entity/Customer.php index bbd287c8..f04a794d 100644 --- a/src/Entity/Customer.php +++ b/src/Entity/Customer.php @@ -115,7 +115,7 @@ class Customer $this->flag_confirmed = false; $this->flag_mobile_app = false; - $this->flag_active = false; + $this->flag_active = true; } public function getID() From ad041315154b71b96755491d87e616c12e83eb68 Mon Sep 17 00:00:00 2001 From: Kendrick Chan Date: Thu, 1 Mar 2018 04:15:44 +0800 Subject: [PATCH 05/10] Add Tier 1 and Tier 2 notes #33 --- src/Controller/APIController.php | 3 ++- src/Controller/JobOrderController.php | 18 +++++++++++------ src/Entity/JobOrder.php | 29 +++++++++++++++++++++------ templates/job-order/form.html.twig | 19 ++++++++++++------ 4 files changed, 50 insertions(+), 19 deletions(-) diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php index 23d498bf..d5070b59 100644 --- a/src/Controller/APIController.php +++ b/src/Controller/APIController.php @@ -693,7 +693,8 @@ class APIController extends Controller $jo->setSource('mobile') ->setStatus(JOStatus::PENDING) ->setDeliveryInstructions('') - ->setAgentNotes('') + ->setTier1Notes('') + ->setTier2Notes('') ->setDeliveryAddress('Set by mobile application'); // customer diff --git a/src/Controller/JobOrderController.php b/src/Controller/JobOrderController.php index 223f53c3..f78d8eaf 100644 --- a/src/Controller/JobOrderController.php +++ b/src/Controller/JobOrderController.php @@ -187,7 +187,8 @@ class JobOrderController extends BaseController ->setSource('web') ->setStatus(JOStatus::PENDING) ->setDeliveryInstructions($req->request->get('delivery_instructions')) - ->setAgentNotes($req->request->get('agent_notes')) + ->setTier1Notes($req->request->get('tier1_notes')) + ->setTier2Notes($req->request->get('tier2_notes')) ->setDeliveryAddress($req->request->get('delivery_address')); // check if reference JO is set and validate @@ -667,7 +668,8 @@ class JobOrderController extends BaseController ->setSource('web') ->setStatus(JOStatus::RIDER_ASSIGN) ->setDeliveryInstructions($req->request->get('delivery_instructions')) - ->setAgentNotes($req->request->get('agent_notes')) + ->setTier1Notes($req->request->get('tier1_notes')) + ->setTier2Notes($req->request->get('tier2_notes')) ->setDeliveryAddress($req->request->get('delivery_address')) ->setHub($hub); @@ -821,7 +823,8 @@ class JobOrderController extends BaseController ->setSource('web') ->setStatus(JOStatus::ASSIGNED) ->setDeliveryInstructions($req->request->get('delivery_instructions')) - ->setAgentNotes($req->request->get('agent_notes')) + ->setTier1Notes($req->request->get('tier1_notes')) + ->setTier2Notes($req->request->get('tier2_notes')) ->setDeliveryAddress($req->request->get('delivery_address')) ->setAssignedBy($this->getUser()) ->setDateAssign(new DateTime()) @@ -936,7 +939,8 @@ class JobOrderController extends BaseController ->setSource('web') ->setStatus(JOStatus::FULFILLED) ->setDeliveryInstructions($req->request->get('delivery_instructions')) - ->setAgentNotes($req->request->get('agent_notes')) + ->setTier1Notes($req->request->get('tier1_notes')) + ->setTier2Notes($req->request->get('tier2_notes')) ->setDeliveryAddress($req->request->get('delivery_address')); // validate @@ -1079,7 +1083,8 @@ class JobOrderController extends BaseController ->setSource('web') ->setStatus(JOStatus::RIDER_ASSIGN) ->setDeliveryInstructions($req->request->get('delivery_instructions')) - ->setAgentNotes($req->request->get('agent_notes')) + ->setTier1Notes($req->request->get('tier1_notes')) + ->setTier2Notes($req->request->get('tier2_notes')) ->setDeliveryAddress($req->request->get('delivery_address')) ->setHub($hub) ->clearRider(); @@ -1200,7 +1205,8 @@ class JobOrderController extends BaseController ->setSource('web') ->setStatus(JOStatus::ASSIGNED) ->setDeliveryInstructions($req->request->get('delivery_instructions')) - ->setAgentNotes($req->request->get('agent_notes')) + ->setTier1Notes($req->request->get('tier1_notes')) + ->setTier2Notes($req->request->get('tier2_notes')) ->setDeliveryAddress($req->request->get('delivery_address')) ->setAssignedBy($this->getUser()) ->setDateAssign(new DateTime()) diff --git a/src/Entity/JobOrder.php b/src/Entity/JobOrder.php index 50ffedaf..d2da205f 100644 --- a/src/Entity/JobOrder.php +++ b/src/Entity/JobOrder.php @@ -148,11 +148,17 @@ class JobOrder */ protected $delivery_instructions; - // agent notes + // agent tier I notes /** * @ORM\Column(type="text", nullable=true) */ - protected $agent_notes; + protected $tier1_notes; + + // agent tier II notes + /** + * @ORM\Column(type="text", nullable=true) + */ + protected $tier2_notes; // delivery address /** @@ -420,15 +426,26 @@ class JobOrder return $this->delivery_instructions; } - public function setAgentNotes($agent_notes) + public function setTier1Notes($notes) { - $this->agent_notes = $agent_notes; + $this->tier1_notes = $notes; return $this; } - public function getAgentNotes() + public function getTier1Notes() { - return $this->agent_notes; + return $this->tier1_notes; + } + + public function setTier2Notes($notes) + { + $this->tier2_notes = $notes; + return $this; + } + + public function getTier2Notes() + { + return $this->tier2_notes; } public function setDeliveryAddress($delivery_address) diff --git a/templates/job-order/form.html.twig b/templates/job-order/form.html.twig index 99f38a7a..f000e11b 100644 --- a/templates/job-order/form.html.twig +++ b/templates/job-order/form.html.twig @@ -240,18 +240,25 @@
+
+
+ + + +
+
+ + + +
+
-
- - - -
-
+ From f779c50b8e0adb43f90bc74458871b3e1022624c Mon Sep 17 00:00:00 2001 From: Kendrick Chan Date: Thu, 1 Mar 2018 07:02:17 +0800 Subject: [PATCH 07/10] Add user fields to job order form #33 --- templates/job-order/form.html.twig | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/templates/job-order/form.html.twig b/templates/job-order/form.html.twig index ed4eb3f3..3ef72247 100644 --- a/templates/job-order/form.html.twig +++ b/templates/job-order/form.html.twig @@ -256,8 +256,28 @@
-
+ +
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + + +
@@ -212,6 +212,16 @@ +
+ + + +
From eabee25db9fc27143775d10823044cebcdc809c9 Mon Sep 17 00:00:00 2001 From: Kendrick Chan Date: Thu, 1 Mar 2018 07:39:17 +0800 Subject: [PATCH 10/10] Fix job order related bugs #33 --- src/Controller/CustomerController.php | 2 +- src/Controller/JobOrderController.php | 3 +-- templates/job-order/form.html.twig | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Controller/CustomerController.php b/src/Controller/CustomerController.php index a8eef366..6bbbb6b1 100644 --- a/src/Controller/CustomerController.php +++ b/src/Controller/CustomerController.php @@ -685,7 +685,7 @@ class CustomerController extends BaseController 'model_year_to' => $vehicle->getModelYearTo(), 'model_year' => $obj->getModelYear(), 'color' => $obj->getColor(), - //'plate_number' => $obj->getPlateNumber(), + 'plate_number' => $obj->getPlateNumber(), //'fuel_type' => $obj->getFuelType(), //'status_condition' => $obj->getStatusCondition(), ] diff --git a/src/Controller/JobOrderController.php b/src/Controller/JobOrderController.php index 2fc97e83..b9edfb7a 100644 --- a/src/Controller/JobOrderController.php +++ b/src/Controller/JobOrderController.php @@ -178,8 +178,7 @@ class JobOrderController extends BaseController $point = new Point($req->request->get('coord_lng'), $req->request->get('coord_lat')); // set and save values - $obj->setDateCreate(DateTime::createFromFormat("d M Y", $req->request->get('date_transaction'))) - ->setDateSchedule(DateTime::createFromFormat("d M Y h:i A", $req->request->get('date_schedule_date') . " " . $req->request->get('date_schedule_time'))) + $obj->setDateSchedule(DateTime::createFromFormat("d M Y h:i A", $req->request->get('date_schedule_date') . " " . $req->request->get('date_schedule_time'))) ->setCoordinates($point) ->setAdvanceOrder($req->request->get('flag_advance') ?? false) ->setCreatedBy($this->getUser()) diff --git a/templates/job-order/form.html.twig b/templates/job-order/form.html.twig index 37bc4120..052285ff 100644 --- a/templates/job-order/form.html.twig +++ b/templates/job-order/form.html.twig @@ -258,7 +258,7 @@
- +
@@ -966,6 +966,7 @@ $(function() { $("#vehicle-make").val(vdata.vehicle.make); $("#vehicle-year").val(vdata.vehicle.model_year); $("#vehicle-color").val(vdata.vehicle.color); + $("#vehicle-plate").val(vdata.vehicle.plate_number); if (typeof vdata.battery !== 'undefined') { $("#current-battery").val(vdata.battery.mfg_name + " " + vdata.battery.model_name + " " + vdata.battery.size_name + " (" + vdata.battery.prod_code + ")");