diff --git a/htdocs/public/ticket/create_ticket.php b/htdocs/public/ticket/create_ticket.php index 79a0d758de7..11e4cfc5e7e 100644 --- a/htdocs/public/ticket/create_ticket.php +++ b/htdocs/public/ticket/create_ticket.php @@ -90,6 +90,7 @@ if (GETPOST('removedfile', 'alpha') && !GETPOST('add', 'alpha')) { dol_remove_file_process($_POST['removedfile'], 0, 0); $action = 'create_ticket'; } + if ($action == 'create_ticket' && GETPOST('add', 'alpha')) { $error = 0; $origin_email = GETPOST('email', 'alpha'); @@ -241,11 +242,8 @@ if ($action == 'create_ticket' && GETPOST('add', 'alpha')) { $conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO; } - - // Send email to TICKET_NOTIFICATION_EMAIL_TO - - $sendto = $conf->global->TICKET_NOTIFICATION_EMAIL_TO; - + // Send email to TICKET_NOTIFICATION_EMAIL_TO (Use TICKET_NOTIFICATION_EMAIL_FROM if not defined) + $sendto = (!empty($conf->global->TICKET_NOTIFICATION_EMAIL_TO) ? $conf->global->TICKET_NOTIFICATION_EMAIL_TO : $conf->global->TICKET_NOTIFICATION_EMAIL_FROM); if ($sendto) { $subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubjectAdmin', $object->ref, $object->track_id); @@ -282,7 +280,7 @@ if ($action == 'create_ticket' && GETPOST('add', 'alpha')) { $message_admin .= '
'.$langs->trans('Message').' :
'.$object->message.'
'.$langs->trans('SeeThisTicketIntomanagementInterface').'
'; - $from = $conf->global->MAIN_INFO_SOCIETE_NOM.'<'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>'; + $from = $conf->global->MAIN_INFO_SOCIETE_NOM.' <'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>'; $replyto = $from; $message_admin = dol_nl2br($message_admin); diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index adde08ea155..ec98ae3b4d8 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -296,6 +296,7 @@ input.buttonpaymentstripe { a.buttonticket { padding-left: 5px; padding-right: 5px; + /* height: 40px; */ } /* Used by timesheets */ diff --git a/htdocs/ticket/class/actions_ticket.class.php b/htdocs/ticket/class/actions_ticket.class.php index 246b4b614b6..522ca766c62 100644 --- a/htdocs/ticket/class/actions_ticket.class.php +++ b/htdocs/ticket/class/actions_ticket.class.php @@ -378,9 +378,9 @@ class ActionsTicket { global $langs; - print '