Merge branch 'master' into 'local_production'

application/models/Webservice_model.php

@@ -185,7 +185,9 @@ class Webservice_model extends CI_Model {
         $bookData[$key]['engine_no'] = json_decode($value['vehicle_data'])->engine;
         $bookData[$key]['booked_date'] = (string) strtotime($value['booked_date'])*1000;
         $bookData[$key]['booked_date'] = $bookData[$key]['booked_date']."";
-        $bookData[$key]['services'] = !empty($value['issues_selected'])?json_decode($value['issues_selected']):'';
+        if($value->is_emergency == '1'){   
+          $bookData[$key]['services'] = !empty($value['issues_selected'])?json_decode($value['issues_selected']):'';
+        }
         $bookData[$key]['service_description'] = !empty($value['custom_issue_data'])?json_decode($value['custom_issue_data'])->optionlaDescription:'';
         unset($bookData[$key]['vehicle_data'],$bookData[$key]['issues_selected'],$bookData[$key]['custom_issue_data']);
       }