Skip to content

T
TimeOutAdmin
Commit 1d489766 by Tobin
Options

time issue fix

parent c0a66721
Showing with 20 additions and 13 deletions
application/models/Organizer_model.php
...@@ -373,8 +373,9 @@ class Organizer_model extends CI_Model { ...@@ -373,8 +373,9 @@ class Organizer_model extends CI_Model {
FROM booking AS BUK FROM booking AS BUK
INNER JOIN events AS EVT ON (EVT.event_id = BUK.event_id) INNER JOIN events AS EVT ON (EVT.event_id = BUK.event_id)
INNER JOIN customer AS CUST ON (CUST.customer_id = BUK.customer_id) INNER JOIN customer AS CUST ON (CUST.customer_id = BUK.customer_id)
WHERE EVT.provider_id ='$provider_id' AND CUST.status!='2' INNER JOIN users AS USR ON (CUST.customer_id=USR.id AND USR.user_type='3')
GROUP BY BUK.customer_id" WHERE EVT.provider_id ='$provider_id' AND USR.status!='2'
GROUP BY BUK.customer_id";
$count = $this->db->query($sql)->num_rows(); $count = $this->db->query($sql)->num_rows();
if($count > 0) { if($count > 0) {
$perPage = 10; $perPage = 10;
...@@ -389,7 +390,8 @@ class Organizer_model extends CI_Model { ...@@ -389,7 +390,8 @@ class Organizer_model extends CI_Model {
FROM booking AS BUK FROM booking AS BUK
INNER JOIN events AS EVT ON (EVT.event_id = BUK.event_id) INNER JOIN events AS EVT ON (EVT.event_id = BUK.event_id)
INNER JOIN customer AS CUST ON (CUST.customer_id = BUK.customer_id) INNER JOIN customer AS CUST ON (CUST.customer_id = BUK.customer_id)
WHERE EVT.provider_id ='$provider_id' AND CUST.status!='2' INNER JOIN users AS USR ON (CUST.customer_id=USR.id AND USR.user_type='3')
WHERE EVT.provider_id ='$provider_id' AND USR.status!='2'
GROUP BY BUK.customer_id LIMIT $limit,$perPage"; GROUP BY BUK.customer_id LIMIT $limit,$perPage";
$custData = $this->db->query($sql)->result_array(); $custData = $this->db->query($sql)->result_array();
$res = array('status'=>1,'data'=>array('data'=>$custData,'meta'=>$meta)); $res = array('status'=>1,'data'=>array('data'=>$custData,'meta'=>$meta));
...@@ -414,7 +416,8 @@ class Organizer_model extends CI_Model { ...@@ -414,7 +416,8 @@ class Organizer_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 host_categories AS HCAT ON (HCAT.host_cat_id=VEN.host_cat_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 event_date_time AS EDT ON (EDT.id=BOK.event_date_id)
WHERE BOK.status IN (0,1,2,3,5,6) AND EVT.provider_id='$provider_id' AND CUST.status!='2' INNER JOIN users AS USR ON (CUST.customer_id=USR.id AND USR.user_type='3')
WHERE BOK.status IN (0,1,2,3,5,6) AND EVT.provider_id='$provider_id' AND USR.status!='2'
GROUP BY BOK.id"; GROUP BY BOK.id";
$count = $this->db->query($sql)->num_rows(); $count = $this->db->query($sql)->num_rows();
if($count > 0) { if($count > 0) {
...@@ -434,7 +437,8 @@ class Organizer_model extends CI_Model { ...@@ -434,7 +437,8 @@ class Organizer_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 host_categories AS HCAT ON (HCAT.host_cat_id=VEN.host_cat_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 event_date_time AS EDT ON (EDT.id=BOK.event_date_id)
WHERE EVT.provider_id ='$provider_id' AND BOK.status != 4 AND CUST.status!='2' INNER JOIN users AS USR ON (CUST.customer_id=USR.id AND USR.user_type='3')
WHERE EVT.provider_id ='$provider_id' AND BOK.status != 4 AND USR.status!='2'
GROUP BY BOK.id ORDER BY BOK.id DESC GROUP BY BOK.id ORDER BY BOK.id DESC
LIMIT $limit,$perPage"; LIMIT $limit,$perPage";
$bookingData = $this->db->query($sql)->result_array(); $bookingData = $this->db->query($sql)->result_array();
...@@ -471,7 +475,8 @@ class Organizer_model extends CI_Model { ...@@ -471,7 +475,8 @@ class Organizer_model extends CI_Model {
INNER JOIN translator_venue AS TSVNE ON (TSVNE.venue_id = EVT.venue_id) INNER JOIN translator_venue AS TSVNE ON (TSVNE.venue_id = EVT.venue_id)
INNER JOIN event_date_time AS EVDT ON (BUK.event_date_id = EVDT.id) INNER JOIN event_date_time AS EVDT ON (BUK.event_date_id = EVDT.id)
INNER JOIN venue AS VNE ON (VNE.id = EVT.venue_id) INNER JOIN venue AS VNE ON (VNE.id = EVT.venue_id)
WHERE BUK.bookId='".$data['booking_id']."' AND CUST.status!='2' "; INNER JOIN users AS USR ON (CUST.customer_id=USR.id AND USR.user_type='3')
WHERE BUK.bookId='".$data['booking_id']."' AND USR.status!='2' ";
$query = $this->db->query($sql); $query = $this->db->query($sql);
if(empty($query) || empty($query= $query->row_array())){ if(empty($query) || empty($query= $query->row_array())){
$res= array('status'=>0,'message'=>'Ohh No!! Something Went South','code'=>'ER06'); $res= array('status'=>0,'message'=>'Ohh No!! Something Went South','code'=>'ER06');
...@@ -880,8 +885,9 @@ class Organizer_model extends CI_Model { ...@@ -880,8 +885,9 @@ class Organizer_model extends CI_Model {
FROM events AS EVT FROM events AS EVT
INNER JOIN booking AS BUK ON (BUK.event_id = EVT.event_id) INNER JOIN booking AS BUK ON (BUK.event_id = EVT.event_id)
INNER JOIN customer AS CUST ON (CUST.customer_id = BUK.customer_id) INNER JOIN customer AS CUST ON (CUST.customer_id = BUK.customer_id)
INNER JOIN users AS USR ON (CUST.customer_id=USR.id AND USR.user_type='3')
WHERE EVT.provider_id='".$data['organiser_id']."' AND WHERE EVT.provider_id='".$data['organiser_id']."' AND
CUST.name LIKE '%".$data['keyword']."%' AND CUST.status!='2' CUST.name LIKE '%".$data['keyword']."%' AND USR.status!='2'
GROUP BY BUK.customer_id"; GROUP BY BUK.customer_id";
$custData = $this->db->query($sql); $custData = $this->db->query($sql);
if(empty($custData) || empty($custData = $custData->result_array())){ if(empty($custData) || empty($custData = $custData->result_array())){
...@@ -904,7 +910,8 @@ class Organizer_model extends CI_Model { ...@@ -904,7 +910,8 @@ class Organizer_model extends CI_Model {
INNER JOIN translator_category AS TSCAT ON (TSCAT.category_id = EVT.category_id) INNER JOIN translator_category AS TSCAT ON (TSCAT.category_id = EVT.category_id)
INNER JOIN customer AS CUST ON (CUST.customer_id = BUK.customer_id) INNER JOIN customer AS CUST ON (CUST.customer_id = BUK.customer_id)
INNER JOIN event_date_time AS EVDT ON (EVDT.id = BUK.event_date_id) INNER JOIN event_date_time AS EVDT ON (EVDT.id = BUK.event_date_id)
WHERE EVT.provider_id='".$data['organiser_id']."' AND CUST.status!='2' AND INNER JOIN users AS USR ON (CUST.customer_id=USR.id AND USR.user_type='3')
WHERE EVT.provider_id='".$data['organiser_id']."' AND USR.status!='2' AND
TSEVT.event_name LIKE '%".$data['keyword']."%' AND TSEVT.language_code='EN' TSEVT.event_name LIKE '%".$data['keyword']."%' AND TSEVT.language_code='EN'
GROUP BY EVT.event_id"; GROUP BY EVT.event_id";
$bookData = $this->db->query($sql); $bookData = $this->db->query($sql);
......
application/views/Event/eventAddForm.php
...@@ -397,7 +397,7 @@ ...@@ -397,7 +397,7 @@
<div class="col-sm-10 clockpicker" data-autoclose="true"> <div class="col-sm-10 clockpicker" data-autoclose="true">
<input type="text" class="form-control required" data-parsley-minlength="2" <input type="text" class="form-control required" data-parsley-minlength="2"
data-parsley-trigger="change" required name="event_time[]" autocomplete="off" data-parsley-trigger="change" required name="event_time[]" autocomplete="off"
placeholder="Show Time" id="start_time"> placeholder="Show Time" id="start_time" readonly>
</div> </div>
<div class="col-sm-2" style="padding-left: initial;"> <div class="col-sm-2" style="padding-left: initial;">
<i class="fa fa-plus-circle cpoint fav-add-icon" onclick="addTimePicker(jQuery(this))" count="1"></i> <i class="fa fa-plus-circle cpoint fav-add-icon" onclick="addTimePicker(jQuery(this))" count="1"></i>
...@@ -444,7 +444,7 @@ ...@@ -444,7 +444,7 @@
<div class="col-sm-10 padTop10 clockpicker" data-autoclose="true" id="timePickerEnable_{:count}"> <div class="col-sm-10 padTop10 clockpicker" data-autoclose="true" id="timePickerEnable_{:count}">
<input type="text" class="form-control required" data-parsley-minlength="2" <input type="text" class="form-control required" data-parsley-minlength="2"
data-parsley-trigger="change" required name="event_time[]" autocomplete="off" data-parsley-trigger="change" required name="event_time[]" autocomplete="off"
placeholder="Show Time" id="start_time"> placeholder="Show Time" readonly id="start_time">
</div> </div>
<div class="col-sm-2" style="padding-left: initial;"> <div class="col-sm-2" style="padding-left: initial;">
<i class="padTop12 fa fa-times-circle-o cpoint fav-rem-icon" onclick="remTimePicker({:count})"></i> <i class="padTop12 fa fa-times-circle-o cpoint fav-rem-icon" onclick="remTimePicker({:count})"></i>
......
application/views/Event/eventEditForm.php
...@@ -459,7 +459,7 @@ ...@@ -459,7 +459,7 @@
<div class="col-sm-10 clockpicker" data-autoclose="true"> <div class="col-sm-10 clockpicker" data-autoclose="true">
<input type="text" class="form-control required" data-parsley-minlength="2" <input type="text" class="form-control required" data-parsley-minlength="2"
data-parsley-trigger="change" required name="event_time[]" autocomplete="off" data-parsley-trigger="change" required name="event_time[]" autocomplete="off"
placeholder="Show Time" id="start_time" placeholder="Show Time" id="start_time" readonly
value="<?= $event_data->eventSchedule->time[0] ?>"> value="<?= $event_data->eventSchedule->time[0] ?>">
</div> </div>
<div class="col-sm-2" style="padding-left: initial;"> <div class="col-sm-2" style="padding-left: initial;">
...@@ -478,7 +478,7 @@ ...@@ -478,7 +478,7 @@
id="timePickerEnable_<?= $tCount ?>"> id="timePickerEnable_<?= $tCount ?>">
<input type="text" class="form-control required" data-parsley-minlength="2" <input type="text" class="form-control required" data-parsley-minlength="2"
data-parsley-trigger="change" required name="event_time[]" data-parsley-trigger="change" required name="event_time[]"
autocomplete="off" placeholder="Show Time" id="start_time" autocomplete="off" placeholder="Show Time" readonly id="start_time"
value="<?= $time ?>"> value="<?= $time ?>">
</div> </div>
<div class="col-sm-2" style="padding-left: initial;"> <div class="col-sm-2" style="padding-left: initial;">
...@@ -541,7 +541,7 @@ ...@@ -541,7 +541,7 @@
<div class="col-sm-10 padTop10 clockpicker" data-autoclose="true" id="timePickerEnable_{:count}"> <div class="col-sm-10 padTop10 clockpicker" data-autoclose="true" id="timePickerEnable_{:count}">
<input type="text" class="form-control required" data-parsley-minlength="2" <input type="text" class="form-control required" data-parsley-minlength="2"
data-parsley-trigger="change" required name="event_time[]" autocomplete="off" data-parsley-trigger="change" required name="event_time[]" autocomplete="off"
placeholder="Show Time" id="start_time"> placeholder="Show Time" readonly id="start_time">
</div> </div>
<div class="col-sm-2" style="padding-left: initial;"> <div class="col-sm-2" style="padding-left: initial;">
<i class="padTop12 fa fa-times-circle-o cpoint fav-rem-icon" onclick="remTimePicker({:count})"></i> <i class="padTop12 fa fa-times-circle-o cpoint fav-rem-icon" onclick="remTimePicker({:count})"></i>
......
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