dc

application/controllers/Webservices.php

@@ -1458,9 +1458,9 @@
 				return;
 			}
 			
-			// $data = "{ \"notification\": { \"title\": \"".$fcm_data['title']."\", \"text\": \"".$fcm_data['message']."\", \"sound\": \"default\" }, \"time_to_live\": 60, \"data\" : {\"response\" : {\"status\" : \"success\", \"data\" : {\"booking_id\" : \"".$fcm_data['booking_id']."\", \"type\" : \"".$fcm_data['service_type']."\"}}}, \"collapse_key\" : \"trip\", \"priority\":\"high\", \"to\" : \"".$fcm_data['device_id']."\"}";
+			$data = "{ \"notification\": { \"title\": \"".$fcm_data['title']."\", \"text\": \"".$fcm_data['message']."\", \"sound\": \"default\" }, \"time_to_live\": 60, \"data\" : {\"response\" : {\"status\" : \"success\", \"data\" : {\"service_id\" : \"".$fcm_data['booking_id']."\", \"type\" : \"".$fcm_data['service_type']."\"}}}, \"collapse_key\" : \"trip\", \"priority\":\"high\", \"to\" : \"".$fcm_data['device_id']."\"}";
 
-			$data = "{\"data\":{\"params\":{\"service_id\":\"".$fcm_data['booking_id']."\"},\"type\":\"".$fcm_data['service_type']."\"},\"to\":\"".$fcm_data['device_id']."\"}";
+			// $data = "{\"data\":{\"params\":{\"service_id\":\"".$fcm_data['booking_id']."\"},\"type\":\"".$fcm_data['service_type']."\"},\"to\":\"".$fcm_data['device_id']."\"}";
 
 			$ch = curl_init("https://fcm.googleapis.com/fcm/send");
 			$header = array('Content-Type: application/json', 'Authorization: key='.$key);

application/models/Booking_model.php

@@ -113,6 +113,9 @@ class Booking_model extends CI_Model {
     $bookDetails = array();
     $bookData = $bookData->result();
     foreach($bookData AS $book) {
+      if(empty($book->scheduled_date) || empty($book->scheduled_time)){
+        continue;
+      }
       $bookMechData=$this->db->query("SELECT * FROM mechanic_booking 
                                       WHERE booking_id='$book->booking_id' AND status!='2'");
       if(!empty($bookMechData)){