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
58d01873
Commit
58d01873
authored
Nov 29, 2019
by
Jansa Jose
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
J : Wallet Transaction History
parent
ec3ced1e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
85 additions
and
2 deletions
+85
-2
Webservice.php
application/controllers/Webservice.php
+22
-0
HotelServices_model.php
application/models/HotelServices_model.php
+0
-1
Validation_app_model.php
application/models/Validation_app_model.php
+16
-0
Webservice_model.php
application/models/Webservice_model.php
+47
-1
No files found.
application/controllers/Webservice.php
View file @
58d01873
...
@@ -614,5 +614,27 @@ class Webservice extends CI_Controller {
...
@@ -614,5 +614,27 @@ class Webservice extends CI_Controller {
$this
->
errorResponse
(
$res
[
'code'
],
$res
[
'message'
]);
$this
->
errorResponse
(
$res
[
'code'
],
$res
[
'message'
]);
}
}
}
}
public
function
walletBalance
(){
$data
=
(
array
)
json_decode
(
file_get_contents
(
'php://input'
));
$data
[
'auth_token'
]
=
$this
->
auth_token
;
$res
=
$this
->
Webservice_model
->
walletBalance
(
$data
);
if
(
$res
[
'status'
]
==
'success'
){
$this
->
response
(
$res
[
'data'
]);
}
else
{
$this
->
errorResponse
(
$res
[
'code'
],
$res
[
'message'
]);
}
}
public
function
walletTransactionHistory
(){
$data
=
(
array
)
json_decode
(
file_get_contents
(
'php://input'
));
$data
[
'auth_token'
]
=
$this
->
auth_token
;
$res
=
$this
->
Webservice_model
->
walletTransactionHistory
(
$data
);
if
(
$res
[
'status'
]
==
'success'
){
$this
->
response
(
$res
[
'data'
]);
}
else
{
$this
->
errorResponse
(
$res
[
'code'
],
$res
[
'message'
]);
}
}
}
}
?>
?>
application/models/HotelServices_model.php
View file @
58d01873
...
@@ -80,7 +80,6 @@ class HotelServices_model extends CI_Model {
...
@@ -80,7 +80,6 @@ class HotelServices_model extends CI_Model {
}
}
$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'
])){
$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'
],
...
...
application/models/Validation_app_model.php
View file @
58d01873
...
@@ -1257,6 +1257,22 @@ class Validation_app_model extends CI_Model {
...
@@ -1257,6 +1257,22 @@ class Validation_app_model extends CI_Model {
'message'
=>
'User Id is null or empty'
'message'
=>
'User Id is null or empty'
)
)
)
)
),
'walletBalance'
=>
array
(
'auth_token'
=>
array
(
'required'
=>
array
(
'code'
=>
'ER02'
,
'message'
=>
'User Id is null or empty'
)
)
),
'walletTransactionHistory'
=>
array
(
'auth_token'
=>
array
(
'required'
=>
array
(
'code'
=>
'ER02'
,
'message'
=>
'User Id is null or empty'
)
)
)
)
);
);
...
...
application/models/Webservice_model.php
View file @
58d01873
...
@@ -2203,7 +2203,53 @@ class Webservice_model extends CI_Model {
...
@@ -2203,7 +2203,53 @@ class Webservice_model extends CI_Model {
$res
=
array
(
'status'
=>
'error'
,
'message'
=>
'No Data Found'
,
'code'
=>
'ER12'
);
$res
=
array
(
'status'
=>
'error'
,
'message'
=>
'No Data Found'
,
'code'
=>
'ER12'
);
}
}
}
else
{
}
else
{
$res
=
array
(
'status'
=>
'error'
,
'message'
=>
'Invalid User'
,
'code'
=>
'ER010'
);
$res
=
array
(
'status'
=>
'error'
,
'message'
=>
'Invalid User'
,
'code'
=>
'ER10'
);
}
}
catch
(
Exception
$e
){
$res
=
array
(
'status'
=>
'error'
,
'message'
=>
'Ohh No!! Something Went South'
,
'code'
=>
'ER08'
);
}
return
$res
;
}
public
function
walletBalance
(
$data
){
try
{
$user_id
=
$this
->
auth_token_get
(
$data
[
'auth_token'
]);
if
(
$user_id
>
0
){
$countryData
=
$this
->
getCountryData
(
$user_id
);
$sql
=
"SELECT balance_amount AS amount FROM wallet WHERE customer_id ='
$user_id
'"
;
$query
=
$this
->
db
->
query
(
$sql
);
if
(
empty
(
$query
)
||
empty
(
$walletBalance
=
$query
->
row_array
())){
$res
=
array
(
'status'
=>
'error'
,
'message'
=>
'No Data Found'
,
'code'
=>
'ER12'
);
return
$res
;
}
$walletBalance
[
'currency_symbol'
]
=
$countryData
[
'currency_symbol'
];
$res
=
array
(
'status'
=>
'success'
,
'data'
=>
$walletBalance
);
}
else
{
$res
=
array
(
'status'
=>
'error'
,
'message'
=>
'User Authentication Error'
,
'code'
=>
'ER10'
);
}
}
catch
(
Exception
$e
){
$res
=
array
(
'status'
=>
'error'
,
'message'
=>
'Ohh No!! Something Went South'
,
'code'
=>
'ER08'
);
}
return
$res
;
}
public
function
walletTransactionHistory
(
$data
){
try
{
$user_id
=
$this
->
auth_token_get
(
$data
[
'auth_token'
]);
if
(
$user_id
>
0
){
$countryData
=
$this
->
getCountryData
(
$user_id
);
$sql
=
"SELECT wallet_trans_id,amount,transaction_type,created_date,status FROM wallet_transactions WHERE customer_id='
$user_id
'"
;
$query
=
$this
->
db
->
query
(
$sql
);
if
(
empty
(
$query
)
||
empty
(
$walletHistory
=
$query
->
result_array
())){
$res
=
array
(
'status'
=>
'error'
,
'message'
=>
'No History Found'
,
'code'
=>
'ER13'
);
return
$res
;
}
foreach
(
$walletHistory
AS
$walletKey
=>
$walletValue
){
$walletHistory
[
$walletKey
][
'currency_symbol'
]
=
$countryData
[
'currency_symbol'
];
}
$res
=
array
(
'status'
=>
'success'
,
'data'
=>
$walletHistory
);
}
else
{
$res
=
array
(
'status'
=>
'error'
,
'message'
=>
'User authentication Error'
,
'code'
=>
'ER10'
);
}
}
}
catch
(
Exception
$e
){
}
catch
(
Exception
$e
){
$res
=
array
(
'status'
=>
'error'
,
'message'
=>
'Ohh No!! Something Went South'
,
'code'
=>
'ER08'
);
$res
=
array
(
'status'
=>
'error'
,
'message'
=>
'Ohh No!! Something Went South'
,
'code'
=>
'ER08'
);
...
...
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