multiple DID provisioning, RT#13721

3 files changed, 57 insertions, 47 deletions

diff --git a/httemplate/misc/areacodes.cgi b/httemplate/misc/areacodes.cgi
index 69c9573c3..9d32a3baf 100644
--- a/httemplate/misc/areacodes.cgi
+++ b/httemplate/misc/areacodes.cgi
@@ -1,4 +1,3 @@
-%# [ <% join(', ', map { qq("$_") } @areacodes) %> ]
 <% objToJson(\@areacodes) %>
 <%init>
 
@@ -7,18 +6,21 @@ my( $state, $svcpart ) = $cgi->param('arg');
 my $part_svc = qsearchs('part_svc', { 'svcpart'=>$svcpart } );
 die "unknown svcpart $svcpart" unless $part_svc;
 
-my @exports = $part_svc->part_export_did;
-if ( scalar(@exports) > 1 ) {
-  die "more than one DID-providing export attached to svcpart $svcpart";
-} elsif ( ! @exports ) {
-  die "no DID providing export attached to svcpart $svcpart";
-}
-my $export = $exports[0];
+my @areacodes = ();
+if ( $state ) {
+
+  my @exports = $part_svc->part_export_did;
+  if ( scalar(@exports) > 1 ) {
+    die "more than one DID-providing export attached to svcpart $svcpart";
+  } elsif ( ! @exports ) {
+    die "no DID providing export attached to svcpart $svcpart";
+  }
+  my $export = $exports[0];
 
-my $something = $export->get_dids('state'=>$state);
+  my $something = $export->get_dids('state'=>$state);
 
-#warn Dumper($something);
+  @areacodes = @{ $something };
 
-my @areacodes = @{ $something };
+}
 
 </%init>
diff --git a/httemplate/misc/exchanges.cgi b/httemplate/misc/exchanges.cgi
index f5860cff2..8a67f7bab 100644
--- a/httemplate/misc/exchanges.cgi
+++ b/httemplate/misc/exchanges.cgi
@@ -1,4 +1,3 @@
-%# [ <% join(', ', map { qq("$_") } @exchanges) %> ]
 <% objToJson(\@exchanges) %>
 <%init>
 
@@ -7,18 +6,21 @@ my( $areacode, $svcpart ) = $cgi->param('arg');
 my $part_svc = qsearchs('part_svc', { 'svcpart'=>$svcpart } );
 die "unknown svcpart $svcpart" unless $part_svc;
 
-my @exports = $part_svc->part_export_did;
-if ( scalar(@exports) > 1 ) {
-  die "more than one DID-providing export attached to svcpart $svcpart";
-} elsif ( ! @exports ) {
-  die "no DID providing export attached to svcpart $svcpart";
-}
-my $export = $exports[0];
+my @exchanges = ();
+if ( $areacode ) {
+
+  my @exports = $part_svc->part_export_did;
+  if ( scalar(@exports) > 1 ) {
+    die "more than one DID-providing export attached to svcpart $svcpart";
+  } elsif ( ! @exports ) {
+    die "no DID providing export attached to svcpart $svcpart";
+  }
+  my $export = $exports[0];
 
-my $something = $export->get_dids('areacode'=>$areacode);
+  my $something = $export->get_dids('areacode'=>$areacode);
 
-#warn Dumper($something);
+  @exchanges = @{ $something };
 
-my @exchanges = @{ $something };
+}
 
 </%init>
diff --git a/httemplate/misc/phonenums.cgi b/httemplate/misc/phonenums.cgi
index 108a5f7cd..784a19016 100644
--- a/httemplate/misc/phonenums.cgi
+++ b/httemplate/misc/phonenums.cgi
@@ -1,4 +1,4 @@
-<% objToJson(\@exchanges) %>
+<% objToJson(\@phonenums) %>
 <%init>
 
 my( $exchangestring, $svcpart ) = $cgi->param('arg');
@@ -6,31 +6,37 @@ my( $exchangestring, $svcpart ) = $cgi->param('arg');
 my $part_svc = qsearchs('part_svc', { 'svcpart'=>$svcpart } );
 die "unknown svcpart $svcpart" unless $part_svc;
 
-my @exports = $part_svc->part_export_did;
-if ( scalar(@exports) > 1 ) {
-  die "more than one DID-providing export attached to svcpart $svcpart";
-} elsif ( ! @exports ) {
-  die "no DID providing export attached to svcpart $svcpart";
-}
-my $export = $exports[0];
+my @phonenums = ();
+
+if ( $exchangestring ) {
+
+  my @exports = $part_svc->part_export_did;
+  if ( scalar(@exports) > 1 ) {
+    die "more than one DID-providing export attached to svcpart $svcpart";
+  } elsif ( ! @exports ) {
+    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 %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(%opts);
-my @exchanges = @{ $something };
+  my $something = $export->get_dids(%opts);
+  @phonenums = @{ $something };
+
+}
 
 </%init>