[freeside-commits] branch FREESIDE_4_BRANCH updated. b7ecc6b125afafbc213e73c242eac1e551a636b4

[Ivan]

The branch, FREESIDE_4_BRANCH has been updated
       via  b7ecc6b125afafbc213e73c242eac1e551a636b4 (commit)
      from  46d94c06672255639c63691db91accc651f32ba6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b7ecc6b125afafbc213e73c242eac1e551a636b4
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Jun 28 17:23:46 2017 -0700

    fix country code browser on subsequent selections and add country name

diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index 414e1fa..99e88be 100644
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@ -118,6 +118,7 @@ if ( -e $addl_handler_use_file ) {
   #use FS::geocode_Mixin; #for its code2country
   use Locale::Currency;
   use Locale::Currency::Format;
+  use Number::Phone::Country qw( noexport );
   use Business::US::USPS::WebTools::AddressStandardization;
   use Geo::GoogleEarth::Pluggable;
   use LWP::UserAgent;
diff --git a/httemplate/browse/rate_region.html b/httemplate/browse/rate_region.html
index bbe2136..b872455 100644
--- a/httemplate/browse/rate_region.html
+++ b/httemplate/browse/rate_region.html
@@ -74,10 +74,9 @@ my @links      = ( ($link) x 4 );
 my @align      = ( 'right', 'left', 'right', 'left' );
 my @xls_format = ( ({ locked=>1, bg_color=>22 }) x 4 );
 
-$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 +127,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
       ).

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Mason.pm                     |    1 +
 httemplate/browse/rate_region.html |   23 ++++++++++++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)