X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FCron%2Fnotify.pm;h=3d427b234bbe085709dc76be1727d9f4de599fba;hb=9a46dd94e70887c5365c4b10d9db0d1b7f1b71ab;hp=ece96fcfd81d6a1545bd2adf075fed11e6b5d905;hpb=995a145c931164347683071c95c6754379d36604;p=freeside.git diff --git a/FS/FS/Cron/notify.pm b/FS/FS/Cron/notify.pm index ece96fcfd..3d427b234 100644 --- a/FS/FS/Cron/notify.pm +++ b/FS/FS/Cron/notify.pm @@ -4,7 +4,7 @@ use strict; use vars qw( @ISA @EXPORT_OK $DEBUG ); use Exporter; use FS::UID qw( dbh driver_name ); -use FS::Record qw(qsearch); +use FS::Record qw(qsearch qsearchs); use FS::cust_main; use FS::cust_pkg; @@ -37,7 +37,7 @@ sub notify_flat_delay { and 0 < ( select count(*) from part_pkg_option where part_pkg.pkgpart = part_pkg_option.pkgpart and part_pkg_option.optionname = 'recur_notify' - and CAST( part_pkg_option.optionvalue AS INTEGER ) > 0 + and CAST( part_pkg_option.optionvalue AS $integer ) > 0 and 0 <= ( $time + CAST( part_pkg_option.optionvalue AS $integer ) * 86400 @@ -64,7 +64,7 @@ END 0 = ( select count(*) from cust_pkg_option where cust_pkg.pkgnum = cust_pkg_option.pkgnum and cust_pkg_option.optionname = 'impending_recur_notification_sent' - and CAST( cust_pkg_option.optionvalue AS INTEGER ) = 1 + and CAST( cust_pkg_option.optionvalue AS $integer ) = 1 ) END @@ -106,6 +106,8 @@ END my $msgnum = $conf->config('impending_recur_msgnum',$cust_main->agentnum); if ( $msgnum ) { my $msg_template = qsearchs('msg_template', { msgnum => $msgnum }); + $cust_main->setfield('packages', \\@packages); + $cust_main->setfield('recurdates', \\@recurdates); $error = $msg_template->send('cust_main' => $cust_main); } else {