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
680927d7
Commit
680927d7
authored
Nov 19, 2019
by
Tobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
t : checker list issue fix
parent
47c9330c
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
13 deletions
+11
-13
Api.php
application/controllers/Api.php
+3
-0
Webservice.php
application/controllers/Webservice.php
+4
-6
Organizer_model.php
application/models/Organizer_model.php
+2
-4
viewProvider.php
application/views/Provider/viewProvider.php
+2
-3
No files found.
application/controllers/Api.php
View file @
680927d7
...
...
@@ -699,6 +699,9 @@ class Api extends CI_Controller {
}
public
function
addCard
(){
$settings
=
getSettings
();
$redUrl
=
$settings
[
'web_base_url'
];
$data
=
(
array
)
json_decode
(
file_get_contents
(
'php://input'
));
$reqData
=
$this
->
decrypt
(
$data
[
'requestData'
],
$this
->
local_key
,
$this
->
local_iv
);
if
(
empty
(
$reqData
)
||
empty
(
$reqData
=
json_decode
(
$reqData
,
true
))
||
...
...
application/controllers/Webservice.php
View file @
680927d7
...
...
@@ -615,6 +615,7 @@ class Webservice extends CI_Controller {
}
}
/*********************************** START Hotel API ****************************************/
public
function
get_hotel_city_list
(){
$data
=
$_GET
;
$data
[
'auth_token'
]
=
$this
->
auth_token
;
...
...
@@ -691,10 +692,10 @@ class Webservice extends CI_Controller {
$this
->
errorResponse
(
$res
[
'code'
],
$res
[
'message'
]);
}
}
/*********************************** END Hotel API ****************************************/
/*******************************Flight API******************************************/
/********************************** START Flight API ***************************************/
public
function
flight_authenticate
(){
$data
=
(
array
)
json_decode
(
file_get_contents
(
'php://input'
));
$data
[
'auth_token'
]
=
$this
->
auth_token
;
...
...
@@ -782,9 +783,6 @@ class Webservice extends CI_Controller {
$this
->
errorResponse
(
$res
[
'code'
],
$res
[
'message'
]);
}
}
/******************************* END Flight API******************************************/
}
?>
application/models/Organizer_model.php
View file @
680927d7
...
...
@@ -1065,8 +1065,7 @@ class Organizer_model extends CI_Model {
$count
=
$this
->
db
->
get_where
(
'checker'
,
array
(
'id'
=>
$checker_id
,
'status'
=>
'1'
))
->
num_rows
();
if
(
$count
>
0
){
$sql
=
"SELECT BOOK.bookId AS booking_id
FROM checker_bookings AS CBOOK
INNER JOIN booking AS BOOK ON (BOOK.bookId=CBOOK.booking_id)
FROM booking AS BOOK
INNER JOIN events AS EVT ON (EVT.event_id=BOOK.event_id)
INNER JOIN checker AS CHK ON (CHK.provider_id=EVT.provider_id)
WHERE CHK.id='
$checker_id
' AND BOOK.status='1'"
;
...
...
@@ -1082,8 +1081,7 @@ class Organizer_model extends CI_Model {
$sql
=
"SELECT TEVT.event_name,TCAT.category_name,CUST.name,EDATE.date,
EDATE.time,BOOK.amount,BOOK.bookId AS booking_id
FROM checker_bookings AS CBOOK
INNER JOIN booking AS BOOK ON (BOOK.bookId=CBOOK.booking_id)
FROM booking AS BOOK
INNER JOIN events AS EVT ON (EVT.event_id=BOOK.event_id)
INNER JOIN checker AS CHK ON (CHK.provider_id=EVT.provider_id)
INNER JOIN event_date_time AS EDATE ON (EDATE.event_id=EVT.event_id)
...
...
application/views/Provider/viewProvider.php
View file @
680927d7
...
...
@@ -41,7 +41,7 @@
<th
class=
"hidden"
>
ID
</th>
<th
width=
"80px;"
>
Organizer
</th>
<th
width=
"80px;"
>
User Name
</th>
<th
width=
"
10
0px;"
>
Email_id
</th>
<th
width=
"
8
0px;"
>
Email_id
</th>
<th
width=
"70px;"
>
Phone
</th>
<th
width=
"60px;"
>
Status
</th>
<th
width=
"600px;"
>
Action
</th>
...
...
@@ -93,4 +93,4 @@
</div>
</div>
</section>
</div>
\ No newline at end of file
</div>
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