Merge pull request 'Update - Perbaikan untuk menampilkan data semua email yang aktif ke Mail Group' (#2) from mikael-zakaria/crm-summit:fitur-email-group into main

Reviewed-on: #2
This commit is contained in:
mahdahar 2026-04-17 15:45:11 +07:00
commit ea52ad8f99

View File

@ -24,17 +24,14 @@ class Mailgroups extends BaseController {
$results = $query->getResultArray(); $results = $query->getResultArray();
$data['mailgroups'] = $results; $data['mailgroups'] = $results;
} }
$sql = "SELECT email_1 FROM users WHERE `enddate` IS NULL UNION SELECT email_2 FROM users WHERE `enddate` IS NULL"; $sql = "SELECT email_2 as emails FROM users WHERE enddate IS NULL
UNION SELECT email FROM emails WHERE email IS NOT NULL AND email != '' AND enddate IS NULL
UNION SELECT email_1 FROM contacts WHERE email_1 IS NOT NULL AND email_1 != ''
UNION SELECT email_2 FROM contacts WHERE email_2 IS NOT NULL AND email_2 != ''";
$query = $db->query($sql); $query = $db->query($sql);
$results = $query->getResultArray(); $results = $query->getResultArray();
foreach($results as $email) { array_push( $data['emails'], $email['email_1']); } $data['emails'] = array_column($results, 'emails');
$sql = "SELECT email_1 FROM contacts WHERE enddate IS NULL UNION SELECT email_2 FROM contacts WHERE enddate IS NULL;";
$query = $db->query($sql);
$results = $query->getResultArray();
foreach($results as $email) { array_push( $data['emails'], $email['email_1']); }
$data['emails'] = array_unique($data['emails']);
$data['emails'] = array_filter($data['emails']);
//print_r($data['emails']);
if ($this->request->getMethod() === 'POST') { if ($this->request->getMethod() === 'POST') {
$rules = [ $rules = [
'mailgroupname' => 'required', 'mailgroupname' => 'required',