|
|
@@ -601,10 +601,10 @@ class tools {
|
|
|
and lower(ni.user_login) = '".strtolower(_getLoginName())."'
|
|
|
and ((ni.frequency_type = 'Daily'
|
|
|
and timezone(ni.daily_time_zone, NOW()::time) > ni.daily_time::time
|
|
|
- and ni.insert_date::date <= CURRENT_DATE + ni.daily_time::time)
|
|
|
+ and ni.insert_date::timestamp <= CURRENT_DATE + ni.daily_time::time)
|
|
|
or (ni.frequency_type = 'Weekly' and timezone(ni.weekly_time_zone, NOW()::time) > ni.weekly_time::time
|
|
|
and ni.weekly_week ilike '%'|| EXTRACT(dow FROM timezone(ni.weekly_time_zone, NOW())) ||'%'
|
|
|
- and ni.insert_date::date <= CURRENT_DATE + ni.weekly_time::time))
|
|
|
+ and ni.insert_date::timestamp <= CURRENT_DATE + ni.weekly_time::time))
|
|
|
group by ni.notifiation_type,insert_date_format
|
|
|
union all
|
|
|
select ni.notifiation_type, '' as insert_date_format
|
|
|
@@ -706,10 +706,10 @@ class tools {
|
|
|
where lower(ni.user_login) in ('".strtolower(_getLoginName())."','all_user')
|
|
|
and (ni.frequency_type = 'Instant'
|
|
|
or (ni.frequency_type = 'Daily' and timezone(ni.daily_time_zone, NOW()::time) > ni.daily_time::time
|
|
|
- and ni.insert_date::date <= CURRENT_DATE + ni.daily_time::time)
|
|
|
+ and ni.insert_date::timestamp <= CURRENT_DATE + ni.daily_time::time)
|
|
|
or (ni.frequency_type = 'Weekly' and timezone(ni.weekly_time_zone, NOW()::time) > ni.weekly_time::time
|
|
|
and ni.weekly_week ilike '%'|| EXTRACT(dow FROM timezone(ni.weekly_time_zone, NOW())) ||'%'
|
|
|
- and ni.insert_date::date <= CURRENT_DATE + ni.weekly_time::time))
|
|
|
+ and ni.insert_date::timestamp <= CURRENT_DATE + ni.weekly_time::time))
|
|
|
and ni.notifications_method = true and is_send_message is null limit 1";
|
|
|
$unread = common::excuteObjectSql($checkUnread);
|
|
|
$returnData = array("has_message" =>!empty($unread));
|
|
|
@@ -1268,18 +1268,18 @@ class tools {
|
|
|
$sql_where = " and (ni.frequency_type = 'Instant'
|
|
|
or (ni.frequency_type = 'Daily'
|
|
|
and timezone(ni.daily_time_zone, NOW()::time) > ni.daily_time::time
|
|
|
- and ni.insert_date::date <= CURRENT_DATE + ni.daily_time::time)
|
|
|
+ and ni.insert_date::timestamp <= CURRENT_DATE + ni.daily_time::time)
|
|
|
or (ni.frequency_type = 'Weekly' and timezone(ni.weekly_time_zone, NOW()::time) > ni.weekly_time::time
|
|
|
and ni.weekly_week ilike '%'|| EXTRACT(dow FROM timezone(ni.weekly_time_zone, NOW())) ||'%'
|
|
|
- and ni.insert_date::date <= CURRENT_DATE + ni.weekly_time::time))";
|
|
|
+ and ni.insert_date::timestamp <= CURRENT_DATE + ni.weekly_time::time))";
|
|
|
} elseif($frequency_type == "Daily"){
|
|
|
$sql_where = " and (ni.frequency_type = 'Daily'
|
|
|
and timezone(ni.daily_time_zone, NOW()::time) >= ni.daily_time::time
|
|
|
- and ni.insert_date::date <= CURRENT_DATE + ni.daily_time::time)";
|
|
|
+ and ni.insert_date::timestamp <= CURRENT_DATE + ni.daily_time::time)";
|
|
|
} elseif($frequency_type == "Weekly"){
|
|
|
$sql_where = " and (ni.frequency_type = 'Weekly' and timezone(ni.weekly_time_zone, NOW()::time) > ni.weekly_time::time
|
|
|
and ni.weekly_week ilike '%'|| EXTRACT(dow FROM timezone(ni.weekly_time_zone, NOW())) ||'%'
|
|
|
- and ni.insert_date::date <= CURRENT_DATE + ni.weekly_time::time)";
|
|
|
+ and ni.insert_date::timestamp <= CURRENT_DATE + ni.weekly_time::time)";
|
|
|
}
|
|
|
if (!empty($_REQUEST['current_time'])){
|
|
|
// $sql_where .= " and ni.insert_date >= TO_TIMESTAMP('".$_REQUEST['current_time']."', 'MM/DD/YYYY HH24:MI:SS') - interval '5 minutes'
|
