Merge branch 'master' into 'production'

application/controllers/Webservices.php

@@ -520,24 +520,25 @@ class Webservices extends CI_Controller {
       if(empty($ride['pickup_lat']) || empty($ride['pickup_lng'])){
         continue;
       }
+      $ride_id = $ride['transport_id'];
       if($ride['request_type'] == 3 && 
         (empty($ride['appointment_time']) || 
          $ride['appointment_time'] < strtotime(date('Y-m-d H:i:s')) || 
          $ride['appointment_time'] > (strtotime(date('Y-m-d H:i:s'))+7200))){
         continue;
       }
-      $driver_data = $this->Webservice_model->getAvailableDrivers($ride['pickup_lat'],$ride['pickup_lng'],$ride['transport_id']);
+      $driver_data = $this->Webservice_model->getAvailableDrivers($ride['pickup_lat'],$ride['pickup_lng'],$ride_id);
       if(empty($driver_data)){
         continue;
       }
       if(!empty($driver_data) && !empty($driver_data['driver_id']) && 
          !empty($driver_data['distance']) && !empty($driver_data['fcm_token'])){
 
-         $this->db->update('transport_details',array('status'=>'3'),array('transport_id'=>$ride_id));
-         $this->db->insert('driver_request',array('trip_id'=>$ride_id,
-                                                  'driver_id'=>$driverData[$key]['driver_id'],
-                                                  'request_time'=>date('Y-m-d H:i:s'),'status'=>'0'));
-         
+          $this->db->update('transport_details',array('status'=>'3'),array('transport_id'=>$ride_id));
+          $this->db->insert('driver_request',array('trip_id'=>$ride_id,
+                                                   'driver_id'=>$driver_data['driver_id'],
+                                                   'request_time'=>date('Y-m-d H:i:s'),'status'=>'0'));
+
         $type = ($ride['request_type'] == 3)?'2':'1';
         $fcm_data = array('title'=>'Ride Request','message'=>'Emergency Ride Request',
                           'request_id'=>$ride['transport_id']);

application/controllers/Webservices_driver.php

@@ -2035,6 +2035,30 @@
 
        }
 
+      public function update_ride_start() {
+        header('Content-type: application/json');
+
+        if(isset(apache_request_headers()['Auth'])){
+          $auth = apache_request_headers()['Auth'];
+          $postdata = file_get_contents("php://input");
+          $request = json_decode($postdata, true);
+
+          if(!empty($auth) && isset($request['trip_id']) && !empty($request['trip_id'])) {
+            $request['auth'] = $auth;
+            $status = $this->Webservices_driver_model->update_ride_start($request);
+            if ($status) {
+              $resp = array('status'=>'success');
+            } else {
+              $resp = array('status'=>'error','code'=>'208','message'=>'Something Went wrong');
+            }
+          } else {
+            $resp = array('status'=>'error','code'=>'209','message'=>'Required Fields are missing');
+          }
+        } else {
+          $resp = array('status'=>'error','code'=>'210','message'=>'Auth Tokon Missing');
+        }
+        print_r(json_encode($resp));exit;
+      }
         
         public function arrived_on_hospital() {
 
@@ -2172,8 +2196,6 @@
 
        }
 
-    
-
        function get_cal() {
 
                 $num = 5;
@@ -2190,19 +2212,6 @@
                 print_r($sum);exit();
 
                 return $sum;
-
        }
-       
-       
-       
+ }
+ ?>
\ No newline at end of file
-       
-       
-       
-
-       
-       
-       
-       
-       
-
- }
\ No newline at end of file

application/models/Webservice_model.php

@@ -472,7 +472,7 @@ class Webservice_model extends CI_Model {
       if(empty($data) || !isset($data['phone']) || empty($data['phone'])){
          return 0;
       } 
-      $sql = "SELECT * FROM customers WHERE phone LIKE '%".$data['phone']."' AND status IN (0,1)";
+      $sql = "SELECT * FROM customers WHERE phone LIKE '%".$data['phone']."' AND status IN ('0','1')";
       $isAvailable = $this->db->query($sql);
       $isAvailable = $isAvailable->num_rows();
 
@@ -489,10 +489,10 @@ class Webservice_model extends CI_Model {
       $sql = "SELECT TD.transport_id,TD.appointment_time,TD.pickup_lat,TD.pickup_lng,TD.drop_lat, 
                      TD.drop_lng,TD.vehicle_type,TD.status,TD.is_scheduled,TD.request_type
               FROM transport_details AS TD
-              LEFT JOIN driver_request AS DR ON (TD.transport_id=DR.trip_id AND DR.status IN (2,3))
               WHERE ((TD.request_type='3' AND TD.is_scheduled='1') OR (TD.request_type='1')) AND 
-                    TD.status IN ('1','3','7') 
-              ORDER BY TD.transport_id DESC";
+                    TD.status IN ('1','3','7') AND 
+                    TD.transport_id NOT IN (SELECT trip_id FROM driver_request WHERE status IN ('0','1'))
+              GROUP BY TD.transport_id ORDER BY TD.transport_id DESC";
       $ride_data = $this->db->query($sql);
       if(empty($ride_data)){
          return 0;
@@ -511,7 +511,10 @@ class Webservice_model extends CI_Model {
                        cos(($lat*pi()/180))*cos((lat_driver*pi()/180))*
                        cos((($lng-lng_driver)*pi()/180))))*180/pi())*60*1.1515) as distance 
                    FROM drivers AS d 
