Netsyms/Mods-for-HESK-Netsyms
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #193 from mkoch227/show-other-tickets-from-email

Browse Source 
Show other tickets from email
This commit is contained in:
Mike Koch 2015-04-09 22:38:03 -04:00
commit 42f67322c5
2 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
admin/admin_ticket.php
View File

@ -640,6 +640,32 @@ if ( defined('HESK_DEMO') )
$ticket['ip'] = '127.0.0.1'; $ticket['ip'] = '127.0.0.1';
} }
// If an email address is tied to this ticket, check if there are any others
$recentTickets = NULL;
if($ticket['email'] != '') {
$recentTicketsSql = hesk_dbQuery("SELECT * FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets`
WHERE `email` = '".hesk_dbEscape($ticket['email'])."' AND `trackid` <> '".hesk_dbEscape($trackingID)."' ORDER BY `lastchange` DESC LIMIT 5");
while ($recentRow = hesk_dbFetchAssoc($recentTicketsSql)) {
if ($recentTickets === NULL) {
$recentTickets = array();
}
array_push($recentTickets, $recentRow);
}
if ($recentTickets !== NULL) {
$recentTicketsWithStatuses = array();
foreach ($recentTickets as $recentTicket) {
$newRecentTicket = $recentTicket;
$thisTicketStatusRS = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "statuses` WHERE `ID` = " . intval($recentTicket['status']));
$theStatusRow = hesk_dbFetchAssoc($thisTicketStatusRS);
$newRecentTicket['statusText'] = $hesklang[$theStatusRow['ShortNameContentKey']];
$newRecentTicket['statusColor'] = $theStatusRow['TextColor'];
array_push($recentTicketsWithStatuses, $newRecentTicket);
}
$recentTickets = $recentTicketsWithStatuses;
}
}
/* Print admin navigation */ /* Print admin navigation */
require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
?> ?>
@ -789,6 +815,19 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
</div> </div>
<?php } ?> <?php } ?>
</li> </li>
<?php if ($recentTickets !== NULL): ?>
<li class="list-group-item">
<strong><?php echo $hesklang['recent_tickets']; ?></strong>
<?php foreach ($recentTickets as $recentTicket): ?>
<p style="margin: 0">
<i class="fa fa-circle" data-toggle="tooltip" data-placement="top"
style="color: <?php echo $recentTicket['statusColor']; ?>"
title="<?php echo sprintf($hesklang['current_status_colon'], $recentTicket['statusText']); ?>"></i>
<?php echo '<a href="admin_ticket.php?track='.$recentTicket['trackid'].'&amp;Refresh='.mt_rand(10000,99999).'">'.$recentTicket['trackid'].'</a>'; ?>
</p>
<?php endforeach; ?>
</li>
<?php endif; ?>
</ul> </ul>
</div> </div>
</div> </div>

2
language/en/text.php
View File

@ -59,6 +59,8 @@ $hesklang['staff_only'] = 'Staff only';
$hesklang['yes_title_case'] = 'Yes'; $hesklang['yes_title_case'] = 'Yes';
$hesklang['no_title_case'] = 'No'; $hesklang['no_title_case'] = 'No';
$hesklang['autoclose_ticket_status'] = 'When a ticket is closed automatically, change the status to'; $hesklang['autoclose_ticket_status'] = 'When a ticket is closed automatically, change the status to';
$hesklang['recent_tickets'] = 'Recent tickets';
$hesklang['current_status_colon'] = 'Current status: %s'; // %s: status name (i.e. "Resolved", "New", etc.)
// ADDED OR MODIFIED IN Mods for HESK 2.1.1 // ADDED OR MODIFIED IN Mods for HESK 2.1.1
$hesklang['new_article_default_type'] = 'Default Type for New Articles'; $hesklang['new_article_default_type'] = 'Default Type for New Articles';