Skip to content

T
TimeOutAdmin
Commit 8bd8986e by Tobin
Options

Merge branch 'master' into 'dev_production'

Master See merge request !236
parents 30cf8613 d303d162
Showing with 59 additions and 24 deletions
application/controllers/FlightServices.php
<?php <?php
defined('BASEPATH') OR exit('No direct script access allowed'); defined('BASEPATH') OR exit('No direct script access allowed');
if (isset($_SERVER['HTTP_ORIGIN'])) { if (isset($_SERVER['HTTP_ORIGIN'])) {
header("Access-Control-Allow-Origin: {$_SERVER['HTTP_ORIGIN']}"); header("Access-Control-Allow-Origin: {$_SERVER['HTTP_ORIGIN']}");
header('Access-Control-Allow-Credentials: true'); header('Access-Control-Allow-Credentials: true');
header('Access-Control-Max-Age: 86400'); header('Access-Control-Max-Age: 86400');
} }
if ($_SERVER['REQUEST_METHOD'] == 'OPTIONS') { if ($_SERVER['REQUEST_METHOD'] == 'OPTIONS') {
if (isset($_SERVER['HTTP_ACCESS_CONTROL_REQUEST_METHOD'])) if (isset($_SERVER['HTTP_ACCESS_CONTROL_REQUEST_METHOD']))
header("Access-Control-Allow-Methods: GET, POST, OPTIONS"); header("Access-Control-Allow-Methods: GET, POST, OPTIONS");
if (isset($_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS'])) if (isset($_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']))
header("Access-Control-Allow-Headers: {$_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']}"); header("Access-Control-Allow-Headers: {$_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']}");
exit(0); exit(0);
} }
//test changes //test changes
class FlightServices extends CI_Controller { class FlightServices extends CI_Controller {
var $auth_token; var $auth_token;
......
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/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();
...@@ -622,11 +622,17 @@ class Webservice_model extends CI_Model { ...@@ -622,11 +622,17 @@ class Webservice_model extends CI_Model {
} }
$media_url = explode(',', $rs->media_url); $media_url = explode(',', $rs->media_url);
$waltBlnce = 0;
$balSql = $this->db->query("SELECT balance_amount FROM wallet
WHERE customer_id='$user_id'");
if(!empty($balSql) && !empty($balSql = $balSql->row_array())){
$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,
...@@ -641,7 +647,8 @@ class Webservice_model extends CI_Model { ...@@ -641,7 +647,8 @@ class Webservice_model extends CI_Model {
'address_name'=>$transData['venue'], 'address_name'=>$transData['venue'],
'address'=>$rs->address, 'address'=>$rs->address,
'longitude'=>$rs->lng, 'longitude'=>$rs->lng,
'currency_symbol'=>$countryData['currency_symbol'] 'currency_symbol'=>$countryData['currency_symbol'],
'wallet_balance'=>$waltBlnce
); );
$res = array('status'=>1,'data'=>$resData); $res = array('status'=>1,'data'=>$resData);
} else { } else {
...@@ -861,9 +868,10 @@ class Webservice_model extends CI_Model { ...@@ -861,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();
...@@ -1097,13 +1105,30 @@ class Webservice_model extends CI_Model { ...@@ -1097,13 +1105,30 @@ class Webservice_model extends CI_Model {
if(!isset($post_data['amount']) || empty($post_data['amount'])){ if(!isset($post_data['amount']) || empty($post_data['amount'])){
$post_data['amount'] = 0; $post_data['amount'] = 0;
} }
if(isset($post_data['has_payment']) && $post_data['has_payment'] == 0){ if(isset($post_data['has_payment']) && $post_data['has_payment'] == 0){
$status = $post_data['status'] = '1'; $status = $post_data['status'] = '1';
} }
if(isset($post_data['wallet']) && $post_data['wallet'] == 1){
$amt = (isset($post_data['discounted_price']) && !empty($post_data['discounted_price']))?$post_data['discounted_price']:$post_data['amount'];
$sql = "SELECT balance_amount FROM wallet WHERE customer_id='$user_id'";
$wallet = $this->db->query($sql)->row_array();
if(!empty($wallet) && !empty($wallet['balance_amount']) &&
$wallet['balance_amount'] >= $amt){
$balance = $wallet['balance_amount'] - $amt;
$this->db->update('wallet',array('balance_amount'=>$balance),array('customer_id'=>$user_id));
$post_data['status'] = 1;
} else {
return array('status'=>0,'code'=>'ER40',
'message'=>'Insufficient Wallet Balance');exit;
}
}
$evtData = $this->db->get_where('events',array('event_id'=>$post_data['event_id'])); $evtData = $this->db->get_where('events',array('event_id'=>$post_data['event_id']));
$evtData = $evtData->row_array(); $evtData = $evtData->row_array();
if(!empty($evtData) && isset($evtData['approve_booking']) && $evtData['approve_booking']=='1'){ if(!empty($evtData) && isset($evtData['approve_booking']) &&
$evtData['approve_booking']=='1'){
$post_data['status'] = '6'; $post_data['status'] = '6';
} }
...@@ -1127,7 +1152,8 @@ class Webservice_model extends CI_Model { ...@@ -1127,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