Skip to content

T
TimeOutAdmin
Commit 446f949c by Tobin
Options

dc

parent 1c869207
Showing with 126 additions and 37 deletions
application/controllers/Event.php
...@@ -121,6 +121,7 @@ class Event extends CI_Controller { ...@@ -121,6 +121,7 @@ class Event extends CI_Controller {
} else { } else {
$_POST['seat_pricing'] = json_encode( $_POST['seat_pricing'] = json_encode(
array('price'=>$_POST['price'], array('price'=>$_POST['price'],
'capacity'=>$_POST['capacity'],
'price_details'=>$_POST['price_details'], 'price_details'=>$_POST['price_details'],
'price_details_ar'=>$_POST['price_details_ar'] 'price_details_ar'=>$_POST['price_details_ar']
) )
...@@ -297,6 +298,7 @@ class Event extends CI_Controller { ...@@ -297,6 +298,7 @@ class Event extends CI_Controller {
} else { } else {
$_POST['seat_pricing'] = json_encode( $_POST['seat_pricing'] = json_encode(
array('price'=>$_POST['price'], array('price'=>$_POST['price'],
'capacity'=>$_POST['capacity'],
'price_details'=>$_POST['price_details'], 'price_details'=>$_POST['price_details'],
'price_details_ar'=>$_POST['price_details_ar'] 'price_details_ar'=>$_POST['price_details_ar']
) )
......
application/controllers/Venue.php
...@@ -160,11 +160,13 @@ class Venue extends CI_Controller { ...@@ -160,11 +160,13 @@ class Venue extends CI_Controller {
$template['venue_id'] = $venue_id; $template['venue_id'] = $venue_id;
$template['venue_data'] = $this->Venue_model->getVenueData(decode_param($venue_id)); $template['venue_data'] = $this->Venue_model->getVenueData(decode_param($venue_id));
$region_id = $template['venue_data']->region_id;
$this->load->model('Host_model'); $this->load->model('Host_model');
$this->load->model('Region_model'); $this->load->model('Region_model');
$template['host_data'] = $this->Host_model->getHostCategories(); $template['host_data'] = $this->Host_model->getHostCategories();
$template['regionData'] = $this->Region_model->getRegionData(); $template['regionData'] = $this->Region_model->getRegionData();
$template['localityData'] = $this->Region_model->getLocalityData($region_id,'','1');
$this->load->view('template',$template); $this->load->view('template',$template);
} }
...@@ -243,9 +245,20 @@ class Venue extends CI_Controller { ...@@ -243,9 +245,20 @@ class Venue extends CI_Controller {
$_POST['location_lat'] = $locData['lat']; $_POST['location_lat'] = $locData['lat'];
$_POST['location_lng'] = $locData['lng']; $_POST['location_lng'] = $locData['lng'];
unset($_POST['has_layout'],$_POST['seat_color'],$_POST['seat_price'],$_POST['seat_capacity']); $locality = array();
if(isset($_POST['locality']) && !empty($_POST['locality']) &&
isset($_POST['locality_ar']) && !empty($_POST['locality_ar'])){
$locality['locality'] = $_POST['locality'];
$locality['locality_ar'] = $_POST['locality_ar'];
}
unset($_POST['locality'],$_POST['locality_type'],$_POST['has_layout'],$_POST['seat_color'],
$_POST['seat_price'],$_POST['seat_capacity'],$_POST['locality_ar']);
$status = $this->Venue_model->updateVenues(decode_param($venue_id),$_POST); if($this->session->userdata['user_type'] == 2){
$_POST['provider_id'] = $this->session->userdata['id'];
}
$status = $this->Venue_model->updateVenues(decode_param($venue_id),$_POST,$locality);
if($status == 1){ if($status == 1){
$flashMsg['class'] = 'success'; $flashMsg['class'] = 'success';
$flashMsg['message'] = 'Venue Created'; $flashMsg['message'] = 'Venue Created';
......
application/models/Region_model.php
...@@ -42,15 +42,15 @@ class Region_model extends CI_Model { ...@@ -42,15 +42,15 @@ class Region_model extends CI_Model {
} }
public function getlocalityData($region_id = '',$locality_id = '', $status = '0'){ public function getlocalityData($region_id = '',$locality_id = '', $status = '0'){
$where = array('status'=>$status); $cond = "status IN (".$status.") ";
if(!empty($region_id)){ if(!empty($region_id)){
$where['region_id'] = $region_id; $cond .= " AND region_id='$region_id' ";
} }
if(!empty($locality_id)){ if(!empty($locality_id)){
$where['id'] = $locality_id; $cond .= " AND id='$locality_id' ";
} }
$data = $this->db->get_where('locality',$where); $locData = $this->db->query("SELECT * FROM locality WHERE ".$cond);
return $data->result(); return (!empty($locality_id))?$locData->row():$locData->result();
} }
} }
?> ?>
application/models/Venue_model.php
...@@ -42,10 +42,20 @@ class Venue_model extends CI_Model { ...@@ -42,10 +42,20 @@ class Venue_model extends CI_Model {
return $status; return $status;
} }
public function updateVenues($venue_id = '', $venueData = array()){ public function updateVenues($venue_id = '', $venueData = array(), $locality = array()){
if(empty($venue_id) || empty($venueData)){ if(empty($venue_id) || empty($venueData)){
return 0; return 0;
} }
if(!empty($locality)){
$status = $this->db->insert('locality',
array('locality'=>$locality['locality'],
'locality_ar'=>$locality['locality_ar'],
'region_id'=>$venueData['region_id']));
if($status){
$venueData['locality_id'] = $this->db->insert_id();
}
}
$status = $this->db->update('venue',$venueData,array('id'=>$venue_id)); $status = $this->db->update('venue',$venueData,array('id'=>$venue_id));
return $status; return $status;
} }
......
application/models/Webservice_model.php
...@@ -463,8 +463,9 @@ class Webservice_model extends CI_Model { ...@@ -463,8 +463,9 @@ class Webservice_model extends CI_Model {
$user_id = $this->auth_token_get($data['auth_token']); $user_id = $this->auth_token_get($data['auth_token']);
if($user_id > 0) { if($user_id > 0) {
$event_id = $data['event_id']; $event_id = $data['event_id'];
$cTime = date("H:i", strtotime('+15 minutes'));
$this->db->query("SET SESSION group_concat_max_len = 20000"); $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_FORMAT(NOW(),'%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 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();
if(count($rs)>0){ if(count($rs)>0){
$resultData = array(); $resultData = array();
$event_layout = ''; $event_layout = '';
...@@ -535,7 +536,6 @@ class Webservice_model extends CI_Model { ...@@ -535,7 +536,6 @@ class Webservice_model extends CI_Model {
); );
} }
$dates = explode(',', $rs->date_time); $dates = explode(',', $rs->date_time);
$time_spec = array(); $time_spec = array();
$data_array = array(); $data_array = array();
...@@ -543,19 +543,15 @@ class Webservice_model extends CI_Model { ...@@ -543,19 +543,15 @@ class Webservice_model extends CI_Model {
foreach ($dates as $rss) { foreach ($dates as $rss) {
list($id,$date,$time) = explode('#', $rss); list($id,$date,$time) = explode('#', $rss);
if($date == date("Y-m-d")){ $sTime = $date.' '.$time;
$time_array = explode(':', $time); $cTime = date("Y-m-d H:i", strtotime('+15 minutes'));
if($time_array['0'] > date('H')) {
$time_spec[] = array('id'=>$id, 'date'=>$date, 'time'=>$time); if($cTime < $sTime){
$data_array[$date][] = array('id'=>$id, 'time'=>$time);
}
} else {
$data_array[$date][] = array('id'=>$id, 'time'=>$time);
$time_spec[] = array('id'=>$id, 'date'=>$date, 'time'=>$time); $time_spec[] = array('id'=>$id, 'date'=>$date, 'time'=>$time);
$data_array[$date][] = array('id'=>$id, 'time'=>$time);
} }
} }
$date_list = array(); $date_list = array();
foreach ($data_array as $key => $value) { foreach ($data_array as $key => $value) {
$date_list[] = array('date'=>$key, 'time'=>$value); $date_list[] = array('date'=>$key, 'time'=>$value);
......
application/views/Event/eventAddForm.php
...@@ -269,22 +269,29 @@ ...@@ -269,22 +269,29 @@
<div class="form-group"> <div class="form-group">
<label>Price</label> <label>Price</label>
<input type="text" class="form-control required" placeholder="Price" <input type="text" class="form-control required" placeholder="Price"
data-parsley-trigger="change" data-parsley-minlength="2" data-parsley-pattern="^[0-9\ . \/]+$" name="price" data-parsley-trigger="change" data-parsley-minlength="1" data-parsley-pattern="^[0-9\ . \/]+$" name="price">
required>
</div> </div>
</div> </div>
<div class="col-sm-5"> <div class="col-sm-2">
<div class="form-group">
<label>Capicity</label>
<input type="text" class="form-control required" placeholder="Provide Capicity"
data-parsley-trigger="change" data-parsley-minlength="1"
name="capacity" data-parsley-pattern="^[0-9\ . \/]+$">
</div>
</div>
<div class="col-sm-4">
<div class="form-group"> <div class="form-group">
<label>About Price Division (English)</label> <label>About Price Division (English)</label>
<textarea type="text" class="ip_reg_form_input form-control reset-form-custom required" placeholder="Price Division (English)" name="price_details" required <textarea type="text" class="ip_reg_form_input form-control reset-form-custom required" placeholder="Price Division (English)" name="price_details" required
style="height:35px; min-height:35px; max-width: 410px; min-width: 410px;" data-parsley-trigger="change" data-parsley-minlength="2"></textarea> style="height:35px; min-height:35px; max-width: 300px; min-width: 330px;" data-parsley-trigger="change" data-parsley-minlength="2"></textarea>
</div> </div>
</div> </div>
<div class="col-sm-5"> <div class="col-sm-4">
<div class="form-group"> <div class="form-group">
<label>About Price Division (Arabic)</label> <label>About Price Division (Arabic)</label>
<textarea type="text" class="ip_reg_form_input form-control reset-form-custom required" placeholder="Price Division (Arabic)" name="price_details_ar" required <textarea type="text" class="ip_reg_form_input form-control reset-form-custom required" placeholder="Price Division (Arabic)" name="price_details_ar" required
style="height:35px; min-height:35px; max-width: 410px; min-width: 410px;" data-parsley-trigger="change" data-parsley-minlength="2"></textarea> style="height:35px; min-height:35px; max-width: 300px; min-width: 330px;" data-parsley-trigger="change" data-parsley-minlength="2"></textarea>
</div> </div>
</div> </div>
</div> </div>
......
application/views/Event/eventEditForm.php
...@@ -303,21 +303,28 @@ ...@@ -303,21 +303,28 @@
<div class="form-group"> <div class="form-group">
<label>Price</label> <label>Price</label>
<input type="text" class="form-control required" placeholder="Price" <input type="text" class="form-control required" placeholder="Price"
data-parsley-trigger="change" data-parsley-minlength="2" data-parsley-pattern="^[0-9\ . \/]+$" name="price" name="price" data-parsley-trigger="change" data-parsley-minlength="1" data-parsley-pattern="^[0-9\ . \/]+$" value="<?= $seat_pricing['price'] ?>">
value="<?= $seat_pricing['price'] ?>"
required>
</div> </div>
</div> </div>
<div class="col-sm-5"> <div class="col-sm-2">
<div class="form-group">
<label>Capicity</label>
<input class="form-control required" placeholder="Provide Capicity"
type="text" data-parsley-trigger="change" data-parsley-minlength="1"
value="<?=isset($seat_pricing['capacity'])?$seat_pricing['capacity']:''?>"
name="capacity" data-parsley-pattern="^[0-9\ . \/]+$">
</div>
</div>
<div class="col-sm-4">
<div class="form-group"> <div class="form-group">
<label>About Price Division</label> <label>About Price Division (English)</label>
<textarea type="text" class="ip_reg_form_input form-control reset-form-custom required" placeholder="Price Division (English)" name="price_details" required <textarea type="text" class="ip_reg_form_input form-control reset-form-custom required" placeholder="Price Division (English)" name="price_details" required
style="height:35px;" data-parsley-trigger="change" data-parsley-minlength="2"><?= $seat_pricing['price_details'] ?></textarea> style="height:35px;" data-parsley-trigger="change" data-parsley-minlength="2"><?= $seat_pricing['price_details'] ?></textarea>
</div> </div>
</div> </div>
<div class="col-sm-5"> <div class="col-sm-4">
<div class="form-group"> <div class="form-group">
<label>About Price Division</label> <label>About Price Division (Arabic)</label>
<textarea type="text" class="ip_reg_form_input form-control reset-form-custom required" placeholder="Price Division (Arabic)" name="price_details_ar" required <textarea type="text" class="ip_reg_form_input form-control reset-form-custom required" placeholder="Price Division (Arabic)" name="price_details_ar" required
style="height:35px;" data-parsley-trigger="change" data-parsley-minlength="2"><?= (isset($seat_pricing['price_details_ar']))?$seat_pricing['price_details_ar']:'' ?></textarea> style="height:35px;" data-parsley-trigger="change" data-parsley-minlength="2"><?= (isset($seat_pricing['price_details_ar']))?$seat_pricing['price_details_ar']:'' ?></textarea>
</div> </div>
......
application/views/Venue/venueAddForm.php
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
<span class="glyphicon form-control-feedback"></span> <span class="glyphicon form-control-feedback"></span>
</div> </div>
<?php if(!isset($venue_id) || empty($venue_id)){ ?> <?php if(!isset($venue_id) || empty($venue_id)){ ?>
<div class="form-group" style="padding-top: 5px;"> <div id="locality_block" class="form-group disable-div" style="padding-top: 5px;">
<label id="localityLabel">Venue Locality</label> <label id="localityLabel">Venue Locality</label>
<div id="showType" class="hide"> <div id="showType" class="hide">
<div class="col-md-5"> <div class="col-md-5">
...@@ -109,6 +109,47 @@ ...@@ -109,6 +109,47 @@
<select name="locality_id" class="form-control" placeholder="Select Locality"></select> <select name="locality_id" class="form-control" placeholder="Select Locality"></select>
</div> </div>
</div> </div>
<?php } else { ?>
<div id="locality_block" class="form-group" style="padding-top: 5px;">
<label id="localityLabel">Venue Locality</label>
<div id="showType">
<div class="col-md-5">
<input type="radio" name="locality_type" value="0" checked>
<label class="padAll-10">Use Existing Locality</label>
</div>
<div class="col-md-4">
<input class="marginLeft15" type="radio" name="locality_type" value="1">
<label class="padAll-10">Add New Locality</label>
</div>
</div>
<div id="addNew" class="form-group hide">
<div style="width:49%;display:inline-block;">
<input type="text" class="form-control" data-parsley-trigger="change"
name="locality" placeholder="Locality (English)">
</div>
<div style="width:49%;display:inline-block;">
<input type="text" class="form-control" data-parsley-trigger="change"
name="locality_ar" placeholder="Locality (Arabic)">
</div>
</div>
<div id="useExist" class="form-group">
<select name="locality_id" class="form-control required"
placeholder="Select Locality">
<option selected disabled>Choose a Locality</option>
<?php
if(!empty($localityData)){
foreach ($localityData as $locality) {
$select = (isset($venue_data->locality_id) && $venue_data->locality_id == $locality->id)?'selected':'';
echo '<option '.$select.' value="'.$locality->id.'">'.
$locality->locality.
'</option>';
}
}
?>
</select>
</div>
</div>
<?php } ?> <?php } ?>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
...@@ -116,10 +157,10 @@ ...@@ -116,10 +157,10 @@
<label>Venue Address</label> <label>Venue Address</label>
<input type="text" class="form-control required" data-parsley-trigger="change" required name="location" placeholder="Venue Address" value="<?= (isset($venue_data->location))?$venue_data->location:'' ?>"> <input type="text" class="form-control required" data-parsley-trigger="change" required name="location" placeholder="Venue Address" value="<?= (isset($venue_data->location))?$venue_data->location:'' ?>">
</div> </div>
<input type="hidden" id="gooLocLat" value="<?= (isset($venue_data->location_lat) && !empty($venue_data->location_lat))?$venue_data->location_lat:'' ?>" /> <input type="hidden" id="gooLocLat" value="<?= (isset($venue_data->location_lat) && !empty($venue_data->location_lat))?$venue_data->location_lat:'24.774265' ?>" />
<input type="hidden" id="gooLocLng" value="<?= (isset($venue_data->location_lng) && !empty($venue_data->location_lng))?$venue_data->location_lng:'' ?>" /> <input type="hidden" id="gooLocLng" value="<?= (isset($venue_data->location_lng) && !empty($venue_data->location_lng))?$venue_data->location_lng:'46.738586' ?>" />
<input type="hidden" id="gooLocZoom" value="<?= (isset($venue_data->location))?15:0 ?>"/> <input type="hidden" id="gooLocZoom" value="<?= (isset($venue_data->location))?15:0 ?>"/>
<div id="locPointerMap" style="height: 352px;"></div> <div id="locPointerMap" style="height:355px;"></div>
</div> </div>
<input id="has_layout" type="hidden" name="has_layout" value='0'> <input id="has_layout" type="hidden" name="has_layout" value='0'>
<div class="col-md-12" id="layoutCntr" class="hide"> <div class="col-md-12" id="layoutCntr" class="hide">
......
assets/css/custom-style.css
...@@ -682,4 +682,12 @@ ...@@ -682,4 +682,12 @@
.datepicker{ .datepicker{
z-index: 9999 !important; z-index: 9999 !important;
}
.disable-div {
-webkit-filter: blur(1px) !important;
pointer-events: none;
cursor: default;
text-decoration: none;
color: black;
} }
\ No newline at end of file
assets/js/custom-script.js
...@@ -804,6 +804,8 @@ jQuery('[name="region_id"]').on('change',function(){ ...@@ -804,6 +804,8 @@ jQuery('[name="region_id"]').on('change',function(){
jQuery('[id="useExist"]').addClass('hide'); jQuery('[id="useExist"]').addClass('hide');
jQuery('[name="locality_id"]').prop("disabled",true); jQuery('[name="locality_id"]').prop("disabled",true);
jQuery('[name="locality_id"]').removeClass("required"); jQuery('[name="locality_id"]').removeClass("required");
jQuery('[id="locality_block"]').removeClass("disable-div");
} }
if(resp_data['status'] == 1){ if(resp_data['status'] == 1){
...@@ -825,6 +827,8 @@ jQuery('[name="region_id"]').on('change',function(){ ...@@ -825,6 +827,8 @@ jQuery('[name="region_id"]').on('change',function(){
jQuery.each(resp_data['data'], function(key, data) { jQuery.each(resp_data['data'], function(key, data) {
jQuery('[name="locality_id"]').append(jQuery("<option></option>").attr("value",data['id']).text(data['locality'])); jQuery('[name="locality_id"]').append(jQuery("<option></option>").attr("value",data['id']).text(data['locality']));
}); });
jQuery('[id="locality_block"]').removeClass("disable-div");
} }
} }
}); });
......
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