Commit 20781ee2 by Jansa Jose

car details

parent 85ff208f
...@@ -722,7 +722,7 @@ function get_cars_and_colors($request){ ...@@ -722,7 +722,7 @@ function get_cars_and_colors($request){
public function add_users_car($data){ public function add_users_car($data){
$query = $this->db->insert('car_details',array('user_id'=>$data['user_id'],'no_of_seats'=>$data['no_of_seats'],'car_year'=>$data['car_year'],'car_type'=>$data['car_type'],'car_make'=>$data['car_make'],'car_color'=>$data['car_color'])); $query = $this->db->insert('car_details',array('user_id'=>$data['user_id'],'no_of_seats'=>$data['no_of_seats'],'car_year'=>$data['car_year'],'car_type'=>$data['car_type'],'car_make'=>$data['car_make'],'car_color'=>$data['car_color'],'car_plate'=>$data['car_plate']));
if($query){ if($query){
return true; return true;
}else{ }else{
...@@ -1738,10 +1738,10 @@ function offer_history_ride($request){ ...@@ -1738,10 +1738,10 @@ function offer_history_ride($request){
$this->db->where('(ride.ride_status = 2 or ride.ride_status = 3 or ride.ride_status = 4 or ride.ride_status = 5)'); $this->db->where('(ride.ride_status = 2 or ride.ride_status = 3 or ride.ride_status = 4 or ride.ride_status = 5)');
$this->db->where('departure_date<',$date ); $this->db->where('departure_date<',$date );
$this->db->where('users_id',$request['user_id']); $this->db->where('users_id',$request['user_id']);
$this->db->select('ride.*,car_details.car_image'); $this->db->select('ride.*,car_details.car_image,car_details.car_plate,car_details.no_of_seats,car_make.car_type');
$this->db->from('ride'); $this->db->from('ride');
$this->db->join('car_details','ride.car_id=car_details.user_id','left'); $this->db->join('car_details','ride.car_id=car_details.user_id','left');
// $this->db->join('car_make','car_details.car_make=car_make.id','left'); $this->db->join('car_make','car_details.car_make=car_make.id','left');
$query= $this->db->get(); $query= $this->db->get();
// echo $this->db->last_query(); // echo $this->db->last_query();
return $query->result(); return $query->result();
...@@ -1766,12 +1766,13 @@ function booking_ride_history($request){ ...@@ -1766,12 +1766,13 @@ function booking_ride_history($request){
$this->db->or_where('ride.departure_date<',$date ); $this->db->or_where('ride.departure_date<',$date );
$this->db->where('ride.status !=','2' ); $this->db->where('ride.status !=','2' );
$this->db->where('booking.user_id',$request['user_id']); $this->db->where('booking.user_id',$request['user_id']);
$this->db->select('DISTINCT(booking.id) as bookid,rating.rating,booking.ride_id,booking.departure_point,booking.drop_point,booking.amount,ride.detour_time,ride.departure_date,ride.users_id as owner,ride.reached_time,ride.ride_status'); $this->db->select('DISTINCT(booking.id) as bookid,rating.rating,booking.ride_id,booking.departure_point,booking.drop_point,booking.amount,ride.detour_time,ride.departure_date,ride.users_id as owner,ride.reached_time,ride.ride_status,car_details.car_plate,car_details.no_of_seats,car_make.car_type');
$this->db->from('booking'); $this->db->from('booking');
$this->db->join('ride','booking.ride_id=ride.id','left'); $this->db->join('ride','booking.ride_id=ride.id','left');
$this->db->join('rating','booking.id=rating.book_id','left'); $this->db->join('rating','booking.id=rating.book_id','left');
$this->db->join('car_details','ride.car_id=car_details.user_id','left'); $this->db->join('car_details','ride.car_id=car_details.user_id','left');
$this->db->join('car_make','car_details.car_make=car_make.id','left');
$query= $this->db->get(); $query= $this->db->get();
return $query->result(); return $query->result();
...@@ -2290,7 +2291,7 @@ function car_active_check($request){ ...@@ -2290,7 +2291,7 @@ function car_active_check($request){
} }
function edit_users_car($request){ function edit_users_car($request){
$data=array('car_make'=>$request->car_make,'car_type'=>$request->car_type,'no_of_seats'=>$request->seat_no,'car_color'=>$request->car_color,'car_year'=>$request->car_year); $data=array('car_make'=>$request->car_make,'car_type'=>$request->car_type,'no_of_seats'=>$request->seat_no,'car_color'=>$request->car_color,'car_year'=>$request->car_year,'car_plate'=>$data['car_plate']);
$this->db->where('id',$request->car_id); $this->db->where('id',$request->car_id);
$res=$this->db->update('car_details',$data); $res=$this->db->update('car_details',$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