projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
import torrus 1.0.9
[freeside.git]
/
FS
/
FS
/
Cron
/
notify.pm
diff --git
a/FS/FS/Cron/notify.pm
b/FS/FS/Cron/notify.pm
index
74840a6
..
3d427b2
100644
(file)
--- 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 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;
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 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
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'
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
)
END
@@
-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 });
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',
}
else {
$error = $cust_main->notify( 'impending_recur_template',