X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Frate.pm;h=6430ff0815a4f9e5dce7f237195ccc07a3aca51e;hp=7c6a70e8e76ab6797ca2df1737ef747eacc619d3;hb=20f38e4c256094bd938b732950e8f93319f851a5;hpb=3bc7d019313160a918a55cca6ab530f58db3673d

diff --git a/FS/FS/rate.pm b/FS/FS/rate.pm
index 7c6a70e8e..6430ff081 100644
--- a/FS/FS/rate.pm
+++ b/FS/FS/rate.pm
@@ -2,14 +2,12 @@ package FS::rate;
 
 use strict;
 use vars qw( @ISA $DEBUG );
-use Storable qw(thaw);
-use Data::Dumper;
 use FS::Record qw( qsearch qsearchs dbh fields );
 use FS::rate_detail;
 
 @ISA = qw(FS::Record);
 
-$DEBUG = 1;
+$DEBUG = 0;
 
 =head1 NAME
 
@@ -271,16 +269,52 @@ sub check {
   $self->SUPER::check;
 }
 
-=item dest_detail REGIONNUM | RATE_REGION_OBJECTD
+=item dest_detail REGIONNUM | RATE_REGION_OBJECTD | HASHREF
 
 Returns the rate detail (see L<FS::rate_detail>) for this rate to the
-specificed destination.
+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>.
 
 =cut
 
 sub dest_detail {
   my $self = shift;
-  my $regionnum = ref($_[0]) ? shift->regionnum : shift;
+
+  my $regionnum;
+  if ( ref($_[0]) eq 'HASH' ) {
+
+    my $countrycode = $_[0]->{'countrycode'};
+    my $phonenum    = $_[0]->{'phonenum'};
+
+    #find a rate prefix, first look at most specific (4 digits) then 3, etc.,
+    # finally trying the country code only
+    my $rate_prefix = '';
+    for my $len ( reverse(1..10) ) {
+      $rate_prefix = qsearchs('rate_prefix', {
+        'countrycode' => $countrycode,
+        #'npa'         => { op=> 'LIKE', value=> substr($number, 0, $len) }
+        'npa'         => substr($phonenum, 0, $len),
+      } ) and last;
+    }
+    $rate_prefix ||= qsearchs('rate_prefix', {
+      'countrycode' => $countrycode,
+      '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;
+
+    $regionnum = $rate_prefix->regionnum;
+
+    #$rate_region = $rate_prefix->rate_region;
+
+  } else {
+    $regionnum = ref($_[0]) ? shift->regionnum : shift;
+  }
+
   qsearchs( 'rate_detail', { 'ratenum'        => $self->ratenum,
                              'dest_regionnum' => $regionnum,     } );
 }
@@ -309,15 +343,12 @@ Experimental job-queue processor for web interface adds/edits
 
 =cut
 
+use Storable qw(thaw);
+use Data::Dumper;
 use MIME::Base64;
 sub process {
   my $job = shift;
 
-  #my %param = @_;
-
-  #my $param = shift;
-  #my %param = split(/[;=]/, $param);
-
   my $param = thaw(decode_base64(shift));
   warn Dumper($param) if $DEBUG;
 
@@ -368,55 +399,10 @@ sub process {
     #$ratenum = $rate->getfield('ratenum');
   }
 
-  die $error if $error;
-
-}
-
-# begin JSRPC code...
-
-package FS::rate::JSRPC;
-use vars qw(@ISA $DEBUG);
-use JavaScript::RPC::Server::CGI;
-use FS::UID;
-@ISA = qw( JavaScript::RPC::Server::CGI );
-$DEBUG = 1;
-
-sub process_rate {
-  my $self = shift;
-
-  my %param = @_;
-  warn "FS::rate::JSRPC::process_rate\n".
-       join('', map "  $_ => $param{$_}\n", keys %param )
-    if $DEBUG;
+  die "$error\n" if $error;
 
-  #progressbar prototype code...  should be generalized
-  
-  #first get the CGI params shipped off to a job ASAP so an id can be returned
-  #to the caller
-  
-  my $job = new FS::queue { 'job' => 'FS::rate::process' };
-  
-  #too slow to insert all the cgi params as individual args..,?
-  #my $error = $queue->insert('_JOB', $cgi->Vars);
-  
-  #my $bigstring = join(';', map { "$_=". scalar($cgi->param($_)) } $cgi->param );
-  my $bigstring = join(';', map { "$_=". $param{$_} } keys %param );
-  my $error = $job->insert('_JOB', $bigstring);
-
-  if ( $error ) {
-    $error;
-  } else {
-    $job->jobnum;
-  }
-  
-}
-
-sub get_new_query {
-  FS::UID::cgi();
 }
 
-# end JSRPC code...
-
 =head1 BUGS
 
 =head1 SEE ALSO