From 83525aabb530d52c5abf7c7938643c6f0b6e302f Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Fri, 15 May 2015 22:12:30 -0400 Subject: [PATCH] #204 Add crosshair to ticket subject to view location --- admin/admin_ticket.php | 11 +++++++++++ install/mods-for-hesk/sql/installSql.php | 1 + install/mods-for-hesk/sql/uninstallSql.php | 7 +++++++ language/en/text.php | 2 ++ 4 files changed, 21 insertions(+) diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php index d7918c2f..5964e6a2 100644 --- a/admin/admin_ticket.php +++ b/admin/admin_ticket.php @@ -861,6 +861,17 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); { echo ' '; } + $locationText = ''; + if (strpos($ticket['Location'], 'N/A') === false) + { + $locationText = $hesklang['click_for_map']; + } + else + { + $locationText = $hesklang['location_unavailable']; + } + echo ' '; + // TODO ADD LOCATION CROSSHAIR echo $ticket['subject']; ?> diff --git a/install/mods-for-hesk/sql/installSql.php b/install/mods-for-hesk/sql/installSql.php index e4997607..b39ef049 100644 --- a/install/mods-for-hesk/sql/installSql.php +++ b/install/mods-for-hesk/sql/installSql.php @@ -448,6 +448,7 @@ function execute230Scripts() { executeQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."statuses` SET `Key` = `ShortNameContentKey`"); executeQuery("ALTER TABLE `".hesk_dbEscape($hesk_settings['db_pfix'])."statuses` DROP COLUMN `ShortNameContentKey`"); executeQuery("ALTER TABLE `".hesk_dbEscape($hesk_settings['db_pfix'])."statuses` DROP COLUMN `TicketViewContentKey`"); + executeQuery("ALTER TABLE `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` ADD COLUMN `Location` VARCHAR(100) NOT NULL DEFAULT 'N/A-0'"); executeQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` SET `Value` = '2.3.0' WHERE `Key` = 'modsForHeskVersion'"); } diff --git a/install/mods-for-hesk/sql/uninstallSql.php b/install/mods-for-hesk/sql/uninstallSql.php index d76c7728..1c4d7d41 100644 --- a/install/mods-for-hesk/sql/uninstallSql.php +++ b/install/mods-for-hesk/sql/uninstallSql.php @@ -136,6 +136,13 @@ function removeServiceMessageCustomIcon() { executeQuery("ALTER TABLE `".hesk_dbEscape($hesk_settings['db_pfix'])."service_messages` DROP COLUMN `icon`"); } +function removeTicketLocation() { + global $hesk_settings; + + hesk_dbConnect(); + executeQuery("ALTER TABLE `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` DROP COLUMN `Location`"); +} + function executeMiscellaneousSql() { global $hesk_settings; diff --git a/language/en/text.php b/language/en/text.php index 460a94f5..0810af06 100644 --- a/language/en/text.php +++ b/language/en/text.php @@ -44,6 +44,8 @@ $hesklang['show_number_merged_help'] = 'If enabled, the user will be able to see $hesklang['latest_top_on_home'] = 'Latest/Top articles on home page'; $hesklang['latest_top_on_home_help'] = 'Select YES to display the top and latest knowledgebase articles on the home page. Otherwise, a link to the knowledgebase will appear on the home page.'; +$hesklang['location_unavailable'] = "Customer's location is unavailable. Click the crosshair for more information."; +$hesklang['click_for_map'] = "Click the crosshair to see a map of the ticket's location"; // ADDED OR MODIFIED IN Mods for HESK 2.2.1 $hesklang['popart_no_colon']='Top Knowledgebase Articles'; // same as $hesklang['popart'] but without a colon (:)