Merge branch 'jansa' into 'master'

application/models/Organizer_model.php

@@ -103,7 +103,11 @@ class Organizer_model extends CI_Model {
 			$resData['venue_name'] =$result->venue_name;
 			$resData['location'] =$result->location;
 			$resData['booking_limit'] = $result->max_booking;
-			$resData['about_ticket'] = $result->seat_pricing;
+			$resData['layout_type'] = (!empty($result->seat_pricing))?'2':'1';
+			if($resData['layout_type'] == '2'){
+				$resData['layout_pricing'] = $event_layout;
+				$resData['layout_image'] = $result->layout;
+			}
 			if(!empty($result->tag_ids) && !empty($tag_ids = explode(',',$result->tag_ids))){
 				foreach ($tag_ids AS $key => $id) {
 					$tags = langTranslator($id,'TAG','EN');
@@ -806,12 +810,13 @@ class Organizer_model extends CI_Model {
 				$evData['layout_details']['layout_image'] = $evData['layout'];
 			}else{
 				$seatlyt = json_decode($evData['seat_pricing']);
-				//$priceArr = array();
+				$priceArr = array();
 				foreach ($language as $lang) {
 					if(!isset($seatlyt->{'price_details_'.$lang})){
 						continue;
 					}
-					$priceArr[] = array('lang'=>$lang,'desc'=>$seatlyt->{'price_details_'.$lang});
+					$desc=(!empty($seatlyt->{'price_details_'.$lang}))?$seatlyt->{'price_details_'.$lang}:'';
+					$priceArr[] = array('lang'=>$lang,'desc'=>$desc);
 					unset($seatlyt->{'price_details_'.$lang});
 				}
 				$seatlyt->about_price_division = $priceArr;