Skip to content

T
TimeOutAdmin
Commit b8a59eca by Tobin
Options

t : crone tab changes and checker issue fixing

parent 0f0e5792
Showing with 221 additions and 61 deletions
application/controllers/Event.php
......@@ -94,8 +94,8 @@ class Event extends CI_Controller {
$errMsg = 'Provide Proper Layout details';
}
$_POST['has_payment'] = (isset($_POST['has_payment']) && $_POST['has_payment'] == 1)?'1':'0';
$_POST['approve_booking'] = (isset($_POST['approve_booking']) && $_POST['approve_booking']==1)?'1':'0';
$_POST['has_payment'] = (isset($_POST['has_payment']) && $_POST['has_payment'] == 1)?1:0;
$_POST['approve_booking'] = (isset($_POST['approve_booking'])&&$_POST['approve_booking']==1)?1:0;
$_POST['seat_pricing'] = $_POST['custom_seat_layout'] = '';
if(isset($_POST['fare_type']) && $_POST['fare_type'] == 1){
......
application/controllers/Webservice.php
......@@ -684,6 +684,28 @@ class Webservice extends CI_Controller {
}
}
public function flight_availability_search(){
$data = (array)json_decode(file_get_contents('php://input'));
$data['auth_token'] = $this->auth_token;
$res = $this->Webservice_model->flight_availability_search($data);
if($res['status'] == 1){
$this->response($res['data']);
}else{
$this->errorResponse($res['code'],$res['message']);
}
}
public function flight_fare_rules(){
$data = (array)json_decode(file_get_contents('php://input'));
$data['auth_token'] = $this->auth_token;
$res = $this->Webservice_model->flight_fare_rules($data);
if($res['status'] == 1){
$this->response($res['data']);
}else{
$this->errorResponse($res['code'],$res['message']);
}
}
......
application/controllers/bookingStatusCrone.php
......@@ -9,10 +9,15 @@
$sql = "UPDATE booking
INNER JOIN event_date_time ON event_date_time.id = booking.event_date_id
SET booking.status = '2'
WHERE event_date_time.date < '$todate' and event_date_time.time < 'now()' and booking.status='1'";
SET booking.status='2'
WHERE event_date_time.date<'$todate' and event_date_time.time<'now()' and booking.status='1'";
$result = mysqli_query($conn, $sql);
$sql = "UPDATE booking
INNER JOIN event_date_time ON event_date_time.id = booking.event_date_id
SET booking.status='0'
WHERE event_date_time.date<'$todate' and event_date_time.time<'now()' and booking.status='6'";
$result = mysqli_query($conn, $sql);
$sql = "UPDATE booking
INNER JOIN transaction ON transaction.booking_id = booking.bookId
......
application/models/Organizer_model.php
......@@ -9,7 +9,7 @@ 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=1")->num_rows();
$count = $this->db->query("SELECT * FROM events AS EVT WHERE EVT.provider_id = '$organizer_id' AND EVT.status IN ('0','1','3')")->num_rows();
if($count > 0) {
$perPage = 10;
$page = (isset($data['page']))?$data['page']:1;
......@@ -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 EVT.status=1 AND TSEVT.language_code='EN' AND TSVNE.language_code='EN' AND TSCAT.language_code='EN' AND TSREG.language_code='EN'
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;
......@@ -261,7 +261,7 @@ class Organizer_model extends CI_Model {
public function getVenueList($data){
try{
$count = $this->db->query("SELECT * FROM venue AS VNE WHERE VNE.status != '2' AND VNE.provider_id =".$data['organiser_id'])->num_rows();
$count = $this->db->query("SELECT * FROM venue AS VNE WHERE VNE.status = '1' AND VNE.provider_id =".$data['organiser_id'])->num_rows();
if($count > 0) {
$perPage = 10;
$page = (isset($data['page']))?$data['page']:1;
......@@ -269,7 +269,7 @@ class Organizer_model extends CI_Model {
$meta = array('total_pages'=>ceil($count/$perPage),'total'=>$count,
'current_page'=>$page,'per_page'=>$perPage);
$cond = (!empty($view))?" VNE.status IN ($view) ":" VNE.status != '2' ";
$cond = " VNE.status = '1'";
$cond .= (!empty($data['organiser_id']))?" AND VNE.provider_id='".$data['organiser_id']."' ":"";
$sql = "SELECT VNE.id AS venue_id,VNE.location AS venue_location,VNE.region_id
......@@ -355,7 +355,7 @@ class Organizer_model extends CI_Model {
try{
$provider_id = $data['organiser_id'];
$this->db->query("SET SESSION group_concat_max_len = 20000");
$count = $this->db->query("SELECT BUK.id FROM booking AS BUK INNER JOIN events AS EVT ON (EVT.event_id = BUK.event_id) INNER JOIN translator_event AS TSEVT ON (EVT.event_id = TSEVT.event_id)INNER JOIN translator_category AS TSCAT ON (EVT.category_id = TSCAT.category_id) WHERE EVT.provider_id ='$provider_id' AND TSEVT.language_code='EN' AND TSCAT.language_code='EN' GROUP BY BUK.id")->num_rows();
$count = $this->db->query("SELECT BUK.id FROM booking AS BUK INNER JOIN events AS EVT ON (EVT.event_id = BUK.event_id) INNER JOIN translator_event AS TSEVT ON (EVT.event_id = TSEVT.event_id)INNER JOIN translator_category AS TSCAT ON (EVT.category_id = TSCAT.category_id) WHERE EVT.provider_id ='$provider_id' AND TSEVT.language_code='EN' AND TSCAT.language_code='EN' AND BUK.status !='4' GROUP BY BUK.id")->num_rows();
if($count > 0) {
$perPage = 10;
$page = (isset($data['page']))?$data['page']:1;
......@@ -363,14 +363,14 @@ class Organizer_model extends CI_Model {
$meta = array('total_pages'=>ceil($count/$perPage),'total'=>$count,
'current_page'=>$page,'per_page'=>$perPage);
$sql = "SELECT TSEVT.event_id,TSEVT.event_name,BUK.bookId,TSCAT.category_name,BUK.amount,CASE WHEN BUK.status ='0' THEN 'Cancelled' WHEN BUK.status='1' THEN 'Booked' WHEN BUK.status='2' THEN 'Completed' WHEN BUK.status='3' THEN 'Pending' WHEN BUK.status='4' THEN 'Deleted' ELSE 'Payment Failed' END AS status,CUST.name AS customer_name,EVDT.date AS scheduled_date,EVDT.time AS scheduled_time
$sql = "SELECT TSEVT.event_id,TSEVT.event_name,BUK.bookId,TSCAT.category_name,BUK.amount,BUK.status,CUST.name AS customer_name,EVDT.date AS scheduled_date,EVDT.time AS scheduled_time
FROM booking AS BUK
INNER JOIN events AS EVT ON (EVT.event_id = BUK.event_id)
INNER JOIN translator_event AS TSEVT ON (EVT.event_id = TSEVT.event_id)
INNER JOIN translator_category AS TSCAT ON (EVT.category_id = TSCAT.category_id)
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'
WHERE EVT.provider_id ='$provider_id' AND TSEVT.language_code='EN' AND TSCAT.language_code='EN' AND BUK.status !='4'
GROUP BY BUK.id ORDER BY BUK.id DESC
LIMIT $limit,$perPage";
$custData = $this->db->query($sql)->result_array();
......@@ -416,9 +416,18 @@ class Organizer_model extends CI_Model {
try{
$userNameChk = $this->db->query("SELECT * FROM users
WHERE user_type='2' AND status!='2' AND
username='".$data['email_id']."'");
username='".$data['username']."'");
if(!empty($userNameChk) && $userNameChk->num_rows() > 0){
$res = array('status'=>0,'message'=>'Email ID Already Exist','code'=>'ER07');
$res = array('status'=>0,'message'=>'Username Already Exist','code'=>'ER07');
return $res;
}
$emailChk = $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
PRV.email='".$data['email_id']."'");
if(!empty($emailChk) && $emailChk->num_rows() > 0){
$res = array('status'=>0,'message'=>'Email Id Already Exist','code'=>'ER08');
return $res;
}
......@@ -431,7 +440,7 @@ class Organizer_model extends CI_Model {
return $res;
}
$this->db->insert('users',array('username'=>$data['email_id'],'display_name'=>$data['username'],
$this->db->insert('users',array('username'=>$data['username'],'display_name'=>$data['username'],
'password'=>md5($data['password']),'user_type'=>'2','status'=>'3'));
$last_id = $this->db->insert_id();
......@@ -448,11 +457,7 @@ class Organizer_model extends CI_Model {
public function signIn($data){
try{
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.status='1' 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']."'");
}else{
$sql = $this->db->query("SELECT * FROM checker WHERE username='".$data['email_id']."' AND password='".md5($data['password'])."' AND status='1'");
}
......@@ -525,7 +530,7 @@ class Organizer_model extends CI_Model {
set_time_limit(0);
$languages = getLanguages();
$err = 0;
$postData['seat_pricing'] = $postData['custom_seat_layout'] = '';
if(isset($postData['layout_type'],$postData['fare_type']) && $postData['layout_type'] == 1 && $postData['fare_type'] == 2){
$postData['custom_seat_layout'] = $postData['layout'];
......@@ -598,7 +603,7 @@ class Organizer_model extends CI_Model {
}
$this->db->insert_batch('event_tags',$insertTag);
if(isset($_FILES) && isset($_FILES['images']) &&
isset($_FILES['images']['name']) && count($_FILES['images']['name'])>1){
isset($_FILES['images']['name']) && count($_FILES['images']['name'])>=1){
$resp = $this->eventImageUpload($event_id,$_FILES);
$evtMediaData = (isset($resp['evtMediaData']))?$resp['evtMediaData']:array();
$errorMediaFiles = (isset($resp['errorMediaFiles']))?$resp['errorMediaFiles']:array();
......@@ -989,21 +994,24 @@ class Organizer_model extends CI_Model {
function checkerbookingdetails($data) {
try {
$count = $this->db->get_where('checker',array('id'=>$data['checker_id']))->num_rows();
if($count > 0){
$result = $this->db
->select('booking.id AS book_id,booking.bookId,customer.name AS customer_name,
booking.status,booking.no_of_ticket,booking.qrcode,
booking.ticket_details,event_date_time.date AS booking_date')
->where(array('booking.bookId'=>$data['qr_pin'],'status'=>'1'))
->from('booking')
->join('events','booking.event_id = events.event_id')
->join('event_date_time','booking.event_date_id = event_date_time.id')
->join('venue', 'venue.id = events.venue_id')
->join('event_gallery', 'events.event_id = event_gallery.event_id', 'LEFT')
->join('customer','customer.customer_id = booking.customer_id')
->join('host_categories', 'venue.host_cat_id = host_categories.host_cat_id')
->group_by('booking.bookId')->get()->row();
$res = $this->db->get_where('checker',array('id'=>$data['checker_id']));
$qrCode = $data['qr_pin'];
$count = $res->num_rows();
$res = $res->row_array();
if($count>0 && !empty($res) && isset($res['provider_id']) &&
!empty($provider_id = $res['provider_id'])){
$sql = "SELECT BUK.id AS book_id, BUK.bookId, CUST.name AS customer_name, BUK.status,
BUK.no_of_ticket, BUK.qrcode, BUK.ticket_details, EDATE.date AS BUK_date
FROM booking AS BUK
INNER JOIN events AS EVT ON (BUK.event_id = EVT.event_id)
INNER JOIN event_date_time AS EDATE ON (BUK.event_date_id = EDATE.id)
INNER JOIN customer AS CUST ON (CUST.customer_id=BUK.customer_id)
WHERE EVT.provider_id IN (1,$provider_id) AND BUK.status='1' AND
BUK.bookId='$qrCode'
GROUP BY BUK.bookId";
$result = $this->db->query($sql)->row();
if(count($result)>0){
$result->seat_class = '';
if(!empty($ticketDetls = json_decode($result->ticket_details))){
......@@ -1014,7 +1022,7 @@ class Organizer_model extends CI_Model {
}
}
$this->db->insert('checker_bookings',
array('checker_id'=>$data['checker_id'],'booking_id'=>$data['qr_pin'],
array('checker_id'=>$data['checker_id'],'booking_id'=>$qrCode,
'checked_time'=>date('Y-m-d H:i:s')));
$res = array('status'=>1,'data'=>$result);
......@@ -1035,12 +1043,12 @@ class Organizer_model extends CI_Model {
$checker_id = $data['checker_id'];
$count = $this->db->get_where('checker',array('id'=>$checker_id,'status'=>'1'))->num_rows();
if($count > 0){
$sql = "SELECT BOOK.bookId AS booking_id
FROM checker_bookings AS CBOOK
INNER JOIN checker AS CHK ON (CHK.id=$checker_id)
INNER JOIN booking AS BOOK ON (BOOK.bookId=CBOOK.booking_id)
INNER JOIN events AS EVT ON (EVT.event_id=BOOK.event_id)
WHERE EVT.provider_id=CHK.provider_id AND BOOK.status='1'";
$sql = "SELECT BOOK.bookId AS booking_id
FROM checker_bookings AS CBOOK
INNER JOIN booking AS BOOK ON (BOOK.bookId=CBOOK.booking_id)
INNER JOIN events AS EVT ON (EVT.event_id=BOOK.event_id)
INNER JOIN checker AS CHK ON (CHK.provider_id=EVT.provider_id)
WHERE CHK.id='$checker_id' AND BOOK.status='1'";
$count = $this->db->query($sql)->num_rows();
if($count > 0) {
......@@ -1054,17 +1062,17 @@ class Organizer_model extends CI_Model {
$sql = "SELECT TEVT.event_name,TCAT.category_name,CUST.name,EDATE.date,
EDATE.time,BOOK.amount,BOOK.bookId AS booking_id
FROM checker_bookings AS CBOOK
INNER JOIN checker AS CHK ON (CHK.id=CBOOK.checker_id)
INNER JOIN booking AS BOOK ON (BOOK.bookId=CBOOK.booking_id)
INNER JOIN events AS EVT ON (EVT.event_id=BOOK.event_id AND
EVT.provider_id=CHK.provider_id)
INNER JOIN events AS EVT ON (EVT.event_id=BOOK.event_id)
INNER JOIN checker AS CHK ON (CHK.provider_id=EVT.provider_id)
INNER JOIN event_date_time AS EDATE ON (EDATE.event_id=EVT.event_id)
INNER JOIN event_category AS CAT ON (CAT.cat_id=EVT.category_id)
INNER JOIN customer AS CUST ON (CUST.customer_id=BOOK.customer_id)
INNER JOIN translator_event AS TEVT ON (TEVT.event_id=EVT.event_id)
INNER JOIN translator_category AS TCAT ON (TCAT.category_id=CAT.cat_id)
WHERE CBOOK.checker_id='$checker_id' AND TEVT.language_code='EN' AND
TCAT.language_code='EN' AND BOOK.status='1'";
WHERE CHK.id='$checker_id' AND TEVT.language_code='EN' AND
TCAT.language_code='EN' AND BOOK.status='1'
GROUP BY booking_id";
$result = $this->db->query($sql)->result();
$resp = array('data'=>$result,'meta'=>$meta);
......@@ -1078,13 +1086,11 @@ class Organizer_model extends CI_Model {
}
} else {
$res = array('status'=>0,'message'=>'Checker Doesnot Exist','code'=>'ER25');
}
}
} catch(Exception $e) {
$res = array('status'=>0,'message'=>'Ohh No!! Something went South!!','code'=>'ER06');
}
}
return $res;
}
}
}
?>
application/models/Validation_app_model.php
......@@ -792,6 +792,82 @@ class Validation_app_model extends CI_Model {
)
),
),
'flight_authenticate'=>array(
'auth_token' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
)
),
'flight_availability_search'=>array(
'auth_token' => array(
'required' => array(
'code' => 'ER02',
'message' => 'User Id is null or empty'
)
),
'journey_type' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Journey Type is null or empty'
)
),
'airport_from_code' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Airport From Code is null or empty'
)
),
'airport_to_code' => array(
'required' => array(
'code' => 'ER02',
'message' => 'airport To Code is null or empty'
)
),
'departure_date' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Departure Date is null or empty'
)
),
'return_date' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Return Date 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'
)
),
'class' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Class Field is null or empty'
)
),
'target' => array(
'required' => array(
'code' => 'ER02',
'message' => 'Target Field is null or empty'
)
),
),
);
public function validation_check($method_name, $parms) {
......
application/models/Webservice_model.php
......@@ -2088,7 +2088,7 @@ class Webservice_model extends CI_Model {
}
$sql = "SELECT HC.hotel_city_id FROM hotel_cities AS HC
INNER JOIN translator_hotel_city AS THC ON(THC.hotel_city_id=HC.hotel_city_id)
WHERE HC.status=1 $cond";
WHERE HC.status=1 $cond GROUP BY HC.hotel_city_id";
$count = $this->db->query($sql)->num_rows();
if($count >= 1){
$perPage = 10;
......@@ -2326,14 +2326,66 @@ class Webservice_model extends CI_Model {
return $res;
}
public function flight_authenticate($data){
try{
$user_id = $this->auth_token_get($data['auth_token']);
if($user_id > 0){
$settings = getSettings();
$url = "https://trawex.biz/api/flight_trawex/authenticate?user_id=".$settings['trawex_user_id']."&user_password=".$settings['trawex_user_password']."&access=".$settings['trawex_access']."&ip_address=".$settings['trawex_ip_address']."";
$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'=>'ER06');
}
}else{
$res = array('status'=>0,'message'=>'User Authentication Error','code'=>'ER10');
}
}catch(Exception $e){
$res = array('status'=>0,'message'=>'Ohh No!! Something Went South!!','code'=>'ER08');
}
return $res;
}
public function flight_availability_search($data){
try{
$user_id = $this->auth_token_get($data['auth_token']);
if($user_id > 0){
$settings = getSettings();
$url = "https://trawex.biz/api/flight_trawex/flight_availability_search?user_id=".$settings['trawex_user_id']."&user_password=".$settings['trawex_user_password']."&access=".$settings['trawex_access']."&ip_address=".$settings['trawex_ip_address']."&session_id=".$data['session_id']."&journey_type=".$data['journey_type']."&airport_from_code=".$data['airport_from_code']."&airport_to_code=".$data['airport_to_code']."&departure_date=".$data['departure_date']."&return_date=".$data['return_date']."&adult_flight=".$data['adult_flight']."&child_flight=".$data['child_flight']."&infant_flight=".$data['infant_flight']."&class=".$data['class']."&target=".$data['target']."";
$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'=>'ER06');
}
}else{
$res = array('status'=>0,'message'=>'User Authentication Error','code'=>'ER08');
}
}catch(Exception $e){
$res = array('status'=>0,'message'=>'Ohh No!! Something Went South','code'=>'ER08');
}
return $res;
}
public function flight_fare_rules($data){
try{
}catch(Exception $e){
$res = array('status'=>0,'message'=>'Ohh No!! Something Went South','code'=>'ER08');
}
}
public function passToJsonCurl($url='',$postData=array()){
$ch = curl_init();
curl_setopt($ch,CURLOPT_URL,$url);
curl_setopt($ch,CURLOPT_RETURNTRANSFER,1);
curl_setopt($ch,CURLOPT_POST,1);
curl_setopt($ch,CURLOPT_POSTFIELDS,json_encode($postData));
curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
curl_setopt($ch,CURLOPT_SSL_VERIFYHOST, false);
curl_setopt($ch,CURLOPT_SSL_VERIFYPEER, false);
curl_setopt($ch,CURLOPT_HTTPHEADER,array('Content-Type:application/json'));
$result = curl_exec($ch);
curl_close($ch);
......
application/views/Venue/venueAddForm.php
......@@ -99,7 +99,7 @@
<input type="radio" name="locality_type" value="0" checked>
<label class="padAll-10">Use Existing Locality</label>
</div>
<div class="col-md-4">
<div class="col-md-5">
<input class="marginLeft15" type="radio" name="locality_type" value="1">
<label class="padAll-10">Add New Locality</label>
</div>
......
assets/js/custom-script.js
......@@ -1024,16 +1024,15 @@ jQuery('[id^="addMultiLang"]').on('click',function() {
thisObj.html('+ Hide Add More Language Option');
jQuery('[id="showMultiLangBlock_'+block+'"]').removeClass('hide');
}
});
jQuery('[id="custSearch"]').autocomplete({
source: base_url+'Customer_Booking/userSearch',
minLength: 1,
select : (e,data) => {
if(!data || data=='' || data==undefined || data=='undefined' || data==null || data=='null'){
return false;
}
if(!data || data=='' || data==undefined || data=='undefined' || data==null || data=='null'){
return false;
}
jQuery('[name="user_id"]').val(data['item']['data']);
}
});
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