Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
TimeOutAdmin
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
TimeOut
TimeOutAdmin
Commits
9e81086b
Commit
9e81086b
authored
May 08, 2019
by
Jansa Jose
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://gitlab.techware.co.in/timeout/timeOut
into jansa
parents
e7430cac
452a540d
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
Event.php
application/controllers/Event.php
+1
-1
notificationRemainder.php
application/controllers/notificationRemainder.php
+1
-1
Api_model.php
application/models/Api_model.php
+0
-0
left-menu.php
application/views/Templates/left-menu.php
+3
-3
No files found.
application/controllers/Event.php
View file @
9e81086b
...
...
@@ -190,7 +190,7 @@ class Event extends CI_Controller {
$subject
=
"TimeOut, New Event Created"
;
$emailId
=
$settings
[
'admin_mail_id'
];
$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>"
;
$this
->
Api_model
->
send_mail
(
$subject
,
$emailId
,
$message
);
// END - NEW EVENT NOTIFICATION MAIL \\
...
...
application/controllers/notificationRemainder.php
View file @
9e81086b
...
...
@@ -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 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
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
'
GROUP BY BOK.id,CUST.customer_id"
;
$result
=
mysqli_query
(
$conn
,
$sql
);
...
...
application/models/Api_model.php
View file @
9e81086b
This diff is collapsed.
Click to expand it.
application/views/Templates/left-menu.php
View file @
9e81086b
...
...
@@ -11,11 +11,11 @@
break
;
case
2
:
$menus
=
array
(
'Dashboard'
,
'Tag'
,
'Host'
,
'City'
,
'Category'
,
'Venue'
,
'Event'
,
'Checker'
,
'
Organizer'
,
'Customer'
,
'Booking'
,
'Notification
'
);
'
Customer'
,
'Booking
'
);
break
;
case
4
:
$menus
=
array
(
'Dashboard'
,
'Tag'
,
'Host'
,
'City'
,
'Category'
,
'Venue'
,
'Event'
,
'Checker'
,
'
Customer'
,
'Booking
'
);
'
Organizer'
,
'Customer'
,
'Booking'
,
'Notification
'
);
break
;
}
?>
...
...
@@ -177,7 +177,7 @@
</li>
</ul>
</li>
<?php
}
if
(
in_array
(
'
Commission
'
,
$menus
)){
?>
<?php
}
if
(
in_array
(
'
Booking
'
,
$menus
)){
?>
<li>
<a
href=
"
<?=
base_url
(
'Booking/viewBookings'
)
?>
"
>
<img
src=
"
<?=
base_url
(
"assets/images/m8.png"
)
?>
"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment