X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Fphonenums.cgi;h=108a5f7cdbe4485f5a025716547b01e295a06f6f;hb=0fb307c305e4bc2c9c27dc25a3308beae3a4d33c;hp=2ed0f617df1e17e293c2fdc9247d81c8ddbc6c1c;hpb=63a268637b2d51a8766412617724b9436439deb6;p=freeside.git

diff --git a/httemplate/misc/phonenums.cgi b/httemplate/misc/phonenums.cgi
index 2ed0f617d..108a5f7cd 100644
--- a/httemplate/misc/phonenums.cgi
+++ b/httemplate/misc/phonenums.cgi
@@ -1,12 +1,8 @@
-%# [ <% join(', ', map { qq("$_") } @exchanges) %> ]
 <% objToJson(\@exchanges) %>
 <%init>
 
 my( $exchangestring, $svcpart ) = $cgi->param('arg');
 
-$exchangestring =~ /\((\d{3})-(\d{3})-XXXX\)\s*$/i
-  or die "unparsable exchange: $exchangestring";
-my( $areacode, $exchange ) = ( $1, $2 );
 my $part_svc = qsearchs('part_svc', { 'svcpart'=>$svcpart } );
 die "unknown svcpart $svcpart" unless $part_svc;
 
@@ -17,13 +13,24 @@ if ( scalar(@exports) > 1 ) {
   die "no DID providing export attached to svcpart $svcpart";
 }
 my $export = $exports[0];
+    
+my %opts = ();
+if ( $exchangestring eq 'tollfree' ) {
+    $opts{'tollfree'} = 1;
+}
+elsif ( $exchangestring =~ /^([\w\s]+), ([A-Z][A-Z])$/ ) {
+    $opts{'ratecenter'} = $1;
+    $opts{'state'} = $2;
+}
+else {
+    $exchangestring =~ /\((\d{3})-(\d{3})-XXXX\)\s*$/i
+      or die "unparsable exchange: $exchangestring";
+    my( $areacode, $exchange ) = ( $1, $2 );
+    $opts{'areacode'} = $areacode;
+    $opts{'exchange'} = $exchange;
+}
 
-my $something = $export->get_dids('areacode'=>$areacode,
-                                  'exchange'=>$exchange,
-                                 );
-
-#warn Dumper($something);
-
+my $something = $export->get_dids(%opts);
 my @exchanges = @{ $something };
 
 </%init>