Merge branch 'master' into 'dev_production'

application/controllers/Webservices.php

@@ -2962,7 +2962,7 @@
 			
 			$result = $this->Webservice_model->get_ride_status($request);
 			if($result['status'] == 'success'){
-				$res = array('status'=>'success','status'=>$result['data']);
+				$res = array('status'=>'success','status'=>$result['data']['ride_status']);
 				}else{
 				$res = array('status'=>'error');
 			}