-                   WHERE d.status='1' AND d.online_start_time<'$cTime' AND d.online_end_time>'$cTime'
+                   WHERE d.online_start_time<'$cTime' AND d.online_end_time>'$cTime' AND 
+                         d.driver_id NOT IN (SELECT driver_id FROM driver_request 
+                                             WHERE trip_id='$ride_id' AND status IN ('2','3')) AND
+                         d.status='1' 
                    -- HAVING distance<15
                    ORDER BY distance DESC");
 

application/models/Webservices_driver_model.php

@@ -402,6 +402,8 @@ class Webservices_driver_model extends CI_Model {
 
             $id = $request['request_id'];
 
+            $status = (isset($request['trip_accept']) && !empty($request['trip_accept']))?'4':'5';
+
             $requestDetails = "SELECT * FROM transport_details WHERE transport_id = '$id' ";
                     
             $rquDetails = $this->db->query($requestDetails)->row();
@@ -428,7 +430,7 @@ class Webservices_driver_model extends CI_Model {
 
                   $driverDetails = $this->db->query("SELECT vehicle_id FROM `drivers` WHERE driver_id = '$rs->driver_id'")->row();
                   
-                  $data2 = array('vehicle_type' => $driverDetails->vehicle_id, 'driver_id' => $data['driver_id'], 'trip_no' => $book_id, 'book_date' => time(), 'start_time' => time(), 'status' => '4');
+                  $data2 = array('vehicle_type' => $driverDetails->vehicle_id, 'driver_id' => $data['driver_id'], 'trip_no' => $book_id, 'book_date' => time(), 'start_time' => time(), 'status' => $status);
 
                   $this->db->where('transport_id', $request['request_id'])->update('transport_details', $data2);
 
@@ -2423,25 +2425,28 @@ function booster_seat($request) {
                   $currency = $rs->currency;
 
                   $rs = $this->db->query("SELECT t.transport_id AS trip_id,(CASE t.status WHEN 9 THEN 'cancelled' WHEN 3 THEN 'booking' WHEN 5 THEN 'inprocess' WHEN 6 THEN 'completed' ELSE 'Invalid' END) AS trip_status,t.trip_distance AS distance, CONCAT(t.trip_cost,' ','$currency') AS fare, t.pickup_location AS source_location, t.pickup_lat AS source_latitude, t.pickup_lng AS source_longitude, t.drop_location AS destination_location, t.drop_lat AS destination_latitude, t.drop_lng AS destination_longitude, c.profile_image AS customer_photo, CONCAT(c.first_name,' ',c.last_name) AS customer_name FROM `transport_details` AS t LEFT JOIN customers AS c ON t.customer_id = c.customer_id WHERE t.transport_id =".$trip_id)->row();
-
                         if ($rs) {
-
                               return $rs;
-
                         } else {
-
                               return false;
-
                         }
-
             }else{
-
                   return false;
             }
       }
 
+      public function update_ride_start($data = array()) {
+            $status = 0;
+            if(!empty($data) && isset($data['auth']) && !empty($data['auth']) && 
+               isset($data['trip_id']) && !empty($data['trip_id'])){
 
-                       
-}
-
-?>
+                  $drvAuth = $this->db->where('unique_id', $data['auth'])->get('driver_auth_table');
+                  if(!empty($drvAuth) && $drvAuth->num_rows()>0 && 
+                     $drvData=$drvAuth->row() && !empty($driver_id=$drvData->driver_id)){
+                        $status = $this->db->update('transport_details',array('status'=>4),
\ No newline at end of file
+                                                    array('transport_id'=>$data['trip_id']));
+                  }
+            }
+            return $status;
+      }             
+}?>
\ No newline at end of file