final

application/controllers/Webservices.php

@@ -558,7 +558,7 @@
 								if($request['round_trip']!=0){
 									$char = $kmcharge * 2 ;
 								}else{ 
-									$char = $kmcharge 
+									$char = $kmcharge;
 								}
 								$response=array('status' => 'success','message'=>'','data'=>$data,'check'=>$check,'km_price'=>$char);
 								}else{

application/models/Webservice_model.php

@@ -175,7 +175,7 @@ class Webservice_model extends CI_Model{
             $config = Array(
               'protocol' => 'smtp',
               'smtp_host' => $settings->smtp_host,
-              'smtp_port' => 25,
+              'smtp_port' => 587,
                 'smtp_user' => $settings->smtp_username, // change it to yours
                 'smtp_pass' => $settings->smtp_password, // change it to yours
                 'smtp_timeout'=>20,
@@ -2166,7 +2166,7 @@ function get_push_notification_details($request){
  $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');
+ $this->db->join('users','booking.user_id=users.id','left');
  $this->db->join('car_details','ride.car_id=car_details.id','left');
  $query= $this->db->get();
                    // echo $this->db->last_query();
@@ -2190,23 +2190,23 @@ function get_userpush_notification_details($request){
 }
 
 function reject_send_details($request){
-  $this->db->where('booking.id',$request);
+  $this->db->where('booking.booking_id',$request);
   $this->db->select('booking.*,users.*');
   $this->db->from('booking');
   $this->db->join('users','booking.user_id=users.id','left');
   $query= $this->db->get();
-                    // echo $this->db->last_query();
+                   //  echo $this->db->last_query(); exit;
   return $query->row();
 
 
 }
 function approve_send_details($request){
-  $this->db->where('booking.id',$request);
+  $this->db->where('booking.booking_id',$request);
   $this->db->select('booking.*,users.*');
   $this->db->from('booking');
   $this->db->join('users','booking.user_id=users.id','left');
   $query= $this->db->get();
-                     //echo $this->db->last_query();
+                  //echo $this->db->last_query(); exit;
   return $query->row();