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
0a3c10c4
Commit
0a3c10c4
authored
5 years ago
by
Tobin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://gitlab.techware.co.in/timeout/timeOut
into tobin
parents
8aecc03c
7907d504
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
Api_model.php
application/models/Api_model.php
+1
-1
Webservice_model.php
application/models/Webservice_model.php
+1
-1
No files found.
application/models/Api_model.php
View file @
0a3c10c4
...
...
@@ -673,7 +673,7 @@ class Api_model extends CI_Model {
INNER JOIN customer AS CUST ON (CUST.customer_id=BK.customer_id)
INNER JOIN event_date_time AS EDATE ON (EDATE.id=BK.event_date_id)
INNER JOIN translator_event AS TEVT ON (TEVT.event_id=EVT.event_id)
WHERE EVT.status='1' AND BK.status
='1'
AND EDATE.status='1' AND
WHERE EVT.status='1' AND BK.status
IN ('1','6')
AND EDATE.status='1' AND
TEVT.language_code='EN' AND BK.bookId='"
.
$post_data
[
'bookId'
]
.
"'"
;
$bkData
=
$this
->
db
->
query
(
$sql
)
->
row_array
();
...
...
This diff is collapsed.
Click to expand it.
application/models/Webservice_model.php
View file @
0a3c10c4
...
...
@@ -1170,7 +1170,7 @@ class Webservice_model extends CI_Model {
INNER JOIN customer AS CUST ON (CUST.customer_id=BK.customer_id)
INNER JOIN event_date_time AS EDATE ON (EDATE.id=BK.event_date_id)
WHERE BK.bookId='
$bookId
' AND EVT.status='1' AND
BK.status
='1'
AND EDATE.status='1' AND
BK.status
IN ('1','6')
AND EDATE.status='1' AND
(TEVT.language_code='
$lang
' OR TEVT.language_code='EN')"
;
$bkData
=
$this
->
db
->
query
(
$sql
)
->
row_array
();
...
...
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