From 88ee083a365b91f743878cd464f4f435dd1d3542 Mon Sep 17 00:00:00 2001
From: prasad <prasad@vtiger.com>
Date: Thu, 18 Feb 2016 15:40:54 +0530
Subject: [PATCH] Fixed status initialization for activity reminder popup.
---
modules/Calendar/Activity.php | 31 +++++++++++++++++++------------
1 file changed, 19 insertions(+), 12 deletions(-)
diff --git a/modules/Calendar/Activity.php b/modules/Calendar/Activity.php
index 2926ecb68..65a143555 100644
--- a/modules/Calendar/Activity.php
+++ b/modules/Calendar/Activity.php
@@ -204,19 +204,26 @@ class Activity extends CRMEntity {
$reminderid = $adb->query_result($reminderidres, 0, "reminderid");
}
- if(isset($reminderid)) {
- $current_date = new DateTime();
- $record_date = new DateTime($cbdate.' '.$cbtime);
-
- $current = $current_date->format('Y-m-d H:i:s');
- $record = $record_date->format('Y-m-d H:i:s');
- if(strtotime($record) > strtotime($current)){
- $callback_query = "UPDATE vtiger_activity_reminder_popup set status = 0, date_start = ?, time_start = ? WHERE reminderid = ?";
- $callback_params = array($cbdate, $cbtime, $reminderid);
- }
+ $current_date = new DateTime();
+ $record_date = new DateTime($cbdate.' '.$cbtime);
+
+ $current = $current_date->format('Y-m-d H:i:s');
+ $record = $record_date->format('Y-m-d H:i:s');
+
+ $reminder = false;
+ if(strtotime($record) > strtotime($current)){
+ $status = 0;
+ $reminder = true;
} else {
- $callback_query = "INSERT INTO vtiger_activity_reminder_popup (recordid, semodule, date_start, time_start) VALUES (?,?,?,?)";
- $callback_params = array($cbrecord, $cbmodule, $cbdate, $cbtime);
+ $status = 1;
+ }
+
+ if(isset($reminderid)){
+ $callback_query = "UPDATE vtiger_activity_reminder_popup set status = 0, date_start = ?, time_start = ? WHERE reminderid = ?";
+ $callback_params = array($cbdate, $cbtime, $reminderid);
+ } else if ($reminder) {
+ $callback_query = "INSERT INTO vtiger_activity_reminder_popup (recordid, semodule, date_start, time_start, status) VALUES (?,?,?,?,?)";
+ $callback_params = array($cbrecord, $cbmodule, $cbdate, $cbtime, $status);
}
if($callback_query)
--
GitLab