Skip to content

N
nemt_backend
Commit 0927cbc6 by Tobin
Options

dc

parent ea56201b
Showing with 6 additions and 5 deletions
application/models/Ride_model.php
...@@ -175,7 +175,7 @@ class Ride_model extends CI_Model { ...@@ -175,7 +175,7 @@ class Ride_model extends CI_Model {
$driverCond = ''; $driverCond = '';
if(!empty($prvDrivers) && $prvDrivers->num_rows() > 0 && if(!empty($prvDrivers) && $prvDrivers->num_rows() > 0 &&
!empty($prvDrivers = $prvDrivers->row_array()) && isset($prvDrivers['assigned_drivers']) && !empty($prvDrivers=$prvDrivers->row_array()) && isset($prvDrivers['assigned_drivers']) &&
!empty($prvDrivers['assigned_drivers'])){ !empty($prvDrivers['assigned_drivers'])){
$prvDrivers = explode(',',$prvDrivers['assigned_drivers']); $prvDrivers = explode(',',$prvDrivers['assigned_drivers']);
$drivers = array_diff($drivers,$prvDrivers); $drivers = array_diff($drivers,$prvDrivers);
...@@ -183,9 +183,9 @@ class Ride_model extends CI_Model { ...@@ -183,9 +183,9 @@ class Ride_model extends CI_Model {
if(!empty($drivers)){ if(!empty($drivers)){
$drv_ids = implode(",",$drivers); $drv_ids = implode(",",$drivers);
$sql = "SELECT DRV.driver_id,DRV.fcm_token, $sql = "SELECT DRV.driver_id,DRV.fcm_token,
3956*2*ASIN(SQRT(POWER(SIN(($locData['plat']-DRV.active_loc_lat)* 3956*2*ASIN(SQRT(POWER(SIN((".$locData['plat']."-DRV.active_loc_lat)*
pi()/180/2),2)+COS($locData['plat']*pi()/180)*COS(DRV.active_loc_lat* pi()/180/2),2)+COS(".$locData['plat']."*pi()/180)*COS(DRV.active_loc_lat*
pi()/180)*POWER(SIN(($locData['plng']-DRV.active_loc_lng)* pi()/180)*POWER(SIN((".$locData['plng']."-DRV.active_loc_lng)*
pi()/180/2),2))) AS distance pi()/180/2),2))) AS distance
FROM drivers AS DRV FROM drivers AS DRV
WHERE DRV.status = 1 AND DRV.driver_id IN ($drv_ids) AND WHERE DRV.status = 1 AND DRV.driver_id IN ($drv_ids) AND
......
application/models/Webservices_driver_model.php
...@@ -2442,7 +2442,8 @@ function booster_seat($request) { ...@@ -2442,7 +2442,8 @@ function booster_seat($request) {
$drvAuth = $this->db->where('unique_id', $data['auth'])->get('driver_auth_table'); $drvAuth = $this->db->where('unique_id', $data['auth'])->get('driver_auth_table');
if(!empty($drvAuth) && $drvAuth->num_rows()>0 && if(!empty($drvAuth) && $drvAuth->num_rows()>0 &&
$drvData=$drvAuth->row() && !empty($driver_id=$drvData->driver_id)){ !empty($drvData=$drvAuth->row()) && isset($drvData->driver_id) &&
!empty($driver_id=$drvData->driver_id)){
$status = $this->db->update('transport_details',array('status'=>4), $status = $this->db->update('transport_details',array('status'=>4),
array('transport_id'=>$data['trip_id'])); array('transport_id'=>$data['trip_id']));
} }
......
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