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

diff --git a/httemplate/browse/rate_region.html b/httemplate/browse/rate_region.html
index 4e4986987..1b4fd498f 100644
--- a/httemplate/browse/rate_region.html
+++ b/httemplate/browse/rate_region.html
@@ -15,6 +15,7 @@
      'header'         => \@header,
      'fields'         => \@fields,
      'links'          => \@links,
+     'align'          => \@align,
      'xls_format'     => \@xls_format,
    )
 %>
@@ -22,7 +23,7 @@
 
 my $edit_url = $p.'edit/rate_region.cgi';
 
-my $link = [ "$edit_url?", 'regionnum' ];
+my $link = [ "$edit_url?regionnum=", 'regionnum' ];
 
 my $html_init =
   'Regions and prefixes for VoIP and call billing.<BR><BR>'.
@@ -39,13 +40,13 @@ if ( driver_name =~ /^Pg/ ) {
                    "   THEN npa ".
                    "   ELSE npa || '-' || nxx ".
                    " END";
-  my $prefixes_sql = "SELECT $prefix_sql $fromwhere AND npa IS NOT NULL";
-  $select .= "( SELECT countrycode $fromwhere LIMIT 1 ) AS ccode, 
-              ARRAY_TO_STRING( ARRAY($prefixes_sql), ',' ) AS prefixes";
+  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 ) {
   $join = 'LEFT JOIN rate_prefix USING ( regionnum )';
-  $select .= "GROUP_CONCAT( DISTINCT countrycode ) AS ccode,
-              GROUP_CONCAT( npa ORDER BY npa     ) AS prefixes ";
+  $select .= "'+'||GROUP_CONCAT( DISTINCT countrycode ) AS ccode,
+              GROUP_CONCAT( npa ORDER BY npa SEPARATOR ', ' ) AS prefixes ";
   $group_sql = 'GROUP BY regionnum, regionname';
 } else {
   die 'unknown database '. driver_name;
@@ -61,15 +62,35 @@ tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities();
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
 
-my @header     = ( '#',         'Region',  'Country code', 'Prefixes' );
-my @fields     = ( 'regionnum', 'regionname',   'ccode',   'prefixes' );
-my @links      = ( ($link) x 4 );
-my @xls_format = ( ({ locked=>1, bg_color=>22 }) x 4 );
+my $sub_prefixes = sub {
+  my $region = shift;
+  $region->prefixes .
+  ($region->exact_match ? ' <I>(exact match only)</I>' : '');
+};
+
+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;
@@ -88,8 +109,9 @@ sub _rate_detail_factory {
   my( $rate, $field ) = @_;
   return sub {
     my $rate_detail = $rate->dest_detail(shift)
-                      || new FS::rate_region { 'min_included'    => 0,
+                      || new FS::rate_detail { 'min_included'    => 0,
                                                'min_charge'      => 0,
+                                               'min_cost'        => 0,
                                                'sec_granularity' => 0,
                                              };
     my $value = $rate_detail->$field();
@@ -119,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
       ).