[freeside-commits] branch master updated. a616d0c27799413dfbe07ee86e75df3e0d5a740f

[Ivan]

The branch, master has been updated
       via  a616d0c27799413dfbe07ee86e75df3e0d5a740f (commit)
       via  c4e1d36c46b1e0e4554af2dc36f19b65bf840758 (commit)
       via  c6297fc9d80c00a2a32d0e9d1fad5debfe53823d (commit)
      from  6244b8c0e65cfdfe4c7d3c856e6fb377e2118d5e (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 a616d0c27799413dfbe07ee86e75df3e0d5a740f
Merge: c4e1d36 6244b8c
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Jun 28 17:23:32 2017 -0700

    Merge branch 'master' of git.freeside.biz:/home/git/freeside


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

    git wtf?

diff --git a/bin/cust_main.restore-paymask b/bin/cust_main.restore-paymask
new file mode 100755
index 0000000..c6c8a75
--- /dev/null
+++ b/bin/cust_main.restore-paymask
@@ -0,0 +1,31 @@
+#!/usr/bin/perl
+
+use strict;
+use FS::UID qw( adminsuidsetup );
+use FS::Record qw( qsearch dbh );
+
+adminsuidsetup shift
+  or die "Usage: cust_main.restore-paymask freeside_username\n";
+
+foreach my $cust_main ( 
+  qsearch({ 'table' => 'cust_main',
+            'extra_sql' => q[WHERE payby IN ('CARD','DCRD') AND paymask IS NULL OR paymask = 'N/A (tokenized)'],
+         })
+) {
+
+  my $custnum = $cust_main->custnum;
+
+  my $paymask = FS::Record->scalar_sql(qq[
+    SELECT paymask FROM h_cust_main WHERE custnum = $custnum AND history_action = 'replace_old' AND paymask IS NOT NULL AND paymask != 'N/A (tokenized)' ORDER BY historynum desc LIMIT 1
+  ]);
+
+  #dbh->do(
+  print
+    qq[UPDATE cust_main SET paymask = '$paymask' WHERE custnum = $custnum;]
+  ."\n"
+  ;
+
+  #print "$custnum: $paymask\n";
+}
+
+1;

commit c6297fc9d80c00a2a32d0e9d1fad5debfe53823d
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Jun 28 17:21:12 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 89140ca..da2f582 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 +
 bin/cust_main.restore-paymask      |   31 +++++++++++++++++++++++++++++++
 httemplate/browse/rate_region.html |   23 ++++++++++++++++++++---
 3 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100755 bin/cust_main.restore-paymask