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

NEW Autofill email form with the email template with status "Default" on

Browse Source
This commit is contained in:
Laurent Destailleur 2023-04-25 16:57:31 +02:00
parent 06228ca645
commit 2635ec9c19
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
htdocs/core/class/html.formmail.class.php
View File

@ -418,7 +418,7 @@ class FormMail extends Form
$model_id = $this->param["models_id"]; $model_id = $this->param["models_id"];
} }
$arraydefaultmessage = $this->getEMailTemplate($this->db, $this->param["models"], $user, $outputlangs, $model_id); // If $model_id is empty, preselect the first one $arraydefaultmessage = $this->getEMailTemplate($this->db, $this->param["models"], $user, $outputlangs, ($model_id > 0 ? $model_id : 0), 1, '', 1); // If $model_id is empty, preselect the first one
} }
// Define list of attached files // Define list of attached files
@ -1285,22 +1285,26 @@ class FormMail extends Form
* @param string $type_template Get message for model/type=$type_template, type='all' also included. * @param string $type_template Get message for model/type=$type_template, type='all' also included.
* @param User $user Get templates public + limited to this user * @param User $user Get templates public + limited to this user
* @param Translate $outputlangs Output lang object * @param Translate $outputlangs Output lang object
* @param int $id Id of template to get, or -1 for first found with position 0, or 0 for first found whatever is position (priority order depends on lang provided or not) or -2 for exact match with label (no answer if not found) * @param int $id Id of template to get, or
* -1 for first found with position 0, or
* 0 for first found whatever is position (priority order depends on lang provided or not) or
* -2 for exact match with label (no answer if not found)
* @param int $active 1=Only active template, 0=Only disabled, -1=All * @param int $active 1=Only active template, 0=Only disabled, -1=All
* @param string $label Label of template to get * @param string $label Label of template to get
* @param int $defaultfortype 1=Only default templates, 0=Only not default, -1=All
* @return ModelMail|integer One instance of ModelMail or < 0 if error * @return ModelMail|integer One instance of ModelMail or < 0 if error
*/ */
public function getEMailTemplate($dbs, $type_template, $user, $outputlangs, $id = 0, $active = 1, $label = '') public function getEMailTemplate($dbs, $type_template, $user, $outputlangs, $id = 0, $active = 1, $label = '', $defaultfortype = -1)
{ {
global $conf, $langs; global $conf;
$ret = new ModelMail();
if ($id == -2 && empty($label)) { if ($id == -2 && empty($label)) {
$this->error = 'LabelIsMandatoryWhenIdIs-2'; $this->error = 'LabelIsMandatoryWhenIdIs-2or-3';
return -1; return -1;
} }
$ret = new ModelMail();
$languagetosearch = (is_object($outputlangs) ? $outputlangs->defaultlang : ''); $languagetosearch = (is_object($outputlangs) ? $outputlangs->defaultlang : '');
// Define $languagetosearchmain to fall back on main language (for example to get 'es_ES' for 'es_MX') // Define $languagetosearchmain to fall back on main language (for example to get 'es_ES' for 'es_MX')
$tmparray = explode('_', $languagetosearch); $tmparray = explode('_', $languagetosearch);
@ -1317,6 +1321,9 @@ class FormMail extends Form
if ($active >= 0) { if ($active >= 0) {
$sql .= " AND active = ".((int) $active); $sql .= " AND active = ".((int) $active);
} }
if ($defaultfortype >= 0) {
$sql .= " AND defaultfortype = ".((int) $defaultfortype);
}
if ($label) { if ($label) {
$sql .= " AND label = '".$dbs->escape($label)."'"; $sql .= " AND label = '".$dbs->escape($label)."'";
} }
@ -1457,11 +1464,11 @@ class FormMail extends Form
* Find if template exists and are available for current user, then set them into $this->lines_module. * Find if template exists and are available for current user, then set them into $this->lines_module.
* Search into table c_email_templates * Search into table c_email_templates
* *
* @param string $type_template Get message for key module * @param string $type_template Get message for key module
* @param User $user Use template public or limited to this user * @param User $user Use template public or limited to this user
* @param Translate $outputlangs Output lang object * @param Translate $outputlangs Output lang object
* @param int $active 1=Only active template, 0=Only disabled, -1=All * @param int $active 1=Only active template, 0=Only disabled, -1=All
* @return int <0 if KO, nb of records found if OK * @return int <0 if KO, nb of records found if OK
*/ */
public function fetchAllEMailTemplate($type_template, $user, $outputlangs, $active = 1) public function fetchAllEMailTemplate($type_template, $user, $outputlangs, $active = 1)
{ {

2
htdocs/core/tpl/card_presend.tpl.php
View File

@ -119,7 +119,7 @@ if ($action == 'presend') {
print '<br>'; print '<br>';
print load_fiche_titre($langs->trans($titreform)); print load_fiche_titre($langs->trans($titreform));
print dol_get_fiche_head(''); print dol_get_fiche_head('', '', '', -1);
// Create form for email // Create form for email
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';