Skip to content

J
joyride phase2
Commit 91740cab by Jansa Jose
Options

booking ride history

parent ee968ae4
Showing with 92 additions and 52 deletions
application/controllers/Webservices.php
...@@ -2645,11 +2645,8 @@ ...@@ -2645,11 +2645,8 @@
public function duplicate_ride_post(){ public function duplicate_ride_post(){
header('Content-type: application/json');
$headers = apache_request_headers();
$data = (array) json_decode(file_get_contents("php://input")); $data = (array) json_decode(file_get_contents("php://input"));
if(isset($data['ride_id']) && strlen(trim($data['ride_id']," ")) > 0 && isset($data['departure_date']) && strlen(trim($data['departure_date']," ")) > 0 && isset($data['detour_time']) && strlen(trim($data['detour_time']," ")) > 0) { if(isset($data['departure_date']) && strlen(trim($data['departure_date']," ")) > 0 && isset($data['detour_time']) && strlen(trim($data['detour_time']," ")) > 0) {
$result = $this->Webservice_model->duplicate_ride($data); $result = $this->Webservice_model->duplicate_ride($data);
if($result['status'] == 'success'){ if($result['status'] == 'success'){
$res = array('status'=>'success'); $res = array('status'=>'success');
...@@ -2668,9 +2665,6 @@ ...@@ -2668,9 +2665,6 @@
public function get_currency_get(){ public function get_currency_get(){
header('Content-type: application/json');
$headers = apache_request_headers();
$result = $this->Webservice_model->get_currency(); $result = $this->Webservice_model->get_currency();
if($result['status'] == 'success'){ if($result['status'] == 'success'){
$res = array('status'=>'success','data'=>$result['data']); $res = array('status'=>'success','data'=>$result['data']);
...@@ -2681,8 +2675,6 @@ ...@@ -2681,8 +2675,6 @@
} }
public function update_currency_post(){ public function update_currency_post(){
header('Content-type: application/json');
$headers = apache_request_headers();
$data = (array) json_decode(file_get_contents("php://input")); $data = (array) json_decode(file_get_contents("php://input"));
if(isset($data['user_id']) && strlen($data['user_id']) && isset($data['currency']) && strlen($data['currency'])){ if(isset($data['user_id']) && strlen($data['user_id']) && isset($data['currency']) && strlen($data['currency'])){
...@@ -2699,9 +2691,6 @@ ...@@ -2699,9 +2691,6 @@
} }
public function get_ride_members_post(){ public function get_ride_members_post(){
header('Content-type: application/json');
$headers = apache_request_headers();
$data = (array) json_decode(file_get_contents("php://input")); $data = (array) json_decode(file_get_contents("php://input"));
if(isset($data['user_id']) && strlen($data['user_id']) && isset($data['ride_id']) && strlen($data['ride_id'])){ if(isset($data['user_id']) && strlen($data['user_id']) && isset($data['ride_id']) && strlen($data['ride_id'])){
$result = $this->Webservice_model->get_ride_members($data); $result = $this->Webservice_model->get_ride_members($data);
...@@ -2717,9 +2706,6 @@ ...@@ -2717,9 +2706,6 @@
} }
public function get_rider_profile_post(){ public function get_rider_profile_post(){
header('Content-type: application/json');
$headers = apache_request_headers();
$data = (array) json_decode(file_get_contents("php://input")); $data = (array) json_decode(file_get_contents("php://input"));
if(isset($data['rider_id']) && strlen($data['rider_id'])){ if(isset($data['rider_id']) && strlen($data['rider_id'])){
$result = $this->Webservice_model->get_rider_profile($data); $result = $this->Webservice_model->get_rider_profile($data);
...@@ -2734,9 +2720,6 @@ ...@@ -2734,9 +2720,6 @@
print json_encode($res); print json_encode($res);
} }
public function get_reviews_post(){ public function get_reviews_post(){
header('Content-type: application/json');
$headers = apache_request_headers();
$data = (array) json_decode(file_get_contents("php://input")); $data = (array) json_decode(file_get_contents("php://input"));
if(isset($data['user_id']) && strlen($data['user_id'])){ if(isset($data['user_id']) && strlen($data['user_id'])){
$result = $this->Webservice_model->get_reviews($data); $result = $this->Webservice_model->get_reviews($data);
...@@ -2781,14 +2764,14 @@ ...@@ -2781,14 +2764,14 @@
$recur_data = $this->Webservice_model->recurring_ride($request); $recur_data = $this->Webservice_model->recurring_ride($request);
if($recur_data){ if($recur_data){
$ride_data = $this->Webservice_model->get_recuring_rideid_data($request['ride_id']); $ride_data = $this->Webservice_model->get_recuring_rideid_data($request['ride_id']);
$monday = strtotime("last monday"); $monday = strtotime("last monday");
$monday = date('w', $monday)==date('w') ? $monday+7*86400 : $monday; $monday = date('w', $monday)==date('w') ? $monday+7*86400 : $monday;
$sunday = strtotime(date("Y-m-d",$monday)." +6 days"); $sunday = strtotime(date("Y-m-d",$monday)." +6 days");
$this_week_sd = strtotime(date("Y-m-d",$monday)); $this_week_sd = strtotime(date("Y-m-d",$monday));
$this_week_ed = strtotime(date("Y-m-d",$sunday)); $this_week_ed = strtotime(date("Y-m-d",$sunday));
$ride_start_date = strtotime($request['start_date']); $ride_start_date = strtotime($request['start_date']);
$ride_end_date = strtotime($request['end_date']); $ride_end_date = strtotime($request['end_date']);
...@@ -2950,6 +2933,32 @@ ...@@ -2950,6 +2933,32 @@
} }
} }
} }
public function recurring_ride_details_post(){
$postdata = file_get_contents("php://input");
$request = json_decode($postdata,true);
$result = $this->Webservice_model->recurring_ride_details($request);
if($result){
$res = array('status'=>'success','data'=>$result);
}else{
$res = array('status'=>'error','error'=>'error','message'=>'Something Went Wrong.. Try Again Later');
}
print json_encode($res);
}
public function delete_recurring_ride_details_post(){
$postdata = file_get_contents("php://input");
$request = json_decode($postdata,true);
$result = $this->Webservice_model->delete_recurring_ride_details($request);
if($result){
$res = array('status'=>'success');
}else{
$res = array('status'=>'error','error'=>'error','message'=>'Something Went Wrong.. Try Again Later');
}
print json_encode($res);
}
public function get_banners_post(){ public function get_banners_post(){
$result = $this->Webservice_model->get_banners(); $result = $this->Webservice_model->get_banners();
......
application/helpers/general_helper.php
...@@ -80,14 +80,12 @@ function get_total_drivers(){ ...@@ -80,14 +80,12 @@ function get_total_drivers(){
$CI = & get_instance(); $CI = & get_instance();
//$rs = $CI->db->select('COUNT(*) AS tot_drivers')->where('status',1)->get('booking_approve'); //$rs = $CI->db->select('COUNT(*) AS tot_drivers')->where('status',1)->get('booking_approve');
$CI->db->select("users.*");
$CI->db->select("DISTINCT(COUNT(booking_approve.id)) AS tot_drivers"); $CI->db->join('ride','ride.users_id = users.id');
$CI->db->join('users','users.id = booking_approve.driver_id'); $CI->db->where('users.status', '1');
$CI->db->where('booking_approve.status',1); $CI->db->group_by('users.id');
$CI->db->where('driver_id !=', 'NULL'); $result = $CI->db->get('users')->num_rows();
$CI->db->where('users.status', '1'); return $result;
$query = $CI->db->get('booking_approve');
return $query->row()->tot_drivers;
} }
......
application/models/Chat_model.php
...@@ -9,6 +9,7 @@ class Chat_model extends CI_Model { ...@@ -9,6 +9,7 @@ class Chat_model extends CI_Model {
$user = array(); $user = array();
$i=0; $i=0;
foreach ($data['user_id'] as $key => $value) { foreach ($data['user_id'] as $key => $value) {
print_r($value);
$new = explode('-',$value); $new = explode('-',$value);
$this->db->select("TRIM(concat(users.first_name,' ',IFNULL(users.last_name,''))) as name"); $this->db->select("TRIM(concat(users.first_name,' ',IFNULL(users.last_name,''))) as name");
$user_first = $this->db->get_where('users',array('id'=>$new[0]))->row(); $user_first = $this->db->get_where('users',array('id'=>$new[0]))->row();
......
application/models/Customer_model.php
...@@ -13,9 +13,11 @@ class Customer_model extends CI_Model { ...@@ -13,9 +13,11 @@ class Customer_model extends CI_Model {
function get_customer(){ function get_customer(){
$this->db->where('users.status',1); $this->db->where('users.status',1);
$this->db->select('users.*,verification.status as verifiedstatus,verification.id as verified_id'); $this->db->select('users.*,verification.status as verifiedstatus,verification.id as verified_id');
$this->db->from('verification'); $this->db->from('users');
$this->db->join('users','verification.user_id=users.id','left'); $this->db->join('verification','verification.user_id=users.id','left');
$query= $this->db->get(); $query= $this->db->get();
echo $this->db->last_query();exit();
return $query->result(); return $query->result();
} }
...@@ -24,7 +26,7 @@ class Customer_model extends CI_Model { ...@@ -24,7 +26,7 @@ class Customer_model extends CI_Model {
$query = $this->db->get('users'); $query = $this->db->get('users');
$result = $query->row(); $result = $query->row();
return $result; return $result;
} }
......
application/models/Driver_model.php
...@@ -5,16 +5,21 @@ class Driver_model extends CI_Model { ...@@ -5,16 +5,21 @@ class Driver_model extends CI_Model {
} }
function get_driver(){ function get_driver(){
/*$query = $this->db->where('booking_approve.status',1);
$query = $this->db->where('booking_approve.status',1);
$query=$this->db->where('driver_id !=', 'NULL'); $query=$this->db->where('driver_id !=', 'NULL');
$query=$this->db->where('users.status', '1'); $query=$this->db->where('users.status', '1');
$this->db->join('users','users.id = booking_approve.driver_id'); $query=$this->db->join('users','users.id = booking_approve.driver_id');
$query = $this->db->distinct()->select("booking_approve.driver_id,TRIM(concat(users.first_name,' ',IFNULL(users.last_name,''))) as driver_name,users.email,users.gender,users.date_of_birth"); $query = $this->db->distinct()->select("booking_approve.driver_id,TRIM(concat(users.first_name,' ',IFNULL(users.last_name,''))) as driver_name,users.email,users.gender,users.date_of_birth");
$query = $this->db->get('booking_approve'); $query = $this->db->get('booking_approve');
//echo $this->db->last_query();die();
$result = $query->result(); $result = $query->result();
return $result; return $result;*/
$this->db->select("TRIM(concat(users.first_name,' ',IFNULL(users.last_name,''))) as driver_name,users.email,users.gender,users.date_of_birth");
$this->db->join('ride','ride.users_id = users.id');
$this->db->where('users.status', '1');
$this->db->group_by('users.id');
$result = $this->db->get('users')->result();
return $result;
} }
// function get_single_customer($id) { // function get_single_customer($id) {
......
application/models/Webservice_model.php
...@@ -232,10 +232,12 @@ class Webservice_model extends CI_Model{ ...@@ -232,10 +232,12 @@ class Webservice_model extends CI_Model{
function login($request){ function login($request){
//$this->db->where("(username = '".$request['username']."' )"); //$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']));
$this->db->where("username = '".$request['username']. "' OR email ='".$request['username']."'");
// $request['username']); // $request['username']);
// md5($request['password']));die; // md5($request['password']));die;
$this->db->where('status','1');
$query = $this->db->get('users'); $query = $this->db->get('users');
if($query->num_rows()>0){ if($query->num_rows()>0){
...@@ -1601,7 +1603,10 @@ function booking_aproval($request){ ...@@ -1601,7 +1603,10 @@ function booking_aproval($request){
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))){
if($this->db->update('booking',array('status'=>$data->status),array('ride_id'=>$data->ride_id))){ if($this->db->update('booking',array('status'=>$data->status),array('ride_id'=>$data->ride_id))){
return true; if($data->status == '5'){
$this->db->update('booking_approve',array('status'=>'2'),array('ride_id'=>$data->ride_id));
}
return true;
} }
} }
...@@ -1764,7 +1769,7 @@ function booking_ride_history($request){ ...@@ -1764,7 +1769,7 @@ function booking_ride_history($request){
$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('(booking.status = 2 or booking.status = 3 or booking.status = 4 or booking.status = 5)'); $this->db->where('(booking.status = 2 or booking.status = 3 or booking.status = 4 or booking.status = 5)');
$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,car_details.car_plate,car_details.no_of_seats,car_make.car_type'); $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');
...@@ -2153,6 +2158,8 @@ function end_ride_update($request){ ...@@ -2153,6 +2158,8 @@ function end_ride_update($request){
return $query; return $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);
...@@ -2169,7 +2176,7 @@ function get_push_notification_details($request){ ...@@ -2169,7 +2176,7 @@ function get_push_notification_details($request){
$this->db->join('users','booking.user_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'); $this->db->join('car_details','ride.car_id=car_details.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();
} }
...@@ -2308,7 +2315,7 @@ function car_active_check($request){ ...@@ -2308,7 +2315,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,'car_plate'=>$data['car_plate']); $data= array('car_make'=>$request->car_make,'no_of_seats'=>$request->seat_no,'car_plate'=>$request->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);
...@@ -2348,9 +2355,9 @@ function save_goverment_info($request){ ...@@ -2348,9 +2355,9 @@ function save_goverment_info($request){
public function duplicate_ride($data){ public function duplicate_ride($request){
$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'],
'destination'=>$request['destination'], 'destination'=>$request['destination'],
'source_lat'=>$request['source_lat'], 'source_lat'=>$request['source_lat'],
...@@ -2369,8 +2376,8 @@ public function duplicate_ride($data){ ...@@ -2369,8 +2376,8 @@ public function duplicate_ride($data){
'max_luggage'=>$request['max_luggage'], 'max_luggage'=>$request['max_luggage'],
'price'=>$request['price'], 'price'=>$request['price'],
'users_id'=>$request['users_id'], 'users_id'=>$request['users_id'],
'departure_date'=>$data['departure_date'], 'departure_date'=>$request['departure_date'],
'detour_time'=>$data['detour_time'], 'detour_time'=>$request['detour_time'],
'reached_time'=>$request['reached_time'], 'reached_time'=>$request['reached_time'],
'is_round_trip'=>$request['is_round_trip'], 'is_round_trip'=>$request['is_round_trip'],
'status'=>1 'status'=>1
...@@ -2378,9 +2385,9 @@ public function duplicate_ride($data){ ...@@ -2378,9 +2385,9 @@ public function duplicate_ride($data){
if($this->db->insert('ride',$data)){ if($this->db->insert('ride',$data)){
$res = array('status'=>'success'); $res = array('status'=>'success');
} }
}else{ /*}else{
$res = array('status'=>'failed','message'=>'Ride Does not Exist'); $res = array('status'=>'failed','message'=>'Ride Does not Exist');
} }*/
return $res; return $res;
} }
...@@ -2480,6 +2487,26 @@ public function get_ride_status($data){ ...@@ -2480,6 +2487,26 @@ public function get_ride_status($data){
return $res; return $res;
} }
public function recurring_ride_details($data){
$this->db->select('recurring_ride.id as recur_id,recurring_ride.start_date,recurring_ride.recur_type,recurring_ride.end_date,ride.*,car_details.car_image,car_details.car_plate,car_details.no_of_seats,car_make.car_type');
$this->db->from('ride');
$this->db->join('recurring_ride','ride.id=recurring_ride.ride_id');
$this->db->join('car_details','ride.car_id=car_details.id');
$this->db->join('car_make','car_details.car_make=car_make.id');
$this->db->where('ride.users_id',$data['id']);
$this->db->where('recurring_ride.status','0');
$result = $this->db->get()->result();
if($result){
return $result;
}
}
public function delete_recurring_ride_details($id){
if($this->db->delete('recurring_ride',array('id'=>$id))){
return true;
}
}
......
application/views/Chat/chatusers.php
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{{allUsers}}
<tr ng-repeat="val in allUsers" > <tr ng-repeat="val in allUsers" >
<td class="hidden">1</td> <td class="hidden">1</td>
<td class="center">{{val.name}}</td> <td class="center">{{val.name}}</td>
......
application/views/Templates/left-menu-old.php
...@@ -53,7 +53,7 @@ $admin_detail = pull_admin(); ...@@ -53,7 +53,7 @@ $admin_detail = pull_admin();
</li> </li>
<?php } if( in_array('7',$page_name)) <?php } if( in_array('7',$page_name))
{ ?> { ?>
<li class="treeview"><a href="<?php echo base_url();?>Driver/view_driver"><i class="fa fa-male"></i> <span>Drivers</span><i class="fa fa-angle-left pull-right"></i></a> <li class="treeview"><a href="<?php echo base_url();?>Driver/view_driver"><i class="fa fa-male"></i> <span>Riders</span><i class="fa fa-angle-left pull-right"></i></a>
</li> </li>
<?php } if( in_array('8',$page_name) || in_array('9',$page_name) || in_array('10',$page_name)) <?php } if( in_array('8',$page_name) || in_array('9',$page_name) || in_array('10',$page_name))
{?> {?>
......
assets/js/chat/chat-page.js
...@@ -49,10 +49,8 @@ $scope.list = []; ...@@ -49,10 +49,8 @@ $scope.list = [];
}, },
complete(xhr,status){ complete(xhr,status){
//console.log('completed')
}, },
error(xhr,status,error){ error(xhr,status,error){
// alert(status)
} }
}) })
}); });
......
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