Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into tobin

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

@@ -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)){