t : checker booking list bug fix

application/controllers/Api.php

@@ -699,6 +699,9 @@ class Api extends CI_Controller {
   }
 
   public function addCard(){
+    $settings   = getSettings();
+    $redUrl     = $settings['web_base_url'];
+
     $data = (array) json_decode(file_get_contents('php://input'));
     $reqData = $this->decrypt($data['requestData'],$this->local_key,$this->local_iv);
     if(empty($reqData) || empty($reqData = json_decode($reqData,true)) || 

application/controllers/Event.php

@@ -250,7 +250,7 @@ class Event extends CI_Controller {
             $err = 1;
             $errMsg = 'Provide Event Name (English)';
         } 
-        else if ($err == 0 && (!isset($_POST['event_description_EN']) || $_POST['event_description_EN']=='')){
+        else if ($err==0&&(!isset($_POST['event_description_EN'])||$_POST['event_description_EN']=='')){
             $err = 1;
             $errMsg = 'Provide Event Description (English)';
         }  
@@ -279,7 +279,7 @@ class Event extends CI_Controller {
         }
 
         $_POST['has_payment'] = (isset($_POST['has_payment']) && $_POST['has_payment']==1)?'1':'0';
-        $_POST['approve_booking'] = (isset($_POST['approve_booking']) && $_POST['approve_booking']==1)?'1':'0';
+        $_POST['approve_booking']=(isset($_POST['approve_booking']) && $_POST['approve_booking']==1)?1:0;
 
         $_POST['seat_pricing'] = $_POST['custom_seat_layout'] = '';
         if(isset($_POST['fare_type']) && $_POST['fare_type'] == 1){
@@ -309,7 +309,6 @@ class Event extends CI_Controller {
         $_POST['max_booking'] = (isset($_POST['max_booking']) && !empty($_POST['max_booking']))?
                                     $_POST['max_booking']:'14';
 
-        $provider = ($this->session->userdata['user_type']==1)?'1':$this->session->userdata['id'];
         $eventData = array('venue_id'=>$_POST['venue_id'],
                            'category_id'=>$_POST['category_id'],
                            'provider_id'=>$provider,

application/controllers/Webservice.php

@@ -615,6 +615,7 @@ class Webservice extends CI_Controller {
     }
   }
 
+  /*********************************** START Hotel API ****************************************/
   public function get_hotel_city_list(){
     $data = $_GET;
     $data['auth_token'] = $this->auth_token;
@@ -691,10 +692,10 @@ class Webservice extends CI_Controller {
       $this->errorResponse($res['code'],$res['message']);
     }
   }
+  /*********************************** END Hotel API ****************************************/
 
 
-  /*******************************Flight API******************************************/
-
+  /********************************** START Flight API ***************************************/
   public function flight_authenticate(){
     $data = (array)json_decode(file_get_contents('php://input'));
     $data['auth_token'] = $this->auth_token;
@@ -782,9 +783,6 @@ class Webservice extends CI_Controller {
       $this->errorResponse($res['code'],$res['message']);
     }
   }
-
-
-
-
+  /******************************* END Flight API******************************************/
 }
 ?>

application/models/Organizer_model.php

@@ -1065,8 +1065,7 @@ class Organizer_model extends CI_Model {
  			$count = $this->db->get_where('checker',array('id'=>$checker_id,'status'=>'1'))->num_rows();
 			if($count > 0){
  				$sql = "SELECT BOOK.bookId AS booking_id
-						FROM checker_bookings AS CBOOK
-						INNER JOIN booking AS BOOK ON (BOOK.bookId=CBOOK.booking_id)
+						FROM booking AS BOOK
 						INNER JOIN events AS EVT ON (EVT.event_id=BOOK.event_id)
 						INNER JOIN checker AS CHK ON (CHK.provider_id=EVT.provider_id)
 						WHERE CHK.id='$checker_id' AND BOOK.status='1'";
@@ -1082,8 +1081,7 @@ class Organizer_model extends CI_Model {
 
 						$sql = "SELECT TEVT.event_name,TCAT.category_name,CUST.name,EDATE.date,
 									   EDATE.time,BOOK.amount,BOOK.bookId AS booking_id 
-							    FROM checker_bookings AS CBOOK
-							    INNER JOIN booking AS BOOK ON (BOOK.bookId=CBOOK.booking_id)
+							    FROM booking AS BOOK
 							    INNER JOIN events AS EVT ON (EVT.event_id=BOOK.event_id)
 				    			INNER JOIN checker AS CHK ON (CHK.provider_id=EVT.provider_id)
 							    INNER JOIN event_date_time AS EDATE ON (EDATE.event_id=EVT.event_id)

application/views/Provider/viewProvider.php

@@ -41,7 +41,7 @@
                   <th class="hidden">ID</th>
                   <th width="80px;">Organizer</th>
                   <th width="80px;">User Name</th>
-                  <th width="100px;">Email_id</th>
+                  <th width="80px;">Email_id</th>
                   <th width="70px;">Phone</th>
                   <th width="60px;">Status</th>
                   <th width="600px;">Action</th>