X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FCron%2Fnotify.pm;h=1859fcaf7701a7137cb73749cbf3226678d13a6a;hb=5c68c43be829fd926ea148552c6bb87cdcafd7a1;hp=74840a6e77fa99fbc8e7756dddd9ab1c92ca842c;hpb=e574b96088606fe1624223d977e8091b9eab0600;p=freeside.git

diff --git a/FS/FS/Cron/notify.pm b/FS/FS/Cron/notify.pm
index 74840a6e7..1859fcaf7 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
   
@@ -72,7 +72,7 @@ END
     $where_pkg .= <<END;
       and 0 < ( select count(*) from cust_main
                   where cust_pkg.custnum = cust_main.custnum
-                    and cust_main.agentnum = $opt{a}
+                    and cust_main.agentnum IN ( $opt{a} )
               )
 END
   }
@@ -106,7 +106,10 @@ END
     my $msgnum = $conf->config('impending_recur_msgnum',$cust_main->agentnum);
     if ( $msgnum ) {
       my $msg_template = qsearchs('msg_template', { msgnum => $msgnum });
-      $error = $msg_template->send($cust_main);
+      $cust_main->setfield('packages', \\@packages);
+      $cust_main->setfield('recurdates', \\@recurdates);
+      $error = $msg_template->send('cust_main' => $cust_main,
+                                   'object'    => $cust_main);
     }
     else {
       $error = $cust_main->notify( 'impending_recur_template',