Commit 4cda822a by Jansa Jose

Merge branch 'master' into 'local_production'

vehicle data trim and engine in todays service See merge request !147
parents 0a6e51de 0672de6e
...@@ -105,6 +105,9 @@ public function getBookedService($postData = array(),$start = '',$per_page = '', ...@@ -105,6 +105,9 @@ public function getBookedService($postData = array(),$start = '',$per_page = '',
$issues_selected = json_decode($value['issues_selected']); $issues_selected = json_decode($value['issues_selected']);
$custom_issue_data = json_decode($value['custom_issue_data']); $custom_issue_data = json_decode($value['custom_issue_data']);
$bookData[$key]['trim'] = json_decode($value['vehicle_data'])->trim;
$bookData[$key]['engine_no'] = json_decode($value['vehicle_data'])->engine;
$bookData[$key]['service_image'] = (isset($custom_issue_data->optionalImages))?$custom_issue_data->optionalImages:[]; $bookData[$key]['service_image'] = (isset($custom_issue_data->optionalImages))?$custom_issue_data->optionalImages:[];
$bookData[$key]['service_message'] = (isset($custom_issue_data->optionlaDescription))?$custom_issue_data->optionlaDescription:''; $bookData[$key]['service_message'] = (isset($custom_issue_data->optionlaDescription))?$custom_issue_data->optionlaDescription:'';
unset($bookData[$key]['issues_selected'],$bookData[$key]['custom_issue_data']); unset($bookData[$key]['issues_selected'],$bookData[$key]['custom_issue_data']);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment