Skip to content

T
TimeOutAdmin
Commit 9e81086b by Jansa Jose
Options

Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa

parents e7430cac 452a540d
Showing with 5 additions and 5 deletions
application/controllers/Event.php
...@@ -190,7 +190,7 @@ class Event extends CI_Controller { ...@@ -190,7 +190,7 @@ class Event extends CI_Controller {
$subject = "TimeOut, New Event Created"; $subject = "TimeOut, New Event Created";
$emailId = $settings['admin_mail_id']; $emailId = $settings['admin_mail_id'];
$message = "<html><body> $message = "<html><body>
New Event Created, event name: <strong>".$_POST['event_name']."</strong> New Event Created, event name: <strong>".$_POST['event_name']."</strong>. Event URL : https://projects.nuvento.com/eventdetail?event_id=$event_id
</body></html>"; </body></html>";
$this->Api_model->send_mail($subject,$emailId,$message); $this->Api_model->send_mail($subject,$emailId,$message);
// END - NEW EVENT NOTIFICATION MAIL \\ // END - NEW EVENT NOTIFICATION MAIL \\
......
application/controllers/notificationRemainder.php
...@@ -21,7 +21,7 @@ $sql = "SELECT CUST.customer_id,CUST.fcm_token,BOK.id AS booking_id,BOK.bookId,E ...@@ -21,7 +21,7 @@ $sql = "SELECT CUST.customer_id,CUST.fcm_token,BOK.id AS booking_id,BOK.bookId,E
INNER JOIN users AS USR ON (USR.id=CUST.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 events AS EVT ON (EVT.event_id=BOK.event_id)
INNER JOIN event_date_time AS EDATE ON (EDATE.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 WHERE EVT.status='1' AND BOK.status='1' AND USR.status='1' AND EDATE.status='1' AND
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";
$result = mysqli_query($conn, $sql); $result = mysqli_query($conn, $sql);
......
application/views/Templates/left-menu.php
...@@ -11,11 +11,11 @@ ...@@ -11,11 +11,11 @@
break; break;
case 2: case 2:
$menus = array('Dashboard','Tag','Host','City','Category','Venue','Event','Checker', $menus = array('Dashboard','Tag','Host','City','Category','Venue','Event','Checker',
'Organizer','Customer','Booking','Notification'); 'Customer','Booking');
break; break;
case 4: case 4:
$menus = array('Dashboard','Tag','Host','City','Category','Venue','Event','Checker', $menus = array('Dashboard','Tag','Host','City','Category','Venue','Event','Checker',
'Customer','Booking'); 'Organizer','Customer','Booking','Notification');
break; break;
} }
?> ?>
...@@ -177,7 +177,7 @@ ...@@ -177,7 +177,7 @@
</li> </li>
</ul> </ul>
</li> </li>
<?php } if(in_array('Commission',$menus)){ ?> <?php } if(in_array('Booking',$menus)){ ?>
<li> <li>
<a href="<?= base_url('Booking/viewBookings') ?>"> <a href="<?= base_url('Booking/viewBookings') ?>">
<img src="<?=base_url("assets/images/m8.png") ?>"> <img src="<?=base_url("assets/images/m8.png") ?>">
......
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