Skip to content

T
TimeOutAdmin
Commit 3280636f by Tobin
Options

dc

parent b2eeb1bb
Showing with 90 additions and 82 deletions
application/helpers/generals_helper.php
...@@ -359,7 +359,9 @@ ...@@ -359,7 +359,9 @@
function getLanguages(){ function getLanguages(){
$thisObj = & get_instance(); $thisObj = & get_instance();
$sql = "SELECT language_code FROM country GROUP BY language_code $sql = "SELECT language_code FROM country
WHERE status='1'
GROUP BY language_code
ORDER BY CASE WHEN language_code LIKE 'EN' THEN 0 ELSE 1 END, language_code ASC"; ORDER BY CASE WHEN language_code LIKE 'EN' THEN 0 ELSE 1 END, language_code ASC";
$langData = $thisObj->db->query($sql); $langData = $thisObj->db->query($sql);
......
application/models/Booking_model.php
...@@ -10,18 +10,15 @@ class Booking_model extends CI_Model { ...@@ -10,18 +10,15 @@ class Booking_model extends CI_Model {
$cond .= (!empty($booking_id))?" AND BOK.id='$booking_id' ":""; $cond .= (!empty($booking_id))?" AND BOK.id='$booking_id' ":"";
$cond .= (!empty($provider_id))?" AND EVT.provider_id='$provider_id' ":""; $cond .= (!empty($provider_id))?" AND EVT.provider_id='$provider_id' ":"";
$sql = "SELECT BOK.id AS booking_id,CUST.customer_id,CUST.name AS customer_name, $sql = "SELECT BOK.id AS booking_id,CUST.customer_id,CUST.name AS customer_name,EVT.provider_id,
CUST.phone AS customer_phone,CUST.email AS customer_email,CUST.gender, CUST.phone AS customer_phone,CUST.email AS customer_email,CUST.gender,EVT.venue_id,
CUST.dob,CUST.city,CUST.profile_image,BOK.event_id,BOK.bookId,BOK.event_date_id, 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.qrcode,BOK.no_of_ticket,BOK.ticket_details,BOK.amount,EVT.has_payment,
BOK.reserved_by,BOK.status AS book_status,EVT.venue_id,EVT.category_id, BOK.reserved_by,BOK.status AS book_status,EVT.category_id,EVT.max_booking,
EVT.provider_id,EVT.event_name_en,EVT.event_description_en,EVT.has_payment, EVT.seat_pricing,EVT.custom_seat_layout,EVT.status AS evt_status,EDT.time,
EVT.max_booking,EVT.seat_pricing,EVT.custom_seat_layout,EVT.status AS evt_status, HCAT.host_category,HCAT.show_layout,EDT.date,PRV.name AS provider_name,
HCAT.host_category,HCAT.show_layout,EDT.date,EDT.time,ECAT.category_en, PRV.email AS provider_email,PRV.phone AS provider_phone,VEN.location,
ECAT.category_description,ECAT.category_image_en,PRV.name AS provider_name, PRV.profile_image AS provider_image,TRANS.transaction_id,TRANS.status AS trans_status
PRV.email AS provider_email,PRV.phone AS provider_phone,
PRV.profile_image AS provider_image,VEN.venue_name_en,VEN.venue_details,VEN.location,
TRANS.transaction_id,TRANS.status AS trans_status
FROM booking AS BOK FROM booking AS BOK
INNER JOIN events AS EVT ON (EVT.event_id=BOK.event_id) INNER JOIN events AS EVT ON (EVT.event_id=BOK.event_id)
INNER JOIN customer AS CUST ON (CUST.customer_id=BOK.customer_id) INNER JOIN customer AS CUST ON (CUST.customer_id=BOK.customer_id)
...@@ -34,11 +31,30 @@ class Booking_model extends CI_Model { ...@@ -34,11 +31,30 @@ class Booking_model extends CI_Model {
WHERE $cond"; WHERE $cond";
$bookingData = $this->db->query($sql); $bookingData = $this->db->query($sql);
if(empty($bookingData)){
return 0;
}
if(!empty($bookingData)){ if(empty($booking_id)){
return (empty($booking_id))?$bookingData->result():$bookingData->row(); $bookingData = $bookingData->result_array();
foreach ($bookingData AS $index => $book) {
$rtlData = langTranslator($book['event_id'],'EVT');
$bookingData[$index] = array_merge($bookingData[$index],$rtlData);
$rtlData = langTranslator($book['venue_id'],'VEN');
$bookingData[$index] = array_merge($bookingData[$index],$rtlData);
$rtlData = langTranslator($book['category_id'],'CAT');
$bookingData[$index] = array_merge($bookingData[$index],$rtlData);
} }
return 0; } else {
$bookingData = $bookingData->row_array();
$rtlData = langTranslator($bookingData['event_id'],'EVT');
$bookingData = array_merge($bookingData,$rtlData);
$rtlData = langTranslator($bookingData['venue_id'],'VEN');
$bookingData = array_merge($bookingData,$rtlData);
$rtlData = langTranslator($bookingData['category_id'],'CAT');
$bookingData = array_merge($bookingData,$rtlData);
}
return json_decode(json_encode($bookingData));
} }
function changeStatus($booking_id = '', $status = '0'){ function changeStatus($booking_id = '', $status = '0'){
...@@ -87,7 +103,10 @@ class Booking_model extends CI_Model { ...@@ -87,7 +103,10 @@ class Booking_model extends CI_Model {
} }
$fields = 'BOK.id AS Booking_ID,TRANS.transaction_id,TRANS.status AS trans_status, $fields = 'BOK.id AS Booking_ID,TRANS.transaction_id,TRANS.status AS trans_status,
EVT.has_payment,'.$fields; EVT.has_payment,'.$fields;
$sql = "SELECT ".$fields."
$fields = str_replace(array('EVT.event_name,','EVT.event_description,','ECAT.category,','VEN.venue_name,','REG.name_en AS Region,'),'',$fields);
$sql = "SELECT EVT.event_id,EVT.category_id,VEN.id AS venue_id,REG.id AS region_id,".$fields."
FROM booking AS BOK FROM booking AS BOK
INNER JOIN events AS EVT ON (EVT.event_id=BOK.event_id) INNER JOIN events AS EVT ON (EVT.event_id=BOK.event_id)
INNER JOIN customer AS CUST ON (CUST.customer_id=BOK.customer_id) INNER JOIN customer AS CUST ON (CUST.customer_id=BOK.customer_id)
...@@ -101,15 +120,30 @@ class Booking_model extends CI_Model { ...@@ -101,15 +120,30 @@ class Booking_model extends CI_Model {
".$where_clause." ".$where_clause."
GROUP BY Booking_ID GROUP BY Booking_ID
ORDER BY BOK.id ASC"; ORDER BY BOK.id ASC";
$data = $this->db->query($sql);
if(!empty($data)){ $reportData = $this->db->query($sql);
$resData = $data->result_array(); if(empty($reportData)){
if(empty($resData)){ return 0;
}
if(empty($reportData = $reportData->result_array())){
return 2; return 2;
} }
return $resData; foreach ($reportData AS $key => $data) {
$evtData = langTranslator($data['event_id'],'EVT');
$venData = langTranslator($data['venue_id'],'VEN');
$regData = langTranslator($data['region_id'],'REG');
$catData = langTranslator($data['category_id'],'CAT');
$reportData[$key]['Event Name'] = $evtData['event_name_EN'];
$reportData[$key]['Venue Name'] = $venData['venue_name_EN'];
$reportData[$key]['Region Name'] = $regData['region_name_EN'];
$reportData[$key]['Event Category'] = $catData['category_name_EN'];
$reportData[$key]['Event Description'] = $evtData['event_description_EN'];
unset($reportData[$key]['event_id'],$reportData[$key]['venue_id'],
$reportData[$key]['category_id'],$reportData[$key]['region_id']);
} }
return 0; return $reportData;
} }
} }
?> ?>
\ No newline at end of file
application/models/Region_model.php
...@@ -65,6 +65,7 @@ class Region_model extends CI_Model { ...@@ -65,6 +65,7 @@ class Region_model extends CI_Model {
$insertArr = array(); $insertArr = array();
foreach ($languages AS $lang) { foreach ($languages AS $lang) {
if(!isset($regionData['name_'.$lang]) || empty($regionData['name_'.$lang])){ if(!isset($regionData['name_'.$lang]) || empty($regionData['name_'.$lang])){
unset($regionData['name_'.$lang]);
continue; continue;
} }
$insertArr[] = array('region_id'=>$region_id, $insertArr[] = array('region_id'=>$region_id,
......
application/models/Tag_model.php
...@@ -31,7 +31,7 @@ class Tag_model extends CI_Model { ...@@ -31,7 +31,7 @@ class Tag_model extends CI_Model {
if(empty($tagData)){ if(empty($tagData)){
return 0; return 0;
} }
$status = $this->db->insert('tags',array('tag'=>$tagData['tag_en'])); $status = $this->db->insert('tags',array('tag'=>$tagData['tag_EN']));
if($status){ if($status){
$tag_id = $this->db->insert_id(); $tag_id = $this->db->insert_id();
$languages = getLanguages(); $languages = getLanguages();
...@@ -57,7 +57,7 @@ class Tag_model extends CI_Model { ...@@ -57,7 +57,7 @@ class Tag_model extends CI_Model {
if(empty($tag_id) || empty($tagData)){ if(empty($tag_id) || empty($tagData)){
return 0; return 0;
} }
$status = $this->db->update('tags',array('tag'=>$tagData['tag_en']),array('tag_id'=>$tag_id)); $status = $this->db->update('tags',array('tag'=>$tagData['tag_EN']),array('tag_id'=>$tag_id));
if($status){ if($status){
$languages = getLanguages(); $languages = getLanguages();
if(!empty($languages)){ if(!empty($languages)){
......
application/models/Webservice_model.php
...@@ -1347,7 +1347,7 @@ class Webservice_model extends CI_Model { ...@@ -1347,7 +1347,7 @@ class Webservice_model extends CI_Model {
$lang = $countryData['language_code']; $lang = $countryData['language_code'];
$sql = "SELECT booking.bookId AS booking_id,event_date_time.date, $sql = "SELECT booking.bookId AS booking_id,event_date_time.date,
translator_event.event_name,event_gallery.media_url AS event_image, translator_event.event_name,booking.qrcode AS event_image,
venue.location,event_date_time.time,booking.event_id, venue.location,event_date_time.time,booking.event_id,
booking.no_of_ticket AS ticket_count,events.has_payment, booking.no_of_ticket AS ticket_count,events.has_payment,
(CASE booking.status WHEN 1 THEN 0 WHEN 2 THEN 1 WHEN 0 THEN 2 (CASE booking.status WHEN 1 THEN 0 WHEN 2 THEN 1 WHEN 0 THEN 2
...@@ -1357,7 +1357,6 @@ class Webservice_model extends CI_Model { ...@@ -1357,7 +1357,6 @@ class Webservice_model extends CI_Model {
INNER JOIN event_date_time ON booking.event_date_id = event_date_time.id INNER JOIN event_date_time ON booking.event_date_id = event_date_time.id
INNER JOIN venue ON venue.id = events.venue_id INNER JOIN venue ON venue.id = events.venue_id
INNER JOIN translator_event ON translator_event.event_id = events.event_id INNER JOIN translator_event ON translator_event.event_id = events.event_id
LEFT JOIN event_gallery ON events.event_id = event_gallery.event_id AND event_gallery.media_type = 0
WHERE booking.customer_id = '$user_id' AND booking.status IN(0, 1, 2) AND WHERE booking.customer_id = '$user_id' AND booking.status IN(0, 1, 2) AND
translator_event.language_code = '$lang' translator_event.language_code = '$lang'
GROUP BY booking.id GROUP BY booking.id
......
application/views/Booking/generate.php
...@@ -131,10 +131,9 @@ ...@@ -131,10 +131,9 @@
), ),
array('name' => 'Event Details', array('name' => 'Event Details',
'fields' => 'fields' =>
array('EVT.event_name_en AS Event_Name'=>'Event Name', array('EVT.event_name'=>'Event Name',
'EVT.event_description_en'=>'Event Discription', 'EVT.event_description'=>'Event Discription',
'ECAT.category_en AS Category'=>'Event Category', 'ECAT.category'=>'Event Category'
'ECAT.category_description AS Category_Description'=>'Category Description'
) )
), ),
array('name' => 'Customer Details', array('name' => 'Customer Details',
...@@ -154,8 +153,7 @@ ...@@ -154,8 +153,7 @@
), ),
array('name' => 'Venue Details', array('name' => 'Venue Details',
'fields' => 'fields' =>
array('VEN.venue_name_en AS Venue_Name'=>'Venue Name', array('VEN.venue_name'=>'Venue Name',
'VEN.venue_details AS Venue_Details'=>'Venue Details',
'REG.name_en AS Region'=>'Region', 'REG.name_en AS Region'=>'Region',
'VEN.location AS Location'=>'Location' 'VEN.location AS Location'=>'Location'
) )
...@@ -251,8 +249,12 @@ ...@@ -251,8 +249,12 @@
</section> </section>
</div> </div>
<?php
$defFields = '[name^="BOK.bookId"],[name^="CONCAT(EDT.date,EDT.time)"],[name^="BOK.amount"],[name^="BOK.status"],[name^="EVT.event_name"],[name^="EVT.event_description"],[name^="ECAT.category"],[name^="CUST.name"],[name^="VEN.venue_name"],[name^="REG.name_en AS Region"]';
?>
<script type="text/javascript"> <script type="text/javascript">
jQuery(document).ready(function(){ jQuery(document).ready(function(){
jQuery('[name^="BOK.bookId"],[name^="CONCAT(EDT.date,\' \',EDT.time)"],[name^="BOK.amount"],[name^="BOK.status"],[name^="EVT.event_name_en"],[name^="CUST.name"]').prop("checked", true).parent().closest('div').addClass('disable-block'); jQuery('<?= $defFields ?>').prop("checked", true).parent().closest('div').addClass('disable-block');
}); });
</script> </script>
\ No newline at end of file
application/views/Booking/viewBooking.php
...@@ -54,8 +54,8 @@ ...@@ -54,8 +54,8 @@
<tr> <tr>
<th class="hidden"><?= $booking->booking_id ?></th> <th class="hidden"><?= $booking->booking_id ?></th>
<th class="center"><?= $booking->bookId ?></th> <th class="center"><?= $booking->bookId ?></th>
<th class="center"><?= $booking->category_en ?></th> <th class="center"><?= $booking->category_name_EN ?></th>
<th class="center"><?= $booking->event_name_en ?></th> <th class="center"><?= $booking->event_name_EN ?></th>
<th class="center"><?= $booking->customer_name ?></th> <th class="center"><?= $booking->customer_name ?></th>
<th class="center"><?= $booking->date.' '.$booking->time ?></th> <th class="center"><?= $booking->date.' '.$booking->time ?></th>
<th class="center"><?= $booking->amount ?></th> <th class="center"><?= $booking->amount ?></th>
......
application/views/Booking/viewBookingDetails.php
<?php
// pr($bookData);
?>
<div class="box-body"> <div class="box-body">
<div class="view_booking_modal"> <div class="view_booking_modal">
<div class="row"> <div class="row">
...@@ -134,7 +130,7 @@ ...@@ -134,7 +130,7 @@
: :
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
<?= $bookData->event_name_en ?> <?= $bookData->event_name_EN ?>
</div> </div>
</div> </div>
...@@ -146,7 +142,7 @@ ...@@ -146,7 +142,7 @@
: :
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
<?= $bookData->event_description_en ?> <?= $bookData->event_description_EN ?>
</div> </div>
</div> </div>
...@@ -160,20 +156,7 @@ ...@@ -160,20 +156,7 @@
: :
</div> </div>
<div class="col-md-5"> <div class="col-md-5">
<?= $bookData->category_en ?> <?= $bookData->category_name_EN ?>
</div>
</div>
</div>
<div class="col-md-6">
<div class="row">
<div class="col-md-5">
Catagory Description
</div>
<div class="col-md-1">
:
</div>
<div class="col-md-5">
<p class="truncateText"><?= $bookData->category_description ?></p>
</div> </div>
</div> </div>
</div> </div>
...@@ -284,20 +267,7 @@ ...@@ -284,20 +267,7 @@
: :
</div> </div>
<div class="col-md-5"> <div class="col-md-5">
<?= $bookData->venue_name_en ?> <?= $bookData->venue_name_EN ?>
</div>
</div>
</div>
<div class="col-md-6">
<div class="row">
<div class="col-md-5">
Venue Details
</div>
<div class="col-md-1">
:
</div>
<div class="col-md-5">
<p class="truncateText"><?= $bookData->venue_details ?></p>
</div> </div>
</div> </div>
</div> </div>
...@@ -318,6 +288,6 @@ ...@@ -318,6 +288,6 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
\ No newline at end of file
application/views/Category/categoryAddForm.php
...@@ -42,8 +42,7 @@ ...@@ -42,8 +42,7 @@
<div class="form-group"> <div class="form-group">
<label>Category Name (EN)</label> <label>Category Name (EN)</label>
<input type="text" class="form-control required" data-parsley-trigger="change" <input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z0-9\ . _ - ' \/]+$" data-parsley-minlength="2" name="category_name_EN" value="<?= (isset($categoryData->category_name_EN))?$categoryData->category_name_EN:'' ?>" placeholder="Category Name (EN)">
name="category_name_EN" value="<?= (isset($categoryData->category_name_EN))?$categoryData->category_name_EN:'' ?>" placeholder="Category Name (EN)">
<span class="glyphicon form-control-feedback"></span> <span class="glyphicon form-control-feedback"></span>
</div> </div>
</div> </div>
......
application/views/Event/eventAddForm.php
...@@ -360,7 +360,7 @@ ...@@ -360,7 +360,7 @@
id="eventEndDate"> id="eventEndDate">
<input id="date" type="text" class="form-control" disabled <input id="date" type="text" class="form-control" disabled
data-parsley-trigger="change" data-parsley-minlength="5" data-parsley-trigger="change" data-parsley-minlength="5"
name="event_ENd_date" placeholder="Event End Date" autocomplete="off"> name="event_end_date" placeholder="Event End Date" autocomplete="off">
<div class="input-group-addon"> <div class="input-group-addon">
<i class="fa fa-calendar"></i> <i class="fa fa-calendar"></i>
</div> </div>
......
application/views/Event/eventEditForm.php
...@@ -419,9 +419,8 @@ ...@@ -419,9 +419,8 @@
<div class="input-group date padTop10 <?= ($sType==1)?'hide':'' ?>" data-provide="datepicker" <div class="input-group date padTop10 <?= ($sType==1)?'hide':'' ?>" data-provide="datepicker"
id="eventEndDate"> id="eventEndDate">
<input id="date" type="text" class="form-control" <input id="date" type="text" class="form-control" <?= ($sType != 1)?'required':'disabled' ?>
<?= ($sType != 1)?'required':'disabled' ?> data-parsley-trigger="change" data-parsley-minlength="5" name="event_end_date"
data-parsley-trigger="change" data-parsley-minlength="5" name="event_ENd_date"
placeholder="Event End Date" autocomplete="off" value="<?= $end_date ?>"> placeholder="Event End Date" autocomplete="off" value="<?= $end_date ?>">
<div class="input-group-addon"> <div class="input-group-addon">
<i class="fa fa-calendar"></i> <i class="fa fa-calendar"></i>
......
application/views/Region/regionAddForm.php
...@@ -41,8 +41,7 @@ ...@@ -41,8 +41,7 @@
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<input type="text" class="form-control <?= ($lang == 'EN')?'required':'' ?>" <input type="text" class="form-control <?= ($lang == 'EN')?'required':'' ?>"
name="name_<?= $lang ?>" data-parsley-trigger="change" data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z0-9\ . _ - ' \/]+$" name="name_<?= $lang ?>" data-parsley-trigger="change" data-parsley-minlength="2" placeholder="Region Name (<?= $lang ?>)" value="<?= $regionName ?>">
placeholder="Region Name (<?= $lang ?>)" value="<?= $regionName ?>">
<span class="glyphicon form-control-feedback"></span> <span class="glyphicon form-control-feedback"></span>
</div> </div>
</div> </div>
......
application/views/Tag/tagAddForm.php
...@@ -36,10 +36,10 @@ ...@@ -36,10 +36,10 @@
<?php foreach($language AS $lang) { ?> <?php foreach($language AS $lang) { ?>
<div class="col-md-4"> <div class="col-md-4">
<div class="form-group"> <div class="form-group">
<?php $tagName = (isset($tag_data->{'tag_'.strtolower($lang)}))?$tag_data->{'tag_'.strtolower($lang)}:''; ?> <?php $tagName = (isset($tag_data->{'tag_'.$lang}))?$tag_data->{'tag_'.$lang}:''; ?>
<input type="text" class="form-control <?= ($lang == 'EN')?'required':'' ?>" <input type="text" class="form-control <?= ($lang == 'EN')?'required':'' ?>"
data-parsley-trigger="change" data-parsley-minlength="2" data-parsley-trigger="change" data-parsley-minlength="2"
name="<?= 'tag_'.strtolower($lang)?>" placeholder="Tag (<?= $lang ?>)" name="<?= 'tag_'.$lang?>" placeholder="Tag (<?= $lang ?>)"
value="<?= $tagName ?>"> value="<?= $tagName ?>">
<span class="glyphicon form-control-feedback"></span> <span class="glyphicon form-control-feedback"></span>
</div> </div>
......
assets/js/custom-script.js
...@@ -714,7 +714,7 @@ jQuery('[id="rGenerate"]').click(function(){ ...@@ -714,7 +714,7 @@ jQuery('[id="rGenerate"]').click(function(){
jQuery.each(resp_data['report_data'], function(key, data) { jQuery.each(resp_data['report_data'], function(key, data) {
report_data[key] = data; report_data[key] = data;
var vBtn = '<a class="btn btn-sm btn-primary" onclick="viewBooking('+data['Booking_ID']+');"><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(); table.row.add([data['Book_ID'],data['Event Name'],data['Customer_Name'],data['Amount'],data['Show_Time'],data['Book_Status'],vBtn]).draw();
}); });
jQuery('[id="report_table_html"]').removeClass('hide'); jQuery('[id="report_table_html"]').removeClass('hide');
......
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