Merge branch 'master' into 'dev_production'

application/models/Api_model.php

@@ -785,7 +785,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 IN ('1','6') AND EDATE.status='1' AND 
+					            WHERE EVT.status='1' AND BK.status IN ('1','6') AND 
 					                  TEVT.language_code='EN' AND BK.bookId='".$post_data['bookId']."'";
 		          		$bkData = $this->db->query($sql)->row_array();
 

application/models/Webservice_model.php

@@ -706,9 +706,9 @@ class Webservice_model extends CI_Model {
 		if(empty($phone_no) && count($phone_no) < 10 && empty($message)){
 			return;
 		}
-		$user     = "eventstimeout";
-		$senderid = "SMSCountry";
-		$password = "timeout2030";
+		$user     = "Timeoutksa";
+		$senderid = "Timeout";
+		$password = "24617804";
 		$url      = "http://www.smscountry.com/SMSCwebservice_Bulk.aspx";
 		$message  = urlencode($message);
 		if($ch = curl_init()){
@@ -1198,7 +1198,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 IN ('1','6') AND EDATE.status='1' AND 
+					                  BK.status IN ('1','6') AND 
 					                  (TEVT.language_code='$lang' OR TEVT.language_code='EN')";
 
 		          		$bkData = $this->db->query($sql)->row_array();