Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
TimeOutAdmin
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
TimeOut
TimeOutAdmin
Commits
75942c7e
Commit
75942c7e
authored
5 years ago
by
Jansa Jose
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
changes in trawex api
parent
269e653b
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
Webservice_model.php
application/models/Webservice_model.php
+3
-3
No files found.
application/models/Webservice_model.php
View file @
75942c7e
...
...
@@ -2095,7 +2095,7 @@ class Webservice_model extends CI_Model {
$trackingId
=
time
()
.
rand
(
100000
,
999999
);
$settings
=
getSettings
();
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
();
$countryData
=
$this
->
getCountryData
(
$user_id
);
}
...
...
@@ -2106,11 +2106,11 @@ class Webservice_model extends CI_Model {
'access'
=>
$settings
[
'trawex_access'
],
'ip_address'
=>
$settings
[
'trawex_ip_address'
],
'trackingId'
=>
$trackingId
,
'city_name'
=>
$data
[
'city_name'
],
'country_name'
=>
$
userData
[
'nationality
'
],
'country_name'
=>
$
data
[
'country_name
'
],
'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
'
],
'client_nationality'
=>
$userData
[
'nationality'
],
'requiredCurrency'
=>
$countryData
[
'currency'
]);
$postFields
=
(
isset
(
$data
[
'nextToken'
])
&&
!
empty
(
$data
[
'nextToken'
]))
?
''
:
json_encode
(
$postData
);
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment