Merge branch 'master' into 'dev_production'

application/controllers/Webservices.php

@@ -555,7 +555,12 @@
 							$data=array($result);
 							$check='';
 							if($result){
-								$response=array('status' => 'success','message'=>'','data'=>$data,'check'=>$check,'km_price'=>$kmcharge);
+								if($request['round_trip']!=0){
+									$char = $kmcharge * 2 ;
+								}else{ 
+									$char = $kmcharge 
+								}
+								$response=array('status' => 'success','message'=>'','data'=>$data,'check'=>$check,'km_price'=>$char);
 								}else{
 								$response=array('status' => 'error','message'=>'Error Occured','data'=>'');
 							}
@@ -1400,7 +1405,7 @@
 			
 			
 			$fields = array(
-			'app_id' => "7c692b68-a71f-4c8d-b639-635e9dc4b7de",
+			'app_id' => "441ec57a-ee0b-44d5-be11-37ccd442c807",
 			
 	      	'data' => array("type" => "ride alert",
 			"result" => (isset($result) && !empty($result))?$result:'',
@@ -2473,7 +2478,7 @@
 			"en" => 'Ride'
 			);
 			$type='ride_approve_alert';
-			$include_player_ids  = array(isset($res->device_id) && !empty($res->device_id)? $res->device_id : '');
+			$include_player_ids  = array(isset($res->player_id) && !empty($res->player_id)? $res->player_id : '');
 			$id='';
 			
 			$ress= $this->send_Message($content,$headings,$include_player_ids,$res,$type,$id);

application/models/Webservice_model.php

@@ -2163,7 +2163,7 @@ function booked_push_data($request){
 function get_push_notification_details($request){
  $this->db->where('booking.status',0);
  $this->db->where('ride.users_id',$request); 
- $this->db->select('booking.*,ride.no_of_seats AS rideseat,car_details.car_image');
+ $this->db->select('users.first_name,users.email,users.phone_no,booking.*,ride.no_of_seats AS rideseat,car_details.car_image');
  $this->db->from('booking');
  $this->db->join('ride','booking.ride_id=ride.id','left');
  $this->db->join('users','ride.users_id=users.id','left');