X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fbrowse%2Frate_region.html;h=1b4fd498f548346d13713207ca4bb59b2000f944;hp=962841d914be4636a054a84618660cb64b30a53d;hb=c49cfd25a8f92c7a2f44b51d72506a21f6b8d09f;hpb=ba46a6a90321490da78c764657ae19d5c6fd81f8

diff --git a/httemplate/browse/rate_region.html b/httemplate/browse/rate_region.html
index 962841d91..1b4fd498f 100644
--- a/httemplate/browse/rate_region.html
+++ b/httemplate/browse/rate_region.html
@@ -40,7 +40,7 @@ if ( driver_name =~ /^Pg/ ) {
                    "   THEN npa ".
                    "   ELSE npa || '-' || nxx ".
                    " END";
-  my $prefixes_sql = "SELECT $prefix_sql $fromwhere AND npa IS NOT NULL";
+  my $prefixes_sql = "SELECT $prefix_sql $fromwhere AND npa IS NOT NULL ORDER BY npa";
   $select .= "( SELECT '+'||countrycode $fromwhere LIMIT 1 ) AS ccode, 
               ARRAY_TO_STRING( ARRAY($prefixes_sql), ', ' ) AS prefixes";
 } elsif ( driver_name =~ /^mysql/i ) {
@@ -68,16 +68,29 @@ my $sub_prefixes = sub {
   ($region->exact_match ? ' <I>(exact match only)</I>' : '');
 };
 
-my @header     = ( '#',         'Region',  'Country code', 'Prefixes' );
-my @fields     = ( 'regionnum', 'regionname',   'ccode',   $sub_prefixes );
-my @links      = ( ($link) x 4 );
-my @align      = ( 'right', 'left', 'right', 'left' );
-my @xls_format = ( ({ locked=>1, bg_color=>22 }) x 4 );
+my @header = ();
+my @fields = ();
+my @links = ();
+my @align = ();
+my @xls_format = ();
+
+if ( FS::Record->scalar_sql('SELECT 1 FROM rate_region WHERE agent_regionid IS NOT NULL LIMIT 1') ) {
+  push @header, 'Legacy #';
+  push @fields, 'agent_regionid';
+  push @links, $link;
+  push @align, 'right';
+  push @xls_format, { locked=>1, bg_color=>22};
+}
+
+push @header, 'Region',  'Country code', 'Prefixes';
+push @fields, 'regionname',   'ccode',   $sub_prefixes;
+push @links, ($link) x 3;
+push @align, 'left', 'right', 'left';
+push @xls_format, ({ locked=>1, bg_color=>22 }) x 3;
 
-$cgi->param('dummy', 1);
 my $countrycode_filter_change =
   "window.location = '".
-  $cgi->self_url. ";countrycode=' + this.options[this.selectedIndex].value;";
+  $cgi->url. "?countrycode=' + this.options[this.selectedIndex].value;";
 
 my $countrycode = '';
 my $extra_sql = $group_sql;
@@ -128,13 +141,31 @@ if ( $cgi->param('show_rates') ) {
 
 }
 
+sub countrycode2country {
+  my $cc = shift;
+
+  #exceptions to the below
+  return 'North America (NANPA)'                     if $cc eq '1';
+  #return 'Algeria'                                   if $cc eq '214';
+  return 'Ascension Island'                          if $cc eq '247';
+  return 'Satellite / Maritime / Universal Personal' if $cc eq '87'; #? or 870..
+  return 'Inmarsat'                                  if $cc eq '870';
+  return 'Global Mobile Satellite System'            if $cc eq '881';
+  return 'International Networks'                    if $cc eq '882';
+  return 'International Networks'                    if $cc eq '883';
+
+  code2country(
+    Number::Phone::Country::phone2country("+$cc")
+  );
+}
+
 my $html_posttotal = 
   '(show country code: '.
   qq(<SELECT NAME="countrycode" onChange="$countrycode_filter_change">).
   qq(<OPTION VALUE="">(all)).
   join("\n", map { qq(<OPTION VALUE="$_").
                      ($_ eq $countrycode ? ' SELECTED' : '' ).
-                     ">$_",
+                     ">+$_ - ". encode_entities( countrycode2country($_) ),
                  }
                  FS::rate_prefix->all_countrycodes
       ).