t : category edit issue

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;
@@ -113,4 +120,4 @@ class Category_model extends CI_Model {
  		return 1;
  	}
 }
-?>
\ No newline at end of file
+?>

application/models/Organizer_model.php

@@ -853,7 +853,7 @@ class Organizer_model extends CI_Model {
 
     public function getCountryCode(){
     	try{
-    		$sql = "SELECT country_id,country_name,country_code,phone_code FROM country WHERE status=1";
+    		$sql = "SELECT DISTINCT phone_code,country_id,country_name,country_code FROM country WHERE status=1 GROUP BY phone_code";
     		$ctryData = $this->db->query($sql);
     		if(empty($ctryData) || empty($ctryData = $ctryData->result_array())){
     			$res = array('status'=>0,'message'=>'No Data Found','code'=>'ER06');

application/models/Validation_app_model.php

@@ -664,6 +664,12 @@ class Validation_app_model extends CI_Model {
 					'message' => 'Tracking Id is null or empty'
 				)
 			),
+			'boardCode' => array(
+				'required' => array(
+					'code' => 'ER02',
+					'message' => 'Board Code Field is null or empty'
+				)
+			),
 		),
 		'hotel_book'=>array(
 			'auth_token' => array(

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())){
@@ -2347,7 +2347,7 @@ class Webservice_model extends CI_Model {
     		$user_id = $this->auth_token_get($data['auth_token']);
     		if($user_id > 0){
     			$settings = getSettings();
-    			$url = "https://trawex.biz/api/hotel_trawexv5/get_booking_terms";
+    			$url = "https://trawex.biz/api/hotel_trawexv5/get_rate_rules";
     			$postData = array(
     							"user_id"=>$settings['trawex_user_id'],
     							"user_password"=>$settings['trawex_user_password'],
@@ -2362,7 +2362,7 @@ class Webservice_model extends CI_Model {
     							"hotel_name"=>$data['hotel_name'],"infosource"=>$data['infosource'],
     							"meal_code"=>$data['meal_code'],
     							"rate_basis_id"=>$data['rate_basis_id'],
-    							"room_code"=>$data['room_code'],
+    							"room_code"=>$data['room_code'],"boardCode"=>$data['boardCode'],
     							"roomType_runno"=>$data['roomType_runno']);
     			$result = $this->passToJsonCurl($url,$postData);
 			    if(!empty($result)){

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>