Commit 80521a50 by tobin

daily commit

parent 2a6a86ed
......@@ -29,10 +29,10 @@ class Booking extends CI_Controller {
public function getBookingData(){
$resArr = array('status'=>0);
if(!isset($_POST)||empty($_POST)||!isset($_POST['booking_id'])||empty($_POST['booking_id']) ||
!is_numeric($booking_id = decode_param($_POST['booking_id']))){
if(!isset($_POST)||empty($_POST)||!isset($_POST['booking_id'])||empty($_POST['booking_id'])){
echo json_encode($resArr);exit;
}
$booking_id=(!is_numeric($_POST['booking_id']))?decode_param($_POST['booking_id']):$_POST['booking_id'];
$view_all = (isset($_POST['view_all']) && $_POST['view_all'] != '')?$_POST['view_all']:'0,1,2,3';
$provider_id = ($this->session->userdata('user_type')==2)?$this->session->userdata('id'):'';
$bookData['bookData'] = $this->Booking_model->getBookingData($booking_id,$provider_id,$view_all);
......
......@@ -39,7 +39,7 @@ class Event extends CI_Controller {
$template['venueData'] = $this->Venue_model->getVenueData($template['venue_id']);
}
$template['venueList'] = $this->Venue_model->getVenueData();
$template['venueList'] = $this->Venue_model->getVenueData('','1');
$template['page'] = 'Event/eventAddForm';
$template['menu'] = 'Event Management';
......
......@@ -10,13 +10,17 @@ class Booking_model extends CI_Model {
$cond .= (!empty($booking_id))?" AND BOK.id='$booking_id' ":"";
$cond .= (!empty($provider_id))?" AND EVT.provider_id='$provider_id' ":"";
$sql = "SELECT BOK.id AS booking_id,CUST.customer_id,CUST.name,CUST.phone,CUST.email,CUST.gender,
CUST.dob,CUST.city,CUST.profile_image,BOK.event_id,BOK.bookId,BOK.event_date_id,BOK.qrcode,
BOK.no_of_ticket,BOK.ticket_details,BOK.amount,BOK.reserved_by,BOK.status AS book_status,
EVT.venue_id,EVT.category_id,EVT.provider_id,EVT.event_name,EVT.event_discription,
$sql = "SELECT BOK.id AS booking_id,CUST.customer_id,CUST.name AS customer_name,
CUST.phone AS customer_phone,CUST.email AS customer_email,CUST.gender,
CUST.dob,CUST.city,CUST.profile_image,BOK.event_id,BOK.bookId,BOK.event_date_id,
BOK.qrcode,BOK.no_of_ticket,BOK.ticket_details,BOK.amount,
BOK.reserved_by,BOK.status AS book_status,EVT.venue_id,EVT.category_id,
EVT.provider_id,EVT.event_name,EVT.event_discription,
EVT.max_booking,EVT.seat_pricing,EVT.custom_seat_layout,EVT.status AS evt_status,
HCAT.host_category,HCAT.show_layout,EDT.date,EDT.time,ECAT.category,
ECAT.category_description,ECAT.category_image
ECAT.category_description,ECAT.category_image,PRV.name AS provider_name,
PRV.email AS provider_email,PRV.phone AS provider_phone,
PRV.profile_image AS provider_image,VEN.venue_name,VEN.venue_details,VEN.location
FROM booking AS BOK
INNER JOIN events AS EVT ON (EVT.event_id=BOK.event_id)
INNER JOIN customer AS CUST ON (CUST.customer_id=BOK.customer_id)
......@@ -24,6 +28,7 @@ class Booking_model extends CI_Model {
INNER JOIN venue AS VEN ON (VEN.id=EVT.venue_id)
INNER JOIN host_categories AS HCAT ON (HCAT.host_cat_id=VEN.host_cat_id)
INNER JOIN event_date_time AS EDT ON (EDT.id=BOK.event_date_id)
INNER JOIN provider AS PRV ON (PRV.provider_id=EVT.provider_id)
WHERE $cond AND EVT.status!='2'";
$bookingData = $this->db->query($sql);
......@@ -78,7 +83,7 @@ class Booking_model extends CI_Model {
$where_clause .= " BOK.status = '".$where_cond['status']."' ";
}
}
$fields = 'BOK.id AS Booking_ID,'.$fields;
$sql = "SELECT ".$fields."
FROM booking AS BOK
INNER JOIN events AS EVT ON (EVT.event_id=BOK.event_id)
......
......@@ -38,6 +38,7 @@
<div class="col-md-12">
<select name="provider_id" class="form-control" data-parsley-trigger="change">
<option selected disabled>Select Organizer</option>
<option value="">All Organizer</option>
<?php
if(!empty($providerData)){
foreach ($providerData as $provider) {
......@@ -80,6 +81,7 @@
<div class="col-md-12">
<select name="status" class="form-control" data-parsley-trigger="change">
<option selected disabled>Select Ride Status</option>
<option value="">All Bookings</option>
<?php
$status = array('2'=>'Completed','1'=>'Booked','3'=>'Pending','0'=>'Cancelled','4'=>'Deleted');
foreach ($status as $key => $stat) {
......@@ -208,8 +210,8 @@
</table>
</form>
</div>
<div class="col-md-12" style="padding-top:20px;">
<div class="box-footer" style="padding-left:40%;">
<div class="col-md-12">
<div class="box-footer" >
<input type="hidden" id="all_fields" all_fields="<?= implode(',',$allFields) ?>">
<button id="rGenerate" type="submit" action="view" dmclick="0" class="btn btn-primary">
View Report
......
......@@ -38,13 +38,13 @@
<tr>
<th class="hidden">ID</th>
<th width="50px;">Book ID</th>
<th width="100px;">Event Type</th>
<th width="100px;">Event</th>
<th width="130px;">Event Name</th>
<th width="130px;">Customer Name</th>
<th width="130px;">Customer</th>
<th width="130px;">Scheduled On</th>
<th width="50px;">Amount</th>
<th width="50px;">Status</th>
<th width="120px;">Action</th>
<th width="150px;">Action</th>
</tr>
</thead>
<tbody>
......@@ -56,7 +56,7 @@
<th class="center"><?= $booking->bookId ?></th>
<th class="center"><?= $booking->category ?></th>
<th class="center"><?= $booking->event_name ?></th>
<th class="center"><?= $booking->name ?></th>
<th class="center"><?= $booking->customer_name ?></th>
<th class="center"><?= $booking->date.' '.$booking->time ?></th>
<th class="center"><?= $booking->amount ?></th>
<th class="center">
......
......@@ -336,7 +336,7 @@
</div>
<div class="col-md-12 padTop10">
<div class="box-footer textCenterAlign">
<div class="box-footer">
<button type="submit" class="btn btn-primary" id="addEventButton">Submit</button>
<a href="<?= base_url('Event/listEvents') ?>" class="btn btn-primary">Cancel</a>
</div>
......
......@@ -32,7 +32,7 @@
enctype="multipart/form-data" action="<?= base_url('Event/updateEvent/'.encode_param($event_data->event_id))?>" >
<input type="hidden" name="venue_id" value="<?= $event_data->venue_id ?>">
<div class="box-header with-border">
<h3 class="box-title">Venue Details</h3>
<h3 class="box-title padLeft10 padTop5">Venue Details</h3>
</div>
<div class="box-body">
<div class="row">
......@@ -64,22 +64,22 @@
</div>
</div>
</div>
</div>
<?php if($event_data->show_layout == 1){ ?>
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">Layout Details</h3>
<div class="box-header with-border padTop0">
<h3 class="box-title padLeft10 ">Layout Details</h3>
</div>
<div class="box-body">
<div class="col-sm-12">
<div class="col-md-12">
<div class="col-sm-3 dropZoneContainer viewLayout">
<img class="dropZoneOverlay" id="image_id" src="<?= base_url($event_data->layout) ?>"
onerror="this.src='<?=base_url("assets/images/no_image_text.png")?>';"
height="75" width="75" />
</div>
<div class="col-md-9">
<div class="" id="mapTypeCntr">
<div class="col-md-9 padLeft40">
<div class="marginTop23" id="mapTypeCntr">
<input type="radio" name="fare_type" value="0" <?= (empty($event_data->custom_seat_layout))?'checked':'' ?>>
<label class="padAll-10">Use Default Fare</label>
<input class="marginLeft15" type="radio" name="fare_type" value="1"
......@@ -87,7 +87,7 @@
<label class="padAll-10">Create Custome Fare</label>
</div>
<div class="col-sm-12">
<div class="col-sm-12 marginTop-8">
<div class="col-sm-3">
<strong>Seat Division</strong>
</div>
......@@ -102,14 +102,14 @@
<strong>Seating Capacity</strong>
</div>
</div>
<div class="box-header with-border"
<div class="box-header with-border padHead marginBottom-10"
style="width:480px;"></div>
<?php $layoutDtls = json_decode($event_data->layout_details,true); ?>
<div class="col-sm-12 <?= (empty($event_data->custom_seat_layout))?'':'hide' ?>"
id="defaultFareSystem">
<?php foreach($layoutDtls AS $lyDtls){ ?>
<div class="">
<div class="padBottom30">
<div class="col-sm-3">
<strong><?= $lyDtls['color'] ?></strong> block
</div>
......@@ -175,11 +175,10 @@
</div>
</div>
</div>
</div>
<?php } ?>
<div class="box">
<div class="box-header with-border">
<h3 class="box-title ">Event Details</h3>
<h3 class="box-title padLeft10 ">Event Details</h3>
</div>
<div class="box-body">
......@@ -258,14 +257,13 @@
</div>
</div>
</div>
</div>
<?php if($event_data->show_layout != 1 && !empty($event_data->seat_pricing) &&
!empty($seat_pricing = json_decode($event_data->seat_pricing,true))){ ?>
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">Ticket Pricing</h3>
<h3 class="box-title padLeft10 ">Ticket Pricing</h3>
</div>
<div class="box-body">
......@@ -288,11 +286,10 @@
</div>
</div>
</div>
</div>
<?php } ?>
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">Scheduler and Tags</h3>
<h3 class="box-title padLeft10 ">Scheduler and Tags</h3>
</div>
<div class="box-body">
......@@ -302,9 +299,9 @@
$sType = (isset($event_data->eventSchedule) && !empty($event_data->eventSchedule['date']))?count($event_data->eventSchedule['date']):1; ?>
<div id="scheduleTypeCntr">
<input type="radio" name="schedule_type" value="0" <?= ($sType==1)?'checked':'' ?>>
<label class="">For Single Show</label>
<input class="" type="radio" name="schedule_type" value="1" <?= ($sType==1)?'':'checked' ?>>
<label class="">For Multiple Show</label>
<label class="padAll-10">For Single Show</label>
<input class="marginLeft15" type="radio" name="schedule_type" value="1" <?= ($sType==1)?'':'checked' ?>>
<label class="padAll-10">For Multiple Show</label>
</div>
<div class="col-sm-6">
......@@ -413,13 +410,12 @@
<?php } ?>
</div>
<div class="col-md-12 padTop10">
<div class="box-footer textCenterAlign">
<div class="box-footer">
<button type="submit" class="btn btn-primary" id="addEventButton">Submit</button>
<a href="<?= base_url('Event/listEvents') ?>" class="btn btn-primary">Cancel</a>
</div>
</div>
</div>
</div>
</form>
</div>
</div>
......
......@@ -23,14 +23,10 @@
</div>
<?php } ?>
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="col-xs-12">
<div class="box box-warning">
<div class="box-header with-border">
<div class="col-md-6">
<h3 class="box-title">Event List</h3>
</div>
<div class="col-md-6"><h3 class="box-title">Event List</h3></div>
<div class="col-md-6" align="right">
<a class="btn btn-sm btn-primary" href="<?= base_url('Event/addEvent') ?>">
Add New Event
......@@ -44,11 +40,11 @@
<tr>
<th class="hidden">ID</th>
<th>Event Name</th>
<th >Venue</th>
<th>Venue</th>
<th>Region</th>
<th>Location</th>
<th>Status</th>
<th>Action</th>
<th width="300px">Action</th>
</tr>
</thead>
<tbody>
......@@ -56,12 +52,12 @@
if(!empty($event_data)){
foreach($event_data as $event) { ?>
<tr>
<th class="hidden"><?= $event->event_id ?></th>
<th class="center"><?= $event->event_name ?></th>
<th class="center"><?= $event->venue_name ?></th>
<th class="center"><?= $event->region_name ?></th>
<th class="center"><?= $event->location ?></th>
<th class="center">
<td class="hidden"><?= $event->event_id ?></td>
<td><?= $event->event_name ?></td>
<td><?= $event->venue_name ?></td>
<td><?= $event->region_name ?></td>
<td><?= $event->location ?></td>
<td>
<?php
switch($event->event_status){
case 1 : echo 'Active'; break;
......@@ -69,8 +65,8 @@
case 3 : echo 'Waiting For Approval'; break;
}
?>
</th>
<td class="center">
</td>
<td>
<button class="btn btn-sm btn-info" id="viewEventDetails"
event_id="<?= encode_param($event->event_id) ?>">
<i class="fa fa-fw fa-eye"></i>View
......
......@@ -2,9 +2,6 @@
$settings = getSettings();
$gKey = $settings['google_api_key'];
?>
<!-- JAVASCRIPTS-STARTS -->
<script>
base_url = "<?= base_url() ?>";
country_flag = '<?= $settings['country_flag'] ?>';
......@@ -41,8 +38,27 @@
$controllerName = $ci->uri->segment(1);
$actionName = $ci->uri->segment(2);
$page = $controllerName . '-' . $actionName;
?>
</script>
<!-- JAVASCRIPTS-ENDS -->
\ No newline at end of file
// switch ($page) {
//case 'Ride-view_rides': ?>
// jQuery(function () {
// jQuery('.datatable').DataTable({
// scrollY: "300px",
// scrollX: true,
// scrollCollapse: true,
// paging: false,
// fixedColumns: {
// heightMatch: 'none'
// }
// });
// });
<?php //break;
//default : ?>
jQuery(function () {
jQuery('.datatable').DataTable({
"ordering" : jQuery(this).data("ordering"),
"order": [[ 0, "asc" ]]
});
});
<?php //} ?>
</script>
\ No newline at end of file
......@@ -9,9 +9,7 @@
<img id="fav_icon" src="<?= base_url($settings['fav_icon']) ?>"
onerror="this.src='<?= base_url("assets/images/asset_logo.png") ?>';" height="50" width="50" />
</span>
<span class="hidden-xs">
<img src="<?= base_url('assets/images/asset_logo.png') ?>">
</span>
<span class="hidden-xs"><img src="<?= base_url("assets/images/asset_logo.png") ?>"></span>
</a>
<nav class="navbar navbar-static-top" role="navigation">
<a href="#" class="sidebar-toggle" data-toggle="offcanvas" role="button">
......
......@@ -10,8 +10,6 @@
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
<!-- CASCADE-STYLE-SHEET-STARTS -->
<link rel="stylesheet" href="<?= base_url('assets/css/bootstrap.min.css') ?>">
<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css" rel="stylesheet">
<link rel="stylesheet" href="https://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css">
......@@ -23,14 +21,10 @@
<link rel="stylesheet" href="<?= base_url('assets/css/custom-style.css?'.time()) ?>">
<link rel="stylesheet" href="<?= base_url('assets/css/parsley/parsley.css') ?>">
<link rel="stylesheet" href="<?= base_url('assets/css/bootstrap-datepicker3.css') ?>">
<link rel="stylesheet" href="<?= base_url('assets/css/clockpicker.css') ?>" type="text/css" >
<link rel="stylesheet" href="<?= base_url('assets/css/theme.css') ?>">
<link rel="stylesheet" href="<?= base_url('assets/css/custom.css') ?>">
<link rel="stylesheet" href="<?= base_url('assets/css/slick.min.css') ?>" type="text/css" >
<link rel="stylesheet" href="<?= base_url('assets/css/clockpicker.css') ?>" type="text/css" >
<!-- CASCADE-STYLE-SHEET-ENDS -->
<!-- JAVASCRIPTS-STARTS -->
<script src="<?= base_url('assets/js/jQuery-2.1.4.min.js') ?>"></script>
......
<aside class="main-sidebar">
<section class="sidebar">
<div class="user-panel">
<div class="pull-left image">
<img src="<?=base_url($this->session->userdata('profile_pic'))?>" onerror="this.src='<?=base_url("assets/images/user_avatar.jpg")?>'" class="user-image left-sid" alt="User Image">
</div>
<div class="pull-left info">
<p><?php echo $this->session->userdata('logged_in_admin')['username']; ?></p>
<a href="#"><i class="fa fa-circle text-success"></i> Online</a>
</div>
</div>
<ul class="sidebar-menu">
<li><a href="<?= base_url('Dashboard') ?>">
<img src="<?= base_url('assets/images/m1.png') ?>" />
<img src="<?=base_url("assets/images/m1.png") ?>">
<span>Dashboard</span></a>
</li>
<li><a href="<?= base_url('Tag/listTags') ?>">
<img src="<?= base_url('assets/images/m2.png') ?>" />
<img src="<?=base_url("assets/images/m2.png") ?>">
<span>Tag Management</span></a>
</li>
<li class="treeview">
<a href="#">
<img src="<?= base_url('assets/images/m3.png') ?>" />
<img src="<?=base_url("assets/images/m3.png") ?>">
<span>Host Categories</span>
<i class="fa fa-angle-left pull-right"></i>
</a>
......@@ -31,16 +40,16 @@
</ul>
</li>
<li><a href="<?= base_url('Region/listRegion') ?>">
<img src="<?= base_url('assets/images/m4.png') ?>" />
<img src="<?=base_url("assets/images/m4.png") ?>">
<span>Region Management</span></a>
</li>
<li><a href="<?= base_url('Category/listCategory') ?>">
<img src="<?= base_url('assets/images/m5.png') ?>" />
<img src="<?=base_url("assets/images/m5.png") ?>">
<span>Category Management</span></a>
</li>
<li class="treeview">
<a href="#">
<img src="<?= base_url('assets/images/m6.png') ?>" />
<img src="<?=base_url("assets/images/m6.png") ?>">
<span>Venue Management</span>
<i class="fa fa-angle-left pull-right"></i>
</a>
......@@ -61,7 +70,7 @@
</li>
<li class="treeview">
<a href="#">
<img src="<?= base_url('assets/images/m3.png') ?>" />
<img src="<?=base_url("assets/images/m7.png") ?>">
<span>Event Management</span>
<i class="fa fa-angle-left pull-right"></i>
</a>
......@@ -83,7 +92,7 @@
<?php if($this->session->userdata['user_type'] == 1){ ?>
<li class="treeview">
<a href="#">
<i class="fa fa-bars" aria-hidden="true"></i>
<img src="<?=base_url("assets/images/m3.png") ?>">
<span>Organizer Management</span>
<i class="fa fa-angle-left pull-right"></i>
</a>
......@@ -104,7 +113,7 @@
</li>
<li class="treeview">
<a href="#">
<i class="fa fa-bars" aria-hidden="true"></i>
<img src="<?=base_url("assets/images/m9.png") ?>">
<span>Customer Management</span>
<i class="fa fa-angle-left pull-right"></i>
</a>
......@@ -123,14 +132,11 @@
</li>
</ul>
</li>
<?php } ?>
<li><a href="<?= base_url('Booking/viewBookings') ?>">
<i class="fa fa-bars" aria-hidden="true">
</i><span>Booking Details</span></a>
<img src="<?=base_url("assets/images/m8.png") ?>"><span>Booking Details</span></a>
</li>
<?php if($this->session->userdata['user_type'] == 1){ ?>
<li><a href="<?= base_url('Settings') ?>">
<img src="<?= base_url('assets/images/m7.png') ?>" />
<i class="fa fa-wrench" aria-hidden="true">
</i><span>Settings</span></a>
</li>
<?php } ?>
......
......@@ -44,7 +44,7 @@
<th width="100px;">Host Type</th>
<th width="120px;">Location</th>
<th width="50px;">Status</th>
<th width="250px;">Action</th>
<th width="300px;">Action</th>
</tr>
</thead>
<tbody>
......
......@@ -13,7 +13,9 @@ body {
min-height: 100%
}
a:hover{
}
.layout-boxed html,
.layout-boxed body {
height: 100%
......@@ -350,7 +352,7 @@ a:focus {
.content-header>h1 {
margin: 0;
font-size: 35px;
font-size: 24px
}
.content-header>h1>small {
......@@ -1966,7 +1968,7 @@ a:focus {
.box-header>.ion,
.box-header .box-title {
display: inline-block;
font-size: 26px;
font-size: 18px;
margin: 0;
line-height: 1
}
......
......@@ -313,7 +313,7 @@
opacity: 0.5;
}
.padBottom10 {
/* .padBottom10 {
padding-bottom:10px !important;
}
......@@ -427,7 +427,7 @@
.padAll-20 {
padding: 20px;
}
} */
.vechile-body {
background-color:#f7f7f7;
......
......@@ -231,9 +231,18 @@
.btn{
border-radius: 0px !important;
border:none !important;
min-width: 95px;
}
.btn:focus{
outline:none;
}
.btn:hover{
outline:none;
}
.btn .fa{
margin-right: 5px;
}
......@@ -256,10 +265,14 @@
.content-header h1{
font-family: sinhala;
font-weight: 500 !important;
font-size: 35px;
}
.box-title{
font-family: sinhala;
font-size: 30px !important;
padding-left: 20px !important;
}
.user-panel{
......@@ -280,6 +293,31 @@ padding-bottom: 30px;
}
.sidebar-menu li img{
height: 25px;
height: 20px;
margin-right: 10px;
}
.qr_code{
height: 100px;
}
.view_booking_modal{
}
.view_booking_modal .col-md-12 .row{
margin-top: 5px;
margin-bottom: 5px;
border-bottom: 1px solid #e5e5e5;
padding-top: 10px;
padding-bottom:10px;
}
.view_booking_modal .col-md-12 .row .row{
margin-bottom: 0px;
margin-top: 0px;
border:none;
padding-top: 0px;
padding-bottom: 0px;
}
\ No newline at end of file
......@@ -116,10 +116,8 @@ function setLayout(){
var layoutFlag = jQuery('[name="host_cat_id"]').find(":selected").attr('haveLayout');
if(layoutFlag == 1){
jQuery('[id="has_layout"]').val('1');
jQuery('[id="layoutCntr"]').html(jQuery('[id="layoutCntrHtml"]').html());
} else {
jQuery('[id="has_layout"]').val('0');
jQuery('[id="layoutCntr"]').html('');
}
}
......@@ -589,9 +587,7 @@ jQuery('[id="viewEventDetails"]').on('click',function(event) {
});
});
jQuery('[id="viewBooking"]').on('click',function(event) {
var booking_id = jQuery(this).attr('booking_id');
function viewBooking(booking_id){
if(booking_id=='' || booking_id==undefined || booking_id=='undefined' || booking_id==null || booking_id=='null'){
return true;
}
......@@ -619,6 +615,14 @@ jQuery('[id="viewBooking"]').on('click',function(event) {
jQuery('[id="modal_content"]').html('Something went wrong, please try again later...!');
}
});
}
jQuery('[id="viewBooking"]').on('click',function(event) {
var booking_id = jQuery(this).attr('booking_id');
if(booking_id=='' || booking_id==undefined || booking_id=='undefined' || booking_id==null || booking_id=='null'){
return true;
}
viewBooking(booking_id);
});
function showLyDivDtls(thisObj){
......@@ -702,7 +706,7 @@ jQuery('[id="rGenerate"]').click(function(){
jQuery.each(resp_data['report_data'], function(key, data) {
report_data[key] = data;
var vBtn = '<a class="btn btn-sm btn-primary" id="report_view_pop_'+key+'" key="'+key+'"><i class="fa fa-fw fa-edit"></i>View</a>';
var vBtn = '<a class="btn btn-sm btn-primary" onclick="viewBooking('+data['Booking_ID']+');"><i class="fa fa-fw fa-edit"></i>View</a>';
table.row.add([data['Book_ID'],data['Event_Name'],data['Customer_Name'],data['Amount'],data['Show_Time'],data['Book_Status'],vBtn]).draw();
});
......
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