Skip to content

T
TimeOutAdmin
Commit edb5bd49 by Tobin
Options

Merge branch 'jansa' into 'master'

Jansa See merge request !164
parents be297508 26c18b03
Showing with 3 additions and 3 deletions
application/models/Webservice_model.php
...@@ -2095,7 +2095,7 @@ class Webservice_model extends CI_Model { ...@@ -2095,7 +2095,7 @@ class Webservice_model extends CI_Model {
$trackingId = time().rand(100000,999999); $trackingId = time().rand(100000,999999);
$settings = getSettings(); $settings = getSettings();
if(!isset($data['nextToken']) && empty($data['nextToken'])){ if(!isset($data['nextToken']) && empty($data['nextToken'])){
$this->db->select('nationality, nationality_code'); $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);
} }
...@@ -2106,11 +2106,11 @@ class Webservice_model extends CI_Model { ...@@ -2106,11 +2106,11 @@ class Webservice_model extends CI_Model {
'access'=>$settings['trawex_access'], 'access'=>$settings['trawex_access'],
'ip_address'=>$settings['trawex_ip_address'], 'ip_address'=>$settings['trawex_ip_address'],
'trackingId'=>$trackingId,'city_name'=>$data['city_name'], 'trackingId'=>$trackingId,'city_name'=>$data['city_name'],
'country_name'=>$userData['nationality'], 'country_name'=>$data['country_name'],
'room_count'=>$data['room_count'],'adult'=>$data['adult'], 'room_count'=>$data['room_count'],'adult'=>$data['adult'],
'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_code'], '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);
......
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