Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge pull request #32322 from FHenry/dev_new_default_email_template_ticket

Browse Source 
new: if default template for ticket exist we use it avec if there is email template 'all'
This commit is contained in:
Laurent Destailleur
2025-01-05 19:01:42 +01:00
committed by GitHub
parent 5ae9d1bd13 5762d0d843
commit b05958fb25
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/core/class/html.formticket.class.php
View File

@@ -1497,7 +1497,12 @@ class FormTicket
$model_id = (int) $this->param["models_id"]; $model_id = (int) $this->param["models_id"];
} }
$arraydefaultmessage = $formmail->getEMailTemplate($this->db, $this->param["models"], $user, $outputlangs, $model_id); // If $model_id is empty, preselect the first one // If $model_id is empty, preselect the first one
$arraydefaultmessage = $formmail->getEMailTemplate($this->db, $this->param["models"], $user, $outputlangs, $model_id, 1, '', 1);
if (isset($arraydefaultmessage->id) && empty($model_id)) {
$model_id = $arraydefaultmessage->id;
$this->param['models_id']=$model_id;
}
} }
// Define list of attached files // Define list of attached files
@@ -1612,9 +1617,8 @@ class FormTicket
$model_id = 0; $model_id = 0;
if (array_key_exists('models_id', $this->param)) { if (array_key_exists('models_id', $this->param)) {
$model_id = $this->param["models_id"]; $model_id = $this->param["models_id"];
$arraydefaultmessage = $formmail->getEMailTemplate($this->db, $this->param["models"], $user, $outputlangs, $model_id); $arraydefaultmessage = $formmail->getEMailTemplate($this->db, $this->param["models"], $user, $outputlangs, $model_id, 1, '', 1);
} }
$result = $formmail->fetchAllEMailTemplate(!empty($this->param["models"]) ? $this->param["models"] : "", $user, $outputlangs); $result = $formmail->fetchAllEMailTemplate(!empty($this->param["models"]) ? $this->param["models"] : "", $user, $outputlangs);
if ($result < 0) { if ($result < 0) {
setEventMessages($this->error, $this->errors, 'errors'); setEventMessages($this->error, $this->errors, 'errors');