From: mark <mark>
Date: Wed, 1 Sep 2010 18:45:31 +0000 (+0000)
Subject: packages and recurdates for impending_recur templates
X-Git-Tag: freeside_1_9_5~35
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;ds=sidebyside;h=86eee2adbcb794043b1b40443501fcec1332ea72;p=freeside.git

packages and recurdates for impending_recur templates
---

diff --git a/FS/FS/Cron/notify.pm b/FS/FS/Cron/notify.pm
index 7664ff2ff..f3eb96030 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;
 
@@ -106,7 +106,9 @@ 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);
     }
     else {
       $error = $cust_main->notify( 'impending_recur_template',
diff --git a/FS/FS/msg_template.pm b/FS/FS/msg_template.pm
index b1ae6be78..ec3416d6a 100644
--- a/FS/FS/msg_template.pm
+++ b/FS/FS/msg_template.pm
@@ -316,6 +316,7 @@ sub substitutions {
 
       signupdate dundate
       expdate
+      packages recurdates
       ),
       # expdate is a special case
       [ signupdate_ymd    => sub { time2str('%Y-%m-%d', shift->signupdate) } ],