From 3777b7dffe80ca80ca9f1a3ea28c8f95aab8f111 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Mon, 3 Oct 2022 13:38:15 +0200 Subject: [PATCH 1/3] fix: [AdvTargetEmailling] bad table from select and use of dict for prospect status --- .../mailing/class/advtargetemailing.class.php | 18 +++++++++++------- .../class/html.formadvtargetemailing.class.php | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/htdocs/comm/mailing/class/advtargetemailing.class.php b/htdocs/comm/mailing/class/advtargetemailing.class.php index ea6ec241b16..72c9a0e4eb7 100644 --- a/htdocs/comm/mailing/class/advtargetemailing.class.php +++ b/htdocs/comm/mailing/class/advtargetemailing.class.php @@ -111,6 +111,8 @@ class AdvanceTargetingMailing extends CommonObject global $langs; $langs->load('customers'); + + $this->db = $db; $this->select_target_type = array( @@ -119,13 +121,15 @@ class AdvanceTargetingMailing extends CommonObject '3' => $langs->trans('ThirdParty'), '4' => $langs->trans('ContactsWithThirdpartyFilter') ); - $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") - ); + + require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php'; + $customerStatic = new Client($this->db); + $customerStatic->loadCacheOfProspStatus(); + if (!empty($customerStatic->cacheprospectstatus)) { + foreach ($customerStatic->cacheprospectstatus as $dataProspectSt) { + $this->type_statuscommprospect[$dataProspectSt['id']]=$dataProspectSt['label']; + } + } } /** diff --git a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php index 9e10d51031e..50169438baa 100644 --- a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php +++ b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php @@ -355,7 +355,7 @@ class FormAdvTargetEmailing extends Form $out = ''; $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 .= " ORDER BY c.name"; From 7ac0168397e1a8e911b4f6b10ae4985956cff2ea Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Mon, 3 Oct 2022 13:40:33 +0200 Subject: [PATCH 2/3] travais --- htdocs/comm/mailing/class/advtargetemailing.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/comm/mailing/class/advtargetemailing.class.php b/htdocs/comm/mailing/class/advtargetemailing.class.php index 72c9a0e4eb7..35412193c50 100644 --- a/htdocs/comm/mailing/class/advtargetemailing.class.php +++ b/htdocs/comm/mailing/class/advtargetemailing.class.php @@ -111,8 +111,6 @@ class AdvanceTargetingMailing extends CommonObject global $langs; $langs->load('customers'); - - $this->db = $db; $this->select_target_type = array( @@ -129,6 +127,8 @@ class AdvanceTargetingMailing extends CommonObject foreach ($customerStatic->cacheprospectstatus as $dataProspectSt) { $this->type_statuscommprospect[$dataProspectSt['id']]=$dataProspectSt['label']; } + } else { + $this->type_statuscommprospect = array(); } } From 83fa90eef794a34252897f70893b9c990282136e Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Mon, 3 Oct 2022 13:41:07 +0200 Subject: [PATCH 3/3] travais --- htdocs/comm/mailing/class/advtargetemailing.class.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/htdocs/comm/mailing/class/advtargetemailing.class.php b/htdocs/comm/mailing/class/advtargetemailing.class.php index 35412193c50..7b4e06c897f 100644 --- a/htdocs/comm/mailing/class/advtargetemailing.class.php +++ b/htdocs/comm/mailing/class/advtargetemailing.class.php @@ -128,7 +128,13 @@ class AdvanceTargetingMailing extends CommonObject $this->type_statuscommprospect[$dataProspectSt['id']]=$dataProspectSt['label']; } } else { - $this->type_statuscommprospect = array(); + $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") + ); } }