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
db3f2072
Commit
db3f2072
authored
5 years ago
by
Tobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dc
parent
488b58f1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
Webservice.php
application/controllers/Webservice.php
+1
-1
Api_model.php
application/models/Api_model.php
+1
-1
Webservice_model.php
application/models/Webservice_model.php
+2
-2
No files found.
application/controllers/Webservice.php
View file @
db3f2072
...
...
@@ -318,7 +318,7 @@ class Webservice extends CI_Controller {
}
elseif
(
isset
(
$res
[
'data'
])
&&
!
empty
(
$res
[
'data'
])
&&
sizeof
(
$res
[
'data'
]
==
0
)
&&
$res
[
'status'
]
!=
0
){
$this
->
response
(
$res
[
'data'
]);
}
else
{
$this
->
errorResponse
(
'ER06'
,
'Ohh No!! Something went South!!'
);
$this
->
errorResponse
(
$res
[
'code'
],
$res
[
'message'
]
);
}
}
...
...
This diff is collapsed.
Click to expand it.
application/models/Api_model.php
View file @
db3f2072
...
...
@@ -396,7 +396,7 @@ class Api_model extends CI_Model {
INNER JOIN booking AS BOK ON (ODR.booking_id=BOK.bookId)
WHERE ODR.customer_id='
$user_id
' AND ODR.order_type='1' AND BOK.status IN (0,1,2,3,5,6)
GROUP BY ODR.order_id
ORDER BY ODR.order_id DESC
$cond
"
;
ORDER BY ODR.order_id DESC
$cond
"
;
$bookedData
=
$this
->
db
->
query
(
$sql
);
...
...
This diff is collapsed.
Click to expand it.
application/models/Webservice_model.php
View file @
db3f2072
...
...
@@ -1456,14 +1456,14 @@ class Webservice_model extends CI_Model {
HBK.customer_id='
$user_id
')
WHERE ODR.customer_id='
$user_id
'
GROUP BY ODR.order_id
ORDER BY ODR.order_id DESC
$cond
"
;
ORDER BY ODR.order_id DESC
$cond
"
;
$sql
=
"SELECT ODR.order_id,ODR.order_type,ODR.booking_id
FROM orders AS ODR
INNER JOIN booking AS BOK ON (ODR.booking_id=BOK.bookId)
WHERE ODR.customer_id='
$user_id
' AND ODR.order_type='1' AND BOK.status IN (0,1,2,5,6)
GROUP BY ODR.order_id
ORDER BY ODR.order_id DESC
$cond
"
;
ORDER BY ODR.order_id DESC
$cond
"
;
$bookedData
=
$this
->
db
->
query
(
$sql
);
if
(
$per_page
==
0
&&
$page
==
0
){
return
$bookedData
->
num_rows
();
...
...
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