X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Fpayment.cgi;h=447cfa3c1311f31188c5f0088e14c523e77b833c;hb=3d62ec9362d0b22c17a17da6197f8b2fc219a54e;hp=4c02da06646f38cfb5391f182c50d6f4d8e3daca;hpb=8ef00c68688492b2afa3dde8d3d467f89f238c40;p=freeside.git

diff --git a/httemplate/misc/payment.cgi b/httemplate/misc/payment.cgi
index 4c02da066..447cfa3c1 100644
--- a/httemplate/misc/payment.cgi
+++ b/httemplate/misc/payment.cgi
@@ -135,7 +135,7 @@
 %       $stateid, $stateid_state )
 %     = ( '', '', '', '', '', '', '', '' );
 %   if ( $cust_main->payby =~ /^(CHEK|DCHK)$/ ) {
-%     $cust_main->paymask =~ /^([\dx]+)\@([\dx]+)$/i
+%     $cust_main->paymask =~ /^([\dx]+)\@([\dx]*)$/i
 %       or die "unparsable payinfo ". $cust_main->payinfo;
 %     ($payinfo1, $payinfo2) = ($1, $2);
 %     $payname = $cust_main->payname;
@@ -154,13 +154,17 @@
       <TD ALIGN="right"><% mt('Type') |h %></TD>
       <TD><SELECT NAME="paytype"><% join('', map { qq!<OPTION VALUE="$_" !.($paytype eq $_ ? 'SELECTED' : '').">$_</OPTION>" } @FS::cust_main::paytypes) %></SELECT></TD>
     </TR>
-    <TR>
-      <TD ALIGN="right"><% mt('ABA/Routing number') |h %></TD>
-      <TD>
-        <INPUT TYPE="text" SIZE=10 MAXLENGTH=9 NAME="payinfo2" VALUE="<%$payinfo2%>">
-        (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('../docs/ach.html', 380, 240, 'ach_popup' ), CAPTION, 'ACH Help', STICKY, AUTOSTATUSCAP, CLOSECLICK, DRAGGABLE ); return false;"><% mt('help') |h %></A>)
-      </TD>
-    </TR>
+%   if ( $conf->exists('echeck-no_routing') ) {
+      <INPUT TYPE="text" NAME="payinfo2" VALUE="<%$payinfo2%>">
+%   } else {
+      <TR>
+        <TD ALIGN="right"><% mt('ABA/Routing number') |h %></TD>
+        <TD>
+          <INPUT TYPE="text" SIZE=10 MAXLENGTH=9 NAME="payinfo2" VALUE="<%$payinfo2%>">
+          (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('../docs/ach.html', 380, 240, 'ach_popup' ), CAPTION, 'ACH Help', STICKY, AUTOSTATUSCAP, CLOSECLICK, DRAGGABLE ); return false;"><% mt('help') |h %></A>)
+        </TD>
+      </TR>
+%   }
     <TR>
       <TD ALIGN="right"><% mt('Bank name') |h %></TD>
       <TD><INPUT TYPE="text" NAME="payname" VALUE="<%$payname%>"></TD>
@@ -222,7 +226,7 @@
 <TR>
   <TD COLSPAN=2>
     <INPUT TYPE="checkbox" CHECKED NAME="save" VALUE="1">
-    <% mt('Remember this informatio') |h %>
+    <% mt('Remember this information') |h %>
   </TD>
 </TR>
 
@@ -265,8 +269,8 @@
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Process payment');
 
-my %type = ( 'CARD' => emt('credit card'),
-             'CHEK' => emt('electronic check (ACH)'),
+my %type = ( 'CARD' => 'credit card',
+             'CHEK' => 'electronic check (ACH)',
            );
 
 $cgi->param('payby') =~ /^(CARD|CHEK)$/