Skip to content

T
TimeOutAdmin
Commit 8bc59552 by Jansa Jose
Options

Merge branch 'master' into 'dev_production'

Master See merge request !201
parents 1c4bb87f c391942d
Showing with 580 additions and 83 deletions
application/controllers/Api.php
...@@ -232,6 +232,11 @@ class Api extends CI_Controller { ...@@ -232,6 +232,11 @@ class Api extends CI_Controller {
$data['auth_token'] = $this->auth_token; $data['auth_token'] = $this->auth_token;
$res = $this->Api_model->tempbooking($data); $res = $this->Api_model->tempbooking($data);
if($res['status']!=0){ if($res['status']!=0){
if(isset($res['data']['reqData']) && !empty($res['data']['reqData'])){
$reqData = $this->encrypt(json_encode($res['data']['reqData']),$this->local_key,$this->local_iv);
$reqData = urlencode(base64_encode($reqData));
$res['data']['reqData'] = $reqData;
}
$this->response($res['data']); $this->response($res['data']);
} }
else{ else{
...@@ -320,34 +325,68 @@ class Api extends CI_Controller { ...@@ -320,34 +325,68 @@ class Api extends CI_Controller {
} }
} }
public function payNow($auth_token='',$amount=0,$booking_id='',$event_id='',$cardData=''){ public function payNow($reqData=''){
$settings = getSettings(); $settings = getSettings();
$redUrl = $settings['web_base_url']; $redUrl = $settings['web_base_url'];
if(empty($auth_token) || empty($amount) || empty($booking_id)){ if(empty($reqData) || empty($reqData = urldecode($reqData)) ||
empty($reqData = base64_decode($reqData))){
redirect($redUrl.'failure');
}
$reqData = $this->decrypt($reqData,$this->local_key,$this->local_iv);
if(empty($reqData) || empty($reqData = json_decode($reqData,true)) ||
!isset($reqData['amount']) || empty($amount = $reqData['amount']) ||
!isset($reqData['event_id']) || empty($event_id = $reqData['event_id']) ||
!isset($reqData['cardData']) || empty($cardData = $reqData['cardData']) ||
!isset($reqData['auth_token']) || empty($auth_token = $reqData['auth_token']) ||
!isset($reqData['booking_id']) || empty($booking_id = $reqData['booking_id'])){
redirect($redUrl.'failure'); redirect($redUrl.'failure');
} }
$payData = array('auth_token'=>$auth_token,'amount'=>$amount,'booking_id'=>$booking_id); $payData = array('auth_token'=>$auth_token,'amount'=>$amount,'booking_id'=>$booking_id);
$res = $this->Api_model->payNow($payData); $res = $this->Api_model->payNow($payData);
if($res['status']==1){ if($res['status']==1){
$this->paymentGateway($amount,$res['transaction_id'],$event_id,$booking_id,$res['custData'],$cardData); $params = array('amount'=>$amount,'last_id'=>$res['transaction_id'],'event_id'=>$event_id,
} 'booking_id'=>$booking_id,'custData'=>$res['custData'],'cardData'=>$cardData);
else{
redirect($redUrl.'failure?event_id='.$eventid); $reqData = $this->encrypt(json_encode($params),$this->local_key,$this->local_iv);
$reqData = urlencode(base64_encode($reqData));
$this->paymentGateway($reqData);
} else {
redirect($redUrl.'failure?event_id='.$event_id);
} }
} }
public function paymentGateway($amount='0',$last_id='0',$event_id='0',$booking_id='0', public function paymentGateway($reqData=''){
$custData=array(),$cardData=''){ $settings = getSettings();
$redUrl = $settings['web_base_url'];
if(empty($reqData) || empty($reqData = urldecode($reqData)) ||
empty($reqData = base64_decode($reqData))){
redirect($redUrl.'failure');
}
$customerName = array(); $customerName = array();
if(isset($custData->name) && !empty($custData->name)){ $reqData = $this->decrypt($reqData,$this->local_key,$this->local_iv);
$customerName = explode(' ',$custData->name);
if(empty($reqData) || empty($reqData = json_decode($reqData,true)) ||
!isset($reqData['amount']) || empty($amount = $reqData['amount']) ||
!isset($reqData['last_id']) || empty($last_id = $reqData['last_id']) ||
!isset($reqData['event_id']) || empty($event_id = $reqData['event_id']) ||
!isset($reqData['custData']) || empty($custData = $reqData['custData']) ||
!isset($reqData['cardData']) || empty($cardData = $reqData['cardData']) ||
!isset($reqData['booking_id']) || empty($booking_id = $reqData['booking_id'])){
redirect($redUrl.'failure');
}
if(isset($custData['name']) && !empty($custData['name'])){
$customerName = explode(' ',$custData['name']);
} }
$amount = $amount; $amount = $amount;
$phone = (isset($custData->phone))?$custData->phone:''; $phone = (isset($custData['phone']))?$custData['phone']:'';
$email = (isset($custData->email))?$custData->email:''; $email = (isset($custData['email']))?$custData['email']:'';
$userId = (isset($custData->userId))?$custData->userId:''; $userId = (isset($custData['userId']))?$custData['userId']:'';
$f_Name = (isset($customerName[0]))?$customerName[0]:''; $f_Name = (isset($customerName[0]))?$customerName[0]:'';
$l_Name = (isset($customerName[1]))?$customerName[1]:'T'; $l_Name = (isset($customerName[1]))?$customerName[1]:'T';
$add1 = $add2 = $city = $state = 'Saudi Arabia'; $add1 = $add2 = $city = $state = 'Saudi Arabia';
...@@ -355,41 +394,39 @@ class Api extends CI_Controller { ...@@ -355,41 +394,39 @@ class Api extends CI_Controller {
$saveCard = 1; $saveCard = 1;
$savedCard = 0; $savedCard = 0;
$cardMode = 'DD';
$cvv = $token = $cardNo = $holder = $cardType = $expMonth = $expYear = ''; $cvv = $token = $cardNo = $holder = $cardType = $expMonth = $expYear = '';
if(!empty($cardData) && !empty($cardData = urldecode($cardData))){
$cardData = $this->decrypt($cardData,$this->local_key,$this->local_iv); if (isset($cardData['cvv']) && !empty($cardData['cvv']) &&
if(empty($cardData) || empty($cardData = json_decode($cardData,true))){ isset($cardData['token']) && !empty($cardData['token'])){
redirect($redUrl.'failure'); $cvv = $cardData['cvv'];
} else if (isset($cardData['cvv']) && !empty($cardData['cvv']) && $token = $cardData['token'];
isset($cardData['token']) && !empty($cardData['token'])){ $savedCard = 1;
$cvv = $cardData['cvv']; } else if(isset($cardData['cvv']) && !empty($cardData['cvv']) ||
$token = $cardData['token']; isset($cardData['cardType']) && !empty($cardData['cardType']) ||
$savedCard = 1; isset($cardData['cardMode']) && !empty($cardData['cardMode']) ||
} else if(isset($cardData['cvv']) && !empty($cardData['cvv']) || isset($cardData['cardNumber']) && !empty($cardData['cardNumber']) ||
isset($cardData['cardType']) && !empty($cardData['cardType']) || isset($cardData['expMonthYear']) && !empty($cardData['expMonthYear']) ||
isset($cardData['cardNumber']) && !empty($cardData['cardNumber']) || isset($cardData['cardHolderName']) && !empty($cardData['cardHolderName'])){
isset($cardData['expMonthYear']) && !empty($cardData['expMonthYear']) ||
isset($cardData['cardHolderName']) && !empty($cardData['cardHolderName'])){ $cvv = $cardData['cvv'];
$cardNo = $cardData['cardNumber'];
$cvv = $cardData['cvv']; $holder = $cardData['cardHolderName'];
$cardNo = $cardData['cardNumber']; $cardType = $cardData['cardType'];
$holder = $cardData['cardHolderName']; $cardMode = $cardData['cardMode'];
$cardType = $cardData['cardType']; $expMonth = substr($cardData['expMonthYear'],0,2);
$expMonth = substr($cardData['expMonthYear'],0,2); $expYear = '20'.substr($cardData['expMonthYear'],2,2);
$expYear = '20'.substr($cardData['expMonthYear'],2,2); $saveCard = (isset($cardData['saveCard']) && $cardData['saveCard'] == 0)?0:1;
$saveCard = (isset($cardData['saveCard']) && $cardData['saveCard'] == 0)?0:1;
} else {
redirect($redUrl.'failure');
}
} else { } else {
redirect($redUrl.'failure'); redirect($redUrl.'failure?event_id='.$event_id);
} }
$failureUrl = base_url('Api/paymentFailureUrl'); $failureUrl = base_url('Api/paymentFailureUrl');
$successUrl = base_url('Api/paymentSuccessUrl'); $successUrl = base_url('Api/paymentSuccessUrl');
$pText = '1111110||'; $pText = '1111110||';
$pText .= '11111111|'.$last_id.'|'.$amount.'|'.$successUrl.'|'.$failureUrl.'|INTERNET|DD|01|SAR||'; $pText .= '11111111|'.$last_id.'|'.$amount.'|'.$successUrl.'|'.$failureUrl.'|INTERNET|'.$cardMode.'
|01|SAR||';
$pText .= '1111111111111|'.$f_Name.'|'.$l_Name.'|'.$add1.'|'.$add2.'|'.$city.'|'.$state.'|'.$pincode. $pText .= '1111111111111|'.$f_Name.'|'.$l_Name.'|'.$add1.'|'.$add2.'|'.$city.'|'.$state.'|'.$pincode.
'|SA|'.$email.'|'.$phone.'|34|344|34355344||'; '|SA|'.$email.'|'.$phone.'|34|344|34355344||';
$pText .= '111111111111|'.$f_Name.'|'.$l_Name.'|'.$add1.'|'.$add2.'|'.$city.'|'.$state.'|'.$pincode. $pText .= '111111111111|'.$f_Name.'|'.$l_Name.'|'.$add1.'|'.$add2.'|'.$city.'|'.$state.'|'.$pincode.
...@@ -663,24 +700,22 @@ class Api extends CI_Controller { ...@@ -663,24 +700,22 @@ class Api extends CI_Controller {
public function addCard(){ public function addCard(){
$data = (array) json_decode(file_get_contents('php://input')); $data = (array) json_decode(file_get_contents('php://input'));
// $dmyData = '{"auth_token":"cc731b6bd572eb452d85c96aaec77898","cardNumber":"5111111111111118",
// "expMonthYear":"0622","cardHolderName":"John","cvv":"100","cardType":"MasterCard"}';
// $data['requestData'] = $this->encrypt($dmyData,$this->local_key,$this->local_iv);
$settings = getSettings();
$merchant_iv = $settings['merchant_iv'];
$merchant_key = $settings['merchant_key'];
$reqData = $this->decrypt($data['requestData'],$this->local_key,$this->local_iv); $reqData = $this->decrypt($data['requestData'],$this->local_key,$this->local_iv);
if(empty($reqData) || empty($reqData=json_decode($reqData,true))){ if(empty($reqData) || empty($reqData = json_decode($reqData,true)) ||
!isset($reqData['auth_token']) || empty($reqData['auth_token'])){
redirect($redUrl.'failure'); redirect($redUrl.'failure');
} }
$payData = array('auth_token'=>$reqData['auth_token'],'amount'=>'1','booking_id'=>'ADD_CARD'); $payData = array('auth_token'=>$reqData['auth_token'],'amount'=>'1','booking_id'=>'ADD_CARD');
$res = $this->Api_model->payNow($payData); $res = $this->Api_model->payNow($payData);
if($res['status']==1){ if($res['status']==1){
unset($reqData['auth_token']); $params = array('amount'=>1,'last_id'=>$res['transaction_id'],'event_id'=>'test',
$this->paymentGateway(1,$res['transaction_id'],'test','ADD_CARD',$res['custData'],$reqData); 'booking_id'=>'ADD_CARD','custData'=>$res['custData'],'cardData'=>$reqData);
$reqData = $this->encrypt(json_encode($params),$this->local_key,$this->local_iv);
$reqData = urlencode(base64_encode($reqData));
$this->paymentGateway($reqData);
}else{ }else{
redirect($redUrl.'failure'); redirect($redUrl.'failure');
} }
......
application/controllers/Webservice.php
...@@ -593,6 +593,28 @@ class Webservice extends CI_Controller { ...@@ -593,6 +593,28 @@ class Webservice extends CI_Controller {
} }
} }
public function update_user_location(){
$data = (array)json_decode(file_get_contents('php://input'));
$data['auth_token'] = $this->auth_token;
$res = $this->Webservice_model->update_user_location($data);
if($res['status'] != 0){
$this->successResponse();
}else{
$this->errorResponse($res['code'],$res['message']);
}
}
public function get_nearby_users(){
$data = (array)json_decode(file_get_contents('php://input'));
$data['auth_token'] = $this->auth_token;
$res = $this->Webservice_model->get_nearby_users($data);
if($res['status'] == 'success'){
$this->response($res['data']);
}else{
$this->errorResponse($res['code'],$res['message']);
}
}
public function get_hotel_city_list(){ public function get_hotel_city_list(){
$data = $_GET; $data = $_GET;
$data['auth_token'] = $this->auth_token; $data['auth_token'] = $this->auth_token;
...@@ -717,6 +739,50 @@ class Webservice extends CI_Controller { ...@@ -717,6 +739,50 @@ class Webservice extends CI_Controller {
} }
} }
public function flight_book(){
$data = (array)json_decode(file_get_contents('php://input'));
$data['auth_token'] = $this->auth_token;
$res = $thia->Webservice_model->flight_book($data);
if($res['status'] == 1){
$this->response($res['data']);
}else{
$this->errorResponse($res['code'],$res['message']);
}
}
public function flight_ticket_order(){
$data = (array)json_decode(file_get_contents('php://input'));
$data['auth_token'] = $this->auth_token;
$res = $this->Webservice_model->flight_ticket_order($data);
if($res['status'] == 1){
$this->response($res['data']);
}else{
$this->errorResponse($res['code'],$res['message']);
}
}
public function flight_trip_details(){
$data = (array)json_decode(file_get_contents('php://input'));
$data['auth_token'] = $this->auth_token;
$res = $this->Webservice_model->flight_trip_details($data);
if($res['status'] == 1){
$this->response($res['data']);
}else{
$this->errorResponse($res['code'],$res['message']);
}
}
public function cancel_flights(){
$data = (array)json_decode(file_get_contents('php://input'));
$data['auth_token'] = $this->auth_token;
$res = $this->Webservice_model->cancel_flights($data);
if($res['status'] == 1){
$this->response($res['data']);
}else{
$this->errorResponse($res['code'],$res['message']);
}
}
......
application/models/Api_model.php
...@@ -626,7 +626,9 @@ class Api_model extends CI_Model { ...@@ -626,7 +626,9 @@ class Api_model extends CI_Model {
'redeem_amount'=>$post_data['redeem_amount'], 'redeem_amount'=>$post_data['redeem_amount'],
'created_date'=>date('Y-m-d H:i:s'),'status'=>$promoStatus); 'created_date'=>date('Y-m-d H:i:s'),'status'=>$promoStatus);
} }
unset($post_data['auth_token'],$post_data['has_payment'], $card_data = $post_data['cardData'];
$auth_token = $post_data['auth_token'];
unset($post_data['auth_token'],$post_data['has_payment'],$post_data['cardData'],
$post_data['promocode_id'],$post_data['redeem_amount']); $post_data['promocode_id'],$post_data['redeem_amount']);
$rs = $this->db->insert('booking', $post_data); $rs = $this->db->insert('booking', $post_data);
...@@ -634,8 +636,34 @@ class Api_model extends CI_Model { ...@@ -634,8 +636,34 @@ class Api_model extends CI_Model {
if(!empty($promocodeData)){ if(!empty($promocodeData)){
$this->db->insert('promocode_used',$promocodeData); $this->db->insert('promocode_used',$promocodeData);
} }
$cardDetails = array();
if(!empty($card_data)){
// (CC)-Credit ,(DC)-Debit ,(DD)-Direct Debit,(PAYPAL)-PayPal,(NB)-Net Banking
switch($card_data->card_type) {
case '1': $cardDetails['cardMode'] = 'CC'; break;
case '2': $cardDetails['cardMode'] = 'DC'; break;
case '3': $cardDetails['cardMode'] = 'DD'; break;
default : $cardDetails['cardMode'] = 'DD'; break;
}
switch(substr($card_data->card_number,0,1)) {
case '4': $cardDetails['cardType'] = 'VisaCard'; break;
case '5': $cardDetails['cardType'] = 'Mastercard'; break;
case '6': $cardDetails['cardType'] = 'DiscoverCard'; break;
default : $cardDetails['cardType'] = 'Mastercard'; break;
}
$cardDetails['cvv'] = $card_data->card_cvv;
$cardDetails['cardNumber'] = $card_data->card_number;
$cardDetails['expMonthYear'] = $card_data->exp_date.$card_data->exp_year;
$cardDetails['cardHolderName'] = $card_data->holder_name;
}
$reqData = array('amount'=>$post_data['amount'],'event_id'=>$post_data['event_id'],
'cardData'=>$cardDetails,'auth_token'=>$auth_token,
'booking_id'=>$post_data['bookId']);
$res = array('status'=>1,'data'=>array('user_id'=>$user_id, $res = array('status'=>1,'data'=>array('user_id'=>$user_id,
'bookingCode'=>$post_data['bookId'])); 'bookingCode'=>$post_data['bookId'],'reqData'=>$reqData));
if($status == 1){ if($status == 1){
$sql = "SELECT TEVT.event_name,CUST.name,CUST.email,CUST.phone, $sql = "SELECT TEVT.event_name,CUST.name,CUST.email,CUST.phone,
...@@ -932,8 +960,7 @@ class Api_model extends CI_Model { ...@@ -932,8 +960,7 @@ class Api_model extends CI_Model {
} }
if(!empty($user_id)) { if(!empty($user_id)) {
$sql = "SELECT SUM(no_of_ticket) AS bookCount $sql = "SELECT SUM(no_of_ticket) AS bookCount FROM booking AS BOK
FROM booking AS BOK
WHERE event_id='$event_id' AND customer_id='$user_id' AND status IN (1)"; WHERE event_id='$event_id' AND customer_id='$user_id' AND status IN (1)";
$result = $this->db->query($sql)->row_array(); $result = $this->db->query($sql)->row_array();
if(!empty($result)){ if(!empty($result)){
......
application/models/Organizer_model.php
...@@ -164,9 +164,9 @@ class Organizer_model extends CI_Model { ...@@ -164,9 +164,9 @@ class Organizer_model extends CI_Model {
set_time_limit(0); set_time_limit(0);
$languages = getLanguages(); $languages = getLanguages();
$postData['seat_pricing'] = $postData['custom_seat_layout'] = ''; $postData['seat_pricing'] = $postData['custom_seat_layout'] = '';
if(isset($postData['layout_type']) && $postData['layout_type'] == 1){ if(isset($postData['layout_type'],$postData['fare_type']) && $postData['layout_type'] == 1 && $postData['fare_type'] == 2){
$postData['custom_seat_layout'] = $postData['layout']; $postData['custom_seat_layout'] = $postData['layout'];
} else { } else if($postData['layout_type'] == 2) {
$postData['seat_pricing'] = $postData['layout']; $postData['seat_pricing'] = $postData['layout'];
} }
$eventData = array('venue_id'=>(!empty($postData['venue_id']))?$postData['venue_id']:'', $eventData = array('venue_id'=>(!empty($postData['venue_id']))?$postData['venue_id']:'',
...@@ -464,7 +464,12 @@ class Organizer_model extends CI_Model { ...@@ -464,7 +464,12 @@ class Organizer_model extends CI_Model {
public function signIn($data){ public function signIn($data){
try{ try{
if($data['user_type'] == '2'){ if($data['user_type'] == '2'){
$sql = $this->db->query("SELECT USR.* FROM users AS USR INNER JOIN provider AS PDR ON (PDR.provider_id = USR.id) WHERE USR.password='".md5($data['password'])."' AND PDR.email='".$data['email_id']."' AND USR.user_type='".$data['user_type']."'"); $sql = $this->db->query("SELECT USR.* FROM users AS USR
INNER JOIN provider AS PDR ON (PDR.provider_id = USR.id)
WHERE USR.password='".md5($data['password'])."' AND
PDR.email='".$data['email_id']."' AND
USR.user_type='".$data['user_type']."' AND
USR.status='1'");
}else{ }else{
$sql = $this->db->query("SELECT * FROM checker WHERE username='".$data['email_id']."' AND password='".md5($data['password'])."' AND status='1'"); $sql = $this->db->query("SELECT * FROM checker WHERE username='".$data['email_id']."' AND password='".md5($data['password'])."' AND status='1'");
} }
...@@ -485,11 +490,20 @@ class Organizer_model extends CI_Model { ...@@ -485,11 +490,20 @@ class Organizer_model extends CI_Model {
$res = array('status'=>0,'message'=>'New Password and Confirm Password Doesnot Match','code'=>'ER10'); $res = array('status'=>0,'message'=>'New Password and Confirm Password Doesnot Match','code'=>'ER10');
return $res; return $res;
} }
if($data['user_type'] == '2'){ $sql = "SELECT * FROM provider AS PDR
$status = $this->db->query("UPDATE users SET password='".md5($data['confirm_password'])."' WHERE id='".$data['user_id']."' AND user_type='".$data['user_type']."'"); INNER JOIN users AS USR ON (USR.id=PDR.provider_id)
}else{ WHERE phone LIKE '%".$data['phone_number']."' AND
$status = $this->db->query("UPDATE checker SET password ='".md5($data['confirm_password'])."' WHERE id='".$data['user_id']."'"); USR.user_type='2' AND USR.status='1'";
$usrData = $this->db->query($sql);
if(empty($usrData) || empty($usrData = $usrData->row_array())){
$res = array('status'=>0,'message'=>'Provider Doesnot Exist','code'=>'ER08');
return $res;
} }
$sql = "UPDATE users SET password='".md5($data['confirm_password'])."'
WHERE id='".$usrData['provider_id']."' AND user_type='".$data['user_type']."'";
$status = $this->db->query($sql);
if($status){ if($status){
$res = array('status'=>1,'message'=>'Password Updated Successfully'); $res = array('status'=>1,'message'=>'Password Updated Successfully');
} }
...@@ -854,7 +868,7 @@ class Organizer_model extends CI_Model { ...@@ -854,7 +868,7 @@ class Organizer_model extends CI_Model {
public function getCountryCode(){ public function getCountryCode(){
try{ try{
$sql = "SELECT country_id,country_name,country_code,phone_code FROM country WHERE status='1'"; $sql = "SELECT country_id,country_name,country_code,phone_code FROM country WHERE status=1";
$ctryData = $this->db->query($sql); $ctryData = $this->db->query($sql);
if(empty($ctryData) || empty($ctryData = $ctryData->result_array())){ if(empty($ctryData) || empty($ctryData = $ctryData->result_array())){
$res = array('status'=>0,'message'=>'No Data Found','code'=>'ER06'); $res = array('status'=>0,'message'=>'No Data Found','code'=>'ER06');
...@@ -865,7 +879,7 @@ class Organizer_model extends CI_Model { ...@@ -865,7 +879,7 @@ class Organizer_model extends CI_Model {
$res = array('status'=>0,'message'=>'Ohh No!! Something Went South','code'=>'ER08'); $res = array('status'=>0,'message'=>'Ohh No!! Something Went South','code'=>'ER08');
} }
return $res; return $res;
} }
public function getCheckerList($data){ public function getCheckerList($data){
try{ try{
......
application/models/Validation_app_model.php
...@@ -415,15 +415,6 @@ class Validation_app_model extends CI_Model { ...@@ -415,15 +415,6 @@ class Validation_app_model extends CI_Model {
'code' => 'ER02', 'code' => 'ER02',
'message' => 'User id is null or empty' 'message' => 'User id is null or empty'
) )
),
'create_guest_user' => array(),
'update_user_visibility' => array(
'visible' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Required field is null or empty'
)
)
) )
), ),
'upload_audio_message' => array( 'upload_audio_message' => array(
...@@ -914,6 +905,369 @@ class Validation_app_model extends CI_Model { ...@@ -914,6 +905,369 @@ class Validation_app_model extends CI_Model {
) )
), ),
), ),
'update_user_location'=>array(
'auth_token' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'latitude' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Latitude Field is null or empty'
)
),
'longitude' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Longitude Field is null or empty'
)
),
),
'get_nearby_users'=>array(
'auth_token' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'latitude' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Latitude Field is null or empty'
)
),
'longitude' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Longitude Field is null or empty'
)
),
),
'flight_book'=>array(
'auth_token' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'target' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Target Field is null or empty'
)
),
'session_id' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Session Id is null or empty'
)
),
'area_code' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Area Code is null or empty'
)
),
'country_code' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Country Code is null or empty'
)
),
'first_name' => array(
'required' => array(
'code' => 'ER02',
'message' => 'First Name is null or empty'
)
),
'last_name' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Last Name is null or empty'
)
),
'title' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Title Field is null or empty'
)
),
'email_id' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Email ID is null or empty'
)
),
'mobile_no' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Mobile Number is null or empty'
)
),
'dob' => array(
'required' => array(
'code' => 'ER02',
'message' => 'DOB is null or empty'
)
),
'gender' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Gender is null or empty'
)
),
'issue_country' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Issue Country is null or empty'
)
),
'passport_expiry' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Passport Expiry Field is null or empty'
)
),
'passport_no' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Passport Number is null or empty'
)
),
'type' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Type Field is null or empty'
)
),
'IsPassportMandatory' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Is Passport Mandatory Field is null or empty'
)
),
'adult_flight' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Adult flight is null or empty'
)
),
'child_flight' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Child Flight is null or empty'
)
),
'infant_flight' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Infant Flight is null or empty'
)
),
'frequentFlyrNum' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Frequent Flyr Number Field is null or empty'
)
),
'adultmealplan' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Adult Meal Plan Field is null or empty'
)
),
'child_dob' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Child Dob is null or empty'
)
),
'child_gender' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Child Gender is null or empty'
)
),
'child_title' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Child Title is null or empty'
)
),
'child_first_name' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Child First Name is null or empty'
)
),
'child_last_name' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Child Last Name is null or empty'
)
),
'child_passport_expiry_date' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Child Passport Expiry Date is null or empty'
)
),
'child_passport_no' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Child Passport Number is null or empty'
)
),
'child_frequentFlyrNum' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Child Frequent Flyr Number is null or empty'
)
),
'childMealplan' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Child Meal Plan is null or empty'
)
),
'infant_dob' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Infant Dob is null or empty'
)
),
'infant_gender' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Infant Gender is null or empty'
)
),
'infant_first_name' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Infant First Name is null or empty'
)
),
'infant_last_name' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Infant Last Name is null or empty'
)
),
'infant_title' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Infant Title is null or empty'
)
),
'infantMealplan' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Infant Meal Plan is null or empty'
)
),
'FareSourceCode' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Fare Source Code is null or empty'
)
),
'PostCode' => array(
'required' => array(
'code' => 'ER02',
'message' => 'PostCode is null or empty'
)
),
),
'flight_ticket_order'=>array(
'auth_token' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'target' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Target Field is null or empty'
)
),
'session_id' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Session Id is null or empty'
)
),
'UniqueID' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Unique Id is null or empty'
)
),
),
'flight_trip_details'=>array(
'auth_token' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'target' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Target Field is null or empty'
)
),
'session_id' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Session Id is null or empty'
)
),
'UniqueID' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Unique Id is null or empty'
)
),
),
'cancel_flights'=>array(
'auth_token' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'target' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Target Field is null or empty'
)
),
'session_id' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Session Field is null or empty'
)
),
'UniqueID' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Unique ID is null or empty'
)
),
),
'create_guest_user' => array(),
'update_user_visibility' => array(
'visible' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Required field is null or empty'
)
)
)
); );
public function validation_check($method_name, $parms) { public function validation_check($method_name, $parms) {
......
application/models/Validation_model.php
...@@ -428,4 +428,4 @@ class Validation_model extends CI_Model { ...@@ -428,4 +428,4 @@ class Validation_model extends CI_Model {
} }
} }
?> ?>
\ No newline at end of file
application/models/Validation_organizer_model.php
...@@ -166,10 +166,10 @@ class Validation_organizer_model extends CI_Model { ...@@ -166,10 +166,10 @@ class Validation_organizer_model extends CI_Model {
'message' => 'Confirm Password is null or empty' 'message' => 'Confirm Password is null or empty'
) )
), ),
'user_id' => array( 'phone_number' => array(
'required' => array( 'required' => array(
'code' => 'ER18', 'code' => 'ER18',
'message' => 'User Id is null or empty' 'message' => 'Phone Number is null or empty'
) )
), ),
'user_type' => array( 'user_type' => array(
......
application/views/Booking/viewBooking.php
...@@ -78,7 +78,9 @@ ...@@ -78,7 +78,9 @@
<i class="fa fa-fw fa-eye"></i>View <i class="fa fa-fw fa-eye"></i>View
</a> <br> </a> <br>
<?php <?php
if($this->session->userdata('user_type')==2 && $booking->book_status == '6'){ if(($this->session->userdata('user_type')==1 && $booking->provider_id==1 &&
$booking->book_status=='6') ||
($this->session->userdata('user_type')==2 && $booking->book_status=='6')){
$msg = "Are you sure to Aprove this booking ?"; $msg = "Are you sure to Aprove this booking ?";
$bookId = encode_param($booking->booking_id); $bookId = encode_param($booking->booking_id);
$param = "{'booking_id':'$bookId','alertMsg':'$msg'}"; ?> $param = "{'booking_id':'$bookId','alertMsg':'$msg'}"; ?>
......
application/views/Category/categoryAddForm.php
...@@ -85,8 +85,8 @@ ...@@ -85,8 +85,8 @@
<div class="form-group"> <div class="form-group">
<label>Category Name (<?= $lang ?>)</label> <label>Category Name (<?= $lang ?>)</label>
<input type="text" class="form-control" data-parsley-trigger="change" <input type="text" class="form-control" data-parsley-trigger="change"
data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z0-9\ . _ - ' \/]+$" data-parsley-minlength="2" name="category_name_<?= $lang ?>"
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 (English)">
<span class="glyphicon form-control-feedback"></span> <span class="glyphicon form-control-feedback"></span>
</div> </div>
</div> </div>
......
application/views/Host/viewHostCategories.php
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<?= ($host->status == 1)?'Active':'De-activate' ?> <?= ($host->status == 1)?'Active':'De-activate' ?>
</th> </th>
<?php if(in_array('2',$pAccess)||in_array('3',$pAccess)||in_array('4',$pAccess)){?> <td class="center"> <?php if(in_array('2',$pAccess)||in_array('3',$pAccess)||in_array('4',$pAccess)){?> <td class="center">
<?php if(in_array('2',$pAccess)){ ?> <?php if(in_array('NILL',$pAccess)){ ?>
<a class="btn btn-sm btn-primary" <a class="btn btn-sm btn-primary"
href="<?= base_url('Host/editHostCategory/'.encode_param($host->host_cat_id))?>"> href="<?= base_url('Host/editHostCategory/'.encode_param($host->host_cat_id))?>">
<i class="fa fa-fw fa-edit"></i>Edit <i class="fa fa-fw fa-edit"></i>Edit
......
application/views/Staff/staffForm.php
...@@ -59,12 +59,12 @@ ...@@ -59,12 +59,12 @@
<div class="col-md-3"> <div class="col-md-3">
<input type="radio" class="required padLeft10" data-parsley-trigger="change" <input type="radio" class="required padLeft10" data-parsley-trigger="change"
required value="4" name="user_type" checked> required value="4" name="user_type" checked>
<label class="padLeft10">Staff User</label> <label class="padLeft10">Staff</label>
</div> </div>
<div class="col-md-5"> <div class="col-md-5">
<input type="radio" class="required padLeft10" data-parsley-trigger="change" <input type="radio" class="required padLeft10" data-parsley-trigger="change"
required value="5" name="user_type"> required value="5" name="user_type">
<label class="padLeft10">Customer User</label> <label class="padLeft10">Customer Care</label>
</div> </div>
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment