Merge branch 'master' into 'dev_production'

application/controllers/OrganizerServices.php

@@ -186,7 +186,7 @@ class OrganizerServices extends CI_Controller {
     $data = (array) json_decode(file_get_contents('php://input'));
     $res = $this->Organizer_model->signIn($data);
     if($res['status'] != 0){
-      $this->successResponse($res);
+      $this->response($res['data']);
     }else{
       $this->errorResponse($res['code'],$res['message']);
     }

application/models/Organizer_model.php

@@ -16,7 +16,7 @@ class Organizer_model extends CI_Model {
 				$limit = ($page - 1) * $perPage;
 				$meta = array('total_pages'=>ceil($count/$perPage),'total'=>$count,
 						  'current_page'=>$page,'per_page'=>$perPage);
-				$evtData = $this->db->query("SELECT TSEVT.event_name,TSVNE.venue_name AS venue,TSCAT.category_name AS category,TSREG.region_name AS region,EVT.status 
+				$evtData = $this->db->query("SELECT TSEVT.event_id,TSEVT.event_name,TSVNE.venue_name AS venue,TSCAT.category_name AS category,TSREG.region_name AS region,EVT.status 
  				FROM events AS EVT 
  				INNER JOIN translator_event AS TSEVT ON (EVT.event_id = TSEVT.event_id) 
  				INNER JOIN translator_venue AS TSVNE ON (EVT.venue_id = TSVNE.venue_id)