Skip to content

T
TimeOutAdmin
Commit 0cc21b8b by Tobin
Options

Merge branch 'jansa' into 'master'

Jansa See merge request !168
parents b9ec6b93 c24d3a0b
Showing with 8 additions and 5 deletions
application/models/Organizer_model.php
...@@ -70,13 +70,13 @@ class Organizer_model extends CI_Model { ...@@ -70,13 +70,13 @@ class Organizer_model extends CI_Model {
$event_layout = $faretype =''; $event_layout = $faretype ='';
if($result->layout!=''){ if($result->layout!=''){
if($result->custom_seat_layout!=''){ if($result->custom_seat_layout!=''){
$pricelist = json_decode($result->custom_seat_layout, TRUE); //$pricelist = json_decode($result->custom_seat_layout, TRUE);
$price = min(array_column($pricelist, 'price')); //$price = min(array_column($pricelist, 'price'));
$event_layout = $result->custom_seat_layout; $event_layout = $result->custom_seat_layout;
$faretype = 2; $faretype = 2;
} else { } else {
$pricelist = json_decode($result->layout_details, TRUE); //$pricelist = json_decode($result->layout_details, TRUE);
$price = min(array_column($pricelist, 'price')); //$price = min(array_column($pricelist, 'price'));
$event_layout = $result->layout_details; $event_layout = $result->layout_details;
$faretype = 1; $faretype = 1;
} }
......
application/models/Webservice_model.php
...@@ -2100,8 +2100,9 @@ class Webservice_model extends CI_Model { ...@@ -2100,8 +2100,9 @@ class Webservice_model extends CI_Model {
$countryData = $this->getCountryData($user_id); $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"; $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'])){
$postData = array('user_id'=>$settings['trawex_user_id'], $postData = array('user_id'=>$settings['trawex_user_id'],
'user_password'=>$settings['trawex_user_password'], 'user_password'=>$settings['trawex_user_password'],
'access'=>$settings['trawex_access'], 'access'=>$settings['trawex_access'],
'ip_address'=>$settings['trawex_ip_address'], 'ip_address'=>$settings['trawex_ip_address'],
...@@ -2112,6 +2113,8 @@ class Webservice_model extends CI_Model { ...@@ -2112,6 +2113,8 @@ class Webservice_model extends CI_Model {
'checkin'=>$data['checkin'],'checkout'=>$data['checkout'], 'checkin'=>$data['checkin'],'checkout'=>$data['checkout'],
'client_nationality'=>$userData['nationality'], 'client_nationality'=>$userData['nationality'],
'requiredCurrency'=>$countryData['currency']); 'requiredCurrency'=>$countryData['currency']);
}
$postFields = (isset($data['nextToken']) && !empty($data['nextToken']))?'':json_encode($postData); $postFields = (isset($data['nextToken']) && !empty($data['nextToken']))?'':json_encode($postData);
$ch = curl_init(); $ch = curl_init();
......
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