Merge branch 'master' into 'dev_production'

application/models/Validation_flight_model.php

@@ -41,12 +41,6 @@ class Validation_flight_model extends CI_Model {
 					'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',

application/models/Webservice_model.php

@@ -1978,7 +1978,10 @@ class Webservice_model extends CI_Model {
 	public function recent_chats($data){
 		$respArr = array('status'=>0,'code'=>'918','message'=>'No Request for you');
 		$user_id = $this->auth_token_get($data['auth_token']);
-		$result = $this->db->query("SELECT from_user,to_user,type FROM chats WHERE (from_user=$user_id OR to_user=$user_id) AND type IN('0','1')")->result_array();
+		$result = $this->db->query("SELECT from_user,to_user,type 
+									FROM chats 
+									WHERE (from_user=$user_id OR to_user=$user_id) AND 
+										  type IN ('0','1')")->result_array();
 		$custData = array();
 		if(!empty($result)){
 			foreach ($result as $key => $value) {