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

application/models/Webservice_model.php

@@ -1737,7 +1737,7 @@ class Webservice_model extends CI_Model {
 							LEFT JOIN event_gallery AS IMG ON (IMG.event_id=EVT.event_id AND 
 															   IMG.media_type=0  AND IMG.status='1')
 							WHERE EDATE.date>=DATE_FORMAT(NOW(),'%Y-%m-%d') AND EVT.status='1' AND 
-						  		  VEN.status='1' AND EDATE.status='1' AND 
+						  		  VEN.status='1' AND EDATE.status='1' AND TEVT.language_code='$lang' AND
 						  		  EVT.event_id IN (SELECT event_id FROM translator_event 
 					  		  				  	   WHERE (event_name LIKE '%$str%' OR 
 				  		  				  	   			 event_description LIKE '%$str%')
@@ -1880,7 +1880,7 @@ class Webservice_model extends CI_Model {
 
 		$sql = "SELECT CUST.customer_id FROM customer AS CUST 
 			    INNER JOIN users AS USR ON (USR.id=CUST.customer_id)
-			    WHERE $phNumbers";
+			    WHERE $phNumbers AND CUST.customer_id!=$user_id";
 		$custIds = $this->db->query($sql)->result_array();
 		if(empty($custIds)){
 			return array('status'=>0,'code'=>'919','message'=>'No Data Found');