make customer location columns available in various reports, #940

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

diff --git a/FS/FS/rate_region.pm b/FS/FS/rate_region.pm
index 7945f52..f4a0ab1 100644 (file)
--- a/FS/FS/rate_region.pm
+++ b/FS/FS/rate_region.pm
@@ -248,6 +248,7 @@ Returns all prefixes (see L<FS::rate_prefix>) for this region.
 sub rate_prefix {
   my $self = shift;
 
+  map { $_ } #return $self->num_rate_prefix unless wantarray;
   sort {    $a->countrycode cmp $b->countrycode
          or $a->npa         cmp $b->npa
          or $a->nxx         cmp $b->nxx
@@ -264,7 +265,7 @@ destionation.
 
 sub dest_detail {
   my $self = shift;
-  qsearch( 'rate_detail', { 'dest_regionnum' => $self->regionnum, } );
+  qsearch( 'rate_detail', { 'dest_regionnum' => $self->regionnum } );
 }
 
 =item prefixes_short
@@ -281,13 +282,22 @@ sub prefixes_short {
 
   foreach my $rate_prefix ( $self->rate_prefix ) {
     if ( $countrycode ne $rate_prefix->countrycode ) {
-      $out =~ s/,$//;
+      $out =~ s/, $//;
       $countrycode = $rate_prefix->countrycode;
-      $out.= " $countrycode-";
+      $out.= " +$countrycode ";
     }
-    $out .= $rate_prefix->npa. ',';
+    my $npa = $rate_prefix->npa;
+    if ( $countrycode eq '1' ) {
+      #$out .= '('. substr( $npa, 0, 3 ). ')';
+      $out .= substr( $npa, 0, 3 );
+      $out .= ' '. substr( $npa, 3 ) if length($npa) > 3;
+    } else {
+      $out .= $rate_prefix->npa;
+    }
+    $out .= '-'. $rate_prefix->nxx if $rate_prefix->nxx;
+    $out .= ', ';
   }
-  $out =~ s/,$//;
+  $out =~ s/, $//;
 
   $out;
 }