[Vtigercrm-commits] [vtiger-commits] r10475 - in /vtigercrm/branches/5.0.3/modules/Calendar: CalendarCommon.php Save.php TodoSave.php language/en_us.lang.php
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Mon Mar 19 01:57:13 EDT 2007
Author: saraj
Date: Sun Mar 18 23:57:03 2007
New Revision: 10475
Log:
event notification and invitation mail has been changed. --Minnie
Modified:
vtigercrm/branches/5.0.3/modules/Calendar/CalendarCommon.php
vtigercrm/branches/5.0.3/modules/Calendar/Save.php
vtigercrm/branches/5.0.3/modules/Calendar/TodoSave.php
vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php
Modified: vtigercrm/branches/5.0.3/modules/Calendar/CalendarCommon.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Calendar/CalendarCommon.php (original)
+++ vtigercrm/branches/5.0.3/modules/Calendar/CalendarCommon.php Sun Mar 18 23:57:03 2007
@@ -305,24 +305,43 @@
$log->debug("Entering getActivityDetails(".$description.") method ...");
$reply = (($description['mode'] == 'edit')?'updated':'created');
+ if($description['activity_mode'] == "Events")
+ {
+ $end_date_lable=$mod_strings['End date and time'];
+ }
+ else
+ {
+ $end_date_lable=$mod_strings['End date'];
+ }
if($inviteeid=='')
- $name = getUserName($description['user_id']);
+ {
+ $name = getUserName($description['user_id']);
+ $msg = $mod_strings['LBL_ACTIVITY_NOTIFICATION'];
+ }
else
- $name = getUserName($inviteeid);
+ {
+ $name = getUserName($inviteeid);
+ $msg = $mod_strings['LBL_ACTIVITY_INVITATION'];
+ }
$current_username = getUserName($current_user->id);
$status = $description['status'];
$list = $name.',';
- $list .= '<br><br>'.$mod_strings['LBL_ACTIVITY_STRING'].' '.$reply.'.<br> '.$mod_strings['LBL_DETAILS_STRING'].':<br>';
+ $list .= '<br><br>'.$msg.' '.$reply.'.<br> '.$mod_strings['LBL_DETAILS_STRING'].':<br>';
$list .= '<br> '.$mod_strings["LBL_SUBJECT"].' '.$description['subject'];
+ $list .= '<br> '.$mod_strings["Start date and time"].' : '.$description['st_date_time'];
+ $list .= '<br> '.$end_date_lable.' : '.$description['end_date_time'];
$list .= '<br> '.$mod_strings["LBL_STATUS"].': '.$status;
$list .= '<br> '.$mod_strings["Priority"].': '.$description['taskpriority'];
- $list .= '<br> '.$mod_strings["Related To"].' : '.$description['relatedto'];
+ $list .= '<br> '.$mod_strings["Related To"].': '.$description['relatedto'];
if($description['activity_mode'] != 'Events')
{
$list .= '<br> '.$mod_strings["LBL_CONTACT"].' '.$description['contact_name'];
}
+ else
+ $list .= '<br> '.$mod_strings["Location"].' : '.$description['location'];
+
$list .= '<br> '.$mod_strings["LBL_APP_DESCRIPTION"].': '.$description['description'];
$list .= '<br><br>'.$mod_strings["LBL_REGARDS_STRING"].' ,';
$list .= '<br>'.$current_username.'.';
@@ -422,7 +441,11 @@
$send_notification = $adb->query_result($ary_res,0,"sendnotification");
$subject = $adb->query_result($ary_res,0,"subject");
$priority = $adb->query_result($ary_res,0,"priority");
- //$parent_name = $adb->query_result($ary_res,0,"priority");
+ $st_date = $adb->query_result($ary_res,0,"date_start");
+ $st_time = $adb->query_result($ary_res,0,"time_start");
+ $end_date = $adb->query_result($ary_res,0,"due_date");
+ $end_time = $adb->query_result($ary_res,0,"time_end");
+ $location = $adb->query_result($ary_res,0,"location");
$usr_qry = "select smownerid from vtiger_crmentity where crmid=".$return_id;
$res = $adb->query($usr_qry);
@@ -468,6 +491,9 @@
$mail_data['description'] = $description;
$mail_data['assingn_type'] = $assignType;
$mail_data['group_name'] = $grp_name;
+ $mail_data['st_date_time']=$st_date." ".$st_time;
+ $mail_data['end_date_time']=$end_date." ".$end_time;
+ $mail_data['location']=$location;
return $mail_data;
Modified: vtigercrm/branches/5.0.3/modules/Calendar/Save.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Calendar/Save.php (original)
+++ vtigercrm/branches/5.0.3/modules/Calendar/Save.php Sun Mar 18 23:57:03 2007
@@ -168,6 +168,9 @@
$mail_data['assingn_type'] = $_REQUEST['assigntype'];
$mail_data['group_name'] = $_REQUEST['assigned_group_name'];
$mail_data['mode'] = $_REQUEST['mode'];
+ $mail_data['st_date_time'] = $_REQUEST['date_start']." ".$_REQUEST['time_start'];
+ $mail_data['end_date_time']=$_REQUEST['due_date']." ".$_REQUEST['time_end'];
+ $mail_data['location']=$_REQUEST['location'];
return $mail_data;
}
//Added code to send mail to the assigned to user about the details of the vtiger_activity if sendnotification = on and assigned to user
Modified: vtigercrm/branches/5.0.3/modules/Calendar/TodoSave.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Calendar/TodoSave.php (original)
+++ vtigercrm/branches/5.0.3/modules/Calendar/TodoSave.php Sun Mar 18 23:57:03 2007
@@ -67,6 +67,8 @@
$mail_data['assingn_type'] = $_REQUEST['task_assigntype'];
$mail_data['group_name'] = $_REQUEST['task_assigned_group_name'];
$mail_data['mode'] = $_REQUEST['task_mode'];
+ $mail_data['st_date_time'] = $_REQUEST['task_date_start']." ".$_REQUEST['task_time_start'];
+ $mail_data['end_date_time']=$_REQUEST['task_due_date'];
return $mail_data;
}
Modified: vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php Sun Mar 18 23:57:03 2007
@@ -257,7 +257,8 @@
'LBL_CALENDAR_INFORMATION'=>'Calendar Information',
'LBL_NAME'=>'Subject:',
-'LBL_ACTIVITY_STRING'=>'This is a notification that an activity you have been invited to has been',
+'LBL_ACTIVITY_NOTIFICATION'=>'This is a notification that an activity is assigned to you that has been',
+'LBL_ACTIVITY_INVITATION'=>'You have been invited for an activity that has been ',
'LBL_DETAILS_STRING'=>'The details are',
'LBL_REGARDS_STRING'=>'Thanks & Regards',
'LBL_CONTACT_NAME'=>'Contact Name',
@@ -403,6 +404,14 @@
'Call'=>'Call',
'Meeting'=>'Meeting',
+//added to send dates and time in calendar notification/invitation mail.
+
+'Start date and time'=>'Start Date & Time',
+'End date and time'=>'End Date & Time',
+//this is for task
+'End date'=>'End date',
+
+
);
?>
More information about the vtigercrm-commits
mailing list