Skip to content

T
TimeOutAdmin
Commit 951e3ff8 by Tobin
Options

Merge branch 'master' into 'live_production'

dc See merge request !76
parents e0a02444 dcd84680
Showing with 53 additions and 19 deletions
application/controllers/Booking.php
......@@ -207,4 +207,4 @@ class Booking extends CI_Controller {
return $reportData;
}
}
?>
\ No newline at end of file
?>
application/models/Webservice_model.php
......@@ -254,7 +254,7 @@ class Webservice_model extends CI_Model {
if($lang == 'ar') {
$cityField = 'region.name_ar AS city';
}
$sql = "SELECT $cityField FROM customer
$sql = "SELECT region.id,$cityField FROM customer
INNER JOIN region ON customer.city=region.id
WHERE customer.customer_id='$user_id' AND region.status='1'";
$cityName = $this->db->query($sql)->row_array();
......@@ -282,8 +282,8 @@ class Webservice_model extends CI_Model {
}
}
if(isset($data['city_id'])) {
$where = ' AND venue.region_id = '.$data['city_id'];
if(isset($cityName['id'])) {
$where = ' AND venue.region_id = '.$cityName['id'];
}
if(isset($data['filters'])){
......@@ -513,12 +513,51 @@ class Webservice_model extends CI_Model {
$event_id = $data['event_id'];
$cTime = date("H:i", strtotime('+15 minutes'));
$this->db->query("SET SESSION group_concat_max_len = 20000");
$rs = $this->db->query("SELECT IF(host_categories.show_layout = 0,'false','true') AS is_layout,IF(events.has_payment = 0,'false','true') AS is_payment_required,IF(favourite.is_favorite = 1,'true','false') AS is_favorite,events.event_id, CAST(AVG (review.rate) AS DECIMAL (12,1)) AS rate, (SELECT SUM(no_of_ticket) FROM booking WHERE event_id = events.event_id AND status IN (1,2)) AS attendees, events.event_name,events.event_name_ar,events.event_discription AS event_description,events.event_discription_ar,events.seat_pricing, events.custom_seat_layout, venue.layout, venue.layout_details,venue.venue_name,venue.venue_details,venue.location,venue.location_lat AS lat,venue.location_lng AS lng,venue.venue_name AS address_name,venue.venue_name_ar AS address_name_ar,venue.location AS address, GROUP_CONCAT(DISTINCT `event_gallery`.`media_url`) AS media_url,IF(favourite.status = 1,'true','false') AS fav_status, GROUP_CONCAT(DISTINCT tags.tag_name) AS tag, GROUP_CONCAT(DISTINCT tags.tag_name_ar) AS tag_ar, GROUP_CONCAT(DISTINCT CONCAT_WS('#',event_date_time.id,event_date_time.date,event_date_time.time)) AS date_time, events.max_booking FROM events INNER JOIN event_date_time ON events.event_id = event_date_time.event_id INNER JOIN venue ON venue.id = events.venue_id LEFT JOIN `event_gallery` ON `events`.`event_id` = `event_gallery`.`event_id` AND `event_gallery`.`status` != 0 LEFT JOIN booking on booking.event_id = events.event_id LEFT JOIN favourite ON favourite.event_id = events.event_id AND favourite.user_id = ".$user_id." AND favourite.status = 1 LEFT JOIN event_tags ON events.event_id = event_tags.event_id LEFT JOIN tags on tags.tag_id = event_tags.tag_id LEFT JOIN review ON events.event_id = review.event_id INNER JOIN host_categories ON venue.host_cat_id = host_categories.host_cat_id WHERE event_date_time.date>='".date('Y-m-d')."' AND events.event_id = ".$event_id." GROUP BY events.event_id, event_date_time.event_id")->row();
$rs = $this->db->query("
SELECT host_categories.show_layout AS is_layout,events.has_payment AS is_payment_required,
favourite.is_favorite AS is_favorite,events.event_id, events.event_name,
events.event_name_ar,events.event_discription AS event_description,
events.event_discription_ar,events.seat_pricing, events.custom_seat_layout,
venue.layout, venue.layout_details,venue.venue_name,venue.venue_details,
venue.location,venue.location_lat AS lat,venue.location_lng AS lng,
venue.venue_name AS address_name,venue.venue_name_ar AS address_name_ar,
venue.location AS address, events.max_booking,
GROUP_CONCAT(DISTINCT tags.tag_name) AS tag,
GROUP_CONCAT(DISTINCT tags.tag_name_ar) AS tag_ar,
GROUP_CONCAT(DISTINCT `event_gallery`.`media_url`) AS media_url,
GROUP_CONCAT(DISTINCT CONCAT_WS('#',event_date_time.id,event_date_time.date,
event_date_time.time)) AS date_time
FROM events
INNER JOIN event_date_time ON events.event_id=event_date_time.event_id
INNER JOIN venue ON venue.id=events.venue_id
LEFT JOIN event_gallery ON events.event_id=event_gallery.event_id AND
event_gallery.status != 0
LEFT JOIN booking on booking.event_id = events.event_id
LEFT JOIN favourite ON favourite.event_id = events.event_id AND favourite.user_id=$user_id AND favourite.status = 1
LEFT JOIN event_tags ON events.event_id = event_tags.event_id
LEFT JOIN tags on tags.tag_id = event_tags.tag_id
LEFT JOIN review ON events.event_id = review.event_id
INNER JOIN host_categories ON venue.host_cat_id = host_categories.host_cat_id
WHERE event_date_time.date>='".date('Y-m-d')."' AND events.event_id=$event_id
GROUP BY events.event_id, event_date_time.event_id")->row();
if(count($rs)>0){
$event_layout = '';
$colorData = array();
$resultData = array();
$sql = "SELECT AVG(review.rate) AS rate
FROM review WHERE event_id=$event_id";
$rating = $this->db->query($sql)->row_array();
$rate = isset($rating['rate'])&&!empty($rating['rate'])?
$rating['rate']:'0.0';
$sql = "SELECT SUM(booking.no_of_ticket) AS attend FROM booking
WHERE status IN (1,2) AND event_id=$event_id";
$atten = $this->db->query($sql)->row_array();
$atte = isset($atten['attend'])&&!empty($atten['attend'])?
$atten['attend']:'0';
if($rs->layout!=''){
if($rs->custom_seat_layout!=''){
$event_layout = $rs->custom_seat_layout;
......@@ -531,7 +570,7 @@ class Webservice_model extends CI_Model {
$dates = explode(',', $rs->date_time);
$time_spec = array();
$data_array = array();
$date_list = array();
foreach ($dates as $rss) {
list($id,$date,$time) = explode('#', $rss);
......@@ -539,16 +578,12 @@ class Webservice_model extends CI_Model {
$cTime = date("Y-m-d H:i", strtotime('+15 minutes'));
if($cTime < $sTime){
$time_spec[] = array('id'=>$id, 'date'=>$date, 'time'=>$time);
$data_array[$date][] = array('id'=>$id, 'time'=>$time);
$date_list[] = array('date'=>$date, 'time'=>array('id'=>$id, 'time'=>$time));
}
}
$date_list = array();
foreach ($data_array as $key => $value) {
$date_list[] = array('date'=>$key, 'time'=>$value);
}
$lang = $this->getUserLang($user_id);
if($rs->is_layout && !empty($pData = json_decode($rs->seat_pricing, TRUE))){
if($rs->is_layout == 1 && !empty($pData = json_decode($rs->seat_pricing, TRUE))){
if($lang == 'en'){
$rs->event_description .= '<p>'.$pData['price_details'].' '.'(SAR '.$pData['price'].')'.'</p>';
}
......@@ -569,12 +604,12 @@ class Webservice_model extends CI_Model {
'event_id'=>$rs->event_id,
'name'=>($lang == 'en')?$rs->event_name:$rs->event_name_ar,
'description'=>($lang == 'en')?$rs->event_description:$rs->event_discription_ar,
'rating'=>$rs->rate,
'total_attendees'=>$rs->attendees == ''? '0': $rs->attendees,
'rating'=>$rate,
'total_attendees'=>$atte,
'layout_image'=>$rs->layout,
'is_favorite'=>$rs->is_favorite === 'true'? true: false,
'is_payment_required'=>$rs->is_payment_required === 'true'? true: false,
'is_layout'=>$rs->is_layout === 'true'? true: false,
'is_favorite'=>$rs->is_favorite == '1'? true: false,
'is_payment_required'=>$rs->is_payment_required == '1'? true: false,
'is_layout'=>$rs->is_layout == '1'? true: false,
'photos'=>$media_url,
'time'=>$time_spec[0]['time'],
'date'=>$time_spec[0]['date'],
......
application/views/Templates/footer-script.php
......@@ -15,7 +15,7 @@
<script src="<?= base_url('assets/js/bootbox.min.js') ?>"></script>
<script src="<?= base_url('assets/js/app.min.js') ?>"></script>
<script src="<?= base_url('assets/js/locationpicker.js') ?>" type="text/javascript"></script>
<script src="<?= base_url('assets/js/custom-script.js') ?>"></script>
<script src="<?= base_url('assets/js/custom-script.js?ts='.time()) ?>"></script>
<script src="<?= base_url('assets/js/parsley.min.js') ?>"></script>
<script src="https://cdn.ckeditor.com/4.5.7/standard/ckeditor.js"></script>
<script src="<?= base_url('assets/js/bootstrap-datepicker.js') ?>"></script>
......
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