Merge branch 'master' into 'dev_production'

application/controllers/Webservice.php

@@ -783,6 +783,17 @@ class Webservice extends CI_Controller {
       $this->errorResponse($res['code'],$res['message']);
     }
   }
+
+  public function airportSearch(){
+    $data = $_GET;
+    $data['auth_token'] = $this->auth_token;
+    $res = $this->Webservice_model->airportSearch($data);
+    if($res['status'] == 1){
+      $this->response($res['data']);
+    }else{
+      $this->errorResponse($res['code'],$res['message']);
+    }
+  }
   /******************************* END Flight API******************************************/
 }
 ?>

application/models/Category_model.php

@@ -74,7 +74,6 @@ class Category_model extends CI_Model {
 
 		$languages = getLanguages();
  		if(!empty($languages)){
- 			$insertArr = array();
  			foreach ($languages AS $lang) {
  				if((!isset($catData['category_name_'.$lang]) || empty($catData['category_name_'.$lang])) && 
  				   (!isset($catData['category_image_'.$lang]) || empty($catData['category_image_'.$lang]))){
@@ -86,8 +85,16 @@ class Category_model extends CI_Model {
  				if(isset($catData['category_image_'.$lang]) && !empty($catData['category_image_'.$lang])){
  					$upArr['category_image'] = $catData['category_image_'.$lang];
  				}
- 				$status = $this->db->update('translator_category',$upArr,
-								  			array('category_id'=>$category_id,'language_code'=>$lang));
+ 				$condArr = array('category_id'=>$category_id,'language_code'=>$lang);
+ 				$isCat = $this->db->get_where('translator_category',$condArr);
+ 				if(!empty($isCat) && $isCat->num_rows() > 0){
+ 					$status = $this->db->update('translator_category',$upArr,$condArr);
+ 				} else {
+ 					$upArr['category_id'] = $category_id;
+ 					$upArr['language_code'] = $lang;
+ 					$status = $this->db->insert('translator_category',$upArr);
+ 				}
+ 				
  			}
  		}
  		return $status;

application/models/Validation_app_model.php

@@ -1273,6 +1273,14 @@ class Validation_app_model extends CI_Model {
 					'message' => 'Required field is null or empty'
 				)
 			)
+		),
+		'airportSearch'=>array(
+			'auth_token' => array(
+				'required' => array(
+					'code' => 'ER02',
+					'message' => 'User Id is null or empty'
+				)
+			)
 		)
 	);
 

application/models/Webservice_model.php

@@ -2185,7 +2185,7 @@ class Webservice_model extends CI_Model {
  				$sql = "SELECT CUST.customer_id AS user_id,CUST.name,CUST.profile_image AS user_image,CUST.cust_lat AS latitude,CUST.cust_lng AS longitude, (((acos(sin((".$data['latitude']."*pi()/180)) * sin((CUST.cust_lat*pi()/180)) + cos((".$data['latitude']."*pi()/180)) * cos((CUST.cust_lat*pi()/180)) * cos(((".$data['longitude']." - CUST.cust_lng)*pi()/180))))*180/pi())*60*1.1515) as distance 
 		 				FROM customer AS CUST 
 		 				INNER JOIN users AS USR ON (USR.id = CUST.customer_id) 
-		 				WHERE USR.user_type='3' AND USR.status='1' AND CUST.customer_id != '$user_id'
+		 				WHERE USR.user_type='3' AND USR.status='1'
 		 				HAVING distance < 5";
 		 		$result = $this->db->query($sql);
 		 		if(!empty($result) && !empty($result = $result->result_array())){
@@ -2628,6 +2628,35 @@ class Webservice_model extends CI_Model {
     	return $res;
     }
 
+    public function airportSearch($data){
+    	try{
+    		$user_id = $this->auth_token_get($data['auth_token']);
+    		if($user_id > 0){
+    			$sql = "SELECT id FROM airport_details WHERE airport_code LIKE '%".$data['query']."%' OR airport_name LIKE '%".$data['query']."%'";
+    			$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);
+	    			$sql = "SELECT * FROM airport_details WHERE airport_code LIKE '%".$data['query']."%' OR airport_name LIKE '%".$data['query']."%' LIMIT $limit,$perPage";
+	    			$airPortList = $this->db->query($sql);
+	    			if(!isset($airPortList) || empty($airPortList = $airPortList->result_array())){
+	    				$res = array('status'=>0,'message'=>'No data Found','code'=>'ER04');
+	    				return $res;
+	    			}
+	    			$res =array('status'=>1,'data'=>array('airportlist'=>$airPortList,'meta'=>$meta));
+    			}
+    		}else{
+    			$res = array('status'=>0,'message'=>'User Authentication Error','code'=>'ER06');
+    		}
+    	}catch(Exception $e){
+    		$res = array('status'=>0,'message'=>'Ohh No!! Something Went South','code'=>'ER10');
+    	}
+    	return $res;
+    }
+
     public function passToJsonCurl($url='',$postData=array()){
     	$ch = curl_init();
 	    curl_setopt($ch,CURLOPT_URL,$url);

application/views/Category/categoryAddForm.php

@@ -86,7 +86,7 @@
                     <label>Category Name (<?= $lang ?>)</label>
                     <input type="text" class="form-control" data-parsley-trigger="change"
                     data-parsley-minlength="2" name="category_name_<?= $lang ?>" 
-                    value="<?= (isset($categoryData->{'category_name_'.$lang}))?$categoryData->{'category_name_'.$lang}:'' ?>" placeholder="Category Name (English)">
+                    value="<?= (isset($categoryData->{'category_name_'.$lang}))?$categoryData->{'category_name_'.$lang}:'' ?>" placeholder="Category Name (<?= $lang ?>)">
                     <span class="glyphicon form-control-feedback"></span>
                   </div>
                 </div>