mahdahar/crm-summit
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into feature-pdf-generate

Browse Source
This commit is contained in:
mikael-zakaria 2026-02-25 14:04:30 +07:00
commit 252d30d040
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/Controllers/Activities.php
View File

@ -161,9 +161,11 @@ class Activities extends Controller {
-- OR ( a.reportdate between '$reportdate 00:00:00' and '$closedate 23:59:59' $filterquery $areaquery )
OR ( a.activitystatus='O' $filterquery $areaquery )
OR ( a.activitystatus='P' $filterquery )
OR ( a.activitystatus='R' )
-- OR ( a.activitystatus='R' ) Dinonaktifkan Dulu
GROUP BY a.actid
order by field(a.activitystatus,'O','R','C'), a.closedate desc, a.reportdate desc";
-- order by field(a.activitystatus,'O','R','C'), a.closedate desc, a.reportdate desc Dinonaktifkan Dulu
order by field(a.activitystatus,'O','C'), a.closedate desc, a.reportdate desc"
;
// $sql = "SELECT s.sitename, pc.productname, v.vendorname, u.firstname AS username, up.userposid, at.fulltext, a.*
// -- ,ad.*
// FROM
@ -1244,6 +1246,12 @@ class Activities extends Controller {
$data['emails'] = array_filter($data['emails']);
if ($this->request->getMethod() === 'POST') {
// $check = $db->query("SELECT sendmail FROM activities WHERE actid='$actid'")->getRow();
// if ($check && $check->sendmail == '1') {
// return redirect()->to('activities/')->with('error', 'Email Sudah Pernah Dikirim');
// }
$email = \Config\Services::email();
$sql = "update activities set sendmail='1' where actid='$actid'";
$query = $db->query($sql);
@ -1321,7 +1329,9 @@ class Activities extends Controller {
fwrite($myfile,$response);
fclose($myfile);
*/
// if ($response) {
// $db->query("UPDATE activities SET sendmail='1' WHERE actid='$actid'");
// }
return redirect()->to('activities/');
} else {
return view('activities_compose', $data);

7
app/Views/activities_index.php
View File

@ -6,6 +6,11 @@
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
<strong><?= session()->getFlashdata('msg'); ?></strong>
</div>
<?php endif; ?>
<?php if ($error = session()->getFlashdata('error')): ?>
<div class="alert alert-danger" role="alert">
<strong><?= $error ?></strong>
</div>
<?php endif; ?>
<div class="container-fluid">
<div class="row page-titles">
@ -262,7 +267,7 @@
<div class="input-group input-group-sm">
<span class="input-group-text d-flex align-items-center justify-content-center" style="width: 100px;">Search Detail</span>
<div class="col">
<input type="text" name="detail_activity" value="<?= $detail_activity; ?>" class="form-control" placeholder="🙏 Minta Tolong Kalau Memakai Search Detail, Rentang Date Jangan Sampai 1 - 2 Tahun. Cukup Kurang Dari 1 - 2 Bulan Saja 🙏">
<input type="text" name="detail_activity" value="<?= $detail_activity; ?>" class="form-control" placeholder="Misal : Sertifikat Kalibrasi Alat">
<!-- <input type="text" class="form-control" placeholder="Lagi maintenis !" disabled /> -->
</div>
</div>