Commit 322ef405 by Tobin

dc

parent 263233c4
...@@ -388,14 +388,16 @@ class Api_model extends CI_Model { ...@@ -388,14 +388,16 @@ class Api_model extends CI_Model {
LEFT JOIN hotel_booking AS HBK ON LEFT JOIN hotel_booking AS HBK ON
(ODR.booking_id=HBK.hotel_book_id AND HBK.status IN (0,1,2,3,5)) (ODR.booking_id=HBK.hotel_book_id AND HBK.status IN (0,1,2,3,5))
WHERE ODR.customer_id='$user_id' 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 $sql = "SELECT ODR.order_id,ODR.order_type,ODR.booking_id
FROM orders AS ODR FROM orders AS ODR
INNER JOIN booking AS BOK ON (ODR.booking_id=BOK.bookId) 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) 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); $bookedData = $this->db->query($sql);
if($per_page == 0 && $page == 0){ if($per_page == 0 && $page == 0){
......
...@@ -1455,13 +1455,15 @@ class Webservice_model extends CI_Model { ...@@ -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 (ODR.booking_id=HBK.hotel_book_id AND HBK.status IN (0,1,2,3,5) AND
HBK.customer_id='$user_id') HBK.customer_id='$user_id')
WHERE ODR.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 $sql = "SELECT ODR.order_id,ODR.order_type,ODR.booking_id
FROM orders AS ODR FROM orders AS ODR
INNER JOIN booking AS BOK ON (ODR.booking_id=BOK.bookId) 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) 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 $cond"; GROUP BY ODR.order_id
ORDER BY ODR.order_id DESC $cond";
$bookedData = $this->db->query($sql); $bookedData = $this->db->query($sql);
if($per_page == 0 && $page == 0){ if($per_page == 0 && $page == 0){
return $bookedData->num_rows(); return $bookedData->num_rows();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment