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
d24d374b
Commit
d24d374b
authored
Nov 08, 2019
by
Jansa Jose
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
trawex and organizer api changes
parent
35507b83
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
Organizer_model.php
application/models/Organizer_model.php
+1
-1
Validation_app_model.php
application/models/Validation_app_model.php
+1
-1
Webservice_model.php
application/models/Webservice_model.php
+2
-2
No files found.
application/models/Organizer_model.php
View file @
d24d374b
...
@@ -358,7 +358,7 @@ class Organizer_model extends CI_Model {
...
@@ -358,7 +358,7 @@ class Organizer_model extends CI_Model {
INNER JOIN customer AS CUST ON (CUST.customer_id = BUK.customer_id)
INNER JOIN customer AS CUST ON (CUST.customer_id = BUK.customer_id)
INNER JOIN event_date_time AS EVDT ON (BUK.event_date_id = EVDT.id)
INNER JOIN event_date_time AS EVDT ON (BUK.event_date_id = EVDT.id)
WHERE EVT.provider_id ='
$provider_id
' AND TSEVT.language_code='EN' AND TSCAT.language_code='EN'
WHERE EVT.provider_id ='
$provider_id
' AND TSEVT.language_code='EN' AND TSCAT.language_code='EN'
GROUP BY BUK.id
GROUP BY BUK.id
ORDER BY BUK.id DESC
LIMIT
$limit
,
$perPage
"
;
LIMIT
$limit
,
$perPage
"
;
$custData
=
$this
->
db
->
query
(
$sql
)
->
result_array
();
$custData
=
$this
->
db
->
query
(
$sql
)
->
result_array
();
$res
=
array
(
'status'
=>
1
,
'data'
=>
array
(
'data'
=>
$custData
,
'meta'
=>
$meta
));
$res
=
array
(
'status'
=>
1
,
'data'
=>
array
(
'data'
=>
$custData
,
'meta'
=>
$meta
));
...
...
application/models/Validation_app_model.php
View file @
d24d374b
...
@@ -554,7 +554,7 @@ class Validation_app_model extends CI_Model {
...
@@ -554,7 +554,7 @@ class Validation_app_model extends CI_Model {
'message'
=>
'Result Index Field is null or empty'
'message'
=>
'Result Index Field is null or empty'
)
)
),
),
'hotel
C
ode'
=>
array
(
'hotel
c
ode'
=>
array
(
'required'
=>
array
(
'required'
=>
array
(
'code'
=>
'ER02'
,
'code'
=>
'ER02'
,
'message'
=>
'Hotel Code is null or empty'
'message'
=>
'Hotel Code is null or empty'
...
...
application/models/Webservice_model.php
View file @
d24d374b
...
@@ -2162,7 +2162,7 @@ class Webservice_model extends CI_Model {
...
@@ -2162,7 +2162,7 @@ class Webservice_model extends CI_Model {
if
(
$user_id
>
0
){
if
(
$user_id
>
0
){
$settings
=
getSettings
();
$settings
=
getSettings
();
$url
=
"https://trawex.biz/api/hotel_trawexv5/get_room_rates"
;
$url
=
"https://trawex.biz/api/hotel_trawexv5/get_room_rates"
;
$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'
],
"hotel
Code"
=>
$data
[
'hotelC
ode'
]);
$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'
],
"hotel
code"
=>
$data
[
'hotelc
ode'
]);
$result
=
$this
->
passToJsonCurl
(
$url
,
$postData
);
$result
=
$this
->
passToJsonCurl
(
$url
,
$postData
);
if
(
!
empty
(
$result
)){
if
(
!
empty
(
$result
)){
$result
=
json_decode
(
$result
);
$result
=
json_decode
(
$result
);
...
@@ -2185,7 +2185,7 @@ class Webservice_model extends CI_Model {
...
@@ -2185,7 +2185,7 @@ class Webservice_model extends CI_Model {
$user_id
=
$this
->
auth_token_get
(
$data
[
'auth_token'
]);
$user_id
=
$this
->
auth_token_get
(
$data
[
'auth_token'
]);
if
(
$user_id
>
0
){
if
(
$user_id
>
0
){
$settings
=
getSettings
();
$settings
=
getSettings
();
$url
=
"https://trawex.biz/api/hotel_trawexv5/get_
rate_rule
s"
;
$url
=
"https://trawex.biz/api/hotel_trawexv5/get_
booking_term
s"
;
$postData
=
array
(
$postData
=
array
(
"user_id"
=>
$settings
[
'trawex_user_id'
],
"user_id"
=>
$settings
[
'trawex_user_id'
],
"user_password"
=>
$settings
[
'trawex_user_password'
],
"user_password"
=>
$settings
[
'trawex_user_password'
],
...
...
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