import torrus 1.0.9

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

diff --git a/FS/FS/rate.pm b/FS/FS/rate.pm
index 6430ff0..f30e4c7 100644 (file)
--- a/FS/FS/rate.pm
+++ b/FS/FS/rate.pm
@@ -272,9 +272,16 @@ 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>.
+
+An optional third key, I<weektime>, will return a timed rate (one with 
+a non-null I<ratetimenum>) if one exists for a call at that time.  If 
+no matching timed rate exists, the non-timed rate will be returned.
 
 =cut
 
@@ -282,12 +289,14 @@ sub dest_detail {
   my $self = shift;
 
   my $regionnum;
+  my $weektime;
   if ( ref($_[0]) eq 'HASH' ) {
 
     my $countrycode = $_[0]->{'countrycode'};
     my $phonenum    = $_[0]->{'phonenum'};
+    $weektime       = $_[0]->{'weektime'};
 
-    #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..10) ) {
@@ -302,10 +311,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;
 
@@ -314,9 +320,31 @@ sub dest_detail {
   } else {
     $regionnum = ref($_[0]) ? shift->regionnum : shift;
   }
-
-  qsearchs( 'rate_detail', { 'ratenum'        => $self->ratenum,
-                             'dest_regionnum' => $regionnum,     } );
+  
+  if(!defined($weektime)) {
+    return qsearchs( 'rate_detail', 
+                            { 'ratenum'        => $self->ratenum,
+                              'dest_regionnum' => $regionnum,
+                              'ratetimenum'    => '',
+                            } );
+  }
+  else {
+    my @details = grep { my $rate_time = $_->rate_time;
+                            $rate_time && $rate_time->contains($weektime) }
+                       qsearch( 'rate_detail',
+                                    { 'ratenum'        => $self->ratenum,
+                                      'dest_regionnum' => $regionnum, } );
+    if(!@details) {
+      # this may change at some point
+      return $self->dest_detail($regionnum);
+    }
+    elsif(@details == 1) {
+      return $details[0];
+    }
+    else {
+      die "overlapping rate_detail times (region $regionnum, time $weektime)\n";
+    }
+  }
 }
 
 =item rate_detail
@@ -364,6 +392,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 +400,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 +419,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,