From eabee25db9fc27143775d10823044cebcdc809c9 Mon Sep 17 00:00:00 2001
From: Kendrick Chan <kc@jankstudio.com>
Date: Thu, 1 Mar 2018 07:39:17 +0800
Subject: [PATCH] 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 @@
 									</div>
 									<div class="col-lg-6">
 										<label data-field="tier2_notes">Tier 2 Notes</label>
-										<textarea name="tier2_notes" class="form-control m-input" rows="4">{{ obj.getTier1Notes }}</textarea>
+										<textarea name="tier2_notes" class="form-control m-input" rows="4">{{ obj.getTier2Notes }}</textarea>
 										<div class="form-control-feedback hide" data-field="tier2_notes"></div>
 									</div>
 								</div>
@@ -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 + ")");