projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT#30820: Report not working
[freeside.git]
/
FS
/
FS
/
part_pkg
/
flat_introrate.pm
diff --git
a/FS/FS/part_pkg/flat_introrate.pm
b/FS/FS/part_pkg/flat_introrate.pm
index
10c2056
..
1fc9cd2
100644
(file)
--- a/
FS/FS/part_pkg/flat_introrate.pm
+++ b/
FS/FS/part_pkg/flat_introrate.pm
@@
-1,12
+1,10
@@
package FS::part_pkg::flat_introrate;
package FS::part_pkg::flat_introrate;
+use base qw( FS::part_pkg::flat );
use strict;
use strict;
-use vars qw(@ISA %info $DEBUG $me);
-use FS::part_pkg::flat;
+use vars qw( %info );
-@ISA = qw(FS::part_pkg::flat);
-$me = '[' . __PACKAGE__ . ']';
-$DEBUG = 0;
+use FS::Log;
%info = (
'name' => 'Introductory price for X months, then flat rate,'.
%info = (
'name' => 'Introductory price for X months, then flat rate,'.
@@
-34,7
+32,10
@@
sub base_recur {
my ($duration) = ($self->option('intro_duration') =~ /^\s*(\d+)\s*$/);
unless (length($duration)) {
my ($duration) = ($self->option('intro_duration') =~ /^\s*(\d+)\s*$/);
unless (length($duration)) {
- die "Invalid intro_duration: " . $self->option('intro_duration');
+ my $log = FS::Log->new('FS::part_pkg');
+ $log->warning("Invalid intro_duration '".$self->option('intro_duration')."' on pkgpart ".$self->pkgpart
+ .", defaulting to 0, check package definition");
+ $duration = 0;
}
my $intro_end = $self->add_freq($cust_pkg->setup, $duration);
}
my $intro_end = $self->add_freq($cust_pkg->setup, $duration);