Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into tobin

application/models/Organizer_model.php

@@ -9,7 +9,13 @@ class Organizer_model extends CI_Model {
   	public function getOrganizerEventList($data){
   		try {
  			$organizer_id = $data['organiser_id'];
-			$count = $this->db->query("SELECT * FROM events AS EVT WHERE EVT.provider_id = '$organizer_id' AND EVT.status IN ('0','1','3')")->num_rows();
+			$count = $this->db->query("SELECT EVT.event_id FROM events AS EVT
+				INNER JOIN translator_event AS TSEVT ON (EVT.event_id = TSEVT.event_id) 
+ 				INNER JOIN translator_venue AS TSVNE ON (EVT.venue_id = TSVNE.venue_id) 
+ 				INNER JOIN translator_category AS TSCAT ON (EVT.category_id = TSCAT.category_id)
+ 				INNER JOIN venue AS VNE ON (EVT.venue_id = VNE.id) 
+				INNER JOIN translator_region AS TSREG ON (VNE.region_id = TSREG.region_id) 
+				WHERE EVT.provider_id = '$organizer_id'AND TSEVT.language_code='EN' AND TSVNE.language_code='EN' AND TSCAT.language_code='EN' AND TSREG.language_code='EN' AND EVT.status IN ('0','1','3')")->num_rows();
 			if($count > 0) {
 				$perPage = 10;
 				$page = (isset($data['page']))?$data['page']:1;
@@ -431,6 +437,7 @@ class Organizer_model extends CI_Model {
 	 			return $res;
 	 		}
 	 		
+ 			$data['contact_no'] = preg_replace('/\D/', '', $data['contact_no']);
 	 		$phoneChk = $this->db->query("SELECT * FROM provider AS PRV 
 	 									  INNER JOIN users AS USR ON (USR.id=PRV.provider_id)
 										  WHERE USR.user_type='2' AND USR.status!='2' AND 

application/models/Validation_app_model.php

@@ -884,7 +884,26 @@ class Validation_app_model extends CI_Model {
 					'message' => 'Session Id is null or empty'
 				)
 			),
-			
+		),
+		'flight_revalidate'=>array(
+			'auth_token' => array(
+				'required' => array(
+					'code' => 'ER02',
+					'message' => 'User Id is null or empty'
+				)
+			),
+			'fare_source_code' => array(
+				'required' => array(
+					'code' => 'ER02',
+					'message' => 'Fare Source Code is null or empty'
+				)
+			),
+			'session_id' => array(
+				'required' => array(
+					'code' => 'ER02',
+					'message' => 'Session Id is null or empty'
+				)
+			),
 		),
 		'create_guest_user' => array(),
 		'update_user_visibility' => array(

application/models/Webservice_model.php

@@ -2442,7 +2442,15 @@ class Webservice_model extends CI_Model {
     	try{
     		$user_id = $this->auth_token_get($data['auth_token']);
     		if($user_id > 0){
-
+    			$settings = getSettings();
+    			$url = "https://trawex.biz/api/flight_trawex/revalidate?user_id=".$settings['trawex_user_id']."&user_password=".$settings['trawex_user_password']."&access=".$settings['trawex_access']."&ip_address=".$settings['trawex_ip_address']."&fare_source_code=".$data['fare_source_code']."&session_id=".$data['session_id']."";
+    			$result = $this->passToJsonCurl($url,'');
+    			if(!empty($result)){
+    				$result = json_decode($result);
+    				$res = array('status'=>1,'data'=>$result);
+    			}else{
+    				$res = array('status'=>0,'message'=>'No Data Found','code'=>'ER08');
+    			}
     		}else{
     			$res = array('status'=>0,'message'=>'User Authentication Error','code'=>'ER06');
     		}