agent-virtualize VoIP rates, RT#29183

[freeside.git] / FS / FS / cdr.pm

diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index d3e44fe..c2be4f2 100644 (file)
--- a/FS/FS/cdr.pm
+++ b/FS/FS/cdr.pm
@@ -896,8 +896,8 @@ sub rate_prefix {
       # The rate detail itself has included minutes.  We MUST have a place
       # to track them.
       my $included_min = $opt{'detail_included_min_hashref'}
-        or die "unable to rate CDR: rate detail has included minutes, but ".
-               "no detail_included_min_hashref provided.\n";
+        or return "unable to rate CDR: rate detail has included minutes, but ".
+                  "no detail_included_min_hashref provided.\n";
 
       # by default, set the included minutes for this region/time to
       # what's in the rate_detail
@@ -911,7 +911,7 @@ sub rate_prefix {
         $charge_sec -= ($included_min->{$regionnum}{$ratetimenum} * 60);
         $included_min->{$regionnum}{$ratetimenum} = 0;
       }
-    } elsif ( ${ $opt{'plan_included_min'} } > 0 ) {
+    } elsif ( $opt{plan_included_min} && ${ $opt{plan_included_min} } > 0 ) {
       # The package definition has included minutes, but only for in-group
       # rate details.  Decrement them if this is an in-group call.
       if ( $rate_detail->region_group ) {