Skip to content

T
TimeOutAdmin
Commit 7358c548 by Jansa Jose
Options

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

parents fef9cfb6 2bb57c97
Showing with 57 additions and 25 deletions
application/models/Api_model.php
...@@ -1590,9 +1590,10 @@ class Api_model extends CI_Model { ...@@ -1590,9 +1590,10 @@ class Api_model extends CI_Model {
public function checkSeatAvailability($data = ''){ public function checkSeatAvailability($data = ''){
try{ try{
$date = $data['date'];
$time = $data['time'];
$user_id = $this->auth_token_get($data['auth_token']); $user_id = $this->auth_token_get($data['auth_token']);
$event_id = $data['event_id']; $event_id = $data['event_id'];
$evtTimeId = $data['time_id'];
$lyCapacity = array(); $lyCapacity = array();
$capacity = $usrBooked = $maxBooking = 0; $capacity = $usrBooked = $maxBooking = 0;
...@@ -1602,8 +1603,8 @@ class Api_model extends CI_Model { ...@@ -1602,8 +1603,8 @@ class Api_model extends CI_Model {
INNER JOIN venue AS VEN ON (VEN.id=EVT.venue_id) INNER JOIN venue AS VEN ON (VEN.id=EVT.venue_id)
INNER JOIN event_date_time AS EDATE ON (EVT.event_id=EDATE.event_id) INNER JOIN event_date_time AS EDATE ON (EVT.event_id=EDATE.event_id)
INNER JOIN host_categories AS HST ON (VEN.host_cat_id=HST.host_cat_id) INNER JOIN host_categories AS HST ON (VEN.host_cat_id=HST.host_cat_id)
WHERE EVT.event_id='$event_id' AND EDATE.id='$evtTimeId' AND EDATE.status='1' AND WHERE EVT.event_id='$event_id' AND EDATE.date='$date' AND EDATE.time='$time' AND
EDATE.date >= DATE_FORMAT(NOW(),'%Y-%m-%d')"; EDATE.status='1' AND EDATE.date >= DATE_FORMAT(NOW(),'%Y-%m-%d')";
$evtSql = $this->db->query($sql); $evtSql = $this->db->query($sql);
if(empty($evtSql) || empty($evtData = $evtSql->row_array())){ if(empty($evtSql) || empty($evtData = $evtSql->row_array())){
...@@ -1619,7 +1620,8 @@ class Api_model extends CI_Model { ...@@ -1619,7 +1620,8 @@ class Api_model extends CI_Model {
FROM booking AS BOK FROM booking AS BOK
INNER JOIN event_date_time AS EDATE ON (BOK.event_date_id=EDATE.id) INNER JOIN event_date_time AS EDATE ON (BOK.event_date_id=EDATE.id)
WHERE BOK.event_id='$event_id' AND BOK.customer_id='$user_id' AND WHERE BOK.event_id='$event_id' AND BOK.customer_id='$user_id' AND
EDATE.id='$evtTimeId' AND EDATE.status='1' AND BOK.status IN (1,2)"; EDATE.date='$date' AND EDATE.time='$time' AND EDATE.status='1' AND
BOK.status IN (1,2)";
$result = $this->db->query($sql)->row_array(); $result = $this->db->query($sql)->row_array();
$usrBooked = (!empty($result))?$result['bookCount']:0; $usrBooked = (!empty($result))?$result['bookCount']:0;
...@@ -1642,7 +1644,8 @@ class Api_model extends CI_Model { ...@@ -1642,7 +1644,8 @@ class Api_model extends CI_Model {
$sql = "SELECT BOOK.no_of_ticket,BOOK.ticket_details $sql = "SELECT BOOK.no_of_ticket,BOOK.ticket_details
FROM booking AS BOOK FROM booking AS BOOK
INNER JOIN event_date_time AS EDATE ON (BOOK.event_date_id=EDATE.id) INNER JOIN event_date_time AS EDATE ON (BOOK.event_date_id=EDATE.id)
WHERE EDATE.status='1' AND BOOK.event_id='$event_id' AND BOOK.event_date_id='$evtTimeId'"; WHERE EDATE.status='1' AND BOOK.event_id='$event_id' AND EDATE.date='$date' AND
EDATE.time='$time'";
if(!empty($result = $this->db->query($sql)->result_array())){ if(!empty($result = $this->db->query($sql)->result_array())){
foreach($result AS $value) { foreach($result AS $value) {
......
application/models/HotelServices_model.php
...@@ -77,7 +77,6 @@ class HotelServices_model extends CI_Model { ...@@ -77,7 +77,6 @@ class HotelServices_model extends CI_Model {
$this->db->select('nationality'); $this->db->select('nationality');
$userData = $this->db->get_where('customer',array('customer_id'=>$user_id))->row_array(); $userData = $this->db->get_where('customer',array('customer_id'=>$user_id))->row_array();
$countryData = $this->getCountryData($user_id); $countryData = $this->getCountryData($user_id);
$currency = (isset($data['currency']) && !empty($data['currency']))?$data['currency']:$countryData['currency'];
} }
$url = (isset($data['nextToken']) && !empty($data['nextToken']))?"https://trawex.biz/api/hotel_trawexv5/getMoreHotels?user_id=".$settings['trawex_user_id']."&user_password=".$settings['trawex_user_password']."&access=".$settings['trawex_access']."&ip_address=".$settings['trawex_ip_address']."&sessionId=".$data['sessionId']."&nextToken=".$data['nextToken']."&trackingId=".$data['trackingId']."":"https://trawex.biz/api/hotel_trawexv5/hotel_search"; $url = (isset($data['nextToken']) && !empty($data['nextToken']))?"https://trawex.biz/api/hotel_trawexv5/getMoreHotels?user_id=".$settings['trawex_user_id']."&user_password=".$settings['trawex_user_password']."&access=".$settings['trawex_access']."&ip_address=".$settings['trawex_ip_address']."&sessionId=".$data['sessionId']."&nextToken=".$data['nextToken']."&trackingId=".$data['trackingId']."":"https://trawex.biz/api/hotel_trawexv5/hotel_search";
if(!isset($data['nextToken']) && empty($data['nextToken'])){ if(!isset($data['nextToken']) && empty($data['nextToken'])){
...@@ -91,7 +90,7 @@ class HotelServices_model extends CI_Model { ...@@ -91,7 +90,7 @@ class HotelServices_model extends CI_Model {
'child'=>$data['child'],'child_age'=>$data['child_age'], 'child'=>$data['child'],'child_age'=>$data['child_age'],
'checkin'=>$data['checkin'],'checkout'=>$data['checkout'], 'checkin'=>$data['checkin'],'checkout'=>$data['checkout'],
'client_nationality'=>$userData['nationality'], 'client_nationality'=>$userData['nationality'],
'requiredCurrency'=>$currency); 'requiredCurrency'=>'SAR');
} }
$postFields = (isset($data['nextToken']) && !empty($data['nextToken']))?'':$postData; $postFields = (isset($data['nextToken']) && !empty($data['nextToken']))?'':$postData;
...@@ -99,7 +98,9 @@ class HotelServices_model extends CI_Model { ...@@ -99,7 +98,9 @@ class HotelServices_model extends CI_Model {
if(!empty($result)){ if(!empty($result)){
$result = json_decode($result); $result = json_decode($result);
$result->status->trackingId = (!isset($data['nextToken']) && empty($data['nextToken']))?$trackingId:$data['trackingId']; $result->status->trackingId = (!isset($data['nextToken']) && empty($data['nextToken']))?$trackingId:$data['trackingId'];
$res = array('status'=>1,'data'=>array('itineraries'=> $result)); $data = array("itineraries"=>$result,"currency_symbol"=>$countryData['currency_symbol'],
"conversion_rate"=>$countryData['conversion_rate']);
$res = array('status'=>1,'data'=>$data);
}else{ }else{
$res = array('status'=>0,'message'=>'No Data Found','code'=>'ER07'); $res = array('status'=>0,'message'=>'No Data Found','code'=>'ER07');
} }
...@@ -120,8 +121,12 @@ class HotelServices_model extends CI_Model { ...@@ -120,8 +121,12 @@ class HotelServices_model extends CI_Model {
$url = "https://trawex.biz/api/hotel_trawexv5/get_specific_hotel_content?user_id=".$settings['trawex_user_id']."&user_password=".$settings['trawex_user_password']."&access=".$settings['trawex_access']."&ip_address=".$settings['trawex_ip_address']."&sessionId=".$data['sessionId']."&trackingId=".$data['trackingId']."&productId=".$data['productId']."&hotelId=".$data['hotelId'].""; $url = "https://trawex.biz/api/hotel_trawexv5/get_specific_hotel_content?user_id=".$settings['trawex_user_id']."&user_password=".$settings['trawex_user_password']."&access=".$settings['trawex_access']."&ip_address=".$settings['trawex_ip_address']."&sessionId=".$data['sessionId']."&trackingId=".$data['trackingId']."&productId=".$data['productId']."&hotelId=".$data['hotelId']."";
$result = $this->passToJsonCurl($url,''); $result = $this->passToJsonCurl($url,'');
if(!empty($result)){ if(!empty($result)){
$result = json_decode($result); $result = json_decode($result,true);
$result->trackingId = $data['trackingId']; $countryData = $this->getCountryData($user_id);
$result['trackingId'] = $data['trackingId'];
$result['conversion_rate'] = $countryData['conversion_rate'];
$result['currency_symbol'] = $countryData['currency_symbol'];
$res = array('status'=>1,'data'=>$result); $res = array('status'=>1,'data'=>$result);
}else{ }else{
$res = array('status'=>0,'message'=>'No Data Found','code'=>'ER06'); $res = array('status'=>0,'message'=>'No Data Found','code'=>'ER06');
...@@ -144,8 +149,12 @@ class HotelServices_model extends CI_Model { ...@@ -144,8 +149,12 @@ class HotelServices_model extends CI_Model {
$postData = array("user_id"=>$settings['trawex_user_id'],"user_password"=>$settings['trawex_user_password'],"access"=>$settings['trawex_access'],"ip_address"=>$settings['trawex_ip_address'],"TraceId"=>$data['TraceId'],"propertyid"=>$data['propertyid'],"trackingId"=>$data['trackingId'],"sessionId"=>$data['sessionId'],"productId"=>$data['productId'],"TokenId"=>$data['TokenId'],"resultindex"=>$data['resultindex'],"hotelcode"=>$data['hotelcode']); $postData = array("user_id"=>$settings['trawex_user_id'],"user_password"=>$settings['trawex_user_password'],"access"=>$settings['trawex_access'],"ip_address"=>$settings['trawex_ip_address'],"TraceId"=>$data['TraceId'],"propertyid"=>$data['propertyid'],"trackingId"=>$data['trackingId'],"sessionId"=>$data['sessionId'],"productId"=>$data['productId'],"TokenId"=>$data['TokenId'],"resultindex"=>$data['resultindex'],"hotelcode"=>$data['hotelcode']);
$result = $this->passToJsonCurl($url,$postData); $result = $this->passToJsonCurl($url,$postData);
if(!empty($result)){ if(!empty($result)){
$result = json_decode($result); $result = json_decode($result,true);
$result->trackingId = $data['trackingId']; $countryData = $this->getCountryData($user_id);
$result['trackingId'] = $data['trackingId'];
$result['conversion_rate'] = $countryData['conversion_rate'];
$result['currency_symbol'] = $countryData['currency_symbol'];
$res = array('status'=>1,'data'=>$result); $res = array('status'=>1,'data'=>$result);
}else{ }else{
$res = array('status'=>0,'message'=>'No data Found','code'=>'ER06'); $res = array('status'=>0,'message'=>'No data Found','code'=>'ER06');
...@@ -183,8 +192,12 @@ class HotelServices_model extends CI_Model { ...@@ -183,8 +192,12 @@ class HotelServices_model extends CI_Model {
"roomType_runno"=>$data['roomType_runno']); "roomType_runno"=>$data['roomType_runno']);
$result = $this->passToJsonCurl($url,$postData); $result = $this->passToJsonCurl($url,$postData);
if(!empty($result)){ if(!empty($result)){
$result = json_decode($result); $result = json_decode($result,true);
$result->trackingId = $data['trackingId']; $countryData = $this->getCountryData($user_id);
$result['trackingId'] = $data['trackingId'];
$result['conversion_rate'] = $countryData['conversion_rate'];
$result['currency_symbol'] = $countryData['currency_symbol'];
$res = array('status'=>1,'data'=>$result); $res = array('status'=>1,'data'=>$result);
}else{ }else{
$res = array('status'=>0,'message'=>'No data Found','code'=>'ER06'); $res = array('status'=>0,'message'=>'No data Found','code'=>'ER06');
...@@ -220,8 +233,12 @@ class HotelServices_model extends CI_Model { ...@@ -220,8 +233,12 @@ class HotelServices_model extends CI_Model {
); );
$result = $this->passToJsonCurl($url,$postData); $result = $this->passToJsonCurl($url,$postData);
if(!empty($result)){ if(!empty($result)){
$result = json_decode($result); $result = json_decode($result,true);
$result->trackingId = $data['trackingId']; $countryData = $this->getCountryData($user_id);
$result['trackingId'] = $data['trackingId'];
$result['conversion_rate'] = $countryData['conversion_rate'];
$result['currency_symbol'] = $countryData['currency_symbol'];
$res = array('status'=>1,'data'=>$result); $res = array('status'=>1,'data'=>$result);
}else{ }else{
$res = array('status'=>0,'message'=>'No data Found','code'=>'ER06'); $res = array('status'=>0,'message'=>'No data Found','code'=>'ER06');
...@@ -252,8 +269,12 @@ class HotelServices_model extends CI_Model { ...@@ -252,8 +269,12 @@ class HotelServices_model extends CI_Model {
); );
$result = $this->passToJsonCurl($url,$postData); $result = $this->passToJsonCurl($url,$postData);
if(!empty($result)){ if(!empty($result)){
$result = json_decode($result); $result = json_decode($result,true);
$result->trackingId = $data['trackingId']; $countryData = $this->getCountryData($user_id);
$result['trackingId'] = $data['trackingId'];
$result['conversion_rate'] = $countryData['conversion_rate'];
$result['currency_symbol'] = $countryData['currency_symbol'];
$res = array('status'=>1,'data'=>$result); $res = array('status'=>1,'data'=>$result);
}else{ }else{
$res = array('status'=>0,'message'=>'No data Found','code'=>'ER06'); $res = array('status'=>0,'message'=>'No data Found','code'=>'ER06');
......
application/models/Validation_model.php
...@@ -118,7 +118,13 @@ class Validation_model extends CI_Model { ...@@ -118,7 +118,13 @@ class Validation_model extends CI_Model {
'message' => 'Event Id is null or empty' 'message' => 'Event Id is null or empty'
) , ) ,
) , ) ,
'time_id' => array( 'date' => array(
'required' => array(
'code' => 'ER18',
'message' => 'Time Id is null or empty'
)
) ,
'time' => array(
'required' => array( 'required' => array(
'code' => 'ER18', 'code' => 'ER18',
'message' => 'Time Id is null or empty' 'message' => 'Time Id is null or empty'
......
application/models/Webservice_model.php
...@@ -551,7 +551,7 @@ class Webservice_model extends CI_Model { ...@@ -551,7 +551,7 @@ class Webservice_model extends CI_Model {
$resultData = array(); $resultData = array();
$sql = "SELECT AVG(review.rate) AS rate FROM review WHERE event_id=$event_id"; $sql = "SELECT AVG(review.rate) AS rate FROM review WHERE event_id=$event_id";
$rating = $this->db->query($sql)->row_array(); $rating = $this->db->query($sql)->row_array();
$rate = isset($rating['rate'])&&!empty($rating['rate'])?round($rating['rate'],1):'0.0'; $rating = isset($rating['rate'])&&!empty($rating['rate'])?round($rating['rate'],1):'0.0';
$sql = "SELECT SUM(booking.no_of_ticket) AS attend FROM booking $sql = "SELECT SUM(booking.no_of_ticket) AS attend FROM booking
WHERE status IN (1,2) AND event_id=$event_id"; WHERE status IN (1,2) AND event_id=$event_id";
$atten = $this->db->query($sql)->row_array(); $atten = $this->db->query($sql)->row_array();
...@@ -626,13 +626,13 @@ class Webservice_model extends CI_Model { ...@@ -626,13 +626,13 @@ class Webservice_model extends CI_Model {
$balSql = $this->db->query("SELECT balance_amount FROM wallet $balSql = $this->db->query("SELECT balance_amount FROM wallet
WHERE customer_id='$user_id'"); WHERE customer_id='$user_id'");
if(!empty($balSql) && !empty($balSql = $balSql->row_array())){ if(!empty($balSql) && !empty($balSql = $balSql->row_array())){
$waltBlnce = $balSql['balance_amount']; $waltBlnce = $balSql['balance_amount'] * $rate;
} }
$resData = array( $resData = array(
'event_id'=>$rs->event_id, 'event_id'=>$rs->event_id,
'name'=>$transData['event'], 'name'=>$transData['event'],
'description'=>$transData['description'], 'description'=>$transData['description'],
'rating'=>$rate, 'rating'=>$rating,
'total_attendees'=>$atte, 'total_attendees'=>$atte,
'layout_image'=>$rs->layout, 'layout_image'=>$rs->layout,
'is_favorite'=>$rs->is_favorite == '1'? true: false, 'is_favorite'=>$rs->is_favorite == '1'? true: false,
...@@ -868,9 +868,10 @@ class Webservice_model extends CI_Model { ...@@ -868,9 +868,10 @@ class Webservice_model extends CI_Model {
$kk = array(); $kk = array();
$sql = "SELECT ticket_details FROM booking WHERE bookId='$bookId'"; $sql = "SELECT ticket_details FROM booking WHERE bookId='$bookId'";
$ticketDetails = $this->db->query($sql)->row(); $ticketDetails = $this->db->query($sql)->row();
if(!empty($ticketDetails)){ if(!empty($ticketDetails) && isset($ticketDetails->ticket_details) &&
!empty($ticketDetails->ticket_details)){
$res = json_decode($ticketDetails->ticket_details); $res = json_decode($ticketDetails->ticket_details);
$kk['ticket_rate'] = (!empty($res))?"$res->price":''; $kk['ticket_rate'] = (!empty($res) && isset($res->price))?"$res->price":'';
} }
$settings = getSettings(); $settings = getSettings();
...@@ -1151,7 +1152,8 @@ class Webservice_model extends CI_Model { ...@@ -1151,7 +1152,8 @@ class Webservice_model extends CI_Model {
$invite_phone = (isset($post_data['invite_list']))?$post_data['invite_list']:''; $invite_phone = (isset($post_data['invite_list']))?$post_data['invite_list']:'';
unset($post_data['auth_token'],$post_data['has_payment'],$post_data['friends_ids'], unset($post_data['auth_token'],$post_data['has_payment'],$post_data['friends_ids'],
$post_data['promo_code'],$post_data['discounted_price'],$post_data['invite_list']); $post_data['promo_code'],$post_data['discounted_price'],$post_data['invite_list'],
$post_data['wallet']);
$rs = $this->db->insert('booking', $post_data); $rs = $this->db->insert('booking', $post_data);
$id = $this->db->insert_id(); $id = $this->db->insert_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