Merge branch 'master' into 'dev_production'

application/config/database.php

@@ -75,10 +75,10 @@ $query_builder = TRUE;
 
 $db['default'] = array(
 	'dsn'	=> '',
-	'hostname' => 'localhost',
-	'username' => 'nuvento_timeout',
+	'hostname' => '192.168.140.123',
+	'username' => 'root',
 	'password' => 'Golden_123',
-	'database' => 'nuvento_timeout',
+	'database' => 'tobin_eventTimeOut',
 	'dbdriver' => 'mysqli',
 	'dbprefix' => '',
 	'pconnect' => FALSE,

application/controllers/Api.php

@@ -331,15 +331,15 @@ class Api extends CI_Controller {
     $res = $this->Api_model->payNow($payData);
 
     if($res['status']==1){
-       $this->paymentGateway($amount,$res['transaction_id'],$event_id,$booking_id,$res['custData'],$cardData);
+      $this->paymentGateway($amount,$res['transaction_id'],$event_id,$booking_id,$res['custData'],$cardData);
     }
     else{
-       redirect($redUrl.'failure?event_id='.$eventid);
+      redirect($redUrl.'failure?event_id='.$eventid);
     }
   }
 
   public function paymentGateway($amount='0',$last_id='0',$event_id='0',$booking_id='0',
-                                 $custData=array(),$cardData=array()){
+                                 $custData=array(),$cardData=''){
     $customerName = array();
     if(isset($custData->name) && !empty($custData->name)){
       $customerName = explode(' ',$custData->name);
@@ -353,13 +353,18 @@ class Api extends CI_Controller {
     $add1     = $add2 = $city = $state = 'Saudi Arabia';
     $pincode  = '61961';
 
-    $noCard    = 0;
     $saveCard  = 1;
     $savedCard = 0;
-    if(!empty($cardData)){
-      if(isset($cardData['cvv']) && !empty($cardData['cvv']) && 
-         isset($cardData['tocken']) && !empty($cardData['tocken'])){
-        $savedCard = 1;
+    $cvv = $token = $cardNo = $holder = $cardType = $expMonth = $expYear = '';
+    if(!empty($cardData) && !empty($cardData = urldecode($cardData))){
+      $cardData = $this->decrypt($cardData,$this->local_key,$this->local_iv);
+      if(empty($cardData) || empty($cardData = json_decode($cardData,true))){
+        redirect($redUrl.'failure');
+      } else if (isset($cardData['cvv']) && !empty($cardData['cvv']) && 
+                 isset($cardData['token']) && !empty($cardData['token'])){
+        $cvv        = $cardData['cvv'];
+        $token      = $cardData['token'];
+        $savedCard  = 1;
       } else if(isset($cardData['cvv']) && !empty($cardData['cvv']) || 
                 isset($cardData['cardType']) && !empty($cardData['cardType']) || 
                 isset($cardData['cardNumber']) && !empty($cardData['cardNumber']) || 
@@ -372,12 +377,12 @@ class Api extends CI_Controller {
         $cardType = $cardData['cardType'];
         $expMonth = substr($cardData['expMonthYear'],0,2);
         $expYear  = '20'.substr($cardData['expMonthYear'],2,2);
-        $saveCard = (isset($cardData['saveCard'])&&!empty($cardData['saveCard'])&&$cardData['saveCard']==0)?0:1;
+        $saveCard = (isset($cardData['saveCard']) && $cardData['saveCard'] == 0)?0:1;
       } else {
-        $noCard = 1;
+        redirect($redUrl.'failure');
       }
     } else {
-      $noCard = 1;
+      redirect($redUrl.'failure');
     }
 
     $failureUrl = base_url('Api/paymentFailureUrl');
@@ -390,13 +395,9 @@ class Api extends CI_Controller {
     $pText .= '111111111111|'.$f_Name.'|'.$l_Name.'|'.$add1.'|'.$add2.'|'.$city.'|'.$state.'|'.$pincode.
               '|SA|'.$phone.'|34|344|34355344||';
     if($savedCard == 1){
-      $pText .= '00010000001|'.$cardData['cvv'].'|'.$cardData['tocken'].'||';
+      $pText .= '00010000001|'.$cvv.'|'.$token.'||';
     } else {
-      if($noCard == 0){
-        $pText .= '11111100000|'.$cardNo.'|'.$expMonth.'|'.$expYear.'|'.$cvv.'|'.$holder.'|'.$cardType.'||';
-      } else {
-        // Provide Card Details Manually in Bayanpay Payment gateway.
-      }
+      $pText .='11111100000|'.$cardNo.'|'.$expMonth.'|'.$expYear.'|'.$cvv.'|'.$holder.'|'.$cardType.'||';
     }
     $pText .= '1110000|'.$last_id.'|'.$event_id.'|'.$booking_id.'||';
     if($saveCard == 1){
@@ -684,41 +685,5 @@ class Api extends CI_Controller {
       redirect($redUrl.'failure');
     }
   }
-
-  /*================ START : Checker API ================*/
-
-  public function checker_bookingDetails(){
-    $data = (array) json_decode(file_get_contents('php://input'));
-    $res = $this->Api_model->checkerbookingdetails($data);
-    if($res['status']!=0){
-      $this->response($res['data']);
-    }
-    else{
-      $this->errorResponse($res['code'],$res['message']);
-    }
-  }
-
-  public function checker_login(){
-    $data = (array) json_decode(file_get_contents('php://input'));
-    $res = $this->Api_model->checker_login($data);
-    if($res['status']!=0){
-      $this->response($res['data']);
-    } else {
-      $this->errorResponse($res['code'],$res['message']);
-    }
-  }
-
-  public function getCheckerBookList(){
-    $data = (array) json_decode(file_get_contents('php://input'));
-    $res = $this->Api_model->getOrganiserBookList($data);
-    if(isset($res['data']) && !empty($res['data'])){
-      $this->response($res['data']);
-    }
-    else{
-      $this->errorResponse($res['code'],$res['message']);
-    }
-  }
-
-  /*================ END : Checker API ================*/
 }
 ?>

application/controllers/Dashboard.php

@@ -17,7 +17,6 @@ class Dashboard extends CI_Controller {
 		}
 
 		redirect(base_url('Event/listEvents'));
-		$this->load->model('Dashboard_model');
  	}
 	
 	public function index() {

application/controllers/Event.php

@@ -94,8 +94,8 @@ class Event extends CI_Controller {
             $errMsg = 'Provide Proper Layout details';
         }
 
-        $_POST['has_payment'] = (isset($_POST['has_payment']) && $_POST['has_payment'] == 1)?'1':'0';
-        $_POST['approve_booking'] = (isset($_POST['approve_booking']) && $_POST['approve_booking']==1)?'1':'0';
+        $_POST['has_payment'] = (isset($_POST['has_payment']) && $_POST['has_payment'] == 1)?1:0;
+        $_POST['approve_booking'] = (isset($_POST['approve_booking'])&&$_POST['approve_booking']==1)?1:0;
 
         $_POST['seat_pricing'] = $_POST['custom_seat_layout'] = '';
         if(isset($_POST['fare_type']) && $_POST['fare_type'] == 1){
@@ -188,7 +188,7 @@ class Event extends CI_Controller {
                 $subject  = "TimeOut, New Event Created";
                 $emailId  = $settings['admin_mail_id'];
                 $message  =  "<html><body>
-                               New Event Created, event name: <strong>".$_POST['event_name_en']."</strong>. Event URL : ".base_url()."eventdetail?event_id=$event_id
+                               New Event Created, event name: <strong>".$_POST['event_name_en']."</strong>. Event URL : ".base_url()."Event/listEvents
                               </body></html>";
                 $this->Api_model->send_mail($subject,$emailId,$message);
             }

application/controllers/OrganizerServices.php

@@ -330,6 +330,28 @@ class OrganizerServices extends CI_Controller {
     }
   }
 
+  public function checker_bookingDetails(){
+    $data = (array) json_decode(file_get_contents('php://input'));
+    $res = $this->Organizer_model->checkerbookingdetails($data);
+    if($res['status']!=0){
+      $this->response($res['data']);
+    }
+    else{
+      $this->errorResponse($res['code'],$res['message']);
+    }
+  }
+
+  public function getCheckerBookList(){
+    $data = (array) json_decode(file_get_contents('php://input'));
+    $res = $this->Organizer_model->getCheckerBookList($data);
+    if(isset($res['data']) && !empty($res['data'])){
+      $this->response($res['data']);
+    }
+    else{
+      $this->errorResponse($res['code'],$res['message']);
+    }
+  }
+
   /*================ END : Organizer API ================*/
 }
 ?>

application/controllers/Webservice.php

@@ -132,7 +132,7 @@ class Webservice extends CI_Controller {
     print json_encode($result);
   }
 
-  public function successResponse($data) {
+  public function successResponse($data='') {
     $result =  array(
       'status' => 'success',
     );
@@ -579,6 +579,18 @@ class Webservice extends CI_Controller {
     else{
       $this->errorResponse($res['code'],$res['message']);
     }
+  }  
+
+  public function update_user_visibility(){
+    $data = (array) json_decode(file_get_contents('php://input'));
+    $data['auth_token'] = $this->auth_token;
+
+    $res = $this->Webservice_model->update_user_visibility($data);
+    if($res['status'] != 0){
+      $this->successResponse();
+    } else {
+      $this->errorResponse($res['code'],$res['message']);
+    }
   }
 
   public function get_hotel_city_list(){
@@ -672,6 +684,39 @@ class Webservice extends CI_Controller {
     }
   } 
 
+  public function flight_availability_search(){
+    $data = (array)json_decode(file_get_contents('php://input'));
+    $data['auth_token'] = $this->auth_token;
+    $res = $this->Webservice_model->flight_availability_search($data);
+    if($res['status'] == 1){
+      $this->response($res['data']);
+    }else{
+      $this->errorResponse($res['code'],$res['message']);
+    }
+  }
+
+  public function flight_fare_rules(){
+    $data = (array)json_decode(file_get_contents('php://input'));
+    $data['auth_token'] = $this->auth_token;
+    $res = $this->Webservice_model->flight_fare_rules($data);
+    if($res['status'] == 1){
+      $this->response($res['data']);
+    }else{
+      $this->errorResponse($res['code'],$res['message']);
+    }
+  }
+
+  public function flight_revalidate(){
+    $data = (array)json_decode(file_get_contents('php://input'));
+    $data['auth_token'] = $this->auth_token;
+    $res = $this->Webservice_model->flight_revalidate($data);
+    if($res['status'] == 1){
+      $this->response($res['data']);
+    }else{
+      $this->errorResponse($res['code'],$res['message']);
+    }
+  }
+
 
 
 

application/controllers/bookingStatusCrone.php

@@ -9,10 +9,15 @@
 
     $sql = "UPDATE booking
             INNER JOIN event_date_time ON event_date_time.id = booking.event_date_id
-            SET booking.status = '2'
-            WHERE event_date_time.date < '$todate' and event_date_time.time < 'now()' and booking.status='1'";
+            SET booking.status='2'
+            WHERE event_date_time.date<'$todate' and event_date_time.time<'now()' and booking.status='1'";
     $result = mysqli_query($conn, $sql);
 
+    $sql = "UPDATE booking
+            INNER JOIN event_date_time ON event_date_time.id = booking.event_date_id
+            SET booking.status='0'
+            WHERE event_date_time.date<'$todate' and event_date_time.time<'now()' and booking.status='6'";
+    $result = mysqli_query($conn, $sql);
 
     $sql = "UPDATE booking
             INNER JOIN transaction ON transaction.booking_id = booking.bookId

application/helpers/generals_helper.php

@@ -175,6 +175,10 @@
 		        			   'Organizer'=>array(1,2,3,4),'Booking'=>array(1,2,3,4),
 		        			   'Notification'=>array(1,2,3,4),'HotelCity'=>array(1,2,3,4));
 		        break;
+         	case 5: 
+			 	$menus = array('Customer'=>array(),'Customer_Booking'=>array());
+		 	break;
+
 		}
 		return $menus;
 	}

application/models/Api_model.php

@@ -53,7 +53,8 @@ class Api_model extends CI_Model {
  			$res_count = $this->db->query($sql)->row();
 
  			if(count($res_count) > 0) {
- 				if($res_count->email == $data['email_id'] && $res_count->phone == $data['phone']){
+ 				if($res_count->email == $data['email_id'] && 
+ 				   ($res_count->phone == $data['phone'] || strpos($res_count->phone,$data['phone'])!==false)){
  					return array('status'=>0,'message'=>'Already have an account with email id and phone no. Please login','code'=>'ER12');
  				} else if($res_count->email == $data['email_id']){
  					return array('status'=>0,'message'=>'Email id already exists','code'=>'ER09');
@@ -1705,123 +1706,5 @@ class Api_model extends CI_Model {
 			$res = array('status'=>0,'message'=>'Invalid user','code'=>'ER19');
 		}
 	}
-
-  /*================ START : Checker API ================*/
-
- 	public function checker_login($data){
- 		try{
- 			$this->db->where('status',1);
-	 		$this->db->where('password',md5($data['password']));
-	 		$this->db->where('username',$data['email']);
-	 		$this->db->from('checker');
-	 		$result = $this->db->get()->row();
-	 		if($result){
-	 			$res = array('status'=>1,'data'=>array('checker_id'=>$result->id));
-	 		} else {
-	 			$res = array('status'=>0,'message'=>'Invalid Email Id / Password','code'=>'ER05');
-	 		}
- 		} catch(Exception $e) {
- 			 $res = array('status'=>0,'message'=>'Ohh No!! Something went South!!','code'=>'ER06');
- 		} 
- 		return $res;	
- 	}
-
- 	function checkerbookingdetails($data) {
- 		try {
- 			$count = $this->db->get_where('checker',array('id'=>$data['checker_id']))->num_rows();
-			if($count > 0){
-				$result = $this->db
-				->select('booking.id AS book_id,booking.bookId,customer.name AS customer_name,
-						  booking.status,booking.no_of_ticket,booking.qrcode,
-						  booking.ticket_details,event_date_time.date AS booking_date')
-				->where(array('booking.bookId'=>$data['qr_pin'],'status'=>'1'))
-				->from('booking')
-				->join('events','booking.event_id = events.event_id')
-				->join('event_date_time','booking.event_date_id = event_date_time.id')
-				->join('venue', 'venue.id = events.venue_id')
-				->join('event_gallery', 'events.event_id = event_gallery.event_id', 'LEFT')
-				->join('customer','customer.customer_id = booking.customer_id')
-				->join('host_categories', 'venue.host_cat_id = host_categories.host_cat_id')
-				->group_by('booking.bookId')->get()->row();
-				if(count($result)>0){
-					$result->seat_class = '';
-					if(!empty($ticketDetls = json_decode($result->ticket_details))){
-						if(is_array($ticketDetls) && isset($ticketDetls[0]) && isset($ticketDetls[0]->color)){
-							$result->seat_class = $ticketDetls[0]->color;	
-						} else if (isset($ticketDetls->color)){
-							$result->seat_class = $ticketDetls->color;	
-						}
-					}
-					$this->db->insert('checker_bookings',
-								array('checker_id'=>$data['checker_id'],'booking_id'=>$data['qr_pin'],
-								      'checked_time'=>date('Y-m-d H:i:s')));
-
-					$res = array('status'=>1,'data'=>$result);
-				} else {
-					$res = array('status'=>0,'message'=>'Invalid booking code','code'=>'ER24');
-				}
-			}else{
-				$res = array('status'=>0,'message'=>'Checker Doesnot Exist','code'=>'ER24');
-			}		
- 		} catch(Exception $e) {
- 			$res = array('status'=>0,'message'=>'Ohh No!! Something went South!!','code'=>'ER06');
- 		} 
- 		return $res;
- 	}
-
- 	function getCheckerBookList($data) {
- 		try {
- 			$checker_id = $data['checker_id'];
- 			$count = $this->db->get_where('checker',array('id'=>$checker_id,'status'=>'1'))->num_rows();
-			if($count > 0){
- 				$sql = "SELECT BOOK.bookId AS booking_id 
-					    FROM checker_bookings AS CBOOK
-					    INNER JOIN checker AS CHK ON (CHK.id=$checker_id)
-					    INNER JOIN booking AS BOOK ON (BOOK.bookId=CBOOK.booking_id)
-					    INNER JOIN events AS EVT ON (EVT.event_id=BOOK.event_id)
-					    WHERE EVT.provider_id=CHK.provider_id AND BOOK.status='1'";
- 				$count = $this->db->query($sql)->num_rows();
-
- 				if($count > 0) {
- 					$perPage = 10;
- 					$page = (isset($data['page']))?$data['page']:1;
- 					$limit = ($page - 1) * $perPage;
- 					$meta = array('total_pages'=>ceil($count/$perPage),'total'=>$count,
-								  'current_page'=>$page,'per_page'=>$perPage);
- 					if($count > $limit) {
-
-						$sql = "SELECT TEVT.event_name,TCAT.category_name,CUST.name,EDATE.date,
-									   EDATE.time,BOOK.amount,BOOK.bookId AS booking_id 
-							    FROM checker_bookings AS CBOOK
-				    			INNER JOIN checker AS CHK ON (CHK.id=CBOOK.checker_id)
-							    INNER JOIN booking AS BOOK ON (BOOK.bookId=CBOOK.booking_id)
-							    INNER JOIN events AS EVT ON (EVT.event_id=BOOK.event_id AND 
-					    							 		 EVT.provider_id=CHK.provider_id)
-							    INNER JOIN event_date_time AS EDATE ON (EDATE.event_id=EVT.event_id)
-							    INNER JOIN event_category AS CAT ON (CAT.cat_id=EVT.category_id)
-							    INNER JOIN customer AS CUST ON (CUST.customer_id=BOOK.customer_id)
-							    INNER JOIN translator_event AS TEVT ON (TEVT.event_id=EVT.event_id)
-							    INNER JOIN translator_category AS TCAT ON (TCAT.category_id=CAT.cat_id)
-							    WHERE CBOOK.checker_id='$checker_id' AND TEVT.language_code='EN' AND 
-							    	  TCAT.language_code='EN' AND BOOK.status='1'";
-						$result = $this->db->query($sql)->result();
-						
-						$resp = array('data'=>$result,'meta'=>$meta);
- 						$res = array('status'=>1,'message'=>'Successfully','data'=>$resp);
-					} else {
-						$resp = array('data'=>[],'meta'=>$meta);
-						$res = array('status'=>1,'message'=>'No More Data Found','data'=>$resp);
-					}
-				} else {
-					$res = array('status'=>0,'message'=>'No Record Found','code'=>'ER24');
-				}
-			} else {
-				$res = array('status'=>0,'message'=>'Checker Doesnot Exist','code'=>'ER25');
-			}		
- 		} catch(Exception $e) {
- 			$res = array('status'=>0,'message'=>'Ohh No!! Something went South!!','code'=>'ER06');
- 		} 
- 		return $res;
- 	}
 } 
 ?>
\ No newline at end of file

application/models/Booking_model.php

@@ -5,10 +5,12 @@ class Booking_model extends CI_Model {
 		parent::_construct();
  	}
 
- 	public function getBookingData($booking_id='',$provider_id='',$view='0,1,2,3,5,6'){
+ 	public function getBookingData($booking_id='',$provider_id='',$view='0,1,2,3,5,6',$customer_id='',$bookId=''){
  		$cond  = (!empty($view))?" BOK.status IN ($view) ":" BOK.status != '4' ";
+ 		$cond .= (!empty($bookId))?" AND BOK.bookId='$bookId' ":"";
  		$cond .= (!empty($booking_id))?" AND BOK.id='$booking_id' ":"";
- 		$cond .= (!empty($provider_id))?" AND EVT.provider_id='$provider_id' ":"";
+ 		$cond .= (!empty($provider_id))?" AND EVT.provider_id='$provider_id' ":""; 
+ 		$cond .= (!empty($customer_id))?" AND BOK.customer_id='$customer_id' ":"";
 
  		$sql = "SELECT BOK.id AS booking_id,CUST.customer_id,CUST.name AS customer_name,EVT.provider_id,
 					   CUST.phone AS customer_phone,CUST.email AS customer_email,CUST.gender,EVT.venue_id,
@@ -31,7 +33,7 @@ class Booking_model extends CI_Model {
 			    WHERE $cond";
 
 	    $bookingData = $this->db->query($sql);
-		if(empty($bookingData)){
+		if($bookingData->num_rows() <= 0){
  			return 0;
  		}
 

application/models/Login_model.php

@@ -9,7 +9,7 @@ class Login_model extends CI_Model {
 	public function login($username, $password)	{
 		$query = $this->db->query("SELECT * FROM users 
 								   WHERE username='$username' AND password='$password' AND 
-								   		 user_type IN (1,2,4) AND status='1'");
+								   		 user_type IN (1,2,4,5) AND status='1'");
 
 		if($query->num_rows() > 0 && !empty($query)){
 			$result = $query->row();
@@ -34,4 +34,4 @@ class Login_model extends CI_Model {
 		return $result;
     }
 }
-?>
+?>
\ No newline at end of file

application/models/Staff_model.php

@@ -8,7 +8,7 @@ class Staff_model extends CI_Model {
  		$cond  = (!empty($view))?" AND status IN ($view) ":" status != '2' ";
  		$cond .= (!empty($staff_id))?" AND id='$staff_id' ":"";
 
-	    $staffData = $this->db->query("SELECT * FROM users WHERE user_type='4' ".$cond);
+	    $staffData = $this->db->query("SELECT * FROM users WHERE user_type IN (4,5) ".$cond);
 
 	    if(!empty($staffData)){
 	    	return (!empty($staff_id))?$staffData->row():$staffData->result();
@@ -22,7 +22,7 @@ class Staff_model extends CI_Model {
 
  		$userNameChk = $this->db->query("SELECT * FROM users 
  									     WHERE status!='2' AND username='".$staff_data['username']."' AND 
- 									           user_type='4'");
+ 									           user_type IN (4,5)");
  		if(!empty($userNameChk) && $userNameChk->num_rows() > 0) return 2;
 
  		$status = $this->db->insert('users',
@@ -30,7 +30,7 @@ class Staff_model extends CI_Model {
 										  'password'=>$staff_data['password'],
 										  'display_name'=>$staff_data['display_name'],
 										  'profile_image'=>$staff_data['profile_image'],
-										  'user_type'=>'4','status'=>'1'));
+										  'user_type'=>$staff_data['user_type'],'status'=>'1'));
  		return $status;
  	}
 
@@ -39,7 +39,7 @@ class Staff_model extends CI_Model {
  			return 0;
  		$userNameChk = $this->db->query("SELECT * FROM users 
  									     WHERE status!='2' AND username='".$staff_data['username']."' AND 
- 									           user_type='4' AND id!='".$staff_id."'");
+ 									           user_type IN (4,5) AND id!='".$staff_id."'");
  		if(!empty($userNameChk) && $userNameChk->num_rows() > 0) { return 2; }
 
  		if(!isset($staff_data['profile_image']) || empty($staff_data['profile_image'])){

application/models/Validation_app_model.php

@@ -792,6 +792,128 @@ class Validation_app_model extends CI_Model {
 				)
 			),
 		),
+		'flight_authenticate'=>array(
+			'auth_token' => array(
+				'required' => array(
+					'code' => 'ER02',
+					'message' => 'User Id is null or empty'
+				)
+			)
+		),
+		'flight_availability_search'=>array(
+			'auth_token' => array(
+				'required' => array(
+					'code' => 'ER02',
+					'message' => 'User Id is null or empty'
+				)
+			),
+			'journey_type' => array(
+				'required' => array(
+					'code' => 'ER02',
+					'message' => 'Journey Type is null or empty'
+				)
+			),
+			'airport_from_code' => array(
+				'required' => array(
+					'code' => 'ER02',
+					'message' => 'Airport From Code is null or empty'
+				)
+			),
+			'airport_to_code' => array(
+				'required' => array(
+					'code' => 'ER02',
+					'message' => 'airport To Code is null or empty'
+				)
+			),
+			'departure_date' => array(
+				'required' => array(
+					'code' => 'ER02',
+					'message' => 'Departure Date is null or empty'
+				)
+			),
+			'return_date' => array(
+				'required' => array(
+					'code' => 'ER02',
+					'message' => 'Return Date is null or empty'
+				)
+			),
+			'adult_flight' => array(
+				'required' => array(
+					'code' => 'ER02',
+					'message' => 'Adult Flight is null or empty'
+				)
+			),
+			'child_flight' => array(
+				'required' => array(
+					'code' => 'ER02',
+					'message' => 'Child Flight is null or empty'
+				)
+			),
+			'infant_flight' => array(
+				'required' => array(
+					'code' => 'ER02',
+					'message' => 'Infant Flight is null or empty'
+				)
+			),
+			'class' => array(
+				'required' => array(
+					'code' => 'ER02',
+					'message' => 'Class Field is null or empty'
+				)
+			),
+			'target' => array(
+				'required' => array(
+					'code' => 'ER02',
+					'message' => 'Target Field is null or empty'
+				)
+			),
+			'session_id' => array(
+				'required' => array(
+					'code' => 'ER02',
+					'message' => 'Session Id is null or empty'
+				)
+			),
+		),
+		'flight_fare_rules'=>array(
+			'auth_token' => array(
+				'required' => array(
+					'code' => 'ER02',
+					'message' => 'User Id is null or empty'
+				)
+			),
+			'fare_source_code' => array(
+				'required' => array(
+					'code' => 'ER02',
+					'message' => 'Fare Source Code is null or empty'
+				)
+			),
+			'session_id' => array(
+				'required' => array(
+					'code' => 'ER02',
+					'message' => 'Session Id is null or empty'
+				)
+			),
+		),
+		'flight_revalidate'=>array(
+			'auth_token' => array(
+				'required' => array(
+					'code' => 'ER02',
+					'message' => 'User Id is null or empty'
+				)
+			),
+			'fare_source_code' => array(
+				'required' => array(
+					'code' => 'ER02',
+					'message' => 'Fare Source Code is null or empty'
+				)
+			),
+			'session_id' => array(
+				'required' => array(
+					'code' => 'ER02',
+					'message' => 'Session Id is null or empty'
+				)
+			),
+		),
 	);
 
 	public function validation_check($method_name, $parms) {

application/models/Validation_model.php

@@ -312,20 +312,6 @@ class Validation_model extends CI_Model {
 				) 
 			)
 		) ,
-		'checker_bookingDetails' => array(
-			'qr_pin' => array(
-				'required' => array(
-					'code' => 'ER17',
-					'message' => 'Booking Id is null or empty'
-				) ,
-			) ,
-			'checker_id' => array(
-				'required' => array(
-					'code' => 'ER20',
-					'message' => 'User Id is null or empty'
-				) ,
-			) 
-		) ,
 		'reset_password' => array(
 			'reset_key' => array(
 				'required' => array(
@@ -340,20 +326,6 @@ class Validation_model extends CI_Model {
 				) ,
 			) 
 		) ,
-		'checker_login' => array(
-			'email' => array(
-				'required' => array(
-					'code' => 'ER17',
-					'message' => 'Email Id is null or empty'
-				) 
-			) ,
-			'password' => array(
-				'required' => array(
-					'code' => 'ER20',
-					'message' => 'Password is null or empty'
-				) 
-			) 
-		) ,
 		'payNow' => array(),
 		'searchEvent' => array(),
 		'validate_promo_code' => array(
@@ -382,14 +354,6 @@ class Validation_model extends CI_Model {
 				)
 			)
 		),
-		'getCheckerBookList'=>array(
-			'checker_id' => array(
-				'required' => array(
-					'code' => 'ER04',
-					'message' => 'checker ID is null or empty'
-				)
-			)
-		),
 		'getSavedCards'=>array(
 			'email' => array(
 				'required' => array(
@@ -404,286 +368,6 @@ class Validation_model extends CI_Model {
 				)
 			)
 		),
-		'getOrganizerEventList'=>array(
-			'organiser_id' => array(
-				'required' => array(
-					'code' => 'ER18',
-					'message' => 'Organizer ID is null or empty'
-				)
-			)
-		),
-		'getOrganizerEventDetails'=>array(
-			'organiser_id' => array(
-				'required' => array(
-					'code' => 'ER18',
-					'message' => 'Organizer ID is null or empty'
-				)
-			),
-			'event_id' => array(
-				'required' => array(
-					'code' => 'ER18',
-					'message' => 'Event ID is null or empty'
-				)
-			)
-		),
-		'editOrganizerEventDetails'=>array(
-			'organiser_id' => array(
-				'required' => array(
-					'code' => 'ER18',
-					'message' => 'Organizer ID is null or empty'
-				)
-			),
-			'event_id' => array(
-				'required' => array(
-					'code' => 'ER18',
-					'message' => 'Event ID 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 Filed is null or empty'
-				)
-			),
-			'payment_mode' => array(
-				'required' => array(
-					'code' => 'ER18',
-					'message' => 'Payment Mode is null or empty'
-				)
-			),
-			'images' => array(
-				'required' => array(
-					'code' => 'ER18',
-					'message' => 'Images is null or empty'
-				)
-			),
-			'event_desc_en' => array(
-				'required' => array(
-					'code' => 'ER18',
-					'message' => 'Event Description is null or empty'
-				)
-			),
-			'price' => array(
-				'required' => array(
-					'code' => 'ER18',
-					'message' => 'Price Field is null or empty'
-				)
-			),
-			'capacity' => array(
-				'required' => array(
-					'code' => 'ER18',
-					'message' => 'Capacity Field is null or empty'
-				)
-			),
-			'about_price_division_en' => array(
-				'required' => array(
-					'code' => 'ER18',
-					'message' => 'About Price Division 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 Timing is null or empty'
-				)
-			),
-			'tag' => array(
-				'required' => array(
-					'code' => 'ER18',
-					'message' => 'Tag is null or empty'
-				)
-			)
-		),
-		'deleteOrganizerEvent'=>array(
-			'organiser_id' => array(
-				'required' => array(
-					'code' => 'ER18',
-					'message' => 'Organizer ID is null or empty'
-				)
-			),
-			'event_id' => array(
-				'required' => array(
-					'code' => 'ER18',
-					'message' => 'Event ID is null or empty'
-				)
-			)
-		),
-		'deActivateOrganizerEvent'=>array(
-			'organiser_id' => array(
-				'required' => array(
-					'code' => 'ER18',
-					'message' => 'Organizer ID is null or empty'
-				)
-			),
-			'event_id' => array(
-				'required' => array(
-					'code' => 'ER18',
-					'message' => 'Event ID is null or empty'
-				)
-			)
-		),
-		'getVenueList'=>array(
-			'organiser_id' => array(
-				'required' => array(
-					'code' => 'ER18',
-					'message' => 'Organizer ID is null or empty'
-				)
-			)
-		),
-		'getVenueDetails'=>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'
-				)
-			)
-		),
-		'getCustomerList'=>array(
-			'organiser_id' => array(
-				'required' => array(
-					'code' => 'ER18',
-					'message' => 'Organizer ID is null or empty'
-				)
-			)
-		),
-		'getBookingList'=>array(
-			'organiser_id' => array(
-				'required' => array(
-					'code' => 'ER18',
-					'message' => 'Organizer ID is null or empty'
-				)
-			)
-		),
-		'getBookingDetails'=>array(
-			'booking_id' => array(
-				'required' => array(
-					'code' => 'ER18',
-					'message' => 'Booking ID is null or empty'
-				)
-			)
-		),
-		'organiserSignUp'=>array(
-			'username' => array(
-				'required' => array(
-					'code' => 'ER18',
-					'message' => 'Username is null or empty'
-				)
-			),
-			'email_id' => array(
-				'required' => array(
-					'code' => 'ER18',
-					'message' => 'Email Id is null or empty'
-				)
-			),
-			'contact_no' => array(
-				'required' => array(
-					'code' => 'ER18',
-					'message' => 'Contact Number is null or empty'
-				)
-			),
-			'password' => array(
-				'required' => array(
-					'code' => 'ER18',
-					'message' => 'Password is null or empty'
-				)
-			)
-		),
-		'signIn'=>array(
-			'email_id' => array(
-				'required' => array(
-					'code' => 'ER18',
-					'message' => 'Email Id is null or empty'
-				)
-			),
-			'password' => array(
-				'required' => array(
-					'code' => 'ER18',
-					'message' => 'Password is null or empty'
-				)
-			),
-			'user_type' => array(
-				'required' => array(
-					'code' => 'ER18',
-					'message' => 'User Type is null or empty'
-				)
-			),
-		),
-		'changePassword'=>array(
-			'new_password' => array(
-				'required' => array(
-					'code' => 'ER18',
-					'message' => 'New Password is null or empty'
-				)
-			),
-			'confirm_password' => array(
-				'required' => array(
-					'code' => 'ER18',
-					'message' => 'Confirm Password is null or empty'
-				)
-			),
-			'user_id' => array(
-				'required' => array(
-					'code' => 'ER18',
-					'message' => 'User Id is null or empty'
-				)
-			),
-			'user_type' => array(
-				'required' => array(
-					'code' => 'ER18',
-					'message' => 'User Type is null or empty'
-				)
-			),
-		),
-		'checkerDeactivate'=>array(
-			'checker_id' => array(
-				'required' => array(
-					'code' => 'ER18',
-					'message' => 'Checker Id is null or empty'
-				)
-			),
-			'organiser_id' => array(
-				'required' => array(
-					'code' => 'ER18',
-					'message' => 'Organizer Id is null or empty'
-				)
-			)
-		),
 		'getTagList'=>array(
 			'organiser_id' => array(
 				'required' => array(

application/models/Validation_organizer_model.php

@@ -371,6 +371,28 @@ class Validation_organizer_model extends CI_Model {
 				)
 			),
 		),
+		'checker_bookingDetails' => array(
+			'qr_pin' => array(
+				'required' => array(
+					'code' => 'ER17',
+					'message' => 'Booking Id is null or empty'
+				) ,
+			) ,
+			'checker_id' => array(
+				'required' => array(
+					'code' => 'ER20',
+					'message' => 'User Id is null or empty'
+				) ,
+			) 
+		),
+		'getCheckerBookList'=>array(
+			'checker_id' => array(
+				'required' => array(
+					'code' => 'ER04',
+					'message' => 'checker ID is null or empty'
+				)
+			)
+		)
 	);
 	
 	public function _consruct(){

application/views/Staff/staffForm.php

@@ -50,8 +50,27 @@
                   </div> 
                 <?php } ?>
               </div>
-              <div class="col-md-6">
+              <div class="col-md-6"> 
+                <?php if(!isset($staff_id) || empty($staff_id)){ ?>
                 <div class="form-group">
+                  <label>User Role</label>
+                  <div class="row">
+                    <div class="col-md-12">
+                      <div class="col-md-3">
+                        <input type="radio" class="required padLeft10" data-parsley-trigger="change" 
+                        required value="4" name="user_type" checked>
+                        <label class="padLeft10">Staff User</label>
+                      </div>
+                      <div class="col-md-5">
+                        <input type="radio" class="required padLeft10" data-parsley-trigger="change" 
+                        required value="5" name="user_type">
+                        <label class="padLeft10">Customer User</label>
+                      </div>
+                    </div> 
+                  </div>
+                </div>
+                <?php } ?>
+                <div class="form-group padTop10">
                   <label>Profile Picture</label>
                   <div class="col-md-12" style="padding-bottom:10px;">
                     <div class="col-md-3">

application/views/Staff/viewStaff.php

@@ -39,9 +39,10 @@
               <thead>
                 <tr>
                   <th class="hidden">ID</th>
-                  <th width="50px;">Photo</th>
-                  <th width="150px;">Name</th>
-                  <th width="150px;">Username</th>
+                  <th width="50px;">Photo</th> 
+                  <th width="130px;">Name</th>
+                  <th width="130px;">Username</th>
+                  <th width="120px;">Role</th>
                   <th width="50px;">Status</th>
                   <th width="200px;">Action</th>
                </tr>
@@ -59,6 +60,7 @@
                       </th>
                       <th class="center"><?= $staff->display_name ?></th>
                       <th class="center"><?= $staff->username ?></th>
+                      <th class="center"><?= ($staff->user_type == 4)?'Staff User':'Customer Care' ?></th>
                       <th class="center" id="statusFlag_<?= $staff->id ?>">
                         <?= ($staff->status == 1)?'Active':'De-active' ?>
                       </th>

application/views/Templates/footer-script.php

@@ -18,6 +18,7 @@
 <script src="<?= base_url('assets/js/bootbox.min.js') ?>"></script>
 <script src="<?= base_url('assets/js/app.min.js') ?>"></script>
 <script src="<?= base_url('assets/js/locationpicker.js') ?>" type="text/javascript"></script>
+<script src="<?= base_url('assets/js/jquery-ui.min.js') ?>" type="text/javascript"></script>
 <script src="<?= base_url('assets/js/custom-script.js?ts='.time()) ?>"></script>
 <script src="<?= base_url('assets/js/parsley.min.js') ?>"></script>
 <script src="<?= base_url('assets/js/bootstrap-datepicker.js') ?>"></script>

application/views/Templates/header-script.php

@@ -25,6 +25,7 @@
   <link rel="stylesheet" href="<?= base_url('assets/css/theme.css') ?>">
   <link rel="stylesheet" href="<?= base_url('assets/css/custom.css') ?>">
   <link rel="stylesheet" href="<?= base_url('assets/css/slick.min.css') ?>" type="text/css" >
+  <link rel="stylesheet" href="<?= base_url('assets/css/jquery-ui.min.css') ?>" type="text/css" /> 
 
   <script src="<?= base_url('assets/js/jQuery-2.1.4.min.js') ?>"></script>
   <script src="https://cdn.ckeditor.com/4.5.7/standard/ckeditor.js"></script>

application/views/Venue/venueAddForm.php

@@ -99,7 +99,7 @@
                         <input type="radio" name="locality_type" value="0" checked>
                         <label class="padAll-10">Use Existing Locality</label>
                       </div>
-                      <div class="col-md-4">
+                      <div class="col-md-5">
                         <input class="marginLeft15" type="radio" name="locality_type" value="1">
                         <label class="padAll-10">Add New Locality</label>
                       </div>

assets/css/custom-style.css

@@ -357,7 +357,7 @@
     padding-bottom:20px !important;
   }
   
-  /* .padBottom10 {
+  .padBottom10 {
     padding-bottom:10px !important;
   }
 
@@ -397,6 +397,10 @@
     padding-top:20px !important;
   }
 
+  .padTop50 {
+    padding-top:50px !important;
+  }
+
   .padTop300{
     padding-top: 300px;
   }
@@ -447,7 +451,7 @@
 
   .padAll-20 {
     padding: 20px;
-  } */
+  } 
 
   .vechile-body {
     background-color:#f7f7f7; 

assets/js/custom-script.js

@@ -1024,5 +1024,15 @@ jQuery('[id^="addMultiLang"]').on('click',function() {
     thisObj.html('+ Hide Add More Language Option');
     jQuery('[id="showMultiLangBlock_'+block+'"]').removeClass('hide');
   }
-  
-});
+});
+
\ No newline at end of file
+jQuery('[id="custSearch"]').autocomplete({
+  source: base_url+'Customer_Booking/userSearch',
+  minLength: 1,
+  select : (e,data) => {
+    if(!data || data=='' || data==undefined || data=='undefined' || data==null || data=='null'){
+      return false;
+    }
+    jQuery('[name="user_id"]').val(data['item']['data']); 
+  }
+});