Merge branch 'master' into 'dev_production'

application/models/Api_model.php

@@ -954,13 +954,14 @@ class Api_model extends CI_Model {
 
  	function event($data) {
  		try {
-			$event_id    = $data['event_id'];
-			$authToken   = (isset($data['auth_token']) && !empty($data['auth_token']))?$data['auth_token']:'';
- 			$user_id     = $this->auth_token_get($authToken); 
  			$bookedCount = 0;
+			$event_id    = $data['event_id'];
+			if(isset($data['auth_token']) && !empty($data['auth_token'])){
+				$user_id = $this->auth_token_get($data['auth_token']); 
+			}
 
-			$languages = getLanguages();	
 			$tagDummy = array();
+			$languages = getLanguages();	
 			foreach ($languages AS $lang) {
 		 		$tagDummy['tag_'.$lang] = array();
 		 	} 	
@@ -975,19 +976,22 @@ class Api_model extends CI_Model {
  			}
 
 			$this->db->query("SET SESSION group_concat_max_len = 200000");
-			$sql = "SELECT events.has_payment,events.event_id,events.seat_pricing,events.custom_seat_layout,
-						   events.seat_pricing,venue.layout,venue.layout_details,events.max_booking,
-						   venue.location,venue.location_lat AS lat,venue.location_lng AS lng, 
-						   favourite.status AS fav_status,host_categories.show_layout,venue.id AS venue_id,
+			$sql = "SELECT events.has_payment,events.event_id,events.seat_pricing,venue.layout,
+						   events.custom_seat_layout,venue.id AS venue_id,events.seat_pricing,
+						   venue.layout_details,events.max_booking,venue.location,
+						   venue.location_lat AS lat,venue.location_lng AS lng, 
+						   favourite.status AS fav_status,host_categories.show_layout,
 						   GROUP_CONCAT(DISTINCT event_gallery.media_url) AS media_url,
 						   GROUP_CONCAT(DISTINCT event_tags.tag_id) AS tag_ids,
-						   GROUP_CONCAT(DISTINCT CONCAT_WS('#',event_date_time.id,event_date_time.date,event_date_time.time)) AS date_time 
+						   GROUP_CONCAT(DISTINCT event_date_time.date) AS event_date,
+						   GROUP_CONCAT(DISTINCT event_date_time.time) AS event_time
 					FROM events 
 				    INNER JOIN event_date_time ON events.event_id = event_date_time.event_id 
 				    INNER JOIN venue ON venue.id = events.venue_id 
 				    LEFT JOIN event_gallery ON events.event_id=event_gallery.event_id AND 
 				   			                  event_gallery.status!=0 
-		                   LEFT JOIN favourite ON favourite.event_id=events.event_id AND favourite.status=1 AND 				  favourite.user_id='$user_id' 
+                    LEFT JOIN favourite ON favourite.event_id=events.event_id AND 
+                   						  favourite.status=1 AND favourite.user_id='$user_id' 
 					LEFT JOIN event_tags ON events.event_id=event_tags.event_id 
 					INNER JOIN host_categories ON venue.host_cat_id=host_categories.host_cat_id
 					WHERE events.event_id='$event_id' AND event_date_time.status='1'
@@ -1007,7 +1011,7 @@ class Api_model extends CI_Model {
 							WHERE status IN (1,2) AND event_id=$rs->event_id";
 					$atten = $this->db->query($sql)->row_array();
 					$atte=isset($atten['attend'])&&!empty($atten['attend'])?$atten['attend']:'0';
-
+					$latlng = array('lat'=>$rs->lat, 'lng'=>$rs->lng);
 					if($rs->layout!=''){
 						if($rs->custom_seat_layout!=''){
 							$pricelist = json_decode($rs->custom_seat_layout, TRUE);
@@ -1024,33 +1028,16 @@ class Api_model extends CI_Model {
 						$event_layout = $rs->seat_pricing;
 					}
 
-					$dates = explode(',', $rs->date_time);
-					$time_spec = array();
-					$latlng = array('lat'=>$rs->lat, 'lng'=>$rs->lng);
-					foreach ($dates as $rss) {
-						$timeArray = explode('#', $rss);
-
-						$sTime = $timeArray[1].' '.$timeArray[2];
-						$cTime = date("Y-m-d H:i", strtotime('+15 minutes'));
-
-						if($cTime < $sTime){ 
-							$time_spec[$timeArray[1]][] = array("id"=>$timeArray[0],
-																"time"=>$timeArray[2]);
-						}
-					}
-					$media_url = explode(',', $rs->media_url);
-					
-					$tagArr  = array();
 					$resData = array();
-
 					$resData['latlng'] = $latlng;
 					$resData['event_id'] = $rs->event_id;
+					$resData['event_date'] = explode(',',$rs->event_date);
+					$resData['event_time'] = explode(',',$rs->event_time);
 					$resData['event_rate'] = $rate;
-					$resData['event_urls'] = $media_url;
+					$resData['event_urls'] = explode(',',$rs->media_url);
 					$resData['fav_status'] = $rs->fav_status;
 					$resData['event_price'] = $price;
 					$resData['has_payment'] = $rs->has_payment;
-					$resData['event_times'] = $time_spec;
 					$resData['max_booking'] = $rs->max_booking-$bookedCount;
 					$resData['show_layout'] = $rs->show_layout;
 					$resData['seat_pricing'] = $rs->seat_pricing;
@@ -1065,6 +1052,7 @@ class Api_model extends CI_Model {
 					$venData = langTranslator($rs->venue_id,'VEN');
 					$resData = array_merge($resData,$venData);
 
+					$tagArr  = array();
 					if(!empty($rs->tag_ids) && !empty($tag_ids = explode(',',$rs->tag_ids))){
 						foreach ($tag_ids AS $key => $id) {
 							$tags = langTranslator($id,'TAG');