Skip to content

N
nemt_backend
Commit fb0d7781 by Tobin
Options

dc

parent 1e0ab026
Showing with 52 additions and 92 deletions
application/controllers/Webservices.php
...@@ -460,6 +460,7 @@ class Webservices extends CI_Controller { ...@@ -460,6 +460,7 @@ class Webservices extends CI_Controller {
if ($result->request_status == '0' || $result->request_status == '1' || $result->request_status == '3') { if ($result->request_status == '0' || $result->request_status == '1' || $result->request_status == '3') {
print json_encode(array('status'=>'success','data'=>array('request_status'=>'0'))); print json_encode(array('status'=>'success','data'=>array('request_status'=>'0')));
} else if($result->request_status == '4' || $result->request_status == '5' || $result->request_status == '6' || $result->request_status == '8') { } else if($result->request_status == '4' || $result->request_status == '5' || $result->request_status == '6' || $result->request_status == '8') {
$result->request_status = '1';
print json_encode(array('status'=>'success','data'=>$result)); print json_encode(array('status'=>'success','data'=>$result));
} else { } else {
print json_encode(array('status'=>'error','message'=>'Something Went wrong','error'=>'606')); print json_encode(array('status'=>'error','message'=>'Something Went wrong','error'=>'606'));
......
application/controllers/Webservices_driver.php
...@@ -377,13 +377,31 @@ ...@@ -377,13 +377,31 @@
$auth = apache_request_headers()['Auth']; $auth = apache_request_headers()['Auth'];
$postdata = file_get_contents("php://input"); if(!isset($_POST) || empty($_POST) || !isset($_POST['name'])||empty($_POST['name'])){
print json_encode(array('status'=>'error',
'message'=>'Something Went wrong','error'=>'208'));
}
$request = json_decode($postdata, true); $request['last_name'] = '';
$request['auth'] = $auth; $request['first_name'] = $_POST['name'];
if(isset($_FILES)&&!empty($_FILES)&&is_uploaded_file($_FILES['photo']['tmp_name'])){
$uploads_dir = './assets/uploads/profile_pic/';
$tmp_name = $_FILES['photo']['tmp_name'];
$pic_name = $_FILES['photo']['name'];
$pic_name = str_replace(' ', '_', mt_rand().$pic_name);
move_uploaded_file($tmp_name, $uploads_dir.$pic_name);
$request['profile_image'] = 'assets/uploads/profile_pic/'.$pic_name;
}
$result = $this->Webservices_driver_model->update_user_name($request); $result = $this->Webservices_driver_model->update_user_name($auth,$request);
header('Content-type: application/json'); header('Content-type: application/json');
...@@ -501,19 +519,17 @@ ...@@ -501,19 +519,17 @@
$data = $this->db->where('transport_id', $request['request_id'])->get('transport_details')->row(); $data = $this->db->where('transport_id', $request['request_id'])->get('transport_details')->row();
if ($data->status == 1) { if($data->status==4 || $data->status==5 || $data->status==6 || $data->status==8) {
print json_encode(array('status' => 'error', 'message' => 'Trip Assigned ')); print json_encode(array('status' => 'error', 'message' => 'Trip Assigned '));
} }
elseif($data->status == 3) { elseif($data->status == 2 || $data->status == 9) {
print json_encode(array('status' => 'error', 'message' => 'Trip Cancelled ')); print json_encode(array('status' => 'error', 'message' => 'Trip Cancelled '));
} }
else { else {
$result = $this->Webservices_driver_model->accept($request); $result = $this->Webservices_driver_model->accept($request);
header('Content-type: application/json'); if (!empty($result)) {
if ($result) {
print json_encode(array('status' => 'success', 'data' => $result)); print json_encode(array('status' => 'success', 'data' => $result));
...@@ -654,6 +670,7 @@ ...@@ -654,6 +670,7 @@
$result = $this->db->query($result.$limit_sql)->result(); $result = $this->db->query($result.$limit_sql)->result();
$query = $this->db->where('unique_id', $auth)->get('driver_auth_table'); $query = $this->db->where('unique_id', $auth)->get('driver_auth_table');
$rs = $query->row(); $rs = $query->row();
...@@ -732,7 +749,7 @@ ...@@ -732,7 +749,7 @@
} else { } else {
print json_encode(array('status' => 'error', 'message' => 'Something Went wrong', 'error' => '503')); print json_encode(array('status' => 'success','data' => []));
} }
...@@ -1096,8 +1113,6 @@ ...@@ -1096,8 +1113,6 @@
$postdata = $_POST['image']; $postdata = $_POST['image'];
print_r($postdata);
if (is_uploaded_file($_FILES['image']['tmp_name'])) { if (is_uploaded_file($_FILES['image']['tmp_name'])) {
$uploads_dir = './assets/uploads/profile_pic/'; $uploads_dir = './assets/uploads/profile_pic/';
...@@ -1456,16 +1471,6 @@ ...@@ -1456,16 +1471,6 @@
if (!empty($result)) { if (!empty($result)) {
$result->request_id = $request['request_id'];
$car_image = $this->Webservices_driver_model->car_type_image($result->car_type);
$result->car_type_image = $car_image;
$car_type = $this->Webservices_driver_model->car_type($result->car_type);
$result->car_type = $car_type;
print json_encode(array('status' => 'success', 'data' => $result)); print json_encode(array('status' => 'success', 'data' => $result));
} else { } else {
...@@ -2045,58 +2050,15 @@ ...@@ -2045,58 +2050,15 @@
$request['auth'] = $auth; $request['auth'] = $auth;
$result = $request['path'];
$trip_path = json_encode($result);
$array = array();
foreach($result as $rs) {
$latlng = $rs['latitude'].','.$rs['longitude'];
$array[] = $latlng;
}
$count = count($array);
$i = 0;
$distance_val = 0;
while ($i < $count - 1) {
list($lat1, $lon1) = explode(',', $array[$i]);
list($lat2, $lon2) = explode(',', $array[$i + 1]);
$unit = 'K';
$distance_val += $this->distance_calculate($lat1, $lon1, $lat2, $lon2, $unit);
$i++;
}
$rs = $distance_val;
$trip_end_time = time(); $trip_end_time = time();
$this->db->where('transport_id', $request['trip_id'])->update('transport_details', array('trip_end_time' => $trip_end_time, 'trip_path' => $trip_path)); $this->db->where('transport_id', $request['trip_id'])->update('transport_details', array('trip_end_time' => $trip_end_time));
$res = $this->db->where('transport_id', $request['trip_id'])->get('transport_details')->row(); $res = $this->db->where('transport_id', $request['trip_id'])->get('transport_details')->row();
$trip_start_time = $res->trip_start_time; $trip_start_time = (isset($res->trip_start_time) && !empty($res->trip_start_time))?$res->trip_start_time:'00:00';
$trip_end_time = $res->trip_end_time; $trip_end_time = (isset($res->trip_end_time) && !empty($res->trip_end_time))?$res->trip_end_time:'00:00';
$distance = ($rs);
$time = (($trip_end_time - $trip_start_time) / 60); $time = (($trip_end_time - $trip_start_time) / 60);
...@@ -2116,15 +2078,12 @@ ...@@ -2116,15 +2078,12 @@
} else { } else {
$hours = convertToHoursMins($minutes_travel, '%2d : %02d '); $hours = date('H', mktime(0,$minutes));
} }
$array = array('trip_distance' => $distance, 'start_time' => $request['start_time'], 'end_time' => $request['end_time'], $array = array('start_time'=>$request['start_time'],
'end_time'=>$request['end_time'],'total_time'=>$hours,'status'=>6);
'total_time' => $hours,
'status' => 6);
$this->db->where('transport_id', $request['trip_id'])->update('transport_details', $array); $this->db->where('transport_id', $request['trip_id'])->update('transport_details', $array);
......
application/models/Webservice_model.php
...@@ -680,7 +680,7 @@ class Webservice_model extends CI_Model { ...@@ -680,7 +680,7 @@ class Webservice_model extends CI_Model {
if ($booking_status == 4 || $booking_status == 5) { if ($booking_status == 4 || $booking_status == 5) {
$query1 = $this->db->select('CONCAT(transport_details.total_time," ","min") AS time,transport_details.transport_id AS trip_id,vehicles.vehicle_reg_no AS car_number, CONCAT(transport_details.trip_distance," ","km") AS distance, drivers.profile_image AS driver_photo, drivers.phone AS driver_phone_number, transport_details.status AS request_status, transport_details.pickup_lat AS source_latitude, transport_details.pickup_lng AS source_longitude, transport_details.drop_lat AS destination_latitude, transport_details.drop_lng AS destination_longitude, CONCAT(drivers.first_name," ",drivers.last_name) AS driver_name')->from('transport_details')->join('drivers','transport_details.driver_id = drivers.driver_id','left')->join('vehicles','drivers.vehicle = vehicles.vehicle_id','left')->where('transport_details.transport_id', $query1 = $this->db->select('CONCAT(transport_details.total_time," ","min") AS time,transport_details.transport_id AS trip_id,vehicles.vehicle_reg_no AS car_number, CONCAT(transport_details.trip_distance," ","km") AS distance, drivers.profile_image AS driver_photo, drivers.phone AS driver_phone_number, transport_details.status AS request_status, transport_details.pickup_lat AS source_latitude, transport_details.pickup_lng AS source_longitude, transport_details.drop_lat AS destination_latitude, transport_details.drop_lng AS destination_longitude, CONCAT(drivers.first_name," ",drivers.last_name) AS driver_name,transport_details.car_arrival AS trip_status')->from('transport_details')->join('drivers','transport_details.driver_id = drivers.driver_id','left')->join('vehicles','drivers.vehicle = vehicles.vehicle_id','left')->where('transport_details.transport_id',
$book_id)->get(); $book_id)->get();
$result = $query1->row(); $result = $query1->row();
......
application/models/Webservices_driver_model.php
...@@ -294,15 +294,15 @@ class Webservices_driver_model extends CI_Model { ...@@ -294,15 +294,15 @@ class Webservices_driver_model extends CI_Model {
// *********************** UPDATE DRIVER USER NAME ******************** // *********************** UPDATE DRIVER USER NAME ********************
public function update_user_name($request) { public function update_user_name($auth,$request) {
$query = $this->db->where('unique_id', $request['auth'])->get('driver_auth_table'); $query = $this->db->where('unique_id', $auth)->get('driver_auth_table');
if ($query->num_rows() > 0) { if ($query->num_rows() > 0) {
$rs = $query->row(); $rs = $query->row();
$this->db->where('driver_id', $rs->driver_id)->update('drivers', array('first_name' => $request['first_name'],'last_name' => $request['last_name'])); $this->db->where('driver_id',$rs->driver_id)->update('drivers',$request);
return true; return true;
...@@ -432,9 +432,9 @@ class Webservices_driver_model extends CI_Model { ...@@ -432,9 +432,9 @@ class Webservices_driver_model extends CI_Model {
$this->db->where('transport_id', $request['request_id'])->update('transport_details', $data2); $this->db->where('transport_id', $request['request_id'])->update('transport_details', $data2);
$this->db->where('driver_id', $rs->driver_id); $this->db->where(array('driver_id'=>$rs->driver_id,'trip_id'=>$id));
$this->db->update('drivers', array('book_status' => 1)); $this->db->update('driver_request', array('status' => 1));
$data4 = array('trip_id' => $rquDetails->transport_id, 'cust_id' => $rquDetails->customer_id, 'driver_id' => $rs->driver_id); $data4 = array('trip_id' => $rquDetails->transport_id, 'cust_id' => $rquDetails->customer_id, 'driver_id' => $rs->driver_id);
...@@ -485,6 +485,9 @@ class Webservices_driver_model extends CI_Model { ...@@ -485,6 +485,9 @@ class Webservices_driver_model extends CI_Model {
transport_details.trip_distance AS distance, transport_details.trip_distance AS distance,
drivers.profile_image AS driver_photo, drivers.profile_image AS driver_photo,
drivers.phone AS driver_phone_number, drivers.phone AS driver_phone_number,
customers.phone AS customer_phone_number,
customers.profile_image AS customer_photo,
CONCAT(customers.first_name,' ',customers.last_name) AS customer_name,
transport_details.status AS request_status, transport_details.status AS request_status,
transport_details.transport_id AS trip_id, transport_details.transport_id AS trip_id,
transport_details.pickup_lat AS source_latitude, transport_details.pickup_lat AS source_latitude,
...@@ -580,19 +583,16 @@ class Webservices_driver_model extends CI_Model { ...@@ -580,19 +583,16 @@ class Webservices_driver_model extends CI_Model {
customers.profile_image AS customer_photo, customers.profile_image AS customer_photo,
t.pickup_location AS source_location,t.pickup_lat AS source_latitude, t.pickup_location AS source_location,t.pickup_lat AS source_latitude,
t.drop_location AS destination_location, t.drop_location AS destination_location,
t.pickup_lng AS source_longitude,CONCAT(t.trip_cost,'','$currency') AS fare, t.pickup_lng AS source_longitude,t.created_date AS date,
CONCAT(t.trip_cost,'','$currency') AS fare,
t.drop_lat AS destination_latitude,t.drop_lng AS destination_longitude t.drop_lat AS destination_latitude,t.drop_lng AS destination_longitude
FROM transport_details AS t FROM transport_details AS t
LEFT JOIN drivers AS d ON d.driver_id = t.driver_id LEFT JOIN drivers AS d ON d.driver_id = t.driver_id
LEFT JOIN customers ON t.customer_id = customers.customer_id LEFT JOIN customers ON t.customer_id = customers.customer_id
WHERE t.driver_id = '$driv_id' AND request_type = 1 "; WHERE t.driver_id = '$driv_id' AND request_type = 1 ";
return $query; return $query;
} else { } else {
return false; return false;
} }
} }
...@@ -608,11 +608,12 @@ class Webservices_driver_model extends CI_Model { ...@@ -608,11 +608,12 @@ class Webservices_driver_model extends CI_Model {
$data = "SELECT TRNS.transport_id AS id, CUST.customer_id AS customer_id, $data = "SELECT TRNS.transport_id AS id, CUST.customer_id AS customer_id,
CONCAT(CUST.first_name,' ',CUST.last_name) AS customer_name, CONCAT(CUST.first_name,' ',CUST.last_name) AS customer_name,
TRNS.pickup_lng AS source_longitude, TRNS.pickup_lat AS source_latitude, TRNS.pickup_lng AS source_longitude,TRNS.pickup_lat AS source_latitude,
TRNS.drop_location AS destination_location, TRNS.drop_lat AS destination_latitude, TRNS.drop_location AS destination_location,TRNS.trip_cost AS fare,
CUST.profile_image AS customer_photo, TRNS.pickup_location AS source_location, TRNS.drop_lat AS destination_latitude,DR.status AS request_status,
TRNS.drop_lng AS destination_longitude, DR.status AS request_status, CUST.profile_image AS customer_photo,TRNS.appointment_time AS date,
TRNS.status AS ride_status,TRNS.trip_cost AS fare TRNS.pickup_location AS source_location,TRNS.status AS ride_status,
TRNS.drop_lng AS destination_longitude
FROM transport_details AS TRNS FROM transport_details AS TRNS
INNER JOIN driver_request AS DR ON DR.trip_id = TRNS.transport_id INNER JOIN driver_request AS DR ON DR.trip_id = TRNS.transport_id
INNER JOIN customers AS CUST ON TRNS.customer_id = CUST.customer_id INNER JOIN customers AS CUST ON TRNS.customer_id = CUST.customer_id
...@@ -1369,8 +1370,7 @@ function booster_seat($request) { ...@@ -1369,8 +1370,7 @@ function booster_seat($request) {
CONCAT(CUST.first_name,' ',CUST.last_name) AS name CONCAT(CUST.first_name,' ',CUST.last_name) AS name
FROM transport_details AS TD FROM transport_details AS TD
INNER JOIN customers CUST ON (CUST.customer_id=TD.customer_id) INNER JOIN customers CUST ON (CUST.customer_id=TD.customer_id)
WHERE TD.request_type='$type' AND TD.transport_id='$id' AND WHERE TD.transport_id='$id' AND TD.status != '2'";
CUST.status='1' AND TD.status != '2'";
$data = $this->db->query($query); $data = $this->db->query($query);
$drvLoc = $this->db->query("SELECT lat_driver,lng_driver $drvLoc = $this->db->query("SELECT lat_driver,lng_driver
FROM drivers WHERE driver_id='$driver_id'")->row_array(); FROM drivers WHERE driver_id='$driver_id'")->row_array();
......
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