rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Fix job order related bugs #33

Browse source
This commit is contained in:
Kendrick Chan 2018-03-01 07:39:17 +08:00
parent 36e4219f99
commit eabee25db9
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Controller/CustomerController.php
View file

@ -685,7 +685,7 @@ class CustomerController extends BaseController
'model_year_to' => $vehicle->getModelYearTo(), 'model_year_to' => $vehicle->getModelYearTo(),
'model_year' => $obj->getModelYear(), 'model_year' => $obj->getModelYear(),
'color' => $obj->getColor(), 'color' => $obj->getColor(),
//'plate_number' => $obj->getPlateNumber(), 'plate_number' => $obj->getPlateNumber(),
//'fuel_type' => $obj->getFuelType(), //'fuel_type' => $obj->getFuelType(),
//'status_condition' => $obj->getStatusCondition(), //'status_condition' => $obj->getStatusCondition(),
] ]

3
src/Controller/JobOrderController.php
View file

@ -178,8 +178,7 @@ class JobOrderController extends BaseController
$point = new Point($req->request->get('coord_lng'), $req->request->get('coord_lat')); $point = new Point($req->request->get('coord_lng'), $req->request->get('coord_lat'));
// set and save values // set and save values
$obj->setDateCreate(DateTime::createFromFormat("d M Y", $req->request->get('date_transaction'))) $obj->setDateSchedule(DateTime::createFromFormat("d M Y h:i A", $req->request->get('date_schedule_date') . " " . $req->request->get('date_schedule_time')))
->setDateSchedule(DateTime::createFromFormat("d M Y h:i A", $req->request->get('date_schedule_date') . " " . $req->request->get('date_schedule_time')))
->setCoordinates($point) ->setCoordinates($point)
->setAdvanceOrder($req->request->get('flag_advance') ?? false) ->setAdvanceOrder($req->request->get('flag_advance') ?? false)
->setCreatedBy($this->getUser()) ->setCreatedBy($this->getUser())

3
templates/job-order/form.html.twig
View file

@ -258,7 +258,7 @@
</div> </div>
<div class="col-lg-6"> <div class="col-lg-6">
<label data-field="tier2_notes">Tier 2 Notes</label> <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 class="form-control-feedback hide" data-field="tier2_notes"></div>
</div> </div>
</div> </div>
@ -966,6 +966,7 @@ $(function() {
$("#vehicle-make").val(vdata.vehicle.make); $("#vehicle-make").val(vdata.vehicle.make);
$("#vehicle-year").val(vdata.vehicle.model_year); $("#vehicle-year").val(vdata.vehicle.model_year);
$("#vehicle-color").val(vdata.vehicle.color); $("#vehicle-color").val(vdata.vehicle.color);
$("#vehicle-plate").val(vdata.vehicle.plate_number);
if (typeof vdata.battery !== 'undefined') { if (typeof vdata.battery !== 'undefined') {
$("#current-battery").val(vdata.battery.mfg_name + " " + vdata.battery.model_name + " " + vdata.battery.size_name + " (" + vdata.battery.prod_code + ")"); $("#current-battery").val(vdata.battery.mfg_name + " " + vdata.battery.model_name + " " + vdata.battery.size_name + " (" + vdata.battery.prod_code + ")");