Merge branch 'master' into 'live_production'

application/controllers/Webservice.php

@@ -104,17 +104,17 @@ class Webservice extends CI_Controller {
   public function events_details($event_id = null) {
     $data['event_id'] = $_GET['event_id'];
     $data['auth_token'] = $this->auth_token;
+    $data['event_date_id'] = '';
     if($data['event_id'] == null) {
-      $this->errorResponse("ER16","Event id is null or empty");
-      die;
+      $this->errorResponse("ER16","Event id is null or empty");die;
+    }
+    if (isset($_GET['event_date_id']) && !empty($_GET['event_date_id'])){
+      $data['event_date_id'] = $_GET['event_date_id'];
     }
-    
-    
     $res = $this->Webservice_model->event($data);
     if($res['status']!=0){
       $this->response($res['data']);
-    }
-    else{
+    } else{
       $this->errorResponse($res['code'],$res['message']);
     }
   }