Merge branch 'jansa' into 'master'

application/models/Webservice_model.php

@@ -2095,13 +2095,24 @@ class Webservice_model extends CI_Model {
 	    		$trackingId = time().rand(100000,999999);
 	    		$settings = getSettings();
 	    		if(!isset($data['nextToken']) && empty($data['nextToken'])){
-	    			$this->db->select('nationality');
+	    			$this->db->select('nationality,	nationality_code');
 		    		$userData = $this->db->get_where('customer',array('customer_id'=>$user_id))->row_array();
 					$countryData = $this->getCountryData($user_id);
 	    		}
 				$url = (isset($data['nextToken']) && !empty($data['nextToken']))?"https://trawex.biz/api/hotel_trawexv5/getMoreHotels?user_id=".$settings['trawex_user_id']."&user_password=".$settings['trawex_user_password']."&access=".$settings['trawex_access']."&ip_address=".$settings['trawex_ip_address']."&sessionId=".$data['sessionId']."&nextToken=".$data['nextToken']."&trackingId=".$data['trackingId']."":"https://trawex.biz/api/hotel_trawexv5/hotel_search";
 
-			    $postFields = (isset($data['nextToken']) && !empty($data['nextToken']))?'':json_encode(array('user_id'=>$settings['trawex_user_id'],'user_password'=>$settings['trawex_user_password'],'access'=>$settings['trawex_access'],'ip_address'=>$settings['trawex_ip_address'],'trackingId'=>$trackingId,'city_name'=>$data['city_name'],'country_name'=>(!empty($userData['nationality']))?$userData['nationality']:'','room_count'=>$data['room_count'],'adult'=>$data['adult'],'child'=>$data['child'],'child_age'=>$data['child_age'],'checkin'=>$data['checkin'],'checkout'=>$data['checkout'],'client_nationality'=>$countryData['country_code'],'requiredCurrency'=>$countryData['currency']));
+				$postData = array('user_id'=>$settings['trawex_user_id'],
+								  'user_password'=>$settings['trawex_user_password'],
+								  'access'=>$settings['trawex_access'],
+								  'ip_address'=>$settings['trawex_ip_address'],
+								  'trackingId'=>$trackingId,'city_name'=>$data['city_name'],
+								  'country_name'=>$userData['nationality'],
+								  'room_count'=>$data['room_count'],'adult'=>$data['adult'],
+								  'child'=>$data['child'],'child_age'=>$data['child_age'],
+								  'checkin'=>$data['checkin'],'checkout'=>$data['checkout'],
+								  'client_nationality'=>$userData['nationality_code'],
+								  'requiredCurrency'=>$countryData['currency']);
+			    $postFields = (isset($data['nextToken']) && !empty($data['nextToken']))?'':json_encode($postData);
 
 			    $ch = curl_init();
 			    curl_setopt($ch,CURLOPT_URL,$url);
@@ -2114,7 +2125,7 @@ class Webservice_model extends CI_Model {
 			    $result = curl_exec($ch);
 			    curl_close($ch);
 			    $result = json_decode($result);
-			    	$result->status->trackingId = (!isset($data['nextToken']) && empty($data['nextToken']))?$trackingId:$data['trackingId'];
+			    $result->status->trackingId = (!isset($data['nextToken']) && empty($data['nextToken']))?$trackingId:$data['trackingId'];
 			    $res = array('status'=>1,'data'=>array('itineraries'=> $result));
 			}else{
 				$res = array('status'=>0,'message'=>'User Authentication Error','code'=>'ER10');