Merge branch 'jansa' into 'master'

application/models/Organizer_model.php

@@ -62,6 +62,7 @@ class Organizer_model extends CI_Model {
 					LEFT JOIN event_tags AS EVTG ON EVT.event_id=EVTG.event_id
 					WHERE EVT.provider_id='$organizer_id' AND TSEVT.language_code='EN' AND TSVNE.language_code='EN' AND TSREG.language_code='EN' AND EVT.event_id=".$data['event_id'];
 			$result = $this->db->query($sql)->row();
+			//pr($this->db->last_query());
 			if(empty($result->event_id)){
 				$res = array('status'=>0,'message'=>'No data Found','code'=>'ER06');
 				return $res;
@@ -70,20 +71,20 @@ class Organizer_model extends CI_Model {
 			$event_layout = $faretype ='';
 			if($result->layout!=''){
 				if($result->custom_seat_layout!=''){
-					$pricelist = json_decode($result->custom_seat_layout, TRUE);
+					$event_layout = $pricelist = json_decode($result->custom_seat_layout, TRUE);
 					$price = min(array_column($pricelist, 'price'));
-					$event_layout = $result->custom_seat_layout;
+					//$event_layout = json_decode($result->custom_seat_layout;
 					$faretype = 2;
 				} else {
-					$pricelist = json_decode($result->layout_details, TRUE);
+					$event_layout  = $pricelist = json_decode($result->layout_details, TRUE);
 					$price = min(array_column($pricelist, 'price'));
-					$event_layout = $result->layout_details;
+					//$event_layout = $result->layout_details;
 					$faretype = 1;
 				}
 			} else {
-				$pricelist = json_decode($result->seat_pricing, TRUE);
+				$event_layout = $pricelist = json_decode($result->seat_pricing, TRUE);
 				$price = $pricelist['price'];
-				$event_layout = $result->seat_pricing;
+				//$event_layout = $result->seat_pricing;
 			}
 			if($result->date_time != ''){
 				$dates = explode(',', $result->date_time);
@@ -390,6 +391,7 @@ class Organizer_model extends CI_Model {
  				$res= array('status'=>0,'message'=>'Ohh No!! Something Went South','code'=>'ER06');
  				return $res; exit;
  			}
+ 			$query['ticket_details'] = json_decode($query['ticket_details']);
 			$res = array('status'=>1,'data'=>$query);
 
  		} catch (Exception $e){
@@ -906,10 +908,10 @@ class Organizer_model extends CI_Model {
 			if($evData['layout_type'] == '1'){
 				if($evData['custom_seat_layout'] != ''){
 					$evData['fare_type'] = '2';
-					$evData['layout_details']['layout_pricing'] = $evData['custom_seat_layout'];
+					$evData['layout_details']['layout_pricing'] = json_decode($evData['custom_seat_layout']);
 				}else{
 					$evData['fare_type'] = '1';
-					$evData['layout_details']['layout_pricing'] = $evData['layoutDetails'];
+					$evData['layout_details']['layout_pricing'] = json_decode($evData['layoutDetails']);
 				}
 				$evData['layout_details']['layout_image'] = $evData['layout'];
 			}else{
@@ -927,7 +929,7 @@ class Organizer_model extends CI_Model {
 					unset($seatlyt->{'price_details_'.$lang});
 				}
 				$seatlyt->about_price_division = $priceArr;
-				$evData['layout_details'] = json_encode($seatlyt);
+				$evData['layout_details'] = $seatlyt;
 			}
 			unset($evData['layout'],$evData['date_time'],$evData['custom_seat_layout'],$evData['seat_pricing'],$evData['layoutDetails']);