From cd86dbbaa0dbd78627bcaa04fb170a565edd9560 Mon Sep 17 00:00:00 2001
From: jansa <jansa@techware.in>
Date: Wed, 13 Nov 2019 16:24:27 +0530
Subject: [PATCH] J: event list Details error
---
application/controllers/Webservice.php | 11 +++++++++++
application/models/Organizer_model.php | 2 +-
application/models/Validation_app_model.php | 27 +++++++++++++++++++++++++++
application/models/Webservice_model.php | 36 ++++++++++++++++++++++++++++++++----
4 files changed, 71 insertions(+), 5 deletions(-)
diff --git a/application/controllers/Webservice.php b/application/controllers/Webservice.php
index 03ac03b..424d6ef 100644
--- a/application/controllers/Webservice.php
+++ b/application/controllers/Webservice.php
@@ -706,6 +706,17 @@ class Webservice extends CI_Controller {
}
}
+ public function flight_revalidate(){
+ $data = (array)json_decode(file_get_contents('php://input'));
+ $data['auth_token'] = $this->auth_token;
+ $res = $this->Webservice_model->flight_revalidate($data);
+ if($res['status'] == 1){
+ $this->response($res['data']);
+ }else{
+ $this->errorResponse($res['code'],$res['message']);
+ }
+ }
+
diff --git a/application/models/Organizer_model.php b/application/models/Organizer_model.php
index 9d4ca15..a67f1e3 100644
--- a/application/models/Organizer_model.php
+++ b/application/models/Organizer_model.php
@@ -23,7 +23,7 @@ class Organizer_model extends CI_Model {
INNER JOIN translator_category AS TSCAT ON (EVT.category_id = TSCAT.category_id)
INNER JOIN venue AS VNE ON (EVT.venue_id = VNE.id)
INNER JOIN translator_region AS TSREG ON (VNE.region_id = TSREG.region_id)
- WHERE EVT.provider_id = $organizer_id AND TSEVT.language_code='EN' AND TSVNE.language_code='EN' AND TSCAT.language_code='EN' AND TSREG.language_code='EN' AND EVT.status IN ('0','1','3');
+ WHERE EVT.provider_id = $organizer_id AND TSEVT.language_code='EN' AND TSVNE.language_code='EN' AND TSCAT.language_code='EN' AND TSREG.language_code='EN' AND EVT.status IN ('0','1','3')
LIMIT $limit,$perPage");
if(empty($evtData) || empty($evtData = $evtData->result_array())){
$respArr['code'] = 980;
diff --git a/application/models/Validation_app_model.php b/application/models/Validation_app_model.php
index 8dc71b5..6e6ed56 100644
--- a/application/models/Validation_app_model.php
+++ b/application/models/Validation_app_model.php
@@ -867,6 +867,33 @@ class Validation_app_model extends CI_Model {
'message' => 'Target Field is null or empty'
)
),
+ 'session_id' => array(
+ 'required' => array(
+ 'code' => 'ER02',
+ 'message' => 'Session Id is null or empty'
+ )
+ ),
+ ),
+ 'flight_fare_rules'=>array(
+ 'auth_token' => array(
+ 'required' => array(
+ 'code' => 'ER02',
+ 'message' => 'User Id is null or empty'
+ )
+ ),
+ 'fare_source_code' => array(
+ 'required' => array(
+ 'code' => 'ER02',
+ 'message' => 'Fare Source Code is null or empty'
+ )
+ ),
+ 'session_id' => array(
+ 'required' => array(
+ 'code' => 'ER02',
+ 'message' => 'Session Id is null or empty'
+ )
+ ),
+
),
);
diff --git a/application/models/Webservice_model.php b/application/models/Webservice_model.php
index 8882a58..1b4a31a 100644
--- a/application/models/Webservice_model.php
+++ b/application/models/Webservice_model.php
@@ -2359,23 +2359,51 @@ class Webservice_model extends CI_Model {
$result = json_decode($result);
$res = array('status'=>1,'data'=>$result);
}else{
- $res = array('status'=>0,'message'=>'No Data Found','code'=>'ER06');
+ $res = array('status'=>0,'message'=>'No Data Found','code'=>'ER08');
}
}else{
- $res = array('status'=>0,'message'=>'User Authentication Error','code'=>'ER08');
+ $res = array('status'=>0,'message'=>'User Authentication Error','code'=>'ER06');
}
}catch(Exception $e){
- $res = array('status'=>0,'message'=>'Ohh No!! Something Went South','code'=>'ER08');
+ $res = array('status'=>0,'message'=>'Ohh No!! Something Went South','code'=>'ER10');
}
return $res;
}
public function flight_fare_rules($data){
try{
+ $user_id = $this->auth_token_get($data['auth_token']);
+ if($user_id > 0){
+ $settings = getSettings();
+ $url = "https://trawex.biz/api/flight_trawex/fare_rules?user_id=".$settings['trawex_user_id']."&user_password=".$settings['trawex_user_password']."&access=".$settings['trawex_access']."&ip_address=".$settings['trawex_ip_address']."&fare_source_code=".$data['fare_source_code']."&session_id=".$data['session_id']."";
+ $result = $this->passToJsonCurl($url,'');
+ if(!empty($result)){
+ $result = json_decode($result);
+ $res = array('status'=>1,'data'=>$result);
+ }else{
+ $res = array('status'=>0,'message'=>'No Data Found','code'=>'ER08');
+ }
+ }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 flight_revalidate($data){
+ try{
+ $user_id = $this->auth_token_get($data['auth_token']);
+ if($user_id > 0){
+
+ }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'=>'ER08');
+ $res = array('status'=>0,'message'=>'Ohh No!! Something Went South','code'=>'ER10');
}
+ return $res;
}
public function passToJsonCurl($url='',$postData=array()){
--
libgit2 0.27.1