@@ -478,18 +478,32 @@ class Webservices_driver_model extends CI_Model {
$res=$query->row();
if(!empty($res)){
$driver_status=$res->status;
if($driver_status==4||$driver_status==5){
$data="SELECT transport_details.total_time AS time, transport_details.trip_distance AS distance, drivers.profile_image AS driver_photo, drivers.phone AS driver_phone_number, transport_details.status AS request_status, transport_details.transport_id AS trip_id, 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 FROM transport_details LEFT JOIN drivers ON transport_details.driver_id = drivers.driver_id LEFT JOIN customers ON customers.customer_id = transport_details.customer_id WHERE transport_details.driver_id = '$driv_id' AND transport_details.status IN(4,5) ORDER BY transport_details.transport_id DESC LIMIT 0,1";
$data="SELECT transport_details.total_time AS time,
transport_details.trip_distance AS distance,
drivers.profile_image AS driver_photo,
drivers.phone AS driver_phone_number,
transport_details.status AS request_status,
transport_details.transport_id AS trip_id,
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
FROM transport_details
LEFT JOIN drivers ON transport_details.driver_id = drivers.driver_id
LEFT JOIN customers ON customers.customer_id = transport_details.customer_id
WHERE transport_details.driver_id = '$driv_id' AND
transport_details.status IN(4,5)
ORDER BY transport_details.transport_id DESC LIMIT 0,1";
$result=$this->db->query($data)->row();
return$result;
}else{
return$result;
return0;
}
}else{
return0;
}
}else{
...
...
@@ -561,17 +575,17 @@ class Webservices_driver_model extends CI_Model {
$currency=$rs->currency;
$query="SELECT t.transport_id AS id,
customers.customer_id AS customer_id,
$query="SELECT t.transport_id AS id,customers.customer_id AS customer_id,
CONCAT(customers.first_name,' ',customers.last_name) AS customer_name,
customers.profile_image AS customer_photo,
t.pickup_location AS source_location,
t.pickup_lng AS source_longitude,
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_lat AS destination_latitude,
t.drop_lng AS destination_longitude,
CONCAT(t.trip_cost,'','$currency') AS fare FROM transport_details AS t LEFT JOIN drivers AS d ON d.driver_id = t.driver_id LEFT JOIN customers ON t.customer_id = customers.customer_id WHERE t.driver_id = '$driv_id' AND request_type = 1 ";
t.pickup_lng AS source_longitude,CONCAT(t.trip_cost,'','$currency') AS fare,
t.drop_lat AS destination_latitude,t.drop_lng AS destination_longitude
FROM transport_details AS t
LEFT JOIN drivers AS d ON d.driver_id = t.driver_id
LEFT JOIN customers ON t.customer_id = customers.customer_id
WHERE t.driver_id = '$driv_id' AND request_type = 1 ";
return$query;
...
...
@@ -687,7 +701,7 @@ function booster_seat($request) {
@@ -1317,7 +1331,7 @@ function booster_seat($request) {
$driv_id=$rs->driver_id;
$data1="SELECT * FROM driver WHERE id = '$driv_id' ";
$data1="SELECT * FROM drivers WHERE id = '$driv_id' ";
$query1=$this->db->query($data1);
...
...
@@ -1785,7 +1799,7 @@ function booster_seat($request) {
customer.name AS customer_name,customer.image AS customer_photo FROM
booking LEFT JOIN driver ON driver.id = booking.driver_id LEFT JOIN customer ON booking.user_id = customer.id
booking LEFT JOIN drivers ON driver.id = booking.driver_id LEFT JOIN customer ON booking.user_id = customer.id
LEFT JOIN pattern ON booking.pattern_id = pattern.id WHERE booking.id = '$id'";
...
...
@@ -2073,7 +2087,7 @@ function booster_seat($request) {
customer.image AS customer_photo FROM booking
LEFT JOIN driver ON driver.id = booking.driver_id LEFT JOIN customer ON booking.user_id = customer.id
LEFT JOIN drivers ON driver.id = booking.driver_id LEFT JOIN customer ON booking.user_id = customer.id
LEFT JOIN pattern ON booking.pattern_id = pattern.id WHERE booking.driver_id = '$driv_id' AND booking.book_date BETWEEN $start_time AND $end_time AND booking.status != 0";