Merge branch 'master' into 'dev_production'

application/models/Webservice_model.php

@@ -1454,6 +1454,7 @@ class Webservice_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) AND 
 							--  HBK.customer_id='$user_id')
+					WHERE ODR.customer_id='$user_id'
  					GROUP BY ODR.order_id $cond");
 				if($per_page == 0 && $page == 0){
 					return $bookedData->num_rows();