Commit 38a7606f by Jansa Jose

delete bookings

parent f681c733
...@@ -138,7 +138,7 @@ header('Content-Type: text/html; charset=utf-8'); ...@@ -138,7 +138,7 @@ header('Content-Type: text/html; charset=utf-8');
} }
##################################### Facebook Login ####################################################### ##################################### Facebook Login #################################################
public function google_login_post(){ public function google_login_post(){
// 'fb_login');die(); // 'fb_login');die();
...@@ -159,7 +159,7 @@ header('Content-Type: text/html; charset=utf-8'); ...@@ -159,7 +159,7 @@ header('Content-Type: text/html; charset=utf-8');
} }
public function get_cars_details_post(){ public function get_cars_details_post(){
$postdata = file_get_contents("php://input"); $postdata = file_get_contents("php://input");
$request = json_decode($postdata,true); $request = json_decode($postdata,true);
$result = $this->Webservice_model->get_cars_details($request); $result = $this->Webservice_model->get_cars_details($request);
...@@ -190,9 +190,7 @@ public function fb_login_post(){ ...@@ -190,9 +190,7 @@ public function fb_login_post(){
} }
##################################### Forgot password ###############################################
##################################### Forgot password #######################################################
public function forgot_password_post() { public function forgot_password_post() {
...@@ -215,9 +213,7 @@ public function fb_login_post(){ ...@@ -215,9 +213,7 @@ public function fb_login_post(){
} }
##################################### Change password ################################################
##################################### Change password #######################################################
public function change_password_post(){ public function change_password_post(){
...@@ -245,11 +241,7 @@ public function fb_login_post(){ ...@@ -245,11 +241,7 @@ public function fb_login_post(){
##################################### Biography Update ################################################
##################################### Biography Update #######################################################
public function update_biography_post(){ public function update_biography_post(){
...@@ -275,16 +267,7 @@ public function fb_login_post(){ ...@@ -275,16 +267,7 @@ public function fb_login_post(){
} }
##################################### Profile Update ###############################################
##################################### Profile Update #######################################################
public function update_profile_post(){ public function update_profile_post(){
...@@ -311,14 +294,7 @@ public function fb_login_post(){ ...@@ -311,14 +294,7 @@ public function fb_login_post(){
##################################### Profile Pic upadate ###########################################
##################################### Profile Pic upadate #######################################################
...@@ -450,7 +426,7 @@ public function fb_login_post(){ ...@@ -450,7 +426,7 @@ public function fb_login_post(){
} }
############################################################################## ###################################################################################################
public function get_users_car_list_post(){ public function get_users_car_list_post(){
...@@ -507,17 +483,8 @@ public function fb_login_post(){ ...@@ -507,17 +483,8 @@ public function fb_login_post(){
public function add_users_car_post(){ public function add_users_car_post(){
$postdata = file_get_contents("php://input"); $postdata = file_get_contents("php://input");
$request = json_decode($postdata,true); $request = json_decode($postdata,true);
if($request) { if($request) {
...@@ -534,7 +501,6 @@ public function fb_login_post(){ ...@@ -534,7 +501,6 @@ public function fb_login_post(){
} else { } else {
print json_encode(array('status' => 'error','message'=>'Something Went wrong','data'=>'')); print json_encode(array('status' => 'error','message'=>'Something Went wrong','data'=>''));
} }
} }
////****************14-08-2017************************//// ////****************14-08-2017************************////
...@@ -542,14 +508,8 @@ public function fb_login_post(){ ...@@ -542,14 +508,8 @@ public function fb_login_post(){
public function offer_ride_post(){ public function offer_ride_post(){
$postdata = file_get_contents("php://input"); $postdata = file_get_contents("php://input");
$request = json_decode($postdata,true); $request = json_decode($postdata,true);
/*$request = (array) json_decode(file_get_contents("php://input"));*/
//print_r($request);exit;
if($request) { if($request) {
/////////////////////////duration and time calculation////////////////////////// /////////////////////////duration and time calculation//////////////////////////
$from = $request['source']; $from = $request['source'];
$remFrom = str_replace(',', '', $from); //Remove Commas $remFrom = str_replace(',', '', $from); //Remove Commas
...@@ -608,13 +568,12 @@ public function fb_login_post(){ ...@@ -608,13 +568,12 @@ public function fb_login_post(){
}else{ }else{
$response=array('status' => 'carerror','message'=>'No car Found!!! Please Add car','data'=>''); $response=array('status' => 'carerror','message'=>'No car Found!!! Please Add car','data'=>'');
}} }
}
}else { }else {
$response=array('status' => 'error','message'=>'Error Occured','data'=>''); $response=array('status' => 'error','message'=>'Error Occured','data'=>'');
} }
// $response)
print json_encode($response); print json_encode($response);
} }
...@@ -627,8 +586,6 @@ public function fb_login_post(){ ...@@ -627,8 +586,6 @@ public function fb_login_post(){
$ride_list = $request['insert_id']; $ride_list = $request['insert_id'];
$i = 0; $i = 0;
foreach($ride_list as $ride_id){ foreach($ride_list as $ride_id){
++$i; ++$i;
$request['ride_id'] = $ride_id; $request['ride_id'] = $ride_id;
...@@ -650,7 +607,6 @@ public function fb_login_post(){ ...@@ -650,7 +607,6 @@ public function fb_login_post(){
$result = $this->Webservice_model->offer_update($request); $result = $this->Webservice_model->offer_update($request);
if($result){ if($result){
$check_notification=$this->Webservice_model->check_notification_updates($result->users_id); $check_notification=$this->Webservice_model->check_notification_updates($result->users_id);
// var_dump()
if($check_notification){ if($check_notification){
$subject="Offerride"; $subject="Offerride";
$user_id =$result->users_id; $user_id =$result->users_id;
...@@ -658,10 +614,8 @@ public function fb_login_post(){ ...@@ -658,10 +614,8 @@ public function fb_login_post(){
$this->email_send($result,$subject,$user_id, $page); $this->email_send($result,$subject,$user_id, $page);
} }
$result_ride = $this->Webservice_model->result_ride($result); $result_ride = $this->Webservice_model->result_ride($result);
// var_dump($result_ride);
if($result_ride){ if($result_ride){
$res = $this->send_alert($result_ride); $res = $this->send_alert($result_ride);
// var_dump($res);
$response=array('status' => 'success','message'=>'Ride Offered successfully','data'=>''); $response=array('status' => 'success','message'=>'Ride Offered successfully','data'=>'');
} else { } else {
$response=array('status' => 'error','message'=>'Something Went Wrong','data'=>''); $response=array('status' => 'error','message'=>'Something Went Wrong','data'=>'');
...@@ -672,11 +626,6 @@ public function fb_login_post(){ ...@@ -672,11 +626,6 @@ public function fb_login_post(){
} }
} }
print json_encode($response); print json_encode($response);
...@@ -718,11 +667,6 @@ public function fb_login_post(){ ...@@ -718,11 +667,6 @@ public function fb_login_post(){
} }
public function send_alert($result){ public function send_alert($result){
// $result);
/* $result);
die();
$new=array();
if($result){*/
foreach($result as $key => $value){ foreach($result as $key => $value){
$id = $key; $id = $key;
...@@ -740,35 +684,10 @@ public function fb_login_post(){ ...@@ -740,35 +684,10 @@ public function fb_login_post(){
//die; //die;
$include_player_ids = array($rs->player_id); $include_player_ids = array($rs->player_id);
$res= $this->send_Message($content,$headings,$include_player_ids,$result,$type,$id); $res= $this->send_Message($content,$headings,$include_player_ids,$result,$type,$id);
$return = $res; $return = $res;
// $return = json_encode($return);
// print($return);
} }
} }
// print("\n\nJSON received:\n");
// print("\n");
/*}else{
$response=array('status' => 'error','message'=>'Something Went Wrong','data'=>'');
print json_encode($response);
}*/
} }
public function list_offer_ride_post(){ public function list_offer_ride_post(){
...@@ -1817,6 +1736,26 @@ public function goverment_upload_post(){ ...@@ -1817,6 +1736,26 @@ public function goverment_upload_post(){
} }
public function deletebooking_post(){
$postdata = file_get_contents("php://input");
$request = json_decode($postdata);
if($request){
$result=$this->Webservice_model->deletebooking($request);
if($result){
$response=array('status' => 'success','data'=>$result);
}else{
$response=array('status' => 'error');
}
}else{
$response=array('status' => 'error','message'=>'Something Went wrong');
}
print json_encode($response);
}
################################################################################################# #################################################################################################
public function email_send($data,$subject,$user_id,$page) { public function email_send($data,$subject,$user_id,$page) {
...@@ -2121,13 +2060,6 @@ public function goverment_upload_post(){ ...@@ -2121,13 +2060,6 @@ public function goverment_upload_post(){
// } // }
public function update_carphoto_post(){ public function update_carphoto_post(){
// print json_encode(array('status' => 'error','data'=>$_FILES)); // print json_encode(array('status' => 'error','data'=>$_FILES));
...@@ -2989,6 +2921,35 @@ public function end_ride_update_post(){ ...@@ -2989,6 +2921,35 @@ public function end_ride_update_post(){
/********send mail ***************/ /********send mail ***************/
public function mailsendfun(){
$this->load->library('email');
$config = Array(
'protocol' => 'smtp',
'smtp_host' => 'smtp.sendgrid.net',
'smtp_port' => 25,
'smtp_user' => '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', // change it to yours
'smtp_pass' => 'Golden_123', // change it to yours
'smtp_timeout'=>20,
'mailtype' => 'html',
'charset' => 'utf-8',
'wordwrap' => TRUE
);
$this->email->initialize($config);// add this line
$subject = 'New Mail';
//$name= $data->name;
//$mailTemplate=$data->message;
//$this->email->set_newline("\r\n");
$this->email->from('[email protected]');
$this->email->to('[email protected]');
$this->email->subject("Verify Your Email");
$this->email->message("Success");
$this->email->send();
// echo $this->email->print_debugger();
return "EmailSend";
}
......
...@@ -97,7 +97,7 @@ class Webservice_model extends CI_Model{ ...@@ -97,7 +97,7 @@ class Webservice_model extends CI_Model{
// return $result; // return $result;
// } // }
function get_cars_details(){ function get_cars_details(){
$this->db->select('id,car_type'); $this->db->select('id,car_type');
$this->db->from('car_make'); $this->db->from('car_make');
$this->db->where('status',1); $this->db->where('status',1);
...@@ -149,12 +149,7 @@ function get_cars_details(){ ...@@ -149,12 +149,7 @@ function get_cars_details(){
} }
return $result; return $result;
} }
...@@ -236,16 +231,6 @@ function get_cars_details(){ ...@@ -236,16 +231,6 @@ function get_cars_details(){
// function login($request){ // function login($request){
// //$this->db->where("(username = '".$request['username']."' )"); // //$this->db->where("(username = '".$request['username']."' )");
...@@ -366,14 +351,6 @@ function get_cars_details(){ ...@@ -366,14 +351,6 @@ function get_cars_details(){
} }
// function forgetpassword($data) { // function forgetpassword($data) {
// $this->db->where('email', $data->email); // $this->db->where('email', $data->email);
...@@ -452,13 +429,10 @@ function get_cars_details(){ ...@@ -452,13 +429,10 @@ function get_cars_details(){
$query = $this->db->get('users'); $query = $this->db->get('users');
$rs = $query->row(); $rs = $query->row();
if ($rs) { if ($rs) {
$username = $rs->first_name; $username = $rs->first_name;
$this->load->helper('string'); $this->load->helper('string');
$rand_pwd = random_string('alnum', 8); $rand_pwd = random_string('alnum', 8);
...@@ -468,23 +442,17 @@ function get_cars_details(){ ...@@ -468,23 +442,17 @@ function get_cars_details(){
$this->db->where('email', $data->email); $this->db->where('email', $data->email);
$query = $this->db->update('users', $password); $query = $this->db->update('users', $password);
if ($query) { if ($query) {
$data->name = $username; $data->name = $username;
$this->forgot_mails($data,$rand_pwd); $this->forgot_mails($data,$rand_pwd);
return true; return true;
} }
} else { } else {
// return "EmailNotExist"; // return "EmailNotExist";
return false; return false;
} } }
}
...@@ -517,7 +485,7 @@ function get_cars_details(){ ...@@ -517,7 +485,7 @@ function get_cars_details(){
$res = $mail->send(); $res = $mail->send();
//if($res) //if($res)
//echo true; //echo true;
} }
...@@ -581,19 +549,10 @@ function get_cars_details(){ ...@@ -581,19 +549,10 @@ function get_cars_details(){
} }
} }
function update_profile($request){ function update_profile($request){
$data = array('first_name'=>$request['f_name'], $data = array('first_name'=>$request['f_name'],
...@@ -620,20 +579,10 @@ function get_cars_details(){ ...@@ -620,20 +579,10 @@ function get_cars_details(){
'email_is_verified'=>$rs->email_is_verified,'biography'=>$rs->biography,'join_date'=>$rs->join_date,'govt_id_path'=>$rs->govt_id_path); 'email_is_verified'=>$rs->email_is_verified,'biography'=>$rs->biography,'join_date'=>$rs->join_date,'govt_id_path'=>$rs->govt_id_path);
}else{ }else{
return false; return false;
} }
}
}
...@@ -663,12 +612,7 @@ function get_cars_details(){ ...@@ -663,12 +612,7 @@ function get_cars_details(){
// } // }
function photo_uploads($request){
function photo_uploads($request){
$id = $request['id']; $id = $request['id'];
$query = $this->db->where('id',$id)->get('users'); $query = $this->db->where('id',$id)->get('users');
...@@ -696,8 +640,7 @@ function get_cars_details(){ ...@@ -696,8 +640,7 @@ function get_cars_details(){
function update_pref($request){
function update_pref($request){
$data = array('chattiness'=>$request['chattiness'], $data = array('chattiness'=>$request['chattiness'],
'smoking'=>$request['smoking'], 'smoking'=>$request['smoking'],
...@@ -709,15 +652,11 @@ function get_cars_details(){ ...@@ -709,15 +652,11 @@ function get_cars_details(){
return true; return true;
} }
function get_pref($request){ function get_pref($request){
$this->db->select('*'); $this->db->select('*');
...@@ -728,7 +667,7 @@ function get_cars_details(){ ...@@ -728,7 +667,7 @@ function get_cars_details(){
return $rs; return $rs;
} }
...@@ -753,7 +692,7 @@ function get_cars_details(){ ...@@ -753,7 +692,7 @@ function get_cars_details(){
function get_cars_and_colors($request){ function get_cars_and_colors($request){
$this->db->select('id,car_type'); $this->db->select('id,car_type');
...@@ -777,13 +716,10 @@ function get_cars_details(){ ...@@ -777,13 +716,10 @@ function get_cars_details(){
return $rs; return $rs;
} }
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']));
...@@ -797,7 +733,7 @@ function get_cars_details(){ ...@@ -797,7 +733,7 @@ function get_cars_details(){
public function offer_ride($data){ public function offer_ride($data){
$query = $this->db->insert('ride',array('source'=>$data['place_from'],'destination'=>$data['place_to'],'departure_date '=>$data['dep_date'],'car_type'=>$data['car_type'],'car_make'=>$data['car_make'],'car_color'=>$data['car_color'])); $query = $this->db->insert('ride',array('source'=>$data['place_from'],'destination'=>$data['place_to'],'departure_date '=>$data['dep_date'],'car_type'=>$data['car_type'],'car_make'=>$data['car_make'],'car_color'=>$data['car_color']));
...@@ -812,12 +748,6 @@ function get_cars_details(){ ...@@ -812,12 +748,6 @@ function get_cars_details(){
} }
// function get_users_car_list($request){ // function get_users_car_list($request){
// $id = $request["user_id"]; // $id = $request["user_id"];
...@@ -840,7 +770,7 @@ function get_cars_details(){ ...@@ -840,7 +770,7 @@ function get_cars_details(){
// } // }
function get_users_car_list($request){ function get_users_car_list($request){
$id = $request["user_id"]; $id = $request["user_id"];
$this->db->select('car_details.*, car_make.car_type as cartype,car_color.car_color as carcolour'); $this->db->select('car_details.*, car_make.car_type as cartype,car_color.car_color as carcolour');
$this->db->from('car_details'); $this->db->from('car_details');
...@@ -849,21 +779,11 @@ function get_cars_details(){ ...@@ -849,21 +779,11 @@ function get_cars_details(){
$this->db->where('user_id',$id); $this->db->where('user_id',$id);
$query=$this->db->get(); $query=$this->db->get();
return $query->result(); return $query->result();
} }
///////////************14-9-2017*******************/////////////////// ///////////************14-9-2017*******************///////////////////
/////////////////////////offerride///////////////////////////////////// /////////////////////////offerride/////////////////////////////////////
function car_offer_select($request){ function car_offer_select($request){
$this->db->where('user_id',$request); $this->db->where('user_id',$request);
$this->db->select('car_details.car_type,car_details.no_of_seats,car_details.id,car_make.car_type as car_name'); $this->db->select('car_details.car_type,car_details.no_of_seats,car_details.id,car_make.car_type as car_name');
$this->db->from('car_details'); $this->db->from('car_details');
...@@ -871,7 +791,7 @@ function get_cars_details(){ ...@@ -871,7 +791,7 @@ function get_cars_details(){
$query= $this->db->get(); $query= $this->db->get();
return $query->result(); return $query->result();
} }
// function get_reached_time($request){ // function get_reached_time($request){
// $this->db->select('reached_time'); // $this->db->select('reached_time');
...@@ -882,7 +802,7 @@ function get_cars_details(){ ...@@ -882,7 +802,7 @@ function get_cars_details(){
// } // }
function offer_departure($request){ function offer_departure($request){
$data =array('source'=>$request['source'], $data =array('source'=>$request['source'],
...@@ -898,15 +818,15 @@ function get_cars_details(){ ...@@ -898,15 +818,15 @@ function get_cars_details(){
'for_ladies'=>$request['for_ladies'], 'for_ladies'=>$request['for_ladies'],
'to_airport'=>$request['to_airport'] 'to_airport'=>$request['to_airport']
); );
$query= $this->db->insert('ride',$data); $query= $this->db->insert('ride',$data);
$insert_id = $this->db->insert_id(); $insert_id = $this->db->insert_id();
return $insert_id; return $insert_id;
} }
function offer_return($request){ function offer_return($request){
$data=array('source'=>$request['destination'], $data=array('source'=>$request['destination'],
'destination'=>$request['source'], 'destination'=>$request['source'],
...@@ -921,14 +841,14 @@ function get_cars_details(){ ...@@ -921,14 +841,14 @@ function get_cars_details(){
'for_ladies'=>$request['for_ladies'], 'for_ladies'=>$request['for_ladies'],
'to_airport'=>$request['to_airport'] 'to_airport'=>$request['to_airport']
); );
$query= $this->db->insert('ride',$data); $query= $this->db->insert('ride',$data);
$insert_id = $this->db->insert_id(); $insert_id = $this->db->insert_id();
return $insert_id; return $insert_id;
} }
function offer_update($request){ function offer_update($request){
/* $request); /* $request);
die();*/ die();*/
...@@ -1091,13 +1011,13 @@ function get_cars_details(){ ...@@ -1091,13 +1011,13 @@ function get_cars_details(){
return $query->row(); return $query->row();
} }
function offer_ride_count($request){ function offer_ride_count($request){
$id =$request['user_id']; $id =$request['user_id'];
$query= $this->db->query("SELECT count(users_id) AS total_count FROM `ride` WHERE users_id ='$id'")->row(); $query= $this->db->query("SELECT count(users_id) AS total_count FROM `ride` WHERE users_id ='$id'")->row();
return $query; return $query;
} }
function find_ride_filter($request){ function find_ride_filter($request){
$this->db->order_by('ride.price',$request['price']); $this->db->order_by('ride.price',$request['price']);
$this->db->where('chattiness',$request['chattiness']); $this->db->where('chattiness',$request['chattiness']);
$this->db->where('music',$request['music']); $this->db->where('music',$request['music']);
...@@ -1112,8 +1032,8 @@ function get_cars_details(){ ...@@ -1112,8 +1032,8 @@ function get_cars_details(){
$this->db->join('user_details','user_details.user_id=ride.users_id'); $this->db->join('user_details','user_details.user_id=ride.users_id');
$query= $this->db->get(); $query= $this->db->get();
return $query->result(); return $query->result();
} }
function find_ride_filter_rate($id){ function find_ride_filter_rate($id){
$this->db->select('AVG(rating) as avgrate,count(create_user) as ratenum'); $this->db->select('AVG(rating) as avgrate,count(create_user) as ratenum');
$this->db->from('rating'); $this->db->from('rating');
$this->db->where('owner', $id); $this->db->where('owner', $id);
...@@ -1121,8 +1041,8 @@ function get_cars_details(){ ...@@ -1121,8 +1041,8 @@ function get_cars_details(){
$new= $query->row(); $new= $query->row();
return $new; return $new;
} }
function booking_details($request){ function booking_details($request){
$booking_date=date('Y-m-d'); $booking_date=date('Y-m-d');
$rand="JY".date('dmy').rand(111, 999); $rand="JY".date('dmy').rand(111, 999);
$data=array('user_id'=>$request['user_id'], $data=array('user_id'=>$request['user_id'],
...@@ -1137,8 +1057,8 @@ function get_cars_details(){ ...@@ -1137,8 +1057,8 @@ function get_cars_details(){
$this->db->insert('booking',$data); $this->db->insert('booking',$data);
$query =$this->db->insert_id(); $query =$this->db->insert_id();
return $query; return $query;
} }
function booking_ride_details($request){ function booking_ride_details($request){
// $this->db->where('booking.user_id',$request); // $this->db->where('booking.user_id',$request);
// var_dump($request); // var_dump($request);
$date=date('Y-m-d'); $date=date('Y-m-d');
...@@ -1169,61 +1089,47 @@ function get_cars_details(){ ...@@ -1169,61 +1089,47 @@ function get_cars_details(){
// echo $this->db->last_query(); // echo $this->db->last_query();
return $query->result(); return $query->result();
} }
function help($request){ function help($request){
$query = $this->db->get('cms'); $query = $this->db->get('cms');
$rs = $query->row(); $rs = $query->row();
$result = $rs->help; $result = $rs->help;
return $result; return $result;
} }
function terms($request){ function terms($request){
$query = $this->db->get('cms'); $query = $this->db->get('cms');
$rs = $query->row(); $rs = $query->row();
$result = $rs->conditions; $result = $rs->conditions;
return $result; return $result;
} }
function license($request){ function license($request){
$query = $this->db->get('cms'); $query = $this->db->get('cms');
$rs = $query->row(); $rs = $query->row();
$result = $rs->licenses; $result = $rs->licenses;
return $result; return $result;
} }
function privacy($request){ function privacy($request){
$query = $this->db->get('cms'); $query = $this->db->get('cms');
$rs = $query->row(); $rs = $query->row();
$result = $rs->privacy; $result = $rs->privacy;
return $result; return $result;
} }
// function save_notification($request){ // function save_notification($request){
...@@ -1249,7 +1155,7 @@ function get_cars_details(){ ...@@ -1249,7 +1155,7 @@ function get_cars_details(){
function save_notification($request){ function save_notification($request){
$this->db->where('user_id',$request['userid']); $this->db->where('user_id',$request['userid']);
$result = $this->db->update('notifications',array( $result = $this->db->update('notifications',array(
'push_cotraveller_confirmation'=>$request['push_cotraveller_confirmation'], 'push_cotraveller_confirmation'=>$request['push_cotraveller_confirmation'],
...@@ -1350,7 +1256,7 @@ function get_cars_details(){ ...@@ -1350,7 +1256,7 @@ function get_cars_details(){
function get_notification($request){ function get_notification($request){
$query = $this->db->where('user_id',$request['userid']); $query = $this->db->where('user_id',$request['userid']);
$query = $this->db->get('notifications'); $query = $this->db->get('notifications');
//echo $this->db->last_query(); //echo $this->db->last_query();
...@@ -1404,7 +1310,7 @@ function get_cars_details(){ ...@@ -1404,7 +1310,7 @@ function get_cars_details(){
function save_adhar_info($request){ function save_adhar_info($request){
$this->db->where('user_id',$request['userid']); $this->db->where('user_id',$request['userid']);
...@@ -1415,13 +1321,13 @@ function get_cars_details(){ ...@@ -1415,13 +1321,13 @@ function get_cars_details(){
'image'=>$request['image_file'], 'image'=>$request['image_file'],
'number'=>$request['adhar_no'], 'number'=>$request['adhar_no'],
'status'=>'4' 'status'=>'4'
)); ));
// $query = $this->db->where('user_id',$request['userid']); // $query = $this->db->where('user_id',$request['userid']);
// $query = $this->db->get('notifications'); // $query = $this->db->get('notifications');
// $result = $query->row(); // $result = $query->row();
return $result; return $result;
} }
...@@ -1448,7 +1354,7 @@ function get_cars_details(){ ...@@ -1448,7 +1354,7 @@ function get_cars_details(){
function save_pan_info($request){ function save_pan_info($request){
$this->db->where('user_id',$request['userid']); $this->db->where('user_id',$request['userid']);
...@@ -1460,23 +1366,16 @@ function get_cars_details(){ ...@@ -1460,23 +1366,16 @@ function get_cars_details(){
'number'=>$request['pan_no'], 'number'=>$request['pan_no'],
'type'=>$request['type'], 'type'=>$request['type'],
'status'=>'4' 'status'=>'4'
)); ));
// $query = $this->db->where('user_id',$request['userid']); // $query = $this->db->where('user_id',$request['userid']);
// $query = $this->db->get('notifications'); // $query = $this->db->get('notifications');
// $result = $query->row(); // $result = $query->row();
return $result; return $result;
} }
function save_passport_info($request){ function save_passport_info($request){
$this->db->where('user_id',$request['userid']); $this->db->where('user_id',$request['userid']);
...@@ -1488,18 +1387,16 @@ function get_cars_details(){ ...@@ -1488,18 +1387,16 @@ function get_cars_details(){
'number'=>$request['pass_no'], 'number'=>$request['pass_no'],
'type'=>$request['type'], 'type'=>$request['type'],
'status'=>'4' 'status'=>'4'
)); ));
// echo $this->db->last_query(); // echo $this->db->last_query();
// $query = $this->db->where('user_id',$request['userid']); // $query = $this->db->where('user_id',$request['userid']);
// $query = $this->db->get('notifications'); // $query = $this->db->get('notifications');
// $result = $query->row(); // $result = $query->row();
return $result; return $result;
} }
function get_country($request){ function get_country($request){
$this->db->select('id,name'); $this->db->select('id,name');
...@@ -1516,20 +1413,16 @@ function get_cars_details(){ ...@@ -1516,20 +1413,16 @@ function get_cars_details(){
return $rs; return $rs;
} }
function add_number($request){ function add_number($request){
$id = $request['user_id']; $id = $request['user_id'];
$this->db->where('id',$id); $this->db->where('id',$id);
$result = $this->db->update('users',array( $result = $this->db->update('users',array(
'region'=>$request['region'], 'region'=>$request['region'],
'phone_no'=>$request['phone_no'] 'phone_no'=>$request['phone_no']
)); ));
$rs = $this->db->query("SELECT * FROM `users` WHERE id = $id ")->row(); $rs = $this->db->query("SELECT * FROM `users` WHERE id = $id ")->row();
if($rs){ if($rs){
return $result = array('id'=>$rs->id,'first_name'=>$rs->first_name, return $result = array('id'=>$rs->id,'first_name'=>$rs->first_name,
...@@ -1543,10 +1436,10 @@ function get_cars_details(){ ...@@ -1543,10 +1436,10 @@ function get_cars_details(){
}else{ }else{
return false; return false;
} }
} }
public function get_booked_data($request){ public function get_booked_data($request){
$this->db->where('booking.id',$request); $this->db->where('booking.id',$request);
$this->db->select('booking.*,users.*,ride.no_of_seats as rideseat,ride.detour_time'); $this->db->select('booking.*,users.*,ride.no_of_seats as rideseat,ride.detour_time');
$this->db->from('booking'); $this->db->from('booking');
...@@ -1556,8 +1449,8 @@ function get_cars_details(){ ...@@ -1556,8 +1449,8 @@ function get_cars_details(){
return $query->row(); return $query->row();
} }
function similar_ride_alert($request){ function similar_ride_alert($request){
$data=array('user_id'=>$request->user_id, $data=array('user_id'=>$request->user_id,
'source'=>$request->source, 'source'=>$request->source,
...@@ -1569,25 +1462,25 @@ function get_cars_details(){ ...@@ -1569,25 +1462,25 @@ function get_cars_details(){
$query= $this->db->insert('ride_alert',$data); $query= $this->db->insert('ride_alert',$data);
return $query; return $query;
} }
function player_id_insert($request){ function player_id_insert($request){
$this->db->where('username' ,$request['username']); $this->db->where('username' ,$request['username']);
$this->db->where('password' , md5($request['password'])); $this->db->where('password' , md5($request['password']));
$data=array('player_id'=>$request['player_id']); $data=array('player_id'=>$request['player_id']);
$query = $this->db->update('users',$data); $query = $this->db->update('users',$data);
return $query; return $query;
} }
function rate_ride_check($request){ function rate_ride_check($request){
$this->db->where('create_user' ,$request->create_user); $this->db->where('create_user' ,$request->create_user);
$this->db->where('owner' , $request->owner); $this->db->where('owner' , $request->owner);
$this->db->where('ride_id' , $request->ride_id); $this->db->where('ride_id' , $request->ride_id);
$query = $this->db->get('rating'); $query = $this->db->get('rating');
return $query->row(); return $query->row();
} }
function rate_ride_update($request,$id){ function rate_ride_update($request,$id){
$rate_date=date('Y-m-d'); $rate_date=date('Y-m-d');
$request->rating_date= $rate_date; $request->rating_date= $rate_date;
...@@ -1595,17 +1488,16 @@ function get_cars_details(){ ...@@ -1595,17 +1488,16 @@ function get_cars_details(){
$query = $this->db->update('rating',$request); $query = $this->db->update('rating',$request);
return $query; return $query;
}
} function rate_ride($request){
function rate_ride($request){
$rate_date=date('Y-m-d'); $rate_date=date('Y-m-d');
$request->rating_date= $rate_date; $request->rating_date= $rate_date;
$query = $this->db->insert('rating',$request); $query = $this->db->insert('rating',$request);
return $query; return $query;
} }
function getrate($id){ function getrate($id){
// $this->db->where('user_id') // $this->db->where('user_id')
// $query = $this->db->get('rating'); // $query = $this->db->get('rating');
// return $query; // return $query;
...@@ -1618,14 +1510,7 @@ function get_cars_details(){ ...@@ -1618,14 +1510,7 @@ function get_cars_details(){
$new= $query->row(); $new= $query->row();
return $new; return $new;
} }
// function passport_uploads($request){ // function passport_uploads($request){
...@@ -1658,7 +1543,7 @@ function get_cars_details(){ ...@@ -1658,7 +1543,7 @@ function get_cars_details(){
function passport_uploads($request){ function passport_uploads($request){
// $request); // $request);
$id = $request['user_id']; $id = $request['user_id'];
// $data = array('image'=>$request['file']); // $data = array('image'=>$request['file']);
...@@ -1684,10 +1569,10 @@ function get_cars_details(){ ...@@ -1684,10 +1569,10 @@ function get_cars_details(){
'profile_photo'=>$rs->image,'type'=>$rs->type); 'profile_photo'=>$rs->image,'type'=>$rs->type);
}else{ }else{
return false; return false;
} }
} }
function approve_ride($request){ function approve_ride($request){
$data=array('status'=>1); $data=array('status'=>1);
$this->db->where('booking_id',$request->booking_id); $this->db->where('booking_id',$request->booking_id);
$query=$this->db->update('booking',$data); $query=$this->db->update('booking',$data);
...@@ -1696,15 +1581,11 @@ function get_cars_details(){ ...@@ -1696,15 +1581,11 @@ function get_cars_details(){
$this->db->where('id',$request->ride_id); $this->db->where('id',$request->ride_id);
$query=$this->db->update('ride',$data); $query=$this->db->update('ride',$data);
}
return $query;
}
function booking_aproval($request){
}
return $query;
}
function booking_aproval($request){
$data=array('ride_id'=>$request->ride_id, $data=array('ride_id'=>$request->ride_id,
'user_id'=>$request->user_id, 'user_id'=>$request->user_id,
'driver_id'=>$request->driver_id, 'driver_id'=>$request->driver_id,
...@@ -1712,63 +1593,80 @@ function get_cars_details(){ ...@@ -1712,63 +1593,80 @@ function get_cars_details(){
$query=$this->db->insert('booking_approve',$data); $query=$this->db->insert('booking_approve',$data);
return $query; return $query;
}
public function update_ride_status($data){
}
public function update_ride_status($data){
if($this->db->update('ride',array('ride_status'=>$data->status),array('id'=>$data->ride_id))){ if($this->db->update('ride',array('ride_status'=>$data->status),array('id'=>$data->ride_id))){
return true; return true;
} }
} }
function reject_ride($request){ function reject_ride($request){
$data=array('status'=>2); $data=array('status'=>2);
$this->db->where('booking_id',$request); $this->db->where('booking_id',$request);
$query=$this->db->update('booking',$data); $query=$this->db->update('booking',$data);
return $query; return $query;
} }
function delete_offer_ride($request){ function delete_offer_ride($request){
$data=array('status'=>2); $data=array('status'=>2);
$this->db->where('id',$request); $this->db->where('id',$request);
$query=$this->db->update('ride',$data); $query=$this->db->update('ride',$data);
return $query; return $query;
}
function deletebooking($request){
$data=array('status'=>2);
$this->db->select('*');
$this->db->where('id',$request);
$query=$this->db->get('booking');
$val = $query->row();
$ride_id= $val->ride_id;
$this->db->where('id',$request);
$query=$this->db->update('booking',$data);
$this->db->where('id',$ride_id);
$query=$this->db->update('ride',$data);
return $query;
} }
function check_notification_updates($id){
function check_notification_updates($id){
$this->db->where('email_ride_publish','1'); $this->db->where('email_ride_publish','1');
$this->db->where('user_id',$id); $this->db->where('user_id',$id);
$query=$this->db->get('notifications'); $query=$this->db->get('notifications');
return $query->row(); return $query->row();
} }
function check_notification_rideaccept($id){ function check_notification_rideaccept($id){
// var_dump($id); // var_dump($id);
$this->db->where('push_ride_accept','1'); $this->db->where('push_ride_accept','1');
$this->db->where('user_id',$id); $this->db->where('user_id',$id);
$query=$this->db->get('notifications'); $query=$this->db->get('notifications');
return $query->row(); return $query->row();
} }
function check_notification_rate($id){ function check_notification_rate($id){
$this->db->where('email_new_rating','1'); $this->db->where('email_new_rating','1');
$this->db->where('user_id',$id); $this->db->where('user_id',$id);
$query=$this->db->get('notifications'); $query=$this->db->get('notifications');
return $query->row(); return $query->row();
} }
function check_notification_offer_updates($id){ function check_notification_offer_updates($id){
$this->db->where('email_ride_update','1'); $this->db->where('email_ride_update','1');
$this->db->where('user_id',$id); $this->db->where('user_id',$id);
$query=$this->db->get('notifications'); $query=$this->db->get('notifications');
return $query->row(); return $query->row();
} }
function report_ride_insert($request){ function report_ride_insert($request){
$request->date=date('Y-m-d'); $request->date=date('Y-m-d');
...@@ -1776,8 +1674,8 @@ function get_cars_details(){ ...@@ -1776,8 +1674,8 @@ function get_cars_details(){
return $query; return $query;
} }
function offer_ride_count_details($request){ function offer_ride_count_details($request){
$date=date('Y-m-d'); $date=date('Y-m-d');
$this->db->where('status!=',2); $this->db->where('status!=',2);
$this->db->where('departure_date>=',$date ); $this->db->where('departure_date>=',$date );
...@@ -1789,8 +1687,8 @@ function get_cars_details(){ ...@@ -1789,8 +1687,8 @@ function get_cars_details(){
$new= $query->row(); $new= $query->row();
return $new; return $new;
} }
function booking_ride_count_details($request){ function booking_ride_count_details($request){
$date=date('Y-m-d'); $date=date('Y-m-d');
$this->db->where('ride.departure_date>=',$date ); $this->db->where('ride.departure_date>=',$date );
$this->db->select('count(booking.id) as totalcount'); $this->db->select('count(booking.id) as totalcount');
...@@ -1809,8 +1707,8 @@ function get_cars_details(){ ...@@ -1809,8 +1707,8 @@ function get_cars_details(){
// $new= $query->row(); // $new= $query->row();
// return $new; // return $new;
} }
function offer_history_ride($request){ function offer_history_ride($request){
$date=date('Y-m-d'); $date=date('Y-m-d');
if($request['start']==null){ if($request['start']==null){
$stop=0; $stop=0;
...@@ -1836,8 +1734,8 @@ function get_cars_details(){ ...@@ -1836,8 +1734,8 @@ function get_cars_details(){
//echo $this->db->last_query(); //echo $this->db->last_query();
return $query->result(); return $query->result();
} }
function booking_ride_history($request){ function booking_ride_history($request){
// $this->db->where('booking.user_id',$request); // $this->db->where('booking.user_id',$request);
// var_dump($request); // var_dump($request);
$date=date('Y-m-d'); $date=date('Y-m-d');
...@@ -1852,6 +1750,7 @@ function get_cars_details(){ ...@@ -1852,6 +1750,7 @@ function get_cars_details(){
$this->db->order_by("booking.booking_date","desc"); $this->db->order_by("booking.booking_date","desc");
$this->db->order_by("booking.id","desc"); $this->db->order_by("booking.id","desc");
$this->db->where('ride.departure_date<',$date ); $this->db->where('ride.departure_date<',$date );
$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'); $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');
$this->db->from('booking'); $this->db->from('booking');
...@@ -1865,16 +1764,16 @@ function get_cars_details(){ ...@@ -1865,16 +1764,16 @@ function get_cars_details(){
// echo $this->db->last_query(); // echo $this->db->last_query();
return $query->result(); return $query->result();
} }
function user_location_update($request){ function user_location_update($request){
$data=array('crnt_lattitude'=>$request["crnt_lattitude"],'crnt_longitude'=>$request["crnt_longitude"]); $data=array('crnt_lattitude'=>$request["crnt_lattitude"],'crnt_longitude'=>$request["crnt_longitude"]);
$this->db->where('id',$request['user_id']); $this->db->where('id',$request['user_id']);
$query=$this->db->update('users',$data); $query=$this->db->update('users',$data);
return $query; return $query;
} }
function ridestart_push($request){ function ridestart_push($request){
$this->db->where('booking.status',1); $this->db->where('booking.status',1);
$this->db->where('ride_id',$request); $this->db->where('ride_id',$request);
$this->db->select('users.*'); $this->db->select('users.*');
...@@ -1884,8 +1783,8 @@ function get_cars_details(){ ...@@ -1884,8 +1783,8 @@ function get_cars_details(){
return $query->result(); return $query->result();
} }
function cardetails_startride($request){ function cardetails_startride($request){
$this->db->where('car_details.user_id',$request['user_id']); $this->db->where('car_details.user_id',$request['user_id']);
$this->db->select('car_make.car_type,car_color.car_color,car_details.car_type as main_cartype,car_details.no_of_seats'); $this->db->select('car_make.car_type,car_color.car_color,car_details.car_type as main_cartype,car_details.no_of_seats');
$this->db->from('car_make'); $this->db->from('car_make');
...@@ -1895,8 +1794,8 @@ function get_cars_details(){ ...@@ -1895,8 +1794,8 @@ function get_cars_details(){
$query= $this->db->get(); $query= $this->db->get();
return $query->row(); return $query->row();
} }
function cotravellers_list($request){ function cotravellers_list($request){
$this->db->where('booking_approve.status','1'); $this->db->where('booking_approve.status','1');
$this->db->where('booking_approve.ride_id',$request); $this->db->where('booking_approve.ride_id',$request);
$this->db->select('users.*,booking_approve.id as bookid'); $this->db->select('users.*,booking_approve.id as bookid');
...@@ -1906,16 +1805,16 @@ function get_cars_details(){ ...@@ -1906,16 +1805,16 @@ function get_cars_details(){
// var_dump($query);die; // var_dump($query);die;
return $query->result(); return $query->result();
} }
function payment_cash($request){ function payment_cash($request){
$data=array('payment_status'=>1); $data=array('payment_status'=>1);
$this->db->where('ride_id',$request['ride_id']); $this->db->where('ride_id',$request['ride_id']);
$this->db->where('user_id',$request['user_id']); $this->db->where('user_id',$request['user_id']);
$query=$this->db->update('booking_approve',$data); $query=$this->db->update('booking_approve',$data);
return $query; return $query;
} }
function check_redeem_code($request){ function check_redeem_code($request){
$this->db->where('status',1); $this->db->where('status',1);
$this->db->where('code',$request['code']); $this->db->where('code',$request['code']);
$this->db->where('ride_id',$request['ride_id']); $this->db->where('ride_id',$request['ride_id']);
...@@ -1938,8 +1837,8 @@ function get_cars_details(){ ...@@ -1938,8 +1837,8 @@ function get_cars_details(){
} }
function yourride_car_edit($request){ function yourride_car_edit($request){
$this->db->where('car_details.id',$request); $this->db->where('car_details.id',$request);
$this->db->select('car_details.car_type,car_details.id,car_make.car_type as car_name'); $this->db->select('car_details.car_type,car_details.id,car_make.car_type as car_name');
$this->db->from('car_details'); $this->db->from('car_details');
...@@ -1947,9 +1846,9 @@ function get_cars_details(){ ...@@ -1947,9 +1846,9 @@ function get_cars_details(){
$query= $this->db->get(); $query= $this->db->get();
return $query->row(); return $query->row();
} }
function offer_edit($request){ function offer_edit($request){
// var_dump($request); // var_dump($request);
// $this->db->where('users_id',$request['users_id']); // $this->db->where('users_id',$request['users_id']);
$this->db->where('id',$request['id']); $this->db->where('id',$request['id']);
...@@ -1959,8 +1858,8 @@ function get_cars_details(){ ...@@ -1959,8 +1858,8 @@ function get_cars_details(){
// echo $this->db->last_query(); // echo $this->db->last_query();
return $query->row(); return $query->row();
} }
function drivertrack_map($request){ function drivertrack_map($request){
$this->db->where('booking_approve.status',1); $this->db->where('booking_approve.status',1);
$this->db->where('booking_approve.ride_id',$request); $this->db->where('booking_approve.ride_id',$request);
$this->db->select('users.*,booking_approve.*'); $this->db->select('users.*,booking_approve.*');
...@@ -1969,8 +1868,8 @@ function get_cars_details(){ ...@@ -1969,8 +1868,8 @@ function get_cars_details(){
$query= $this->db->get(); $query= $this->db->get();
return $query->result(); return $query->result();
} }
function drivertrack_location($request){ function drivertrack_location($request){
$this->db->where('booking_approve.status',1); $this->db->where('booking_approve.status',1);
$this->db->where('booking_approve.ride_id',$request); $this->db->where('booking_approve.ride_id',$request);
$this->db->select('users.*,booking_approve.*,ride.source_lat,source_lng,destination_lat,destination_lng'); $this->db->select('users.*,booking_approve.*,ride.source_lat,source_lng,destination_lat,destination_lng');
...@@ -1981,14 +1880,14 @@ function get_cars_details(){ ...@@ -1981,14 +1880,14 @@ function get_cars_details(){
$query= $this->db->get(); $query= $this->db->get();
return $query->row(); return $query->row();
} }
function chatuserdetails($request){ function chatuserdetails($request){
$this->db->where('id',$request); $this->db->where('id',$request);
$query= $this->db->get('users'); $query= $this->db->get('users');
return $query->row(); return $query->row();
} }
function car_exist($request,$i){ function car_exist($request,$i){
if($request['round_trip']==true && $i>1){ if($request['round_trip']==true && $i>1){
if($request['rtrn_date'] == $request['departure_date']){ if($request['rtrn_date'] == $request['departure_date']){
return null; return null;
...@@ -2015,8 +1914,8 @@ function get_cars_details(){ ...@@ -2015,8 +1914,8 @@ function get_cars_details(){
} }
function notifysave($request){ function notifysave($request){
$this->db->where('user_id',$request['userid']); $this->db->where('user_id',$request['userid']);
$result = $this->db->update('notifications',array( $result = $this->db->update('notifications',array(
'push_offer_ride_request'=>$request['push_offer_ride_request'], 'push_offer_ride_request'=>$request['push_offer_ride_request'],
...@@ -2090,7 +1989,7 @@ public function otp_verify($data){ ...@@ -2090,7 +1989,7 @@ public function otp_verify($data){
function get_number($request){ function get_number($request){
$this->db->select('phone_no'); $this->db->select('phone_no');
$this->db->from('users'); $this->db->from('users');
$query = $this->db->where('id',$request['id']); $query = $this->db->where('id',$request['id']);
...@@ -2198,7 +2097,7 @@ public function otp_verify($data){ ...@@ -2198,7 +2097,7 @@ public function otp_verify($data){
function carphoto_uploads($request){ function carphoto_uploads($request){
$id = $request['id']; $id = $request['id'];
// $query = $this->db->where('user_id',$id)->get('car_details'); // $query = $this->db->where('user_id',$id)->get('car_details');
...@@ -2222,7 +2121,7 @@ public function otp_verify($data){ ...@@ -2222,7 +2121,7 @@ public function otp_verify($data){
} }
function end_ride_update($request){ function end_ride_update($request){
$data=array('status'=>2); $data=array('status'=>2);
$this->db->where('ride_id',$request['id']); $this->db->where('ride_id',$request['id']);
...@@ -2241,15 +2140,15 @@ public function otp_verify($data){ ...@@ -2241,15 +2140,15 @@ public function otp_verify($data){
// echo $this->db->last_query(); // echo $this->db->last_query();
} }
function booked_push_data($request){ function booked_push_data($request){
$data=array('user_id'=>$request->user_id, $data=array('user_id'=>$request->user_id,
'book_id'=>$request->id); 'book_id'=>$request->id);
$query=$this->db->insert('book_push',$data); $query=$this->db->insert('book_push',$data);
return $query; return $query;
} }
function get_push_notification_details($request){ function get_push_notification_details($request){
$this->db->where('booking.status',0); $this->db->where('booking.status',0);
$this->db->where('ride.users_id',$request); $this->db->where('ride.users_id',$request);
$this->db->select('booking.*,ride.no_of_seats AS rideseat,car_details.car_image'); $this->db->select('booking.*,ride.no_of_seats AS rideseat,car_details.car_image');
...@@ -2261,8 +2160,8 @@ public function otp_verify($data){ ...@@ -2261,8 +2160,8 @@ public function otp_verify($data){
// echo $this->db->last_query(); // echo $this->db->last_query();
return $query->result(); return $query->result();
} }
function reject_send_details($request){ function reject_send_details($request){
$this->db->where('booking.booking_id',$request); $this->db->where('booking.booking_id',$request);
$this->db->select('booking.*,users.*'); $this->db->select('booking.*,users.*');
$this->db->from('booking'); $this->db->from('booking');
...@@ -2272,8 +2171,8 @@ public function otp_verify($data){ ...@@ -2272,8 +2171,8 @@ public function otp_verify($data){
return $query->row(); return $query->row();
} }
function approve_send_details($request){ function approve_send_details($request){
$this->db->where('booking.booking_id',$request); $this->db->where('booking.booking_id',$request);
$this->db->select('booking.*,users.*'); $this->db->select('booking.*,users.*');
$this->db->from('booking'); $this->db->from('booking');
...@@ -2283,8 +2182,8 @@ public function otp_verify($data){ ...@@ -2283,8 +2182,8 @@ public function otp_verify($data){
return $query->row(); return $query->row();
} }
function car_edit_exist($request){ function car_edit_exist($request){
//var_dump($request); //var_dump($request);
$this->db->where('car_id',$request['car_id']); $this->db->where('car_id',$request['car_id']);
$this->db->where('id!=',$request['id']); $this->db->where('id!=',$request['id']);
...@@ -2294,8 +2193,8 @@ public function otp_verify($data){ ...@@ -2294,8 +2193,8 @@ public function otp_verify($data){
$query= $this->db->get('ride'); $query= $this->db->get('ride');
//echo $this->db->last_query(); //echo $this->db->last_query();
return $query->result(); return $query->result();
} }
function result_edit_ride($data){ function result_edit_ride($data){
//var_dump($data); //var_dump($data);
$this->db->where('ride_alert.source',$data['source']); $this->db->where('ride_alert.source',$data['source']);
...@@ -2316,10 +2215,10 @@ public function otp_verify($data){ ...@@ -2316,10 +2215,10 @@ public function otp_verify($data){
// var_dump($new_ride_alert); // var_dump($new_ride_alert);
return $new_ride_alert; return $new_ride_alert;
} }
function booking_history_count_details($request){ function booking_history_count_details($request){
$date=date('Y-m-d'); $date=date('Y-m-d');
$this->db->where('ride.departure_date<',$date ); $this->db->where('ride.departure_date<',$date );
$this->db->where('user_id',$request); $this->db->where('user_id',$request);
...@@ -2333,9 +2232,9 @@ public function otp_verify($data){ ...@@ -2333,9 +2232,9 @@ public function otp_verify($data){
$new= $query->row(); $new= $query->row();
return $new; return $new;
} }
function offer_history_count_details($request){ function offer_history_count_details($request){
$date=date('Y-m-d'); $date=date('Y-m-d');
$this->db->where('status!=',2); $this->db->where('status!=',2);
$this->db->select('count(id) as totalcount'); $this->db->select('count(id) as totalcount');
...@@ -2347,10 +2246,10 @@ public function otp_verify($data){ ...@@ -2347,10 +2246,10 @@ public function otp_verify($data){
$new= $query->row(); $new= $query->row();
return $new; return $new;
} }
function car_active_check($request){ function car_active_check($request){
$this->db->select('id'); $this->db->select('id');
$this->db->from('ride'); $this->db->from('ride');
$this->db->where('car_id',$request->car_id) ; $this->db->where('car_id',$request->car_id) ;
...@@ -2378,22 +2277,22 @@ public function otp_verify($data){ ...@@ -2378,22 +2277,22 @@ public function otp_verify($data){
} }
//echo $this->db->last_query(); //echo $this->db->last_query();
} }
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);
$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);
return $res; return $res;
} }
function get_verification_details($request){ function get_verification_details($request){
$this->db->where('user_id',$request->user_id); $this->db->where('user_id',$request->user_id);
return $this->db->get('verification')->row(); return $this->db->get('verification')->row();
} }
function save_goverment_info($request){ function save_goverment_info($request){
// $request); // $request);
$this->db->where('user_id',$request['user_id']); $this->db->where('user_id',$request['user_id']);
//$this->db->where('type',$request['type']); //$this->db->where('type',$request['type']);
...@@ -2404,24 +2303,24 @@ public function otp_verify($data){ ...@@ -2404,24 +2303,24 @@ public function otp_verify($data){
'number'=>$request['id_no'], 'number'=>$request['id_no'],
'type'=>$request['type'], 'type'=>$request['type'],
'status'=>'4' 'status'=>'4'
)); ));
//echo $this->db->last_query(); //echo $this->db->last_query();
// $query = $this->db->where('user_id',$request['userid']); // $query = $this->db->where('user_id',$request['userid']);
// $query = $this->db->get('notifications'); // $query = $this->db->get('notifications');
// $result = $query->row(); // $result = $query->row();
return $result; return $result;
} }
/**************************************New Webservice Model(TUKKIBI)*****************************/ /**************************************New Webservice Model(TUKKIBI)*****************************/
public function duplicate_ride($data){ public function duplicate_ride($data){
$request = $this->db->get_where('ride',array('id'=>$data['ride_id']))->row_array(); $request = $this->db->get_where('ride',array('id'=>$data['ride_id']))->row_array();
if($request){ if($request){
$data =array('source'=>$request['source'], $data =array('source'=>$request['source'],
...@@ -2455,9 +2354,9 @@ public function otp_verify($data){ ...@@ -2455,9 +2354,9 @@ public function otp_verify($data){
$res = array('status'=>'failed','message'=>'Ride Does not Exist'); $res = array('status'=>'failed','message'=>'Ride Does not Exist');
} }
return $res; return $res;
} }
public function get_currency(){ public function get_currency(){
$this->db->select('id,cc as currency,name as currency_country'); $this->db->select('id,cc as currency,name as currency_country');
$result = $this->db->get_where('country_currency')->result(); $result = $this->db->get_where('country_currency')->result();
if($result){ if($result){
...@@ -2466,17 +2365,17 @@ public function otp_verify($data){ ...@@ -2466,17 +2365,17 @@ public function otp_verify($data){
$res = array('status'=>'failed'); $res = array('status'=>'failed');
} }
return $res; return $res;
} }
public function update_currency($data){ public function update_currency($data){
if($this->db->update('users',array('currency'=>$data['currency']),array('id'=>$data['user_id']))){ if($this->db->update('users',array('currency'=>$data['currency']),array('id'=>$data['user_id']))){
return true; return true;
}else{ }else{
return false; return false;
} }
} }
public function get_ride_members($data){ public function get_ride_members($data){
$this->db->select("TRIM(concat(users.first_name,' ',IFNULL(users.last_name,''))) as name,IF(users.profile_photo != NULL OR users.profile_photo != '' , concat('".base_url()."',users.profile_photo) , '') profile_pic,users.id as rider_id,booking.status"); $this->db->select("TRIM(concat(users.first_name,' ',IFNULL(users.last_name,''))) as name,IF(users.profile_photo != NULL OR users.profile_photo != '' , concat('".base_url()."',users.profile_photo) , '') profile_pic,users.id as rider_id,booking.status");
$this->db->join('users','users.id = booking.user_id'); $this->db->join('users','users.id = booking.user_id');
$this->db->where('booking.ride_id',$data['ride_id']); $this->db->where('booking.ride_id',$data['ride_id']);
...@@ -2489,9 +2388,9 @@ public function otp_verify($data){ ...@@ -2489,9 +2388,9 @@ public function otp_verify($data){
$res = array('status'=>'error'); $res = array('status'=>'error');
} }
return $res; return $res;
} }
public function get_rider_profile($data){ public function get_rider_profile($data){
$this->db->select("TRIM(concat(users.first_name,' ',IFNULL(users.last_name,''))) as name,IF(users.profile_photo != NULL OR users.profile_photo != '' , concat('".base_url()."',users.profile_photo) , '') profile_pic,users.id as rider_id,IFNULL((select round(avg(rating),2) from rating where owner = '".$data['rider_id']."'), 0) as rating, (select count(id) from ride where users_id = ".$data['rider_id'].") as no_of_rides_as_driver,(select count(id) from booking where user_id = ".$data['rider_id'].") as no_of_rides_as_user"); $this->db->select("TRIM(concat(users.first_name,' ',IFNULL(users.last_name,''))) as name,IF(users.profile_photo != NULL OR users.profile_photo != '' , concat('".base_url()."',users.profile_photo) , '') profile_pic,users.id as rider_id,IFNULL((select round(avg(rating),2) from rating where owner = '".$data['rider_id']."'), 0) as rating, (select count(id) from ride where users_id = ".$data['rider_id'].") as no_of_rides_as_driver,(select count(id) from booking where user_id = ".$data['rider_id'].") as no_of_rides_as_user");
// $this->db->join('users','users.id = booking.user_id'); // $this->db->join('users','users.id = booking.user_id');
$this->db->where('users.id',$data['rider_id']); $this->db->where('users.id',$data['rider_id']);
...@@ -2503,9 +2402,9 @@ public function otp_verify($data){ ...@@ -2503,9 +2402,9 @@ public function otp_verify($data){
$res = array('status'=>'error'); $res = array('status'=>'error');
} }
return $res; return $res;
} }
public function get_reviews($data){ public function get_reviews($data){
$this->db->select("rating.rating,rating.review,rating.ride_id,rating.create_user as reviewer_id,ride.source,ride.destination,ride.price,TRIM(concat(users.first_name,' ',IFNULL(users.last_name,''))) as reviewer_name"); $this->db->select("rating.rating,rating.review,rating.ride_id,rating.create_user as reviewer_id,ride.source,ride.destination,ride.price,TRIM(concat(users.first_name,' ',IFNULL(users.last_name,''))) as reviewer_name");
$this->db->from('rating'); $this->db->from('rating');
$this->db->join('ride','ride.id = rating.ride_id'); $this->db->join('ride','ride.id = rating.ride_id');
...@@ -2518,18 +2417,18 @@ public function otp_verify($data){ ...@@ -2518,18 +2417,18 @@ public function otp_verify($data){
$res = array('status'=>'error'); $res = array('status'=>'error');
} }
return $res; return $res;
} }
public function recurring_ride($data){ public function recurring_ride($data){
$data['week_available'] = json_encode($data['week_available']); $data['week_available'] = json_encode($data['week_available']);
if($this->db->insert('recurring_ride',$data)){ if($this->db->insert('recurring_ride',$data)){
return true; return true;
} }
} }
public function get_recuring_rideid_data($id){ public function get_recuring_rideid_data($id){
return $this->db->get_where('ride',array('id'=>$id))->row(); return $this->db->get_where('ride',array('id'=>$id))->row();
} }
......
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