Fix emailcollector ticket tracking (#29393)
* Fix emailcollector ticket tracking * fix some things * fix fetch ticket for email collector --------- Co-authored-by: Hystepik <lmarcouiller@nltechno.com> Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
This commit is contained in:
parent
78017e4982
commit
bfa3853acf
1 changed files with 30 additions and 4 deletions
|
|
@ -2063,7 +2063,7 @@ class EmailCollector extends CommonObject
|
|||
} elseif (preg_match('/<(.*@.*)>/', $reference, $reg)) {
|
||||
// This is an external reference, we check if we have it in our database
|
||||
if (!is_object($objectemail)) {
|
||||
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."ticket where email_msgid = '".$this->db->escape($reg[1])."'";
|
||||
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."ticket where email_msgid = '".$this->db->escape($reg[1])."' OR origin_references like '%".$this->db->escape($this->db->escapeforlike($reg[1]))."%'";
|
||||
$resql = $this->db->query($sql);
|
||||
if ($resql) {
|
||||
$obj = $this->db->fetch_object($resql);
|
||||
|
|
@ -2136,6 +2136,27 @@ class EmailCollector extends CommonObject
|
|||
} else {
|
||||
$projectid = $objectemail->id;
|
||||
}
|
||||
|
||||
if (get_class($objectemail) == 'Ticket') {
|
||||
$changeonticket_references = false;
|
||||
if (empty($trackid)) {
|
||||
$trackid = $objectemail->track_id;
|
||||
}
|
||||
if (empty($objectemail->origin_references)) {
|
||||
$objectemail->origin_references = $headers['References'];
|
||||
$changeonticket_references = true;
|
||||
} else {
|
||||
foreach ($arrayofreferences as $key => $referencetmp) {
|
||||
if (!str_contains($objectemail->origin_references, $referencetmp)) {
|
||||
$objectemail->origin_references.= " ".$referencetmp;
|
||||
$changeonticket_references = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
if ($changeonticket_references) {
|
||||
$objectemail->update($user);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2274,7 +2295,6 @@ class EmailCollector extends CommonObject
|
|||
$description = $descriptiontitle = $descriptionmeta = $descriptionfull = '';
|
||||
|
||||
$descriptiontitle = $langs->trans("RecordCreatedByEmailCollector", $this->ref, $msgid);
|
||||
//TODO: Reply-to
|
||||
$descriptionmeta = dol_concatdesc($descriptionmeta, $langs->trans("MailTopic").' : '.dol_escape_htmltag($subject));
|
||||
$descriptionmeta = dol_concatdesc($descriptionmeta, $langs->trans("MailFrom").($langs->trans("MailFrom") != 'From' ? ' (From)' : '').' : '.dol_escape_htmltag($fromstring));
|
||||
if ($sender) {
|
||||
|
|
@ -3042,9 +3062,15 @@ class EmailCollector extends CommonObject
|
|||
} elseif ($operation['type'] == 'ticket') {
|
||||
// Create ticket
|
||||
$tickettocreate = new Ticket($this->db);
|
||||
$errorfetchticket = 0;
|
||||
|
||||
$alreadycreated = $tickettocreate->fetch(0, '', '', $msgid);
|
||||
if ($alreadycreated == 0) {
|
||||
$alreadycreated1 = $tickettocreate->fetch(0, '', $trackid);
|
||||
$alreadycreated2 = $tickettocreate->fetch(0, '', '', $msgid);
|
||||
$alreadycreated = $alreadycreated1 + $alreadycreated2;
|
||||
if ($alreadycreated1 < 0 || $alreadycreated2 < 0) {
|
||||
$errorfetchticket ++;
|
||||
}
|
||||
if (empty($errorfetchticket) && $alreadycreated == 0) {
|
||||
if ($thirdpartystatic->id > 0) {
|
||||
$tickettocreate->socid = $thirdpartystatic->id;
|
||||
$tickettocreate->fk_soc = $thirdpartystatic->id;
|
||||
|
|
|
|||
Loading…
Reference in a new issue