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

Merge pull request #22476 from FHenry/16_fix_AdvTargetEmailling

Browse Source 
fix: [AdvTargetEmailling] bad table from select and use of dict for prospect status
This commit is contained in:
Laurent Destailleur 2022-10-04 16:59:35 +02:00 committed by GitHub
commit 74ebcc7064
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
htdocs/comm/mailing/class/advtargetemailing.class.php
View File

@ -119,13 +119,23 @@ class AdvanceTargetingMailing extends CommonObject
'3' => $langs->trans('ThirdParty'), '3' => $langs->trans('ThirdParty'),
'4' => $langs->trans('ContactsWithThirdpartyFilter') '4' => $langs->trans('ContactsWithThirdpartyFilter')
); );
$this->type_statuscommprospect = array(
-1 => $langs->trans("StatusProspect-1"), require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
0 => $langs->trans("StatusProspect0"), $customerStatic = new Client($this->db);
1 => $langs->trans("StatusProspect1"), $customerStatic->loadCacheOfProspStatus();
2 => $langs->trans("StatusProspect2"), if (!empty($customerStatic->cacheprospectstatus)) {
3 => $langs->trans("StatusProspect3") foreach ($customerStatic->cacheprospectstatus as $dataProspectSt) {
); $this->type_statuscommprospect[$dataProspectSt['id']]=$dataProspectSt['label'];
}
} else {
$this->type_statuscommprospect = array(
-1 => $langs->trans("StatusProspect-1"),
0 => $langs->trans("StatusProspect0"),
1 => $langs->trans("StatusProspect1"),
2 => $langs->trans("StatusProspect2"),
3 => $langs->trans("StatusProspect3")
);
}
} }
/** /**

2
htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
View File

@ -355,7 +355,7 @@ class FormAdvTargetEmailing extends Form
$out = ''; $out = '';
$sql = "SELECT c.rowid, c.name, c.fk_element"; $sql = "SELECT c.rowid, c.name, c.fk_element";
$sql .= " FROM ".MAIN_DB_PREFIX."advtargetemailing as c"; $sql .= " FROM ".MAIN_DB_PREFIX."mailing_advtarget as c";
$sql .= " WHERE type_element = '".$this->db->escape($type_element)."'"; $sql .= " WHERE type_element = '".$this->db->escape($type_element)."'";
$sql .= " ORDER BY c.name"; $sql .= " ORDER BY c.name";