Merge branch 'master' into 'dev_production'

application/models/Organizer_model.php

@@ -735,7 +735,7 @@ class Organizer_model extends CI_Model {
 
     public function getLanguages(){
     	try{
-    		$sql = "SELECT country_id AS lang_id,language_code AS lang,language FROM country WHERE status='1' ORDER BY language_code ASC";
+    		$sql = "SELECT country_id AS lang_id,language_code AS lang,language,country_name,country_code FROM country WHERE status='1' ORDER BY language_code ASC";
     		$lang = $this->db->query($sql);
     		if(empty($lang) || empty($lang = $lang->result_array())){
     			$res = array('status'=>0,'message'=>'No Data Found','code'=>'ER05');

application/models/Webservice_model.php

@@ -2078,7 +2078,7 @@ class Webservice_model extends CI_Model {
  		return $res;
  	}
 
-    public function get_hotel_city_list($data){
+    public function get_hotel_city_list($data){ 
     	try{
     		$user_id = $this->auth_token_get($data['auth_token']);
 			if($user_id > 0) {