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

add a new function inside ticket.class to remove the closed contact from the receiver list of contact

Browse Source
This commit is contained in:
Maximilien Rozniecki 2023-03-01 10:44:20 +01:00
parent 6fc473bd71
commit 71fc59169f
2 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/langs/en_US/ticket.lang
View File

@ -223,6 +223,7 @@ TicketUpdated=Ticket updated
SendMessageByEmail=Send message by email SendMessageByEmail=Send message by email
TicketNewMessage=New message TicketNewMessage=New message
ErrorMailRecipientIsEmptyForSendTicketMessage=Recipient is empty. No email send ErrorMailRecipientIsEmptyForSendTicketMessage=Recipient is empty. No email send
WarningMailNotSendContactIsClosed=E-mail to %s refused for shipment as this contact is closed
TicketGoIntoContactTab=Please go into "Contacts" tab to select them TicketGoIntoContactTab=Please go into "Contacts" tab to select them
TicketMessageMailIntro=Message header TicketMessageMailIntro=Message header
TicketMessageMailIntroHelp=This text is added only at the beginning of the email and will not be saved. TicketMessageMailIntroHelp=This text is added only at the beginning of the email and will not be saved.

37
htdocs/ticket/class/ticket.class.php
View File

@ -2812,6 +2812,7 @@ class Ticket extends CommonObject
$from = $conf->global->TICKET_NOTIFICATION_EMAIL_FROM; $from = $conf->global->TICKET_NOTIFICATION_EMAIL_FROM;
$is_sent = false; $is_sent = false;
$array_receiver = $this->removeClosedContact($array_receiver);
if (is_array($array_receiver) && count($array_receiver) > 0) { if (is_array($array_receiver) && count($array_receiver) > 0) {
foreach ($array_receiver as $key => $receiver) { foreach ($array_receiver as $key => $receiver) {
$deliveryreceipt = 0; $deliveryreceipt = 0;
@ -3028,6 +3029,42 @@ class Ticket extends CommonObject
$return .= '</div>'; $return .= '</div>';
return $return; return $return;
} }
/**
* Remove the closed contact
*
* @param array $to Array of receiver. exemple array('john@doe.com' => 'John Doe <john@doe.com>', etc...)
* @return array array of email => name
*/
public function removeClosedContact($to)
{
global $db, $langs;
$langs->load("ticket");
if (isset($this->id)) {
$sql = "SELECT IF(tc.source = 'external', sc.email, u.email)";
$sql .= " FROM ".MAIN_DB_PREFIX."element_contact ec";
$sql .= " INNER JOIN ".MAIN_DB_PREFIX."c_type_contact tc on (ec.element_id = ". $this->id ." AND ec.fk_c_type_contact = tc.rowid)";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople sc on (ec.fk_socpeople = sc.rowid AND tc.source = 'external')";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user u on (ec.fk_socpeople = u.rowid AND tc.source = 'internal')";
$sql .= " WHERE IF(tc.source = 'external', sc.statut = 1, u.statut = 1)";
$resql = $db->query($sql);
if ($resql) {
for ($i = 0; $db->num_rows($resql) > $i; $i++) {
$non_closed_contacts[] = $db->fetch_row($resql);
}
}
$to = array_filter($to, function($v, $k) use($non_closed_contacts, $langs) {
foreach($non_closed_contacts as $non_closed_contact) {
if ($k == $non_closed_contact[0])
return true;
}
setEventMessages($langs->trans('WarningMailNotSendContactIsClosed', str_replace(array('>', '<'), '', $v)), null, 'warnings');
return false;
}, ARRAY_FILTER_USE_BOTH);
}
return $to;
}
} }