Commit 680927d7 by Tobin

t : checker list issue fix

parent 47c9330c
...@@ -699,6 +699,9 @@ class Api extends CI_Controller { ...@@ -699,6 +699,9 @@ class Api extends CI_Controller {
} }
public function addCard(){ public function addCard(){
$settings = getSettings();
$redUrl = $settings['web_base_url'];
$data = (array) json_decode(file_get_contents('php://input')); $data = (array) json_decode(file_get_contents('php://input'));
$reqData = $this->decrypt($data['requestData'],$this->local_key,$this->local_iv); $reqData = $this->decrypt($data['requestData'],$this->local_key,$this->local_iv);
if(empty($reqData) || empty($reqData = json_decode($reqData,true)) || if(empty($reqData) || empty($reqData = json_decode($reqData,true)) ||
......
...@@ -615,6 +615,7 @@ class Webservice extends CI_Controller { ...@@ -615,6 +615,7 @@ class Webservice extends CI_Controller {
} }
} }
/*********************************** START Hotel API ****************************************/
public function get_hotel_city_list(){ public function get_hotel_city_list(){
$data = $_GET; $data = $_GET;
$data['auth_token'] = $this->auth_token; $data['auth_token'] = $this->auth_token;
...@@ -691,10 +692,10 @@ class Webservice extends CI_Controller { ...@@ -691,10 +692,10 @@ class Webservice extends CI_Controller {
$this->errorResponse($res['code'],$res['message']); $this->errorResponse($res['code'],$res['message']);
} }
} }
/*********************************** END Hotel API ****************************************/
/*******************************Flight API******************************************/ /********************************** START Flight API ***************************************/
public function flight_authenticate(){ public function flight_authenticate(){
$data = (array)json_decode(file_get_contents('php://input')); $data = (array)json_decode(file_get_contents('php://input'));
$data['auth_token'] = $this->auth_token; $data['auth_token'] = $this->auth_token;
...@@ -782,9 +783,6 @@ class Webservice extends CI_Controller { ...@@ -782,9 +783,6 @@ class Webservice extends CI_Controller {
$this->errorResponse($res['code'],$res['message']); $this->errorResponse($res['code'],$res['message']);
} }
} }
/******************************* END Flight API******************************************/
} }
?> ?>
...@@ -1065,8 +1065,7 @@ class Organizer_model extends CI_Model { ...@@ -1065,8 +1065,7 @@ class Organizer_model extends CI_Model {
$count = $this->db->get_where('checker',array('id'=>$checker_id,'status'=>'1'))->num_rows(); $count = $this->db->get_where('checker',array('id'=>$checker_id,'status'=>'1'))->num_rows();
if($count > 0){ if($count > 0){
$sql = "SELECT BOOK.bookId AS booking_id $sql = "SELECT BOOK.bookId AS booking_id
FROM checker_bookings AS CBOOK FROM booking AS BOOK
INNER JOIN booking AS BOOK ON (BOOK.bookId=CBOOK.booking_id)
INNER JOIN events AS EVT ON (EVT.event_id=BOOK.event_id) 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 checker AS CHK ON (CHK.provider_id=EVT.provider_id)
WHERE CHK.id='$checker_id' AND BOOK.status='1'"; WHERE CHK.id='$checker_id' AND BOOK.status='1'";
...@@ -1082,8 +1081,7 @@ class Organizer_model extends CI_Model { ...@@ -1082,8 +1081,7 @@ class Organizer_model extends CI_Model {
$sql = "SELECT TEVT.event_name,TCAT.category_name,CUST.name,EDATE.date, $sql = "SELECT TEVT.event_name,TCAT.category_name,CUST.name,EDATE.date,
EDATE.time,BOOK.amount,BOOK.bookId AS booking_id EDATE.time,BOOK.amount,BOOK.bookId AS booking_id
FROM checker_bookings AS CBOOK FROM booking AS BOOK
INNER JOIN booking AS BOOK ON (BOOK.bookId=CBOOK.booking_id)
INNER JOIN events AS EVT ON (EVT.event_id=BOOK.event_id) 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 checker AS CHK ON (CHK.provider_id=EVT.provider_id)
INNER JOIN event_date_time AS EDATE ON (EDATE.event_id=EVT.event_id) INNER JOIN event_date_time AS EDATE ON (EDATE.event_id=EVT.event_id)
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<th class="hidden">ID</th> <th class="hidden">ID</th>
<th width="80px;">Organizer</th> <th width="80px;">Organizer</th>
<th width="80px;">User Name</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="70px;">Phone</th>
<th width="60px;">Status</th> <th width="60px;">Status</th>
<th width="600px;">Action</th> <th width="600px;">Action</th>
...@@ -93,4 +93,4 @@ ...@@ -93,4 +93,4 @@
</div> </div>
</div> </div>
</section> </section>
</div> </div>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment