diff --git a/htdocs/admin/ticket_public.php b/htdocs/admin/ticket_public.php index 2bd16271650..f642c261c52 100644 --- a/htdocs/admin/ticket_public.php +++ b/htdocs/admin/ticket_public.php @@ -379,6 +379,21 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) { print ''; print ''; + // show footer for company + print ''.$langs->trans("TicketsShowCompanyFooter").''; + print ''; + if ($conf->use_javascript_ajax) { + print ajax_constantonoff('TICKET_SHOW_COMPANY_FOOTER'); + } else { + $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes")); + print $form->selectarray("TICKET_SHOW_COMPANY_FOOTER", $arrval, $conf->global->TICKET_SHOW_COMPANY_FOOTER); + } + print ''; + print ''; + print $form->textwithpicto('', $langs->trans("TicketsShowCompanyFooterHelp"), 1, 'help'); + print ''; + print ''; + // Show progression print ''.$langs->trans("TicketsShowProgression").''; print ''; diff --git a/htdocs/core/modules/modTicket.class.php b/htdocs/core/modules/modTicket.class.php index a165a4acd2e..097c46186f0 100644 --- a/htdocs/core/modules/modTicket.class.php +++ b/htdocs/core/modules/modTicket.class.php @@ -119,7 +119,8 @@ class modTicket extends DolibarrModules 11 => array('TICKET_MESSAGE_MAIL_SIGNATURE', 'chaine', $default_footer, 'Signature to use by default for messages sent from Dolibarr', 0), 12 => array('MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER', 'chaine', "1", 'Disable the rendering of headers in tickets', 0), 13 => array('MAIN_SECURITY_ENABLECAPTCHA_TICKET', 'chaine', getDolGlobalInt('MAIN_SECURITY_ENABLECAPTCHA_TICKET'), 'Enable captcha code by default', 0), - 14 => array('TICKET_SHOW_COMPANY_LOGO', 'chaine', getDolGlobalInt('TICKET_SHOW_COMPANY_LOGO'), 'Enable logo header on ticket public page', 0) + 14 => array('TICKET_SHOW_COMPANY_LOGO', 'chaine', getDolGlobalInt('TICKET_SHOW_COMPANY_LOGO'), 'Enable logo header on ticket public page', 0), + 15 => array('TICKET_SHOW_COMPANY_FOOTER', 'chaine', getDolGlobalInt('TICKET_SHOW_COMPANY_FOOTER'), 'Enable footer on ticket public page', 0) ); diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang index 00b1b34d492..6832c77292c 100644 --- a/htdocs/langs/en_US/ticket.lang +++ b/htdocs/langs/en_US/ticket.lang @@ -127,6 +127,8 @@ TicketsShowModuleLogo=Display the logo of the module in the public interface TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface TicketsShowCompanyLogo=Display the logo of the company in the public interface TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface +TicketsShowCompanyFooter=Display the footer of the company in the public interface +TicketsShowCompanyFooterHelp=Enable this option to hide the footer of the main company in the pages of the public interface TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s") TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on) diff --git a/htdocs/langs/fr_FR/ticket.lang b/htdocs/langs/fr_FR/ticket.lang index 2db5e2b9924..cde34d64c33 100644 --- a/htdocs/langs/fr_FR/ticket.lang +++ b/htdocs/langs/fr_FR/ticket.lang @@ -128,6 +128,8 @@ TicketsShowModuleLogo=Afficher le logo du module dans l'interface publique TicketsShowModuleLogoHelp=Activer cette option pour cacher le logo du module dans les pages de l'interface publique TicketsShowCompanyLogo=Afficher le logo de la société dans l'interface publique TicketsShowCompanyLogoHelp=Activez cette option pour masquer le logo de la société dans les pages de l'interface publique +TicketsShowCompanyFooter=Afficher le pied de page de l'entreprise dans l'interface publique +TicketsShowCompanyFooterHelp=Activez cette option pour masquer le pied de la page de la société dans les pages de l'interface publique TicketsEmailAlsoSendToMainAddress=Envoyer également une notification à l'adresse e-mail principale TicketsEmailAlsoSendToMainAddressHelp=Activer cette option pour envoyer aussi un email à l'adresse définie dans la configuration "%s" (Voir onglet "%s") TicketsLimitViewAssignedOnly=Limiter l'afficher des tickets assignés à l'utilisateur courant (non valable pour les utilisateurs externes, toujours limité par le tiers dont ils dépendent) diff --git a/htdocs/public/ticket/index.php b/htdocs/public/ticket/index.php index 70f0b027559..fb7dd6277c6 100644 --- a/htdocs/public/ticket/index.php +++ b/htdocs/public/ticket/index.php @@ -93,8 +93,10 @@ print '
'; print ''; print ''; -// End of page -htmlPrintOnlineFooter($mysoc, $langs, 0, $suffix, $object); +if (getDolGlobalInt('TICKET_SHOW_COMPANY_FOOTER')) { + // End of page + htmlPrintOnlineFooter($mysoc, $langs, 0, $suffix, $object); +} llxFooter('', 'public');