Merge branch 'master' into 'dev_production'

application/models/Organizer_model.php

@@ -33,7 +33,9 @@ class Organizer_model extends CI_Model {
 				}
 				$resp = array('data'=>$evtData,'meta'=>$meta);
 	 			$res = array('status'=>1,'message'=>'Successfully','data'=>$resp);
-			}
+			}else{
+	 			$res = array('status'=>0,'message'=>'No Data found','code'=>'ER06');
+	 		}
  		} catch(Exception $e) {
  			$res = array('status'=>0,'message'=>'Ohh No!! Something went South!!','code'=>'ER06');
  		} 
@@ -171,6 +173,8 @@ class Organizer_model extends CI_Model {
 					unset($venueData[$key]['region_id']);
 	 			}
 	 			$res = array('status'=>1,'message'=>'Successfully','data'=>array('data'=>$venueData,'meta'=>$meta));
+	 		}else{
+	 			$res = array('status'=>0,'message'=>'No Data found','code'=>'ER06');
 	 		}
  		} catch(Exception $e){
  			$res = array('status'=>0,'message'=>'Ohh No!! Something Went South','code'=>'ER06');
@@ -221,6 +225,8 @@ class Organizer_model extends CI_Model {
 	 			$sql = "SELECT BUK.customer_id,CUST.name AS customer_name,CUST.email,CUST.phone,CASE WHEN CUST.gender ='1' THEN 'male' WHEN CUST.gender='2' THEN 'female' ELSE 'others' END AS gender,CUST.profile_image AS image,CUST.city FROM booking AS BUK INNER JOIN events AS EVT ON (EVT.event_id = BUK.event_id) INNER JOIN customer AS CUST ON (CUST.customer_id = BUK.customer_id) WHERE EVT.provider_id ='$provider_id' GROUP BY BUK.customer_id LIMIT $limit,$perPage";
 	 			$custData = $this->db->query($sql)->result_array();
 	 			$res = array('status'=>1,'data'=>array('data'=>$custData,'meta'=>$meta));
+	 		}else{
+	 			$res = array('status'=>0,'message'=>'No Data found','code'=>'ER06');
 	 		}
  		} catch (Exception $e){
  			$res = array('status'=>0,'message'=>'Ohh No!! Something Went South','code'=>'ER06');
@@ -267,6 +273,8 @@ class Organizer_model extends CI_Model {
 				}
 
 	 			$res = array('status'=>1,'data'=>array('data'=>$custData,'meta'=>$meta));
+	 		}else{
+	 			$res = array('status'=>0,'message'=>'No Data found','code'=>'ER06');
 	 		}
  		} catch(Exception $e){
  			$res = array('status'=>0,'message'=>'Ohh No!! Something Went South','code'=>'ER06');

application/models/Validation_organizer_model.php

@@ -291,6 +291,92 @@ class Validation_organizer_model extends CI_Model {
 				)
 			)
 		),
+		'addEvent'=>array(
+			'organiser_id' => array(
+				'required' => array(
+					'code' => 'ER18',
+					'message' => 'Organizer Id is null or empty'
+				)
+			),
+			'venue_id' => array(
+				'required' => array(
+					'code' => 'ER18',
+					'message' => 'Venue Id is null or empty'
+				)
+			),
+			'fare_type' => array(
+				'required' => array(
+					'code' => 'ER18',
+					'message' => 'Fare Type is null or empty'
+				)
+			),
+			'fare_amount' => array(
+				'required' => array(
+					'code' => 'ER18',
+					'message' => 'Fare Amount is null or empty'
+				)
+			),
+			'event_name_en' => array(
+				'required' => array(
+					'code' => 'ER18',
+					'message' => 'Event name is null or empty'
+				)
+			),
+			'category' => array(
+				'required' => array(
+					'code' => 'ER18',
+					'message' => 'Category is null or empty'
+				)
+			),
+			'maximum_seat_booking' => array(
+				'required' => array(
+					'code' => 'ER18',
+					'message' => 'Maximum Seat Booking is null or empty'
+				)
+			),
+			'payment_mode' => array(
+				'required' => array(
+					'code' => 'ER18',
+					'message' => 'Payment Mode is null or empty'
+				)
+			),
+			'event_desc_en' => array(
+				'required' => array(
+					'code' => 'ER18',
+					'message' => 'Event Description is null or empty'
+				)
+			),
+			'show_type' => array(
+				'required' => array(
+					'code' => 'ER18',
+					'message' => 'Show Type is null or empty'
+				)
+			),
+			'start_date' => array(
+				'required' => array(
+					'code' => 'ER18',
+					'message' => 'Start Date is null or empty'
+				)
+			),
+			'end_date' => array(
+				'required' => array(
+					'code' => 'ER18',
+					'message' => 'End Date is null or empty'
+				)
+			),
+			'show_timing' => array(
+				'required' => array(
+					'code' => 'ER18',
+					'message' => 'Show Timings is null or empty'
+				)
+			),
+			'tag' => array(
+				'required' => array(
+					'code' => 'ER18',
+					'message' => 'Tag is null or empty'
+				)
+			),
+		),
 	);
 	
 	public function _consruct(){