Merge branch 'jansa' into 'master'

application/models/Organizer_model.php

@@ -252,7 +252,7 @@ class Organizer_model extends CI_Model {
 				$meta = array('total_pages'=>ceil($count/$perPage),'total'=>$count,
 						  'current_page'=>$page,'per_page'=>$perPage);
 
-	 			$sql = "SELECT TESVT.event_id,TSEVT.event_name,BUK.bookId,TSCAT.category_name,BUK.amount,CASE WHEN BUK.status ='0' THEN 'Cancelled' WHEN BUK.status='1' THEN 'Booked' WHEN BUK.status='2' THEN 'Completed' WHEN BUK.status='3' THEN 'Pending' WHEN BUK.status='4' THEN 'Deleted' ELSE 'Payment Failed' END AS status,CUST.name AS customer_name,EVDT.date AS scheduled_date,EVDT.time AS scheduled_time 
+	 			$sql = "SELECT TSEVT.event_id,TSEVT.event_name,BUK.bookId,TSCAT.category_name,BUK.amount,CASE WHEN BUK.status ='0' THEN 'Cancelled' WHEN BUK.status='1' THEN 'Booked' WHEN BUK.status='2' THEN 'Completed' WHEN BUK.status='3' THEN 'Pending' WHEN BUK.status='4' THEN 'Deleted' ELSE 'Payment Failed' END AS status,CUST.name AS customer_name,EVDT.date AS scheduled_date,EVDT.time AS scheduled_time 
 	 			FROM booking AS BUK 
 	 			INNER JOIN events AS EVT ON (EVT.event_id = BUK.event_id) 
 	 			INNER JOIN translator_event AS TSEVT ON (EVT.event_id = TSEVT.event_id) 
@@ -424,65 +424,32 @@ class Organizer_model extends CI_Model {
  		ini_set("memory_limit", "-1");
         set_time_limit(0);
         $language = getLanguages();
-
 		$err = 0;
-        $errMsg = '';
-        // if($err == 0 && (!isset($postData['event_name_EN']) || empty($postData['event_name_EN']))){
-        //     $err = 1;
-        //     $errMsg = 'Provide Event Name (English)';
-        // } 
-        // else if ($err == 0 && (!isset($postData['event_description_EN']) || $postData['event_description_EN']=='')){
-        //     $err = 1;
-        //     $errMsg = 'Provide Event Description (English)';
-        // }  
-        // else if ($err == 0 && (!isset($postData['event_start_date']) || $postData['event_start_date'] == '')){
-        //     $err = 1;
-        //     $errMsg = 'Provide Event Start Date';
-        // } 
-        // else if ($err == 0 && (!isset($postData['event_time']) || count($postData['event_time']) <= 0)){
-        //     $err = 1;
-        //     $errMsg = 'Provide Event Timing';
-        // } 
-        // else if ($err == 0 && (!isset($postData['category_id']) || $postData['category_id'] == '')){
-        //     $err = 1;
-        //     $errMsg = 'Provide Event Category';
-        // } 
-        // else if ($err == 0 && (!isset($postData['tags']) || count($postData['tags']) <= 0)){
-        //     $err = 1;
-        //     $errMsg = 'Provide Proper Event Details';
-        // } 
-        // else if ($err == 0 && isset($postData['fare_type']) && $postData['fare_type'] == 1 && 
-        //           !isset($postData['seat_color']) || empty($postData['seat_color']) || 
-        //           !isset($postData['seat_price']) || empty($postData['seat_price']) || 
-        //           count($postData['seat_price']) != count($postData['seat_color'])){
-        //     $err = 1;
-        //     $errMsg = 'Provide Proper Layout details';
-        // }
 		
         $postData['seat_pricing'] = $postData['custom_seat_layout'] = '';
         if(isset($postData['fare_type']) && $postData['fare_type'] == 1){
             $cstmSeatLayout = array();
             for($i = 0 ; $i < count($postData['seat_block']) ; $i++){
+            	if(!isset($_POST['custom_price'][$i]) || empty($_POST['custom_price'][$i])){
+                    $_POST['custom_price'][$i] = $_POST['seat_price'][$i];
+                }
                 $cstmSeatLayout[] = array('color'=>$postData['seat_block'][$i]['block_name'],
                                           'price'=>$postData['seat_block'][$i]['seat_price'],
                                           'capacity'=>$postData['seat_block'][$i]['capacity'],
                                           'weekend_price'=>$postData['seat_block'][$i]['custom_price']);
             }
             $postData['custom_seat_layout'] = json_encode($cstmSeatLayout);
+        } else {
+            $seatPriceArr = array('price'=>$postData['price'],'capacity'=>$postData['capacity']);
+            foreach($language AS $lang) {
+                $details = $postData['price_details_EN'];
+                if(isset($postData['price_details_'.$lang]) && !empty($postData['price_details_'.$lang])){
+                    $details = $postData['price_details_'.$lang];
+                }
+                $seatPriceArr['price_details_'.$lang] = $details;
+            }
+            $postData['seat_pricing'] = json_encode($seatPriceArr);
         }
-         // else {
-        //     $seatPriceArr = array('price'=>$postData['price'],'capacity'=>$postData['capacity']);
-        //     foreach($language AS $lang) {
-        //         $details = $postData['price_details_EN'];
-        //         if(isset($postData['price_details_'.$lang]) && !empty($postData['price_details_'.$lang])){
-        //             $details = $postData['price_details_'.$lang];
-        //         }
-        //         $seatPriceArr['price_details_'.$lang] = $details;
-        //     }
-        //     $postData['seat_pricing'] = json_encode($seatPriceArr);
-        // }
-
-        // $postData['maximum_seat_booking'] = (isset($postData['maximum_seat_booking']) && !empty($postData['maximum_seat_booking']))?$postData['maximum_seat_booking']:'14';
 
         $provider = ($this->session->userdata['user_type']==1)?'1':$this->session->userdata['id'];
         $eventData = array('venue_id'=>$postData['venue_id'],