From 5fd15230317a0a6b6fcb70d5b83712c8f827ebb1 Mon Sep 17 00:00:00 2001 From: Jonathan Prykop Date: Tue, 21 Jun 2016 23:07:14 -0500 Subject: [PATCH] RT#30820: Report not working --- FS/FS/log_context.pm | 1 + FS/FS/part_pkg/flat_introrate.pm | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/FS/FS/log_context.pm b/FS/FS/log_context.pm index ab1b0c388..83414a680 100644 --- a/FS/FS/log_context.pm +++ b/FS/FS/log_context.pm @@ -11,6 +11,7 @@ my @contexts = ( qw( FS::cust_main::Billing::bill FS::cust_main::Billing_Realtime::realtime_verify_bop FS::pay_batch::import_from_gateway + FS::part_pkg FS::Misc::Geo::standardize_uscensus Cron::bill Cron::backup 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); -- 2.11.0