[freeside-commits] freeside/httemplate/misc/process payment.cgi, 1.22.4.7, 1.22.4.8

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/misc/process
In directory wavetail.420.am:/tmp/cvs-serv10621/httemplate/misc/process

Modified Files:
      Tag: FREESIDE_2_3_BRANCH
	payment.cgi 
Log Message:
improve echeck validation for canada, deprecate echeck-nonus and cust_main-require-bank-branch config in favor of echeck-country, RT#15982

Index: payment.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/misc/process/payment.cgi,v
retrieving revision 1.22.4.7
retrieving revision 1.22.4.8
diff -u -w -d -r1.22.4.7 -r1.22.4.8
--- payment.cgi	30 Nov 2011 21:37:54 -0000	1.22.4.7
+++ payment.cgi	14 Jan 2012 07:05:17 -0000	1.22.4.8
@@ -86,8 +86,8 @@
     $cgi->param('payinfo2') =~ /^(\d+)$/
       or errorpage("Illegal ABA/routing number ". $cgi->param('payinfo2'));
     my $payinfo2 = $1;
-    if ( $conf->exists('cust_main-require-bank-branch') ) {
-      $cgi->param('payinfo3') =~ /^(\d+)$/
+    if ( $conf->config('echeck-country') eq 'CA' ) {
+      $cgi->param('payinfo3') =~ /^(\d{5})$/
         or errorpage("Illegal branch number ". $cgi->param('payinfo2'));
       $payinfo2 = "$1.$payinfo2";
     }