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

application/controllers/FlightServices.php

@@ -108,7 +108,7 @@ class FlightServices extends CI_Controller {
   public function flight_book(){
     $data = (array)json_decode(file_get_contents('php://input'));
     $data['auth_token'] = $this->auth_token;
-    $res = $thia->FlightServices_model->flight_book($data);
+    $res = $this->FlightServices_model->flight_book($data);
     if($res['status'] == 1){
       $this->response($res['data']);
     }else{

application/models/FlightServices_model.php

@@ -116,12 +116,16 @@ class FlightServices_model extends CI_Model {
     			$data['issue_country'] = str_replace(" ","<br>",$data['issue_country']);
     			$data['passport_expiry'] = str_replace(" ","<br>",$data['passport_expiry']);
     			$data['passport_no'] = str_replace(" ","<br>",$data['passport_no']);
+                $childMealplan = (isset($data['childMealplan']) && !empty($data['childMealplan']))?$data['childMealplan']:'';
+                $infantMealplan = (isset($data['infantMealplan']) && !empty($data['infantMealplan']))?$data['infantMealplan']:'';
+                $adultmealplan = (isset($data['adultmealplan']) && !empty($data['adultmealplan']))?$data['adultmealplan']:'';
+                $postCode = (isset($data['PostCode']) && !empty($data['PostCode']))?$data['PostCode']:'';
 
-    			$url = "https://trawex.biz/api/flight_trawex/book?user_id=".$settings['trawex_user_id']."&user_password=".$settings['trawex_user_password']."&access=".$settings['trawex_access']."&ip_address=".$settings['trawex_ip_address']."&target=".$data['target']."&session_id=".$data['session_id']."&area_code=".$data['area_code']."&country_code=".$data['country_code']."&first_name=".$data['first_name']."&last_name=".$data['last_name']."&title=".$data['title']."&email_id=".$data['email_id']."&mobile_no=".$data['mobile_no']."&dob=".$data['dob']."&gender=".$data['gender']."&issue_country=".$data['issue_country']."&passport_expiry=".$data['passport_expiry']."&passport_no=".$data['passport_no']."&type=".$data['type']."&IsPassportMandatory=".$data['IsPassportMandatory']."&adult_flight=".$data['adult_flight']."&child_flight=".$data['child_flight']."&infant_flight=".$data['infant_flight']."&frequentFlyrNum=".$data['frequentFlyrNum']."&adultmealplan=".$data['adultmealplan']."&child_dob=".$data['child_dob']."&child_gender=".$data['child_gender']."&child_title=".$data['child_title']."&child_first_name=".$data['child_first_name']."&child_last_name=".$data['child_last_name']."&child_passport_expiry_date=".$data['child_passport_expiry_date']."&child_passport_no=".$data['child_passport_no']."&child_frequentFlyrNum=".$data['child_frequentFlyrNum']."&childMealplan=".$data['childMealplan']."&infant_dob=".$data['infant_dob']."&infant_gender=".$data['infant_gender']."&infant_first_name=".$data['infant_first_name']."&infant_last_name=".$data['infant_last_name']."&infant_title=".$data['infant_title']."&infantMealplan=".$data['infantMealplan']."&FareSourceCode=".$data['FareSourceCode']."&PostCode=".$data['PostCode']."";
+    			$url = "https://trawex.biz/api/flight_trawex/book?user_id=".$settings['trawex_user_id']."&user_password=".$settings['trawex_user_password']."&access=".$settings['trawex_access']."&ip_address=".$settings['trawex_ip_address']."&target=".$data['target']."&session_id=".$data['session_id']."&area_code=".$data['area_code']."&country_code=".$data['country_code']."&first_name=".$data['first_name']."&last_name=".$data['last_name']."&title=".$data['title']."&email_id=".$data['email_id']."&mobile_no=".$data['mobile_no']."&dob=".$data['dob']."&gender=".$data['gender']."&issue_country=".$data['issue_country']."&passport_expiry=".$data['passport_expiry']."&passport_no=".$data['passport_no']."&type=".$data['type']."&IsPassportMandatory=".$data['IsPassportMandatory']."&adult_flight=".$data['adult_flight']."&child_flight=".$data['child_flight']."&infant_flight=".$data['infant_flight']."&frequentFlyrNum=".$data['frequentFlyrNum']."&adultmealplan=".$adultmealplan."&child_dob=".$data['child_dob']."&child_gender=".$data['child_gender']."&child_title=".$data['child_title']."&child_first_name=".$data['child_first_name']."&child_last_name=".$data['child_last_name']."&child_passport_expiry_date=".$data['child_passport_expiry_date']."&child_passport_no=".$data['child_passport_no']."&child_frequentFlyrNum=".$data['child_frequentFlyrNum']."&childMealplan=".$childMealplan."&infant_dob=".$data['infant_dob']."&infant_gender=".$data['infant_gender']."&infant_first_name=".$data['infant_first_name']."&infant_last_name=".$data['infant_last_name']."&infant_title=".$data['infant_title']."&infantMealplan=".$infantMealplan."&FareSourceCode=".$data['FareSourceCode']."&PostCode=".$postCode."";
     			$result = $this->passToJsonCurl($url,'');
     			if(!empty($result)){
     				$result = json_decode($result);
-    				$res = array('status'=>1,'result'=>$result);
+    				$res = array('status'=>1,'data'=>$result);
     			}else{
     				$res = array('status'=>0,'message'=>'No Data Found','code'=>'ER08');
     			}
@@ -197,7 +201,7 @@ class FlightServices_model extends CI_Model {
     	try{
 			$cond = '';
 			if(isset($data['query']) && !empty($data['query'])){
-				$cond = "WHERE airport_code LIKE '%".$data['query']."%' OR airport_name LIKE '%".$data['query']."%'";
+				$cond = "WHERE airport_code LIKE '%".$data['query']."%' OR airport_name LIKE '%".$data['query']."%' OR city LIKE '%".$data['query']."%'";
 			}
 			$sql = "SELECT id FROM airport_details $cond";
 			$count = $this->db->query($sql)->num_rows();

application/models/Webservice_model.php

@@ -1971,7 +1971,7 @@ class Webservice_model extends CI_Model {
 		if($data['add_as_friend'] == 1){
 			$toCustData = $this->db->get_where('customer',array('customer_id'=>$fromUser))->row_array();
 		    $frmCustData = $this->db->get_where('customer',array('customer_id'=>$user_id))->row_array();
-		    $fcmData  = array('id'=>$user_id,'param'=>'user_id',
+		    $fcmData  = array('id'=>$user_id,'param'=>'friend_id',
 							  'title'=>'Accepted Chat Request',
 							  'message'=>$frmCustData['name'].' has Accepted Your Chat Request');
 			push_sent_cancel(1,$toCustData['fcm_token'],$fcmData);
@@ -1995,7 +1995,7 @@ class Webservice_model extends CI_Model {
 
 			    $toCustData = $this->db->get_where('customer',array('customer_id'=>$toUser))->row_array();
 			    $frmCustData = $this->db->get_where('customer',array('customer_id'=>$user_id))->row_array();
-			    $fcmData  = array('id'=>$toUser,'param'=>'user_id',
+			    $fcmData  = array('id'=>$toUser,'param'=>'friend_id',
 								  'title'=>'New Chat Request',
 								  'message'=>'You got a New Chat Request from '.$toCustData['name']);
 				push_sent_cancel(1,$frmCustData['fcm_token'],$fcmData);