Skip to content

T
TimeOutAdmin
Commit 4126e263 by Tobin
Options

t : payment, location apis : uat

parent 02ddcbed
Showing with 459 additions and 67 deletions
application/controllers/Webservice.php
......@@ -593,6 +593,17 @@ 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_hotel_city_list(){
$data = $_GET;
$data['auth_token'] = $this->auth_token;
......@@ -717,6 +728,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
......@@ -628,6 +628,7 @@ class Api_model extends CI_Model {
'redeem_amount'=>$post_data['redeem_amount'],
'created_date'=>date('Y-m-d H:i:s'),'status'=>$promoStatus);
}
$auth_token = $post_data['auth_token'];
unset($post_data['auth_token'],$post_data['has_payment'],
$post_data['promocode_id'],$post_data['redeem_amount']);
......@@ -636,8 +637,13 @@ class Api_model extends CI_Model {
if(!empty($promocodeData)){
$this->db->insert('promocode_used',$promocodeData);
}
$reqData = array('amount'=>$post_data['amount'],'event_id'=>$post_data['event_id'],
'cardData'=>array('1'),'auth_token'=>$auth_token,
'booking_id'=>$post_data['bookId']);
$res = array('status'=>1,'data'=>array('user_id'=>$user_id,
'bookingCode'=>$post_data['bookId']));
'bookingCode'=>$post_data['bookId'],'reqData'=>$reqData));
if($status == 1){
$sql = "SELECT TEVT.event_name,CUST.name,CUST.email,CUST.phone,
......@@ -934,8 +940,7 @@ class Api_model extends CI_Model {
}
if(!empty($user_id)) {
$sql = "SELECT SUM(no_of_ticket) AS bookCount
FROM booking AS BOK
$sql = "SELECT SUM(no_of_ticket) AS bookCount FROM booking AS BOK
WHERE event_id='$event_id' AND customer_id='$user_id' AND status IN (1)";
$result = $this->db->query($sql)->row_array();
if(!empty($result)){
......
application/models/Organizer_model.php
......@@ -9,7 +9,13 @@ class Organizer_model extends CI_Model {
public function getOrganizerEventList($data){
try {
$organizer_id = $data['organiser_id'];
$count = $this->db->query("SELECT * FROM events AS EVT WHERE EVT.provider_id = '$organizer_id' AND EVT.status IN ('0','1','3')")->num_rows();
$count = $this->db->query("SELECT EVT.event_id FROM events AS EVT
INNER JOIN translator_event AS TSEVT ON (EVT.event_id = TSEVT.event_id)
INNER JOIN translator_venue AS TSVNE ON (EVT.venue_id = TSVNE.venue_id)
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')")->num_rows();
if($count > 0) {
$perPage = 10;
$page = (isset($data['page']))?$data['page']:1;
......@@ -430,7 +436,8 @@ class Organizer_model extends CI_Model {
$res = array('status'=>0,'message'=>'Email Id Already Exist','code'=>'ER08');
return $res;
}
$data['contact_no'] = preg_replace('/\D/', '', $data['contact_no']);
$phoneChk = $this->db->query("SELECT * FROM provider AS PRV
INNER JOIN users AS USR ON (USR.id=PRV.provider_id)
WHERE USR.user_type='2' AND USR.status!='2' AND
......
application/models/Validation_app_model.php
......@@ -415,15 +415,6 @@ class Validation_app_model extends CI_Model {
'code' => 'ER02',
'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(
......@@ -893,8 +884,294 @@ class Validation_app_model extends CI_Model {
'message' => 'Session Id is null or empty'
)
),
),
'flight_revalidate'=>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'
)
),
),
'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'
)
),
),
'flight_book'=>array(
'auth_token' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'target' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'session_id' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'area_code' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'country_code' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'first_name' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'last_name' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'title' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'email_id' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'mobile_no' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'dob' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'gender' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'issue_country' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'passport_expiry' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'passport_no' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'type' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'IsPassportMandatory' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'adult_flight' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'child_flight' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'infant_flight' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'frequentFlyrNum' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'adultmealplan' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'child_dob' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'child_gender' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'child_title' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'child_first_name' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'child_last_name' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'child_passport_expiry_date' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'child_passport_no' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'child_frequentFlyrNum' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'childMealplan' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'infant_dob' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'infant_gender' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'infant_first_name' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),'infant_last_name' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'infant_title' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'infantMealplan' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'FareSourceCode' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'PostCode' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
),
'flight_ticket_order'=>array(),
'flight_trip_details'=>array(),
'cancel_flights'=>array(),
'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) {
......
application/views/Booking/viewBooking.php
......@@ -78,7 +78,9 @@
<i class="fa fa-fw fa-eye"></i>View
</a> <br>
<?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 ?";
$bookId = encode_param($booking->booking_id);
$param = "{'booking_id':'$bookId','alertMsg':'$msg'}"; ?>
......
application/views/Staff/staffForm.php
......@@ -59,12 +59,12 @@
<div class="col-md-3">
<input type="radio" class="required padLeft10" data-parsley-trigger="change"
required value="4" name="user_type" checked>
<label class="padLeft10">Staff User</label>
<label class="padLeft10">Staff</label>
</div>
<div class="col-md-5">
<input type="radio" class="required padLeft10" data-parsley-trigger="change"
required value="5" name="user_type">
<label class="padLeft10">Customer User</label>
<label class="padLeft10">Customer</label>
</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