Commit 36b63830 by Tobin

dc

parent 7300c4ce
...@@ -383,10 +383,10 @@ class Api_model extends CI_Model { ...@@ -383,10 +383,10 @@ class Api_model extends CI_Model {
FROM orders AS ODR FROM orders AS ODR
LEFT JOIN booking AS BOK ON LEFT JOIN booking AS BOK ON
(ODR.booking_id=BOK.bookId AND BOK.status IN (0,1,2,3,5,6)) (ODR.booking_id=BOK.bookId AND BOK.status IN (0,1,2,3,5,6))
LEFT JOIN flight_booking AS FBK ON -- LEFT JOIN flight_booking AS FBK ON
(ODR.booking_id=FBK.flight_book_id AND FBK.status IN (0,1,2,3,5)) -- (ODR.booking_id=FBK.flight_book_id AND FBK.status IN (0,1,2,3,5))
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";
$bookedData = $this->db->query($sql); $bookedData = $this->db->query($sql);
......
...@@ -1448,12 +1448,12 @@ class Webservice_model extends CI_Model { ...@@ -1448,12 +1448,12 @@ class Webservice_model extends CI_Model {
LEFT JOIN booking AS BOK ON LEFT JOIN booking AS BOK ON
(ODR.booking_id=BOK.bookId AND BOK.status IN (0,1,2,3,5,6) AND (ODR.booking_id=BOK.bookId AND BOK.status IN (0,1,2,3,5,6) AND
BOK.customer_id='$user_id') BOK.customer_id='$user_id')
LEFT JOIN flight_booking AS FBK ON -- LEFT JOIN flight_booking AS FBK ON
(ODR.booking_id=FBK.flight_book_id AND FBK.status IN (0,1,2,3,5) AND -- (ODR.booking_id=FBK.flight_book_id AND FBK.status IN (0,1,2,3,5) AND
FBK.customer_id='$user_id') -- FBK.customer_id='$user_id')
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) 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')
GROUP BY ODR.order_id $cond"); GROUP BY ODR.order_id $cond");
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