Skip to content

T
TimeOutAdmin
Commit f635b733 by Tobin
Options

Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into tobin

# Conflicts: # application/models/Api_model.php
parents b1e3e3b9 4edf4a78
Showing with 29 additions and 28 deletions
application/controllers/Api.php
......@@ -156,7 +156,7 @@ class Api extends CI_Controller {
public function bookedlist() {
$data = (array) json_decode(file_get_contents('php://input'));
$data['auth_token'] = $this->auth_token;
$res_count = $this->Webservice_model->bookedlist($data,0,0);
$res_count = $this->Api_model->bookedlist($data,0,0);
$res = $this->Api_model->bookedlist($data,10,'',$res_count);
if($res['status']!=0){
$this->response($res['data']);
......
application/models/Api_model.php
......@@ -382,15 +382,13 @@ class Api_model extends CI_Model {
$bookedData = $this->db->query("
SELECT ODR.order_id,ODR.order_type,ODR.booking_id FROM orders AS ODR
LEFT JOIN booking AS BOK ON
(ODR.booking_id=BOK.bookId AND BOK.status IN (0,1,2,3,5,6) AND
BOK.customer_id='$user_id')
(ODR.booking_id=BOK.bookId AND BOK.status IN (0,1,2,3,5,6))
LEFT JOIN flight_booking AS FBK ON
(ODR.booking_id=FBK.flight_book_id AND FBK.status IN (0,1,2,3,5) AND
FBK.customer_id='$user_id')
(ODR.booking_id=FBK.flight_book_id AND FBK.status IN (0,1,2,3,5))
LEFT JOIN hotel_booking AS HBK ON
(ODR.booking_id=HBK.hotel_book_id AND HBK.status IN (0,1,2,3,5) AND
HBK.customer_id='$user_id')
GROUP BY ODR.order_id $cond");
(ODR.booking_id=HBK.hotel_book_id AND HBK.status IN (0,1,2,3,5))
WHERE ODR.customer_id='$user_id'
GROUP BY ODR.order_id ORDER BY ODR.order_id DESC $cond");
if($per_page == 0 && $page == 0){
return $bookedData->num_rows();
}
......@@ -428,10 +426,10 @@ class Api_model extends CI_Model {
}
function getEventData($booking_id='',$user_id=''){
$countryData = $this->getCountryData($user_id);
$lang = $countryData['language_code'];
// $countryData = $this->getCountryData($user_id);
// $lang = $countryData['language_code'];
$sql = "SELECT booking.id AS book_id,booking.bookId AS bookingCode,booking.amount,
event_date_time.date AS event_date,translator_event.event_name,booking.qrcode,
event_date_time.date AS event_date,booking.qrcode,
venue.location,event_date_time.time AS event_time,booking.event_id,
event_gallery.media_url,booking.no_of_ticket,events.has_payment,
venue.id AS venue_id,booking.status AS book_status
......@@ -441,14 +439,18 @@ class Api_model extends CI_Model {
INNER JOIN venue ON venue.id = events.venue_id
LEFT JOIN event_gallery ON events.event_id=event_gallery.event_id AND
event_gallery.media_type=0
INNER JOIN translator_event ON translator_event.event_id=events.event_id
INNER JOIN translator_venue ON translator_venue.venue_id = events.venue_id
-- INNER JOIN translator_event ON translator_event.event_id=events.event_id
-- INNER JOIN translator_venue ON translator_venue.venue_id = events.venue_id
-- LEFT JOIN transaction ON transaction.booking_id=booking.bookId
WHERE (translator_event.language_code='$lang' OR translator_event.language_code='EN').
AND booking.bookId='$booking_id' AND events.has_payment != '1'
AND transaction.status = '1'";
WHERE booking.bookId='$booking_id'";
$eventData = $this->db->query($sql)->row_array();
$evtLang = langTranslator($eventData['event_id'],'EVT');
array_merge($eventData,$evtLang);
$vneLang = langTranslator($eventData['venue_id'],'VEN');
return array_merge($eventData,$vneLang);
return $this->db->query($sql)->row_array();
}
function getHotelData($booking_id='',$user_id=''){
......@@ -475,9 +477,9 @@ class Api_model extends CI_Model {
}
function getFlightData($booking_id='',$user_id=''){
$sql = "SELECT FBK.id AS event_id,FBK.flight_book_id AS bookingCode,HBK.price AS amount,
$sql = "SELECT FBK.id AS event_id,FBK.flight_book_id AS bookingCode,FBK.price AS amount,
FBK.departure_date AS event_date,FBK.flight_name AS event_name,FBK.qrcode,
FBK.flight_image AS media_url,FBK.status AS booking_status,
FBK.flight_image AS media_url,FBK.status AS book_status,
FBK.traveller_details
FROM flight_booking AS FBK
-- LEFT JOIN transaction AS TRS ON TRS.booking_id=FBK.flight_book_id
......@@ -489,11 +491,11 @@ class Api_model extends CI_Model {
}
$trvlDtls = (isset($flightData['traveller_details']) && !empty($flightData['traveller_details']))?json_decode($flightData['traveller_details']):'';
$flightData['location'] = (!empty($trvlDtls))?$trvlDtls->fromAirportCity.' - '.$trvlDtls->toAirportCity:'';
$flightData['ticket_count'] = (!empty($trvlDtls))?(int)$trvlDtls->passengerDetails->adult + (int)$trvlDtls->passengerDetails->children + (int)$trvlDtls->passengerDetails->infant:'';
$fghtTme = explode("T",$flightData['date']);
unset($flightData['traveller_details'],$flightData['date']);
$flightData['date'] = (isset($fghtTme[0]) && !empty($fghtTme[0]))?$fghtTme[0]:'';
$flightData['time'] = (isset($fghtTme[1]) && !empty($fghtTme[1]))?$fghtTme[1]:'';
$flightData['no_of_ticket'] = (!empty($trvlDtls))?(int)$trvlDtls->passengerDetails->adult + (int)$trvlDtls->passengerDetails->children + (int)$trvlDtls->passengerDetails->infant:'';
$fghtTme = explode("T",$flightData['event_date']);
unset($flightData['traveller_details'],$flightData['event_date']);
$flightData['event_date'] = (isset($fghtTme[0]) && !empty($fghtTme[0]))?$fghtTme[0]:'';
$flightData['event_time'] = (isset($fghtTme[1]) && !empty($fghtTme[1]))?$fghtTme[1]:'';
$flightData['has_payment'] = 1;
$flightData['book_id'] = $flightData['event_id'];
$flightData['venue_id'] = $flightData['event_id'];
......@@ -711,8 +713,7 @@ class Api_model extends CI_Model {
$post_data['event_time']);
$rs = $this->db->insert('booking', $post_data);
$this->db->insert('orders',array('booking_id'=>$post_data['bookId'],'order_type'=>'1',
'created_date'=>date('Y-m-d h:i:s')));
$this->db->insert('orders',array('booking_id'=>$post_data['bookId'],'order_type'=>'1','created_date'=>date('Y-m-d h:i:s'),'customer_id'=>$user_id));
if($rs){
if(!empty($promocodeData)){
$this->db->insert('promocode_used',$promocodeData);
......@@ -1895,7 +1896,7 @@ class Api_model extends CI_Model {
$bookData['amount'],'request_data'=>json_encode($bookData['requestData']),'traveller_details'=>json_encode($trvlerDtls),
'qrcode'=>$qrcode);
$this->db->insert('hotel_booking',$insert);
$this->db->insert('orders',array('booking_id'=>$bookId,'order_type'=>'2','created_date'=>date('Y-m-d h:i:s')));
$this->db->insert('orders',array('booking_id'=>$bookId,'order_type'=>'2','created_date'=>date('Y-m-d h:i:s'),'customer_id'=>$user_id));
return array('status'=>1,'transaction_id'=>$bookId);
} else if($txnData['status'] == '1' && isset($txnData['tnx_id']) &&
!empty($txnData['tnx_id'])){
......@@ -1938,7 +1939,7 @@ class Api_model extends CI_Model {
'departure_date'=>$bookData['departure_date'],'price'=>$bookData['amount'],
'arrival_date'=>$bookData['arrival_date'],'request_data'=>json_encode($bookData['requestData']),'traveller_details'=>json_encode($bookData['requestData']['traveller_details']),'qrcode'=>$qrcode);
$this->db->insert('flight_booking',$insert);
$this->db->insert('orders',array('booking_id'=>$bookId,'order_type'=>'3','created_date'=>date('Y-m-d h:i:s')));
$this->db->insert('orders',array('booking_id'=>$bookId,'order_type'=>'3','created_date'=>date('Y-m-d h:i:s'),'customer_id'=>$user_id));
return array('status'=>1,'transaction_id'=>$bookId);
} else if($txnData['status'] == '1' && isset($txnData['tnx_id']) &&
!empty($txnData['tnx_id'])){
......
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