Merge branch 'master' into 'live_production'

application/models/Api_model.php

@@ -1336,9 +1336,9 @@ class Api_model extends CI_Model {
 		    	$lyout = json_decode($evtData['seat_pricing'],true);
 		    	$capacity = $lyout['capacity'];
 		    } else {
-		    	$lyout = (!empty($evtData['layout_details']))
-						 ?json_decode($evtData['layout_details'],true)
-						 :json_decode($evtData['custom_seat_layout'],true);
+		    	$lyout = (!empty($evtData['custom_seat_layout']))
+						 ?json_decode($evtData['custom_seat_layout'],true)
+						 :json_decode($evtData['layout_details'],true);
 
 	 			foreach($lyout AS $custLy) {
 	 				$lyCapacity[$custLy['color']] = $custLy['capacity'];

application/models/Webservice_model.php

@@ -1432,20 +1432,47 @@ class Webservice_model extends CI_Model {
 				$per_page = 10;
 				$str = urldecode(strtolower($data['query']));
 				
-				$sql = "SELECT EVT.event_id
+				$this->db->query("SET SESSION group_concat_max_len = 20000");
+				$sql = "SELECT GROUP_CONCAT(DISTINCT CONCAT_WS('#',EDATE.id,EDATE.date,EDATE.time)) 
+							   AS date_time
 						FROM events AS EVT
-						INNER JOIN venue AS VEN ON (VEN.id=EVT.venue_id AND VEN.status='1')
+						INNER JOIN venue AS VEN ON (VEN.id=EVT.venue_id)
+						INNER JOIN event_date_time AS EDATE ON (EVT.event_id=EDATE.event_id)
 						INNER JOIN event_gallery AS IMG ON 
-							  (IMG.event_id=EVT.event_id AND IMG.media_type=0 AND IMG.status='1')
-						WHERE EVT.status='1' AND 
-							  EVT.event_name LIKE '%$str%' OR 
-							  EVT.event_name_ar LIKE '%$str%'";
+							  (IMG.event_id=EVT.event_id AND IMG.media_type=0)
+						WHERE (EVT.event_name LIKE '%$str%' OR 
+							  EVT.event_name_ar LIKE '%$str%') AND
+					  		  EDATE.date>=DATE_FORMAT(NOW(),'%Y-%m-%d') AND EVT.status='1' AND 
+					  		  VEN.status='1' AND IMG.status='1' AND EDATE.status='1'
+			  		    GROUP BY EVT.event_id";
+				$resCount = $this->db->query($sql)->result();
+
+			  	foreach ($resCount AS $key => $rs) {
+				  	if(!empty($dates = explode(',',$rs->date_time))){
+						$checkTime = 0;
+						foreach ($dates as $date) {
+							if(empty($date)){
+								unset($resCount[$key]);
+								continue;
+							}
+							$dArr = explode('#', $date);
+							if($dArr[1] == date("Y-m-d") && 
+							   $dArr[1].' '.$dArr[2] < date("Y-m-d H:i", strtotime('+15 minutes'))){
+								$checkTime += 1;
+							}
+						}
+						if($checkTime == count($dates)){
+							unset($resCount[$key]);
+						}
+					} else {
+						unset($resCount[$key]);
+					}
 
-				$count = $this->db->query($sql)->num_rows();
+				}
+				$count = count($resCount);
 
 				$page = (isset($data['page']))?$data['page']:1;
 				$page_limit = ($page - 1) * $per_page;
-
 			  	$meta = array('total_pages'=>ceil($count/$per_page),'total'=>$count,
 			  		          'current_page'=>$page,'per_page'=>$per_page);
 
@@ -1456,20 +1483,45 @@ class Webservice_model extends CI_Model {
 					else $event_name = 'events.event_name_ar AS event_name';
 
 					$limit = $page_limit.','.$per_page;
+
+					$this->db->query("SET SESSION group_concat_max_len = 20000");
 					$sql = "SELECT EVT.event_id,EVT.event_name,VEN.location,
-								   IMG.media_url AS event_image
+								   IMG.media_url AS event_image,
+								   GROUP_CONCAT(DISTINCT CONCAT_WS('#',EDATE.id,EDATE.date,EDATE.time)) 
+								   AS date_time
 							FROM events AS EVT
-							INNER JOIN venue AS VEN ON (VEN.id=EVT.venue_id AND VEN.status='1')
+							INNER JOIN venue AS VEN ON (VEN.id=EVT.venue_id)
+							INNER JOIN event_date_time AS EDATE ON (EVT.event_id=EDATE.event_id)
 							INNER JOIN event_gallery AS IMG ON 
-								  (IMG.event_id=EVT.event_id AND IMG.media_type=0 AND IMG.status='1')
-							WHERE EVT.status='1' AND 
-								  EVT.event_name LIKE '%$str%' OR 
-								  EVT.event_name_ar LIKE '%$str%'
+								  (IMG.event_id=EVT.event_id AND IMG.media_type=0)
+							WHERE (EVT.event_name LIKE '%$str%' OR 
+								  EVT.event_name_ar LIKE '%$str%') AND
+						  		  EDATE.date>=DATE_FORMAT(NOW(),'%Y-%m-%d') AND EVT.status='1' AND 
+						  		  VEN.status='1' AND IMG.status='1' AND EDATE.status='1'
+						  	GROUP BY EVT.event_id
 						  	ORDER BY EVT.event_id DESC
 						  	LIMIT $limit";
-
 				  	$result = $this->db->query($sql)->result();
 
+				  	foreach ($result AS $key => $rs) {
+					  	if(!empty($dates = explode(',',$rs->date_time)) && count($dates) > 0){
+							$checkTime = 0;
+							foreach ($dates as $date) {
+								$dArr = explode('#', $date);
+								if($dArr[1] == date("Y-m-d") && 
+								   $dArr[1].' '.$dArr[2] < date("Y-m-d H:i", strtotime('+15 minutes'))){
+									$checkTime += 1;
+								}
+							}
+							if($checkTime == count($dates)){
+								unset($result[$key]);
+							}
+						} else {
+							unset($result[$key]);
+						}
+						unset($result[$key]->date_time);
+					}
+					
 					$res = array('status'=>1,'data'=>array('events'=>$result,'meta'=>$meta));
 			    } else {
 					$res = array('status'=>1,'data'=>array('events'=>[],'meta'=>$meta));