Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into tobin

application/models/Api_model.php

@@ -673,7 +673,7 @@ class Api_model extends CI_Model {
 					            INNER JOIN customer AS CUST ON (CUST.customer_id=BK.customer_id)
 					            INNER JOIN event_date_time AS EDATE ON (EDATE.id=BK.event_date_id)
 					            INNER JOIN translator_event AS TEVT ON (TEVT.event_id=EVT.event_id)
-					            WHERE EVT.status='1' AND BK.status='1' AND EDATE.status='1' AND 
+					            WHERE EVT.status='1' AND BK.status IN ('1','6') AND EDATE.status='1' AND 
 					                  TEVT.language_code='EN' AND BK.bookId='".$post_data['bookId']."'";
 		          		$bkData = $this->db->query($sql)->row_array();
 

application/models/Webservice_model.php

@@ -1170,7 +1170,7 @@ class Webservice_model extends CI_Model {
 					            INNER JOIN customer AS CUST ON (CUST.customer_id=BK.customer_id)
 					            INNER JOIN event_date_time AS EDATE ON (EDATE.id=BK.event_date_id)
 					            WHERE BK.bookId='$bookId' AND EVT.status='1' AND 
-					                  BK.status='1' AND EDATE.status='1' AND 
+					                  BK.status IN ('1','6') AND EDATE.status='1' AND 
 					                  (TEVT.language_code='$lang' OR TEVT.language_code='EN')";
 
 		          		$bkData = $this->db->query($sql)->row_array();