J : flight booking in web

application/controllers/Api.php

@@ -330,7 +330,8 @@ class Api extends CI_Controller {
       case 'WALLET': 
         return $this->Api_model->updateWalletTxn($txnData);
       case 'HOTEL_BOOK': 
-        if(isset($txnData['bookData']) && !empty($txnData['bookData'])){
+        if((isset($txnData['tnx_id']) && !empty($txnData['tnx_id'])) || 
+           (isset($txnData['bookData']) && !empty($txnData['bookData']))){
           return $this->Api_model->hotelBooking($txnData);
         }
     }

application/models/Api_model.php

@@ -1834,14 +1834,14 @@ class Api_model extends CI_Model {
 						"user_password"=>$settings['trawex_user_password'],
 						"access"=>$settings['trawex_access'],
 						"ip_address"=>$settings['trawex_ip_address'],
-						"TraceId"=>$data['TraceId'],"propertyid"=>$data['propertyid'],
-						"trackingId"=>$data['trackingId'],"sessionId"=>$data['sessionId'],
-						"productId"=>$data['productId'],"TokenId"=>$data['TokenId'],
-						"resultindex"=>$data['resultindex'],"hotelcode"=>$data['hotelcode'],
-						"changedOccupancy"=>$data['changedOccupancy'],
-						"extrabeds"=>$data['extrabeds'],
-						"guests_details"=>$data['guests_details'],"refcode"=>$data['refcode'],
-						"prebookingtoken"=>$data['prebookingtoken']
+						"TraceId"=>$data->TraceId,"propertyid"=>$data->propertyid,
+						"trackingId"=>$data->trackingId,"sessionId"=>$data->sessionId,
+						"productId"=>$data->productId,"TokenId"=>$data->TokenId,
+						"resultindex"=>$data->resultindex,"hotelcode"=>$data->hotelcode,
+						"changedOccupancy"=>$data->changedOccupancy,
+						"extrabeds"=>$data->extrabeds,
+						"guests_details"=>$data->guests_details,"refcode"=>$data->refcode,
+						"prebookingtoken"=>$data->prebookingtoken
 					);
 		$result = passToJsonCurl($url,$postData);
 	    if(!empty($result)){

application/models/FlightServices_model.php

@@ -195,31 +195,26 @@ class FlightServices_model extends CI_Model {
 
     public function airportSearch($data){
     	try{
-    		$user_id = $this->auth_token_get($data['auth_token']);
-    		if($user_id > 0){
-    			$cond = '';
-    			if(isset($data['query']) && !empty($data['query'])){
-    				$cond = "WHERE airport_code LIKE '%".$data['query']."%' OR airport_name LIKE '%".$data['query']."%'";
-    			}
-    			$sql = "SELECT id FROM airport_details $cond";
-    			$count = $this->db->query($sql)->num_rows();
-    			if($count > 0){
-	    			$perPage = 10;
-					$page = (isset($data['page']))?$data['page']:1;
-					$limit = ($page - 1) * $perPage;
-					$meta = array('total_pages'=>ceil($count/$perPage),'total'=>$count,
-							  'current_page'=>$page,'per_page'=>$perPage);
-	    			$sql = "SELECT * FROM airport_details $cond LIMIT $limit,$perPage";
-	    			$airPortList = $this->db->query($sql);
-	    			if(!isset($airPortList) || empty($airPortList = $airPortList->result_array())){
-	    				$res = array('status'=>0,'message'=>'No data Found','code'=>'ER04');
-	    				return $res;
-	    			}
-	    			$res =array('status'=>1,'data'=>array('airportlist'=>$airPortList,'meta'=>$meta));
+			$cond = '';
+			if(isset($data['query']) && !empty($data['query'])){
+				$cond = "WHERE airport_code LIKE '%".$data['query']."%' OR airport_name LIKE '%".$data['query']."%'";
+			}
+			$sql = "SELECT id FROM airport_details $cond";
+			$count = $this->db->query($sql)->num_rows();
+			if($count > 0){
+    			$perPage = 10;
+				$page = (isset($data['page']))?$data['page']:1;
+				$limit = ($page - 1) * $perPage;
+				$meta = array('total_pages'=>ceil($count/$perPage),'total'=>$count,
+						  'current_page'=>$page,'per_page'=>$perPage);
+    			$sql = "SELECT * FROM airport_details $cond LIMIT $limit,$perPage";
+    			$airPortList = $this->db->query($sql);
+    			if(!isset($airPortList) || empty($airPortList = $airPortList->result_array())){
+    				$res = array('status'=>0,'message'=>'No data Found','code'=>'ER04');
+    				return $res;
     			}
-    		}else{
-    			$res = array('status'=>0,'message'=>'User Authentication Error','code'=>'ER06');
-    		}
+    			$res =array('status'=>1,'data'=>array('airportlist'=>$airPortList,'meta'=>$meta));
+			}
     	}catch(Exception $e){
     		$res = array('status'=>0,'message'=>'Ohh No!! Something Went South','code'=>'ER10');
     	}