diff --git a/app/Controllers/Activities.php b/app/Controllers/Activities.php index f22b93a..9172971 100644 --- a/app/Controllers/Activities.php +++ b/app/Controllers/Activities.php @@ -897,7 +897,7 @@ class Activities extends Controller { $sql = "SELECT c.catalogid, c.catalognumber, c.productname, v.`vendorname` FROM productcatalog c LEFT JOIN vendors v ON v.`vendorid`=c.`vendorid` - WHERE c.producttypeid IN (6,7,25,26) AND c.productaliasid > 0"; + WHERE c.producttypeid IN (6,7) AND c.productaliasid > 0"; $query = $db->query($sql); $results = $query->getResultArray(); $data['consumables'] = $results; @@ -1241,7 +1241,6 @@ class Activities extends Controller { $data['emails'] = array_unique($data['emails']); $data['emails'] = array_filter($data['emails']); - if ($this->request->getMethod() === 'POST') { $email = \Config\Services::email(); $sql = "update activities set sendmail='1' where actid='$actid'"; @@ -1255,6 +1254,7 @@ class Activities extends Controller { $message = $this->request->getVar('message'); $attachment = $this->request->getVar('attachment'); $attachments = explode(',',$attachment); + /* $email->setFrom('noreply@services.summit.co.id', 'SUMMIT CRM'); $email->setReplyTo($replyto); @@ -1284,9 +1284,12 @@ class Activities extends Controller { $tos = join(",",$to); if(isset($cc)) { $ccs = join(",",$cc); } else { $ccs = ''; } if(isset($bcc)) { $bccs = join(",",$bcc); } else { $bccs = ''; } - $sql = "insert into actsend_log (actid, replyto, emailto, emailcc, emailbcc, logdate) values ( '$actid', '$replyto', '$tos', '$ccs', '$bccs', NOW() )"; + $sql = "INSERT into actsend_log (actid, replyto, emailto, emailcc, emailbcc, logdate) values ( '$actid', '$replyto', '$tos', '$ccs', '$bccs', NOW() )"; $query = $db->query($sql); - + + // Untuk Simpan Email Otomatis + // $this->syncEmails($tos, $ccs, $bccs); + $data = [ 'replyto' => $replyto, 'to' => $tos, @@ -1316,11 +1319,50 @@ class Activities extends Controller { fwrite($myfile,$response); fclose($myfile); */ + return redirect()->to('activities/'); } else { return view('activities_compose', $data); } } + + // Untuk Simpan Email Otomatis + // public function syncEmails($tos="", $ccs="", $bccs="") { + // $db = \Config\Database::connect(); + + // // Khusus Untuk Simpan email yg dimasukkan + // $allEmails = $tos .",". $ccs .",". $bccs; + // // pecah jadi array + // $emailArr = array_filter(array_map('trim', explode(',', $allEmails))); + // // optional: lowercase biar konsisten + // $emailArr = array_map('strtolower', $emailArr); + // // buang duplikat di request + // $emailArr = array_unique($emailArr); + + // // GUARD CLAUSE (WAJIB) + // if (empty($emailArr)) { + // return; + // } + + // // CEK email + // $placeholders = implode(',', array_fill(0, count($emailArr), '?')); + // $sql = "SELECT email FROM emails WHERE email IN ($placeholders)"; + // $query = $db->query($sql, array_values($emailArr)); + // $existingEmails = array_column($query->getResultArray(), 'email'); + // $newEmails = array_diff($emailArr, $existingEmails); + + // if (!empty($newEmails)) { + // $values = []; + // $binds = []; + + // foreach ($newEmails as $email) { + // $values[] = "(?, NULL)"; + // $binds[] = $email; + // } + // $sql = "INSERT INTO emails (email, enddate) VALUES " . implode(',', $values); + // $db->query($sql, $binds); + // } + // } public function export(){ $db = \Config\Database::connect();