Merge branch 'jansa' into 'master'

application/models/Organizer_model.php

@@ -358,7 +358,7 @@ class Organizer_model extends CI_Model {
 	 			INNER JOIN customer AS CUST ON (CUST.customer_id = BUK.customer_id) 
 	 			INNER JOIN event_date_time AS EVDT ON (BUK.event_date_id = EVDT.id) 
 	 			WHERE EVT.provider_id ='$provider_id' AND TSEVT.language_code='EN' AND TSCAT.language_code='EN'
-	 			GROUP BY BUK.id 
+	 			GROUP BY BUK.id ORDER BY BUK.id DESC
 	 			LIMIT $limit,$perPage";
 	 			$custData = $this->db->query($sql)->result_array();
 	 			$res = array('status'=>1,'data'=>array('data'=>$custData,'meta'=>$meta));

application/models/Validation_app_model.php

@@ -554,7 +554,7 @@ class Validation_app_model extends CI_Model {
 					'message' => 'Result Index Field is null or empty'
 				)
 			),
-			'hotelCode' => array(
+			'hotelcode' => array(
 				'required' => array(
 					'code' => 'ER02',
 					'message' => 'Hotel Code is null or empty'

application/models/Webservice_model.php

@@ -2162,7 +2162,7 @@ class Webservice_model extends CI_Model {
     		if($user_id > 0){
     			$settings = getSettings();
     			$url = "https://trawex.biz/api/hotel_trawexv5/get_room_rates";
-    			$postData = array("user_id"=>$settings['trawex_user_id'],"user_password"=>$settings['trawex_user_password'],"access"=>$settings['trawex_access'],"ip_address"=>$settings['trawex_ip_address'],"TraceId"=>$data['TraceId'],"propertyid"=>$data['propertyid'],"trackingId"=>$data['trackingId'],"sessionId"=>$data['sessionId'],"productId"=>$data['productId'],"TokenId"=>$data['TokenId'],"resultindex"=>$data['resultindex'],"hotelCode"=>$data['hotelCode']);
+    			$postData = array("user_id"=>$settings['trawex_user_id'],"user_password"=>$settings['trawex_user_password'],"access"=>$settings['trawex_access'],"ip_address"=>$settings['trawex_ip_address'],"TraceId"=>$data['TraceId'],"propertyid"=>$data['propertyid'],"trackingId"=>$data['trackingId'],"sessionId"=>$data['sessionId'],"productId"=>$data['productId'],"TokenId"=>$data['TokenId'],"resultindex"=>$data['resultindex'],"hotelcode"=>$data['hotelcode']);
     			$result = $this->passToJsonCurl($url,$postData);
 			    if(!empty($result)){
 			    	$result = json_decode($result);
@@ -2185,7 +2185,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_rate_rules";
+    			$url = "https://trawex.biz/api/hotel_trawexv5/get_booking_terms";
     			$postData = array(
     							"user_id"=>$settings['trawex_user_id'],
     							"user_password"=>$settings['trawex_user_password'],