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
322ef405
Commit
322ef405
authored
Mar 03, 2020
by
Tobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dc
parent
263233c4
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
5 deletions
+9
-5
Api_model.php
application/models/Api_model.php
+4
-2
Webservice_model.php
application/models/Webservice_model.php
+5
-3
No files found.
application/models/Api_model.php
View file @
322ef405
...
...
@@ -388,13 +388,15 @@ class Api_model extends CI_Model {
LEFT JOIN hotel_booking AS HBK ON
(ODR.booking_id=HBK.hotel_book_id AND HBK.status IN (0,1,2,3,5))
WHERE ODR.customer_id='
$user_id
'
GROUP BY ODR.order_id ORDER BY ODR.order_id DESC
$cond
"
;
GROUP BY ODR.order_id
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,3,5,6)
GROUP BY ODR.order_id
$cond
"
;
GROUP BY ODR.order_id
ORDER BY ODR.order_id DESC
$cond
"
;
$bookedData
=
$this
->
db
->
query
(
$sql
);
...
...
application/models/Webservice_model.php
View file @
322ef405
...
...
@@ -1455,13 +1455,15 @@ class Webservice_model extends CI_Model {
(ODR.booking_id=HBK.hotel_book_id AND HBK.status IN (0,1,2,3,5) AND
HBK.customer_id='
$user_id
')
WHERE ODR.customer_id='
$user_id
'
GROUP BY ODR.order_id
$cond
"
;
GROUP BY ODR.order_id
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,3,5,6)
GROUP BY ODR.order_id
$cond
"
;
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
"
;
$bookedData
=
$this
->
db
->
query
(
$sql
);
if
(
$per_page
==
0
&&
$page
==
0
){
return
$bookedData
->
num_rows
();
...
...
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