Merge branch 'master' into 'production'

application/controllers/Webservices.php

@@ -511,6 +511,18 @@ class Webservices extends CI_Controller {
     }
   }
 
+  public function reminderCrone(){
+    $ride_data = $this->Webservice_model->getReminderRide();
+    if(empty($ride_data)){
+      return;
+    }
+    foreach ($ride_data AS $ride) {
+      $fcm_data = array('title'=>'Reminder','message'=>'Reminder Ride Request',
+                        'request_id'=>$ride['transport_id']);
+      push_sent_cancel($type,$ride['fcm_token'],$fcm_data);
+    }
+  }  
+
   public function driverAssignCrone(){
     $ride_data = $this->Webservice_model->driverAssignCrone();
     if(empty($ride_data)){

application/models/Ride_model.php

@@ -181,14 +181,16 @@ class Ride_model extends CI_Model {
 		  		$drivers = array_diff($drivers,$prvDrivers);
 		  	}
 		  	if(!empty($drivers)){
-		 		$sql = "SELECT DRV.driver_id,
-		 					   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)*POWER(SIN((".$locData['plng']."-DRV.active_loc_lng)*
+		  		$drv_ids = implode(",",$drivers);
+		 		$sql = "SELECT DRV.driver_id,DRV.fcm_token,	
+		 					   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)*POWER(SIN(($locData['plng']-DRV.active_loc_lng)*
 		 					   pi()/180/2),2))) AS distance
 		 				FROM drivers AS DRV 
-						WHERE DRV.status = 1 AND DRV.driver_id IN (".implode(",",$drivers).") AND 
-	 					  	  DRV.online_start_time<'$arrTime' AND DRV.online_end_time>'$appTime' 
+						WHERE DRV.status = 1 AND DRV.driver_id IN ($drv_ids) AND 
+	 					  	  DRV.online_start_time<'$arrTime' AND DRV.online_end_time>'$appTime' AND 
+	 					  	  DRV.fcm_token IS NOT NULL AND DRV.fcm_token != ''
 						ORDER BY distance 
 						LIMIT 0,1";
 
@@ -204,6 +206,9 @@ class Ride_model extends CI_Model {
 			    	$this->db->insert('driver_request',
 			    			  array('trip_id'=>$ride_id,'driver_id'=>$driver_id,
 			    			  	    'request_time'=>date('Y-m-d H:i:s'),'status'=>'0'));
+			    	$fcm_data = array('title'=>'Scheduled Ride','message'=>'Schedule Ride Request',
+			    				      'request_id'=>$ride_id);
+        			push_sent_cancel(1,$nearByDriver['fcm_token'],$fcm_data);
 			    	return $status;
 			    }
 		  	}

application/models/Webservice_model.php

@@ -500,6 +500,25 @@ class Webservice_model extends CI_Model {
       return $ride_data->result_array();
    }
 
+   public function getReminderRide(){
+      $sdate = date('Y-m-d H:i:s',strtotime('+59 minutes',strtotime(date('Y-m-d H:i:s'))));
+      $edate = date('Y-m-d H:i:s',strtotime('+60 minutes',strtotime(date('Y-m-d H:i:s'))));
+      $sql = "SELECT TD.transport_id,DR.driver_id,DRV.fcm_token
+              FROM transport_details AS TD
+              INNER JOIN driver_request DR ON (DR.trip_id=TD.transport_id)
+              INNER JOIN drivers DRV ON (DRV.driver_id=DR.driver_id)
+              WHERE TD.status='5' AND DR.status='1' AND 
+                    TD.is_scheduled='1' AND TD.request_type='3' AND 
+                    TD.appointment_time>'$sdate' AND TD.appointment_time<'$edate' AND 
+                    DRV.fcm_token IS NOT NULL AND DRV.fcm_token!=''
+              GROUP BY TD.transport_id ORDER BY TD.transport_id DESC";
+      $ride_data = $this->db->query($sql);
+      if(empty($ride_data)){
+         return 0;
+      }
+      return $ride_data->result_array();
+   }
+
    public function getAvailableDrivers($lat='',$lng='',$ride_id=''){
       if(empty($lat) || empty($lng) || empty($ride_id)){
          return;
@@ -531,7 +550,7 @@ class Webservice_model extends CI_Model {
             $sql = "SELECT TD.driver_id
                     FROM transport_details AS TD
                     WHERE TD.status NOT IN ('4','5') AND TD.driver_id='$driver_id' AND 
-                          TD.appointment_time>$startTime AND TD.appointment_time<$finishTime";
+                          TD.appointment_time>'$startTime' AND TD.appointment_time<'$finishTime'";
             $is_avail = $this->db->query($sql)->num_rows();
 
             if($is_avail <= 0){