Commit 913cb26b by Tobin

dc

parent 73bb6b29
...@@ -94,6 +94,7 @@ class Notification extends CI_Controller { ...@@ -94,6 +94,7 @@ class Notification extends CI_Controller {
$flashMsg = array('message'=>'Something went wrong, please try again..!','class'=>'error'); $flashMsg = array('message'=>'Something went wrong, please try again..!','class'=>'error');
if(!isset($_POST) || empty($_POST) || if(!isset($_POST) || empty($_POST) ||
!isset($_POST['event_id']) || empty($event_id = $_POST['event_id']) || !isset($_POST['event_id']) || empty($event_id = $_POST['event_id']) ||
!isset($_POST['notifMsg']) || empty($message = $_POST['notifMsg']) ||
!isset($_POST['tags']) || empty($cities = $_POST['tags'])){ !isset($_POST['tags']) || empty($cities = $_POST['tags'])){
$this->session->set_flashdata('message',$flashMsg); $this->session->set_flashdata('message',$flashMsg);
redirect(base_url('Notification/pushNotification')); redirect(base_url('Notification/pushNotification'));
...@@ -113,9 +114,10 @@ class Notification extends CI_Controller { ...@@ -113,9 +114,10 @@ class Notification extends CI_Controller {
foreach($users AS $user){ foreach($users AS $user){
$userData = array('id'=>$event_data->event_id, $userData = array('id'=>$event_data->event_id,
'title'=>$event_data->event_name, 'title'=>$event_data->event_name,
'message'=>'New Event in your City'); 'message'=>$message);
$this->push_sent_cancel('1',$user['fcm_token'],$userData); $this->push_sent_cancel('1',$user['fcm_token'],$userData);
} }
$flashMsg['class'] = 'success'; $flashMsg['class'] = 'success';
$flashMsg['message'] = 'Push Send Successfully'; $flashMsg['message'] = 'Push Send Successfully';
$this->session->set_flashdata('message',$flashMsg); $this->session->set_flashdata('message',$flashMsg);
...@@ -137,16 +139,13 @@ class Notification extends CI_Controller { ...@@ -137,16 +139,13 @@ class Notification extends CI_Controller {
EDATE.date='$date' AND EDATE.time<='$eTime' AND EDATE.time>='$sTime' EDATE.date='$date' AND EDATE.time<='$eTime' AND EDATE.time>='$sTime'
GROUP BY BOK.id,CUST.customer_id"; GROUP BY BOK.id,CUST.customer_id";
$sql = "SELECT CUST.customer_id,CUST.fcm_token,BOK.id AS booking_id,BOK.bookId,EVT.event_name FROM booking AS BOK INNER JOIN customer AS CUST ON (CUST.customer_id=BOK.customer_id) INNER JOIN users AS USR ON (USR.id=CUST.customer_id) INNER JOIN events AS EVT ON (EVT.event_id=BOK.event_id) INNER JOIN event_date_time AS EDATE ON (EDATE.event_id=BOK.event_id) WHERE BOK.status='1' AND USR.status='1' AND EDATE.status='1' AND EDATE.date='2019-04-29' AND EDATE.time<='09:45' AND EDATE.time>='09:44' GROUP BY BOK.id,CUST.customer_id";
$bookData = $this->db->query($sql)->result_array(); $bookData = $this->db->query($sql)->result_array();
foreach($bookData AS $bData){ foreach($bookData AS $bData){
$userData = array('id'=>$bData['bookId'], $userData = array('id'=>$bData['bookId'],
'title'=>$bData['event_name'], 'title'=>$bData['event_name'],
'message'=>'Booking Remainder'); 'message'=>'Booking Remainder');
$this->push_sent_cancel('2',$bData['fcm_token'],$userData); $this->push_sent_cancel('2',$bData['fcm_token'],$userData);
break;
} }
} }
......
...@@ -1092,7 +1092,11 @@ class Api_model extends CI_Model { ...@@ -1092,7 +1092,11 @@ class Api_model extends CI_Model {
if(count($result)>0){ if(count($result)>0){
$result->seat_class = ''; $result->seat_class = '';
if(!empty($ticketDetls = json_decode($result->ticket_details))){ if(!empty($ticketDetls = json_decode($result->ticket_details))){
$result->seat_class = $ticketDetls[0]->color; if(isset($ticketDetls[0]) && isset($ticketDetls[0]->color)){
$result->seat_class = $ticketDetls[0]->color;
} else if (isset($ticketDetls->color)){
$result->seat_class = $ticketDetls[0]->color;
}
} }
$res = array('status'=>1,'data'=>$result); $res = array('status'=>1,'data'=>$result);
......
...@@ -29,27 +29,32 @@ ...@@ -29,27 +29,32 @@
<div class="box-body"> <div class="box-body">
<?php if(!empty($regionData)){ ?> <?php if(!empty($regionData)){ ?>
<div class="col-sm-4"> <div class="col-sm-4">
<div class="form-group"> <div class="col-sm-12">
<div class="box-header with-border"> <div class="form-group">
<h3 class="box-title padLeft10 ">Event</h3> <label>Event</label>
<select name="event_id" class="form-control required" placeholder="Select Event" required>
<option selected disabled>Choose an Event</option>
<?php
foreach ($event_data as $event) {
echo '<option value="'.$event->event_id.'">'.$event->event_name.'</option>';
}
?>
</select>
</div>
</div> </div>
<select name="event_id" class="form-control required" placeholder="Select Event" required>
<option selected disabled>Choose an Event</option> <div class="col-sm-12">
<?php <div class="form-group">
foreach ($event_data as $event) { <input type="text" class="form-control required" data-parsley-trigger="change"
echo '<option value="'.$event->event_id.'">'.$event->event_name.'</option>'; data-parsley-minlength="2" name="notifMsg" required data-parsley-pattern="^[a-zA-Z0-9\ . _ @ \/]+$" placeholder="Enter Notification Message">
} </div>
?>
</select>
</div> </div>
</div> </div>
<?php } ?> <?php } ?>
<?php if(!empty($regionData)){ ?> <?php if(!empty($regionData)){ ?>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="box-header with-border"> <label>Tags</label>
<h3 class="box-title padLeft10 ">Tags</h3> <div type="parent" class="header-tag-box marginTop10" style="height:82px;">
</div>
<div type="parent" class="header-tag-box marginTop10">
<?php foreach($regionData AS $region){ ?> <?php foreach($regionData AS $region){ ?>
<div id="tag_<?= $region->id ?>" class="header-tag cpoint" <div id="tag_<?= $region->id ?>" class="header-tag cpoint"
tag_id="<?= $region->name ?>" select="0" onclick="manageTags(jQuery(this))"> tag_id="<?= $region->name ?>" select="0" onclick="manageTags(jQuery(this))">
......
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