[freeside-commits] freeside/FS/FS Conf.pm, 1.470, 1.471 cust_main.pm, 1.586, 1.587 payinfo_Mixin.pm, 1.14, 1.15

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv22176/FS/FS

Modified Files:
	Conf.pm cust_main.pm payinfo_Mixin.pm 
Log Message:
echeck options to hide routing number and add account owner name, RT#13885

Index: Conf.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Conf.pm,v
retrieving revision 1.470
retrieving revision 1.471
diff -u -w -d -r1.470 -r1.471
--- Conf.pm	2 Aug 2011 01:26:19 -0000	1.470
+++ Conf.pm	6 Aug 2011 00:50:48 -0000	1.471
@@ -2959,6 +2959,13 @@
   },
 
   {
+    'key'         => 'echeck-no_routing',
+    'section'     => 'billing',
+    'description' => 'Disable the routing number entirely for Electronic Check payment info.',
+    'type'        => 'checkbox',
+  },
+
+  {
     'key'         => 'voip-cust_accountcode_cdr',
     'section'     => 'telephony',
     'description' => 'Enable the per-customer option for CDR breakdown by accountcode.',

Index: payinfo_Mixin.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/payinfo_Mixin.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -w -d -r1.14 -r1.15
--- payinfo_Mixin.pm	12 Jul 2011 03:54:06 -0000	1.14
+++ payinfo_Mixin.pm	6 Aug 2011 00:50:48 -0000	1.15
@@ -165,7 +165,8 @@
       # Checks (Show last 2 @ bank)
       my( $account, $aba ) = split('@', $payinfo );
       return 'x'x(length($account)-2).
-             substr($account,(length($account)-2))."@".$aba;
+             substr($account,(length($account)-2)).
+             ( length($aba) ? "@".$aba : '');
 
     } else { # Tie up loose ends
       return $payinfo;

Index: cust_main.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main.pm,v
retrieving revision 1.586
retrieving revision 1.587
diff -u -w -d -r1.586 -r1.587
--- cust_main.pm	20 Jul 2011 21:16:16 -0000	1.586
+++ cust_main.pm	6 Aug 2011 00:50:48 -0000	1.587
@@ -1933,8 +1933,10 @@
     if ( $conf->exists('cust_main-require-bank-branch') ) {
       $payinfo =~ /^(\d+)\@(\d+)\.(\d+)$/ or return 'invalid echeck account at branch.bank';
       $payinfo = "$1\@$2.$3";
-    }
-    elsif ( $conf->exists('echeck-nonus') ) {
+    } elsif ( $conf->exists('echeck-no_routing') ) {
+      $payinfo =~ /^(\d+)\@(\d*)$/ or return 'invalid echeck account';
+      $payinfo = "$1\@$2";
+    } elsif ( $conf->exists('echeck-nonus') ) {
       $payinfo =~ /^(\d+)\@(\d+)$/ or return 'invalid echeck account at aba';
       $payinfo = "$1\@$2";
     } else {