diff --git a/htdocs/admin/ticket_public.php b/htdocs/admin/ticket_public.php index 1f32fec97aa..2bd16271650 100644 --- a/htdocs/admin/ticket_public.php +++ b/htdocs/admin/ticket_public.php @@ -379,6 +379,20 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) { print ''; print ''; + // Show progression + print ''.$langs->trans("TicketsShowProgression").''; + print ''; + if (empty(getDolGlobalInt('TICKET_SHOW_PROGRESSION'))) { + print '' . img_picto($langs->trans('Disabled'), 'switch_off') . ''; + } else { + print '' . img_picto($langs->trans('Enabled'), 'switch_on') . ''; + } + print ''; + print ''; + print $form->textwithpicto('', $langs->trans("TicketsShowProgressionHelp"), 1, 'help'); + print ''; + print ''; + // Also send to main email address if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { print ''.$langs->trans("TicketsEmailAlsoSendToMainAddress").''; diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang index 570e7c127aa..cb261bbc378 100644 --- a/htdocs/langs/en_US/ticket.lang +++ b/htdocs/langs/en_US/ticket.lang @@ -103,6 +103,8 @@ TicketNewEmailBodyHelp=The text specified here will be inserted into the email c TicketParamPublicInterface=Public interface setup TicketsEmailMustExist=Require an existing email address to create a ticket TicketsEmailMustExistHelp=In the public interface, the email address should already be filled in the database to create a new ticket. +TicketsShowProgression=Display the ticket progress in the public interface +TicketsShowProgressionHelp=Enable this option to hide the progress of the ticket in the public interface pages TicketCreateThirdPartyWithContactIfNotExist=Ask name and company name for unknown emails. TicketCreateThirdPartyWithContactIfNotExistHelp=Check if a thirdparty or a contact exists for the email entered. If not, ask a name and a company name to create a third party with contact. PublicInterface=Public interface diff --git a/htdocs/public/ticket/list.php b/htdocs/public/ticket/list.php index f7ad050df96..c0835829e6f 100644 --- a/htdocs/public/ticket/list.php +++ b/htdocs/public/ticket/list.php @@ -257,6 +257,9 @@ if ($action == "view_ticketlist") { //'t.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000), ); + if (empty($conf->global->TICKET_SHOW_PROGRESSION)) + unset($arrayfields['t.progress']); + // Extra fields if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) { foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) { @@ -340,7 +343,8 @@ if ($action == "view_ticketlist") { $sql .= " t.message,"; $sql .= " t.fk_statut,"; $sql .= " t.resolution,"; - $sql .= " t.progress,"; + if (!empty($conf->global->TICKET_SHOW_PROGRESSION)) + $sql .= " t.progress,"; $sql .= " t.timing,"; $sql .= " t.type_code,"; $sql .= " t.category_code,"; @@ -470,7 +474,7 @@ if ($action == "view_ticketlist") { print ''; } - if (!empty($arrayfields['t.progress']['checked'])) { + if ((!empty($conf->global->TICKET_SHOW_PROGRESSION)) && !empty($arrayfields['t.progress']['checked'])) { print ''; } @@ -535,7 +539,7 @@ if ($action == "view_ticketlist") { if (!empty($arrayfields['severity.code']['checked'])) { print_liste_field_titre($arrayfields['severity.code']['label'], $url_page_current, 'severity.code', '', $param, '', $sortfield, $sortorder); } - if (!empty($arrayfields['t.progress']['checked'])) { + if ((!empty($conf->global->TICKET_SHOW_PROGRESSION)) && !empty($arrayfields['t.progress']['checked'])) { print_liste_field_titre($arrayfields['t.progress']['label'], $url_page_current, 't.progress', '', $param, '', $sortfield, $sortorder); } if (!empty($arrayfields['t.fk_user_create']['checked'])) { @@ -627,7 +631,7 @@ if ($action == "view_ticketlist") { } // Progression - if (!empty($arrayfields['t.progress']['checked'])) { + if ((!empty($conf->global->TICKET_SHOW_PROGRESSION)) && !empty($arrayfields['t.progress']['checked'])) { print ''; print $obj->progress; print ''; diff --git a/htdocs/public/ticket/view.php b/htdocs/public/ticket/view.php index 3364a3b7850..12b319b7589 100644 --- a/htdocs/public/ticket/view.php +++ b/htdocs/public/ticket/view.php @@ -331,9 +331,11 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a print ''; // Progression - print ''.$langs->trans("Progression").''; - print ($object->dao->progress > 0 ? dol_escape_htmltag($object->dao->progress) : '0').'%'; - print ''; + if (!empty($conf->global->TICKET_SHOW_PROGRESSION)) { + print ''.$langs->trans("Progression").''; + print ($object->dao->progress > 0 ? dol_escape_htmltag($object->dao->progress) : '0').'%'; + print ''; + } // Other attributes include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';