diff options
| author | Jonathan Prykop <jonathan@freeside.biz> | 2016-06-21 23:07:14 -0500 |
|---|---|---|
| committer | Jonathan Prykop <jonathan@freeside.biz> | 2016-06-22 04:30:22 -0500 |
| commit | c48c1ed2ac975eb3b5b97f7876978b90fae4f316 (patch) | |
| tree | 23d2eb3d0ab643c546ed9b1ae57a0580b4401e6f | |
| parent | 6acb603bb4422ca282b29e962291eb3d0d86d7bd (diff) | |
RT#30820: Report not working [v3 merge]
| -rw-r--r-- | FS/FS/log_context.pm | 1 | ||||
| -rw-r--r-- | FS/FS/part_pkg/flat_introrate.pm | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/FS/FS/log_context.pm b/FS/FS/log_context.pm index ddea77119..d7ea26b37 100644 --- a/FS/FS/log_context.pm +++ b/FS/FS/log_context.pm @@ -10,6 +10,7 @@ my @contexts = ( qw( FS::cust_main::Billing::bill_and_collect FS::cust_main::Billing::bill FS::cust_main::Billing_Realtime::realtime_verify_bop + FS::part_pkg FS::Misc::Geo::standardize_uscensus Cron::bill Cron::upload diff --git a/FS/FS/part_pkg/flat_introrate.pm b/FS/FS/part_pkg/flat_introrate.pm index 733760276..1fc9cd262 100644 --- a/FS/FS/part_pkg/flat_introrate.pm +++ b/FS/FS/part_pkg/flat_introrate.pm @@ -4,6 +4,8 @@ use base qw( FS::part_pkg::flat ); use strict; use vars qw( %info ); +use FS::Log; + %info = ( 'name' => 'Introductory price for X months, then flat rate,'. 'relative to setup date (anniversary billing)', @@ -30,7 +32,10 @@ sub base_recur { 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); |