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

diff --git a/httemplate/misc/payment.cgi b/httemplate/misc/payment.cgi
index 813b560bd..447cfa3c1 100644
--- a/httemplate/misc/payment.cgi
+++ b/httemplate/misc/payment.cgi
@@ -1,18 +1,16 @@
-<% include( '/elements/header.html', "Process $type{$payby} payment" ) %>
-<% include( '/elements/small_custview.html', $cust_main, '', '', popurl(2) . "view/cust_main.cgi" ) %>
+<& /elements/header.html, mt("Process [_1] payment",$type{$payby})  &>
+<& /elements/small_custview.html, $cust_main, '', '', popurl(2) . "view/cust_main.cgi" &>
 <FORM NAME="OneTrueForm" ACTION="process/payment.cgi" METHOD="POST" onSubmit="document.OneTrueForm.process.disabled=true">
 <INPUT TYPE="hidden" NAME="custnum"   VALUE="<% $custnum %>">
 <INPUT TYPE="hidden" NAME="payby"     VALUE="<% $payby %>">
 <INPUT TYPE="hidden" NAME="payunique" VALUE="<% $payunique %>">
 <INPUT TYPE="hidden" NAME="balance"   VALUE="<% $balance %>">
 
-<% include('/elements/init_overlib.html') %>
-
-% #include( '/elements/table.html', '#cccccc' ) 
+<& /elements/init_overlib.html &>
 
 <% ntable('#cccccc') %>
   <TR>
-    <TH ALIGN="right">Payment amount</TH>
+    <TH ALIGN="right"><% mt('Payment amount') |h %></TH>
     <TD COLSPAN=7>
       <TABLE><TR><TD BGCOLOR="#ffffff">
         <% $money_char %><INPUT NAME     = "amount"
@@ -67,6 +65,10 @@
 
 % }
 
+<& /elements/tr-select-discount_term.html,
+             'custnum' => $custnum,
+             'cgi'     => $cgi
+&>
 
 % if ( $payby eq 'CARD' ) {
 %
@@ -80,13 +82,13 @@
 %   }
 
     <TR>
-      <TH ALIGN="right">Card&nbsp;number</TH>
+      <TH ALIGN="right"><% mt('Card number') |h %></TH>
       <TD COLSPAN=7>
         <TABLE>
           <TR>
             <TD>
               <INPUT TYPE="text" NAME="payinfo" SIZE=20 MAXLENGTH=19 VALUE="<%$payinfo%>"> </TD>
-            <TH>Exp.</TH>
+            <TH><% mt('Exp.') |h %></TH>
             <TD>
               <SELECT NAME="month">
 % for ( ( map "0$_", 1 .. 9 ), 10 .. 12 ) { 
@@ -111,22 +113,21 @@
       </TD>
     </TR>
     <TR>
-      <TH ALIGN="right">CVV2</TH>
+      <TH ALIGN="right"><% mt('CVV2') |h %></TH>
       <TD><INPUT TYPE="text" NAME="paycvv" VALUE="<% $paycvv %>" SIZE=4 MAXLENGTH=4>
-          (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('../docs/cvv2.html', 480, 352, 'cvv2_popup' ), CAPTION, 'CVV2 Help', STICKY, AUTOSTATUSCAP, CLOSECLICK, DRAGGABLE ); return false;">help</A>)
+          (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('../docs/cvv2.html', 480, 352, 'cvv2_popup' ), CAPTION, 'CVV2 Help', STICKY, AUTOSTATUSCAP, CLOSECLICK, DRAGGABLE ); return false;"><% mt('help') |h %></A>)
       </TD>
     </TR>
     <TR>
-      <TH ALIGN="right">Exact&nbsp;name&nbsp;on&nbsp;card</TH>
+      <TH ALIGN="right"><% mt('Exact name on card') |h %></TH>
       <TD><INPUT TYPE="text" SIZE=32 MAXLENGTH=80 NAME="payname" VALUE="<%$payname%>"></TD>
     </TR>
 
-    <% include( '/elements/location.html',
+    <& /elements/location.html,
                   'object'         => $cust_main, #XXX errors???
                   'no_asterisks'   => 1,
-                  'address1_label' => 'Card billing address',
-              )
-    %>
+                  'address1_label' => emt('Card billing address'),
+    &>
 
 % } elsif ( $payby eq 'CHEK' ) {
 %
@@ -134,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;
@@ -148,34 +149,37 @@
     <INPUT TYPE="hidden" NAME="month" VALUE="12">
     <INPUT TYPE="hidden" NAME="year" VALUE="2037">
     <TR>
-      <TD ALIGN="right">Account&nbsp;number</TD>
+      <TD ALIGN="right"><% mt('Account number') |h %></TD>
       <TD><INPUT TYPE="text" SIZE=10 NAME="payinfo1" VALUE="<%$payinfo1%>"></TD>
-      <TD ALIGN="right">Type</TD>
+      <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>
+%   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">ABA/Routing&nbsp;number</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;">help</A>)
-      </TD>
-    </TR>
-    <TR>
-      <TD ALIGN="right">Bank&nbsp;name</TD>
+      <TD ALIGN="right"><% mt('Bank name') |h %></TD>
       <TD><INPUT TYPE="text" NAME="payname" VALUE="<%$payname%>"></TD>
     </TR>
 
 %   if ( $conf->exists('show_bankstate') ) {
       <TR>
-        <TD ALIGN="right">Bank&nbsp;state</TD>
-        <TD><% include('/elements/select-state.html',
+        <TD ALIGN="right"><% mt('Bank state') |h %></TD>
+        <TD><& /elements/select-state.html,
                          'disable_empty' => 0,
-                         'empty_label'   => '(choose)',
+                         'empty_label'   => emt('(choose)'),
                          'state'         => $paystate,
                          'country'       => $cust_main->country,
                          'prefix'        => 'pay',
-                      )
-            %>
+            &>
         </TD>
       </TR>
 %   } else {
@@ -185,8 +189,8 @@
 %   if ( $conf->exists('show_ss') ) {
       <TR>
         <TD ALIGN="right">
-          Account&nbsp;holder<BR>
-          Social&nbsp;security&nbsp;or&nbsp;tax&nbsp;ID&nbsp;#
+          <% mt('Account holder') |h %><BR>
+          <% mt('Social security or tax ID #') |h %> 
         </TD>
         <TD><INPUT TYPE="text" NAME="ss" VALUE="<% $ss %>"></TD>
       </TR>
@@ -197,19 +201,18 @@
 %   if ( $conf->exists('show_stateid') ) {
       <TR>
         <TD ALIGN="right">
-          Account&nbsp;holder<BR>
-          Driver&rsquo;s&nbsp;license&nbsp;or&nbsp;state&nbsp;ID&nbsp;#
+          <% mt('Account holder') |h %><BR>
+          <% mt("Driver's license or state ID #") |h %> 
         </TD>
         <TD><INPUT TYPE="text" NAME="stateid" VALUE="<% $stateid %>"></TD>
-        <TD ALIGN="right">State</TD>
-        <TD><% include('/elements/select-state.html',
+        <TD ALIGN="right"><% mt('State') |h %></TD>
+        <TD><& /elements/select-state.html,
                          'disable_empty' => 0,
-                         'empty_label'   => '(choose)',
+                         'empty_label'   => emt('(choose)'),
                          'state'         => $stateid_state,
                          'country'       => $cust_main->country,
                          'prefix'        => 'stateid_',
-                      )
-            %>
+            &>
         </TD>
       </TR>
 %   } else {
@@ -223,7 +226,7 @@
 <TR>
   <TD COLSPAN=2>
     <INPUT TYPE="checkbox" CHECKED NAME="save" VALUE="1">
-    Remember this information
+    <% mt('Remember this information') |h %>
   </TD>
 </TR>
 
@@ -240,7 +243,7 @@
           <TR>
             <TD COLSPAN=2>
               <INPUT TYPE="checkbox" NAME="batch" VALUE="1">
-              Add to current batch
+              <% mt('Add to current batch') |h %> 
             </TD>
           </TR>
 
@@ -250,17 +253,17 @@
 <TR>
   <TD COLSPAN=2>
     <INPUT TYPE="checkbox"<% ( ( $payby eq 'CARD' && $cust_main->payby ne 'DCRD' ) || ( $payby eq 'CHEK' && $cust_main->payby eq 'CHEK' ) ) ? ' CHECKED' : '' %> NAME="auto" VALUE="1" onClick="if (this.checked) { document.OneTrueForm.save.checked=true; }">
-    Charge future payments to this <% $type{$payby} %> automatically
+    <% mt("Charge future payments to this [_1] automatically",$type{$payby}) |h %> 
   </TD>
 </TR>
 
 </TABLE>
 
 <BR>
-<INPUT TYPE="submit" NAME="process" VALUE="Process payment">
+<INPUT TYPE="submit" NAME="process" VALUE="<% mt('Process payment') |h %>">
 </FORM>
 
-<% include('/elements/footer.html') %>
+<& /elements/footer.html &>
 <%init>
 
 die "access denied"
@@ -327,6 +330,10 @@ if ( $balance > 0 ) {
   $amount = $balance;
   $amount += $fee
     if $fee && $fee_display eq 'subtract';
+
+  my $cc_surcharge_pct = $conf->config('credit-card-surcharge-percentage');
+  $amount += $amount * $cc_surcharge_pct/100 if $cc_surcharge_pct > 0;
+
   $amount = sprintf("%.2f", $amount);
 }