lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stickler corrections

Browse Source
This commit is contained in:
Thomas Negre 2022-02-28 17:15:06 +01:00
parent 35531b6328
commit b9e0fc7b02
2 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
View File

@ -143,7 +143,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
if (!empty($conf->global->TICKET_NOTIFICATION_EMAIL_TO) && empty($object->context['disableticketemail'])) {
$sendto = empty($conf->global->TICKET_NOTIFICATION_EMAIL_TO) ? '' : $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
if ($sendto) {
$this->ComposeAndSendAdminMessage($sendto, $subject_admin, $body_admin, $object, $langs, $conf);
$this->composeAndSendAdminMessage($sendto, $subject_admin, $body_admin, $object, $langs, $conf);
}
}
@ -168,7 +168,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
}
if ($sendto) {
$this->ComposeAndSendCustomerMessage($sendto, $subject_customer, $body_customer, $see_ticket_customer, $object, $langs, $conf);
$this->composeAndSendCustomerMessage($sendto, $subject_customer, $body_customer, $see_ticket_customer, $object, $langs, $conf);
}
}
@ -197,7 +197,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
if (!empty($conf->global->TICKET_NOTIFICATION_EMAIL_TO) && empty($object->context['disableticketemail'])) {
$sendto = empty($conf->global->TICKET_NOTIFICATION_EMAIL_TO) ? '' : $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
if ($sendto) {
$this->ComposeAndSendAdminMessage($sendto, $subject_admin, $body_admin, $object, $langs, $conf);
$this->composeAndSendAdminMessage($sendto, $subject_admin, $body_admin, $object, $langs, $conf);
}
}
@ -226,10 +226,10 @@ class InterfaceTicketEmail extends DolibarrTriggers
$sendto = '';
if ($res > 0 && !empty($contact->email) && !empty($contact->statut)) {
$sendto = $contact->email;
// if sending to all contacts or sending to contacts while mass closing
} elseif ( !empty($linked_contacts) && ($contactid == -2 || (GETPOST('massaction', 'alpha') == 'close' && GETPOST('confirm', 'alpha') == 'yes'))) {
// if sending to all contacts or sending to contacts while mass closing
$temp_emails = [];
foreach($linked_contacts as $contact) {
foreach ($linked_contacts as $contact) {
$temp_emails[] = $contact['email'];
}
$sendto = implode(", ", $temp_emails);
@ -237,7 +237,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
unset($linked_contacts);
}
if ($sendto) {
$this->ComposeAndSendCustomerMessage($sendto, $subject_customer, $body_customer, $see_ticket_customer, $object, $langs, $conf);
$this->composeAndSendCustomerMessage($sendto, $subject_customer, $body_customer, $see_ticket_customer, $object, $langs, $conf);
}
}
$ok = 1;
@ -247,7 +247,18 @@ class InterfaceTicketEmail extends DolibarrTriggers
return $ok;
}
private function ComposeAndSendAdminMessage($sendto, $base_subject, $body, Ticket $object, Translate $langs, $conf)
/**
* Composes and sends a message concerning a ticket, to be sent to admin address.
* @param string $sendto Addresses to send the mail, format "first@address.net, second@address.net," etc.
* @param string $base_subject email subject. Non-translated string.
* @param string $body email body (first line). Non-translated string.
* @param Ticket $object the ticket thet the email refers to
* @param Translate $langs the translation object
* @param conf $conf Object conf
*
* @return none
*/
private function composeAndSendAdminMessage($sendto, $base_subject, $body, Ticket $object, Translate $langs, $conf)
{
// Init to avoid errors
$filepath = array();
@ -304,7 +315,19 @@ class InterfaceTicketEmail extends DolibarrTriggers
}
}
private function ComposeAndSendCustomerMessage ($sendto, $base_subject, $body, $see_ticket, Ticket $object, Translate $langs, $conf)
/**
* Composes and sends a message concerning a ticket, to be sent to customer addresses.
* @param string $sendto Addresses to send the mail, format "first@address.net, second@address.net, " etc.
* @param string $base_subject email subject. Non-translated string.
* @param string $body email body (first line). Non-translated string.
* @param string $see_ticket string indicating the ticket public address
* @param Ticket $object the ticket thet the email refers to
* @param Translate $langs the translation object
* @param conf $conf Object conf
*
* @return none
*/
private function composeAndSendCustomerMessage($sendto, $base_subject, $body, $see_ticket, Ticket $object, Translate $langs, $conf)
{
// Init to avoid errors
$filepath = array();

4
htdocs/ticket/card.php
View File

@ -826,7 +826,7 @@ if ($action == 'create' || $action == 'presend') {
'-3' => $langs->trans('TicketNotNotifyTiersAtClose')
);
foreach ($thirdparty_contacts as $thirdparty_contact) {
$contacts_select[$thirdparty_contact['id']] = $thirdparty_contact['civility'] . ' ' . $thirdparty_contact['lastname'] . ' ' . $thirdparty_contact['firstname'];
$contacts_select[$thirdparty_contact['id']] = $thirdparty_contact['civility'] . ' ' . $thirdparty_contact['lastname'] . ' ' . $thirdparty_contact['firstname'];
}
// Default select all or no contact
@ -841,7 +841,7 @@ if ($action == 'create' || $action == 'presend') {
),
);
print $form->formconfirm($url_page_current."?track_id=".$object->track_id, $langs->trans("CloseATicket"), $langs->trans("ConfirmCloseAticket"), "confirm_close", $formquestion, '', 1 );
print $form->formconfirm($url_page_current."?track_id=".$object->track_id, $langs->trans("CloseATicket"), $langs->trans("ConfirmCloseAticket"), "confirm_close", $formquestion, '', 1);
}
// Confirmation abandon
if ($action == 'abandon') {