Skip to content

T
TimeOutAdmin
Commit 9c93f95f by Tobin
Options

Merge branch 'master' into 'dev_production'

dc See merge request !237
parents 8bd8986e 2bb57c97
Showing with 34 additions and 13 deletions
application/models/HotelServices_model.php
...@@ -77,7 +77,6 @@ class HotelServices_model extends CI_Model { ...@@ -77,7 +77,6 @@ class HotelServices_model extends CI_Model {
$this->db->select('nationality'); $this->db->select('nationality');
$userData = $this->db->get_where('customer',array('customer_id'=>$user_id))->row_array(); $userData = $this->db->get_where('customer',array('customer_id'=>$user_id))->row_array();
$countryData = $this->getCountryData($user_id); $countryData = $this->getCountryData($user_id);
$currency = (isset($data['currency']) && !empty($data['currency']))?$data['currency']:$countryData['currency'];
} }
$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"; $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";
if(!isset($data['nextToken']) && empty($data['nextToken'])){ if(!isset($data['nextToken']) && empty($data['nextToken'])){
...@@ -91,7 +90,7 @@ class HotelServices_model extends CI_Model { ...@@ -91,7 +90,7 @@ class HotelServices_model extends CI_Model {
'child'=>$data['child'],'child_age'=>$data['child_age'], 'child'=>$data['child'],'child_age'=>$data['child_age'],
'checkin'=>$data['checkin'],'checkout'=>$data['checkout'], 'checkin'=>$data['checkin'],'checkout'=>$data['checkout'],
'client_nationality'=>$userData['nationality'], 'client_nationality'=>$userData['nationality'],
'requiredCurrency'=>$currency); 'requiredCurrency'=>'SAR');
} }
$postFields = (isset($data['nextToken']) && !empty($data['nextToken']))?'':$postData; $postFields = (isset($data['nextToken']) && !empty($data['nextToken']))?'':$postData;
...@@ -99,7 +98,9 @@ class HotelServices_model extends CI_Model { ...@@ -99,7 +98,9 @@ class HotelServices_model extends CI_Model {
if(!empty($result)){ if(!empty($result)){
$result = json_decode($result); $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)); $data = array("itineraries"=>$result,"currency_symbol"=>$countryData['currency_symbol'],
"conversion_rate"=>$countryData['conversion_rate']);
$res = array('status'=>1,'data'=>$data);
}else{ }else{
$res = array('status'=>0,'message'=>'No Data Found','code'=>'ER07'); $res = array('status'=>0,'message'=>'No Data Found','code'=>'ER07');
} }
...@@ -120,8 +121,12 @@ class HotelServices_model extends CI_Model { ...@@ -120,8 +121,12 @@ class HotelServices_model extends CI_Model {
$url = "https://trawex.biz/api/hotel_trawexv5/get_specific_hotel_content?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']."&trackingId=".$data['trackingId']."&productId=".$data['productId']."&hotelId=".$data['hotelId'].""; $url = "https://trawex.biz/api/hotel_trawexv5/get_specific_hotel_content?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']."&trackingId=".$data['trackingId']."&productId=".$data['productId']."&hotelId=".$data['hotelId']."";
$result = $this->passToJsonCurl($url,''); $result = $this->passToJsonCurl($url,'');
if(!empty($result)){ if(!empty($result)){
$result = json_decode($result); $result = json_decode($result,true);
$result->trackingId = $data['trackingId']; $countryData = $this->getCountryData($user_id);
$result['trackingId'] = $data['trackingId'];
$result['conversion_rate'] = $countryData['conversion_rate'];
$result['currency_symbol'] = $countryData['currency_symbol'];
$res = array('status'=>1,'data'=>$result); $res = array('status'=>1,'data'=>$result);
}else{ }else{
$res = array('status'=>0,'message'=>'No Data Found','code'=>'ER06'); $res = array('status'=>0,'message'=>'No Data Found','code'=>'ER06');
...@@ -144,8 +149,12 @@ class HotelServices_model extends CI_Model { ...@@ -144,8 +149,12 @@ class HotelServices_model extends CI_Model {
$postData = array("user_id"=>$settings['trawex_user_id'],"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']); $postData = array("user_id"=>$settings['trawex_user_id'],"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']);
$result = $this->passToJsonCurl($url,$postData); $result = $this->passToJsonCurl($url,$postData);
if(!empty($result)){ if(!empty($result)){
$result = json_decode($result); $result = json_decode($result,true);
$result->trackingId = $data['trackingId']; $countryData = $this->getCountryData($user_id);
$result['trackingId'] = $data['trackingId'];
$result['conversion_rate'] = $countryData['conversion_rate'];
$result['currency_symbol'] = $countryData['currency_symbol'];
$res = array('status'=>1,'data'=>$result); $res = array('status'=>1,'data'=>$result);
}else{ }else{
$res = array('status'=>0,'message'=>'No data Found','code'=>'ER06'); $res = array('status'=>0,'message'=>'No data Found','code'=>'ER06');
...@@ -183,8 +192,12 @@ class HotelServices_model extends CI_Model { ...@@ -183,8 +192,12 @@ class HotelServices_model extends CI_Model {
"roomType_runno"=>$data['roomType_runno']); "roomType_runno"=>$data['roomType_runno']);
$result = $this->passToJsonCurl($url,$postData); $result = $this->passToJsonCurl($url,$postData);
if(!empty($result)){ if(!empty($result)){
$result = json_decode($result); $result = json_decode($result,true);
$result->trackingId = $data['trackingId']; $countryData = $this->getCountryData($user_id);
$result['trackingId'] = $data['trackingId'];
$result['conversion_rate'] = $countryData['conversion_rate'];
$result['currency_symbol'] = $countryData['currency_symbol'];
$res = array('status'=>1,'data'=>$result); $res = array('status'=>1,'data'=>$result);
}else{ }else{
$res = array('status'=>0,'message'=>'No data Found','code'=>'ER06'); $res = array('status'=>0,'message'=>'No data Found','code'=>'ER06');
...@@ -220,8 +233,12 @@ class HotelServices_model extends CI_Model { ...@@ -220,8 +233,12 @@ class HotelServices_model extends CI_Model {
); );
$result = $this->passToJsonCurl($url,$postData); $result = $this->passToJsonCurl($url,$postData);
if(!empty($result)){ if(!empty($result)){
$result = json_decode($result); $result = json_decode($result,true);
$result->trackingId = $data['trackingId']; $countryData = $this->getCountryData($user_id);
$result['trackingId'] = $data['trackingId'];
$result['conversion_rate'] = $countryData['conversion_rate'];
$result['currency_symbol'] = $countryData['currency_symbol'];
$res = array('status'=>1,'data'=>$result); $res = array('status'=>1,'data'=>$result);
}else{ }else{
$res = array('status'=>0,'message'=>'No data Found','code'=>'ER06'); $res = array('status'=>0,'message'=>'No data Found','code'=>'ER06');
...@@ -252,8 +269,12 @@ class HotelServices_model extends CI_Model { ...@@ -252,8 +269,12 @@ class HotelServices_model extends CI_Model {
); );
$result = $this->passToJsonCurl($url,$postData); $result = $this->passToJsonCurl($url,$postData);
if(!empty($result)){ if(!empty($result)){
$result = json_decode($result); $result = json_decode($result,true);
$result->trackingId = $data['trackingId']; $countryData = $this->getCountryData($user_id);
$result['trackingId'] = $data['trackingId'];
$result['conversion_rate'] = $countryData['conversion_rate'];
$result['currency_symbol'] = $countryData['currency_symbol'];
$res = array('status'=>1,'data'=>$result); $res = array('status'=>1,'data'=>$result);
}else{ }else{
$res = array('status'=>0,'message'=>'No data Found','code'=>'ER06'); $res = array('status'=>0,'message'=>'No data Found','code'=>'ER06');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment