diff --git a/modules/Calendar/models/Module.php b/modules/Calendar/models/Module.php index 4c6fefd88132f83c3e606719869cbcdd4c07a9d9..4aef8292d48d951eb3788b7ffeaa6a572ff29e0d 100644 --- a/modules/Calendar/models/Module.php +++ b/modules/Calendar/models/Module.php @@ -863,15 +863,19 @@ class Calendar_Module_Model extends Vtiger_Module_Model { $currentTime = time(); $date = date('Y-m-d', strtotime("+$activityReminder seconds", $currentTime)); $time = date('H:i', strtotime("+$activityReminder seconds", $currentTime)); + $dateAndTime = $date.' '.$time; $reminderActivitiesResult = "SELECT reminderid, recordid FROM vtiger_activity_reminder_popup INNER JOIN vtiger_activity on vtiger_activity.activityid = vtiger_activity_reminder_popup.recordid INNER JOIN vtiger_crmentity ON vtiger_activity_reminder_popup.recordid = vtiger_crmentity.crmid WHERE vtiger_activity_reminder_popup.status = 0 AND vtiger_crmentity.smownerid = ? AND vtiger_crmentity.deleted = 0 - AND ((DATE_FORMAT(vtiger_activity_reminder_popup.date_start,'%Y-%m-%d') <= ?) - AND (TIME_FORMAT(vtiger_activity_reminder_popup.time_start,'%H:%i') <= ?)) + and CONCAT( + DATE_FORMAT(vtiger_activity_reminder_popup.date_start,'%Y-%m-%d'), + ' ', + TIME_FORMAT(vtiger_activity_reminder_popup.time_start,'%H:%i') + ) <= ? AND vtiger_activity.eventstatus <> 'Held' AND (vtiger_activity.status <> 'Completed' OR vtiger_activity.status IS NULL) LIMIT 20"; - $result = $db->pquery($reminderActivitiesResult, array($currentUserModel->getId(), $date, $time)); + $result = $db->pquery($reminderActivitiesResult, array($currentUserModel->getId(), $dateAndTime)); $rows = $db->num_rows($result); for($i=0; $i<$rows; $i++) { $recordId = $db->query_result($result, $i, 'recordid');