dc

application/controllers/Notification.php

@@ -94,6 +94,7 @@ class Notification extends CI_Controller {
 		$flashMsg = array('message'=>'Something went wrong, please try again..!','class'=>'error');
 		if(!isset($_POST) || empty($_POST) || 
 		   !isset($_POST['event_id']) || empty($event_id = $_POST['event_id']) || 
+		   !isset($_POST['notifMsg']) || empty($message = $_POST['notifMsg']) || 
 		   !isset($_POST['tags']) || empty($cities = $_POST['tags'])){
 			$this->session->set_flashdata('message',$flashMsg);
             redirect(base_url('Notification/pushNotification'));
@@ -113,9 +114,10 @@ class Notification extends CI_Controller {
 		foreach($users AS $user){
 			$userData = array('id'=>$event_data->event_id,
 							  'title'=>$event_data->event_name,
-							  'message'=>'New Event in your City');
+							  'message'=>$message);
 			$this->push_sent_cancel('1',$user['fcm_token'],$userData);
 		}
+
 		$flashMsg['class'] = 'success';
 		$flashMsg['message'] = 'Push Send Successfully';
 		$this->session->set_flashdata('message',$flashMsg);
@@ -137,8 +139,6 @@ class Notification extends CI_Controller {
 					  EDATE.date='$date' AND EDATE.time<='$eTime' AND EDATE.time>='$sTime'
 			  	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();
 
 	  	foreach($bookData AS $bData){
@@ -146,7 +146,6 @@ class Notification extends CI_Controller {
 							  'title'=>$bData['event_name'],
 							  'message'=>'Booking Remainder');
 	  		$this->push_sent_cancel('2',$bData['fcm_token'],$userData);
-	  		break;
 	  	}
 	}
 

application/models/Api_model.php

@@ -1092,7 +1092,11 @@ class Api_model extends CI_Model {
 				if(count($result)>0){
 					$result->seat_class = '';
 					if(!empty($ticketDetls = json_decode($result->ticket_details))){
+						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);

application/views/Notification/pushNotification.php

@@ -29,10 +29,9 @@
               <div class="box-body">
                 <?php if(!empty($regionData)){ ?>
                   <div class="col-sm-4">
+                    <div class="col-sm-12">
                       <div class="form-group">
-                    <div class="box-header with-border">
-                      <h3 class="box-title padLeft10 ">Event</h3>
-                    </div>
+                        <label>Event</label>
                        <select name="event_id" class="form-control required" placeholder="Select Event" required>
                           <option selected disabled>Choose an Event</option>
                           <?php 
@@ -43,13 +42,19 @@
                         </select> 
                       </div>
                     </div>
+
+                    <div class="col-sm-12">
+                      <div class="form-group">
+                        <input type="text" class="form-control required" data-parsley-trigger="change"
+                          data-parsley-minlength="2" name="notifMsg" required data-parsley-pattern="^[a-zA-Z0-9\ . _ @  \/]+$" placeholder="Enter Notification Message">
+                      </div>
+                    </div>
+                  </div>
                 <?php } ?>
                 <?php if(!empty($regionData)){ ?>
                   <div class="col-sm-8">
-                    <div class="box-header with-border">
-                      <h3 class="box-title padLeft10 ">Tags</h3>
-                    </div>
-                    <div type="parent" class="header-tag-box marginTop10">
+                      <label>Tags</label>
+                    <div type="parent" class="header-tag-box marginTop10" style="height:82px;">
                       <?php foreach($regionData AS $region){ ?>
                         <div id="tag_<?= $region->id ?>" class="header-tag cpoint" 
                              tag_id="<?= $region->name ?>" select="0" onclick="manageTags(jQuery(this))">