X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Frate.pm;h=793846a7fd19a234d85b4a3864ac104e61d41c51;hb=1d63fa587dad1f8dbd54ef576a10e5a209a6fa91;hp=257278a30dc273640e8dbc2a1e9b0a9dc0c6d3db;hpb=92adead1404db357a11b58f38c2b4403381a2809;p=freeside.git

diff --git a/FS/FS/rate.pm b/FS/FS/rate.pm
index 257278a30..793846a7f 100644
--- a/FS/FS/rate.pm
+++ b/FS/FS/rate.pm
@@ -272,9 +272,12 @@ sub check {
 =item dest_detail REGIONNUM | RATE_REGION_OBJECTD | HASHREF
 
 Returns the rate detail (see L<FS::rate_detail>) for this rate to the
-specificed destination.  Destination can be specified as an FS::rate_detail
-object or regionnum (see L<FS::rate_detail>), or as a hashref with two keys:
-I<countrycode> and I<phonenum>.
+specificed destination, or the empty string if no rate can be found for
+the given destination.
+
+Destination can be specified as an FS::rate_detail object or regionnum
+(see L<FS::rate_detail>), or as a hashref with two keys: I<countrycode>
+and I<phonenum>.
 
 =cut
 
@@ -284,13 +287,13 @@ sub dest_detail {
   my $regionnum;
   if ( ref($_[0]) eq 'HASH' ) {
 
-    my $countrycode = $_->{'countrycode'};
-    my $phonenum    = $_->{'phonenum'};
+    my $countrycode = $_[0]->{'countrycode'};
+    my $phonenum    = $_[0]->{'phonenum'};
 
-    #find a rate prefix, first look at most specific (4 digits) then 3, etc.,
+    #find a rate prefix, first look at most specific, then fewer digits,
     # finally trying the country code only
     my $rate_prefix = '';
-    for my $len ( reverse(1..6) ) {
+    for my $len ( reverse(1..10) ) {
       $rate_prefix = qsearchs('rate_prefix', {
         'countrycode' => $countrycode,
         #'npa'         => { op=> 'LIKE', value=> substr($number, 0, $len) }
@@ -302,10 +305,7 @@ sub dest_detail {
       'npa'         => '',
     });
 
-    #
-    #die "Can't find rate for call $to_or_from +$countrycode $number\n"
-    die "Can't find rate for +$countrycode $phonenum\n"
-      unless $rate_prefix;
+    return '' unless $rate_prefix;
 
     $regionnum = $rate_prefix->regionnum;
 
@@ -364,6 +364,7 @@ sub process {
         'dest_regionnum'  => $regionnum,
         map { $_ => $param->{"$_$regionnum"} }
             qw( min_included min_charge sec_granularity )
+            #qw( min_included conn_charge conn_sec min_charge sec_granularity )
       };
 
     } else {
@@ -371,6 +372,9 @@ sub process {
       new FS::rate_detail {
         'dest_regionnum'  => $regionnum,
         'min_included'    => 0,
+        'conn_charge'     => 0,
+        'conn_sec'        => 0,
+        'conn_charge'     => 0,
         'min_charge'      => 0,
         'sec_granularity' => '60'
       };
@@ -387,10 +391,13 @@ sub process {
   my $error = '';
   if ( $param->{'ratenum'} ) {
     warn "$rate replacing $old (". $param->{'ratenum'}. ")\n" if $DEBUG;
-    $error = $rate->replace( $old,
-                             'rate_detail' => \@rate_detail,
-                             'job'         => $job,
-                           );
+
+    my @param = ( 'job'=>$job );
+    push @param, 'rate_detail'=>\@rate_detail
+      unless $param->{'preserve_rate_detail'};
+
+    $error = $rate->replace( $old, @param );
+
   } else {
     warn "inserting $rate\n" if $DEBUG;
     $error = $rate->insert( 'rate_detail' => \@rate_detail,