Merge branch 'master' into 'dev_production'

application/models/Api_model.php

@@ -667,9 +667,10 @@ class Api_model extends CI_Model {
 
 		 			if($status == 1){
 		 				$sql = "SELECT TEVT.event_name,CUST.name,CUST.email,CUST.phone,
-					            	   CONCAT(EDATE.date,' ',EDATE.time) AS show_time
+					            	   CONCAT(EDATE.date,' ',EDATE.time) AS show_time,PDR.fcm_token
 					            FROM booking AS BK 
 					            INNER JOIN events AS EVT ON (EVT.event_id=BK.event_id)
+					            INNER JOIN provider AS PDR ON (PDR.provider_id=EVT.provider_id)
 					            INNER JOIN customer AS CUST ON (CUST.customer_id=BK.customer_id)
 					            INNER JOIN event_date_time AS EDATE ON (EDATE.id=BK.event_date_id)
 					            INNER JOIN translator_event AS TEVT ON (TEVT.event_id=EVT.event_id)
@@ -700,6 +701,12 @@ class Api_model extends CI_Model {
 			    						    $template['booking_sms']);
 					    }
 					    $this->sendSMS($bkData['phone'],$msgContent);
+					    if($post_data['status'] == 6){
+					    	$userData = array('id'=>$post_data['event_id'],
+							  'title'=>'New Booking',
+							  'message'=>'New Booking is There For Approval');
+	  						$this->push_sent_cancel($bkData['fcm_token'],$userData);
+					    }
 					}
 		 		} else {
 		 			$res = array('status'=>0,'message'=>'Seat booking failed','code'=>'ER37');
@@ -717,6 +724,24 @@ class Api_model extends CI_Model {
  		return 'https://www.barcodefaq.com/wp-content/uploads/2018/08/gs1-qrcode-fnc1.png';
  	}
 
+ 	public function push_sent_cancel($fcm_token='', $fcm_data=array()) {
+		$settings = getSettings();
+		$key = $settings['app_id'];
+		if(empty($key) || empty($fcm_token) || empty($fcm_data)){
+			return;
+		}
+		$data = "{ \"notification\": { \"title\": \"".$fcm_data['title']."\", \"text\": \"".$fcm_data['message']."\", \"sound\": \"default\" }, \"time_to_live\": 60, \"data\" : {\"response\" : {\"status\" : \"success\", \"data\" : {\"event_id\" : \"".$fcm_data['id']."\", \"user_type\" : 2}}}, \"collapse_key\" : \"trip\", \"priority\":\"high\", \"to\" : \"".$fcm_token."\"}";
+		$ch = curl_init("https://fcm.googleapis.com/fcm/send");
+		$header = array('Content-Type: application/json', 'Authorization: key='.$key);
+		curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
+		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+		curl_setopt($ch, CURLOPT_POST, 1);
+		curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+		$out = curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+		curl_exec($ch);
+		curl_close($ch);
+  	}
+
  	function recommend($data) {
  		try {
  			$locCond = '';

application/models/Validation_organizer_model.php

@@ -395,7 +395,7 @@ class Validation_organizer_model extends CI_Model {
 			'checker_id' => array(
 				'required' => array(
 					'code' => 'ER04',
-					'message' => 'checker ID is null or empty'
+					'message' => 'Checker ID is null or empty'
 				)
 			)
 		),
@@ -406,12 +406,6 @@ class Validation_organizer_model extends CI_Model {
 					'message' => 'Booking Id is null or empty'
 				)
 			),
-			'organiser_id' => array(
-				'required' => array(
-					'code' => 'ER04',
-					'message' => 'Organizer Id is null or empty'
-				)
-			)
 		)
 	);
 	

application/models/Webservice_model.php

@@ -1156,9 +1156,10 @@ class Webservice_model extends CI_Model {
 						$bookId = $post_data['bookId'];
 						$lang = $countryData['language_code'];
 						$sql = "SELECT TEVT.event_name,CUST.name,CUST.email,CUST.phone,
-					            	   CONCAT(EDATE.date,' ',EDATE.time) AS show_time
+					            	   CONCAT(EDATE.date,' ',EDATE.time) AS show_time,PDR.fcm_token
 					            FROM booking AS BK 
 					            INNER JOIN events AS EVT ON (EVT.event_id=BK.event_id)
+					            INNER JOIN provider AS PDR ON (EVT.provider_id=PDR.provider_id)
 					            INNER JOIN translator_event AS TEVT ON (TEVT.event_id=EVT.event_id)
 					            INNER JOIN customer AS CUST ON (CUST.customer_id=BK.customer_id)
 					            INNER JOIN event_date_time AS EDATE ON (EDATE.id=BK.event_date_id)
@@ -1202,6 +1203,12 @@ class Webservice_model extends CI_Model {
 								$this->sendSMS($phone,$msg);
 							}
 						}
+						if($post_data['status'] == 6){
+							$userData = array('id'=>$post_data['event_id'],
+							  'title'=>'New Booking',
+							  'message'=>'New Booking is There For Approval');
+	  						$this->push_sent_cancel($bkData['fcm_token'],$userData);
+						}
 					}
 				} else {
 					$res = array('status'=>0,'message'=>'Seat booking failed','code'=>'ER37');
@@ -1219,6 +1226,24 @@ class Webservice_model extends CI_Model {
 		return 'https://www.barcodefaq.com/wp-content/uploads/2018/08/gs1-qrcode-fnc1.png';
 	}
 
+	public function push_sent_cancel($fcm_token='', $fcm_data=array()) {
+		$settings = getSettings();
+		$key = $settings['app_id'];
+		if(empty($key) || empty($fcm_token) || empty($fcm_data)){
+			return;
+		}
+		$data = "{ \"notification\": { \"title\": \"".$fcm_data['title']."\", \"text\": \"".$fcm_data['message']."\", \"sound\": \"default\" }, \"time_to_live\": 60, \"data\" : {\"response\" : {\"status\" : \"success\", \"data\" : {\"event_id\" : \"".$fcm_data['id']."\", \"user_type\" : 2}}}, \"collapse_key\" : \"trip\", \"priority\":\"high\", \"to\" : \"".$fcm_token."\"}";
+		$ch = curl_init("https://fcm.googleapis.com/fcm/send");
+		$header = array('Content-Type: application/json', 'Authorization: key='.$key);
+		curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
+		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+		curl_setopt($ch, CURLOPT_POST, 1);
+		curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+		$out = curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+		curl_exec($ch);
+		curl_close($ch);
+  	}
+
 	function cancel($data) {
 		try {
 			$user_id = $this->auth_token_get($data['auth_token']);