Merge branch 'master' into 'dev_production'

application/models/Api_model.php

@@ -383,12 +383,19 @@ class Api_model extends CI_Model {
 						FROM orders AS ODR
  						LEFT JOIN booking AS BOK ON 
  								(ODR.booking_id=BOK.bookId AND BOK.status IN (0,1,2,3,5,6))
- 						-- LEFT JOIN flight_booking AS FBK ON 
- 						-- 		(ODR.booking_id=FBK.flight_book_id AND FBK.status IN (0,1,2,3,5))
- 						-- LEFT JOIN hotel_booking AS HBK ON 
- 						-- 		(ODR.booking_id=HBK.hotel_book_id AND HBK.status IN (0,1,2,3,5)) 
+ 						LEFT JOIN flight_booking AS FBK ON 
+ 								(ODR.booking_id=FBK.flight_book_id AND FBK.status IN (0,1,2,3,5))
+ 						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";
+
+				$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";
+	 					
 				$bookedData = $this->db->query($sql);
 
 				if($per_page == 0 && $page == 0){

application/models/Webservice_model.php

@@ -1443,19 +1443,26 @@ class Webservice_model extends CI_Model {
 				$page_limit = ($page - 1) * $per_page;
 				$cond =($per_page == 0 && $page == 0)?'':"LIMIT $page_limit, $per_page";
 
-				$bookedData = $this->db->query("
- 					SELECT ODR.order_id,ODR.order_type,ODR.booking_id FROM orders AS ODR
+				$sql = "SELECT ODR.order_id,ODR.order_type,ODR.booking_id 
+						FROM orders AS ODR
  						LEFT JOIN booking AS BOK ON 
 							(ODR.booking_id=BOK.bookId AND BOK.status IN (0,1,2,3,5,6) AND 
 							 BOK.customer_id='$user_id')
- 						-- LEFT JOIN flight_booking AS FBK ON 
-							-- (ODR.booking_id=FBK.flight_book_id AND FBK.status IN (0,1,2,3,5) AND 
-							--  FBK.customer_id='$user_id')
- 						-- LEFT JOIN hotel_booking AS HBK ON 
-							-- (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");
+ 						LEFT JOIN flight_booking AS FBK ON 
+							(ODR.booking_id=FBK.flight_book_id AND FBK.status IN (0,1,2,3,5) AND 
+							 FBK.customer_id='$user_id')
+ 						LEFT JOIN hotel_booking AS HBK ON 
+							(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";
+
+				$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";
+				$bookedData = $this->db->query($sql);
 				if($per_page == 0 && $page == 0){
 					return $bookedData->num_rows();
 				}