Merge branch 'jansa' into 'master'

application/controllers/Event.php

@@ -399,11 +399,9 @@ class Event extends CI_Controller {
             if($this->upload->do_upload('file')){
                 $iDat = $this->upload->data();
                 $path = $bPath.$iDat['file_name'];
-
                 if($extn != 'gif'){
                     $size  = array('width'=>'720','height'=>'480');
                     $tFile = date('YmdHis').gettimeofday()['usec'].'_EVT_IMG_720x480.'.$extn;
-
                     $resp  = $this->imageResize($tFile,$size,$path);
                     if($resp['status'] == '1'){
                         $file = $tFile;

application/controllers/OrganizerServices.php

@@ -28,7 +28,7 @@ class OrganizerServices extends CI_Controller {
     $this->load->model('Validation_organizer_model');
     $method = $this->router->fetch_method();        
     $data = (array) json_decode(file_get_contents('php://input'));
-    if($method == 'addEvent') {
+    if($method == 'addEvent' || $method == 'editOrganizerEventDetails') {
       $data = $_POST;
     }
     if (isset(apache_request_headers()['Auth'])) {
@@ -64,7 +64,7 @@ class OrganizerServices extends CI_Controller {
 
   public function successResponse($data) {
     $result =  array(
-      'status' => 'success','message'=>(isset($data['message']) && !empty($data['message']))?$data['message']:'success');
+      'code'=>1,'status' => 'success','message'=>(isset($data['message']) && !empty($data['message']))?$data['message']:'success');
     print json_encode($result);
   }
 

application/models/Organizer_model.php

@@ -81,6 +81,9 @@ class Organizer_model extends CI_Model {
 			if($result->date_time != ''){
 				$dates = explode(',', $result->date_time);
 				$time_spec = array();
+				// pre($dates);
+				// $startDate = explode('#', $dates[0]);
+				//$endDate = explode('#', $dates[count($dates)-1]);
 				foreach ($dates as $rss) {
 					$timeArray = explode('#', $rss);
 
@@ -129,7 +132,16 @@ class Organizer_model extends CI_Model {
  	}
 
  	function editOrganizerEventDetails($data){
+ 		try{
+ 			ini_set("memory_limit","-1");
+ 			set_time_limit(0);
+ 			$languages = getLanguages();
+ 			pr($languages);
 
+ 		} catch (Exception $e){
+ 			$res = array('status'=>0,'message'=>'Ohh No!! Something Went South!!','code'=>'ER08');
+ 		}
+ 		return $res;
  	}
 
  	function changeOrganizerEventStatus($data,$status=''){
@@ -408,7 +420,7 @@ class Organizer_model extends CI_Model {
  		try{
  			ini_set("memory_limit", "-1");
 	        set_time_limit(0);
-	        $language = getLanguages();
+	        $languages = getLanguages();
 			$err = 0;
 
 	        $postData['seat_pricing'] = $postData['custom_seat_layout'] = '';
@@ -426,8 +438,6 @@ class Organizer_model extends CI_Model {
 	                           'custom_seat_layout'=>$postData['custom_seat_layout'],
 	                       	   'status'=>3);
 	        
-	 		$languages = getLanguages();
-
 	 		$evtName = json_decode($postData['event_name'],true);
 	 		$evtDesc = json_decode($postData['event_desc'],true);
 	        $status = $this->db->insert('events',$eventData);

application/models/Validation_organizer_model.php

@@ -439,6 +439,14 @@ class Validation_organizer_model extends CI_Model {
 				)
 			),
 		),
+		'editOrganizerEventDetails'=>array(
+			'organiser_id'=>array(
+				'required'=>array(
+					'code'=>'ER30',
+					'message'=>'Organizer Id is null or empty'
+				)
+			),
+		),
 	);
 	
 	public function _consruct(){