X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpayment_history.html;h=580a30751a4355be052ca694804773715ddb1b91;hb=3d62ec9362d0b22c17a17da6197f8b2fc219a54e;hp=111810e4ff84828b700bf0567a7efd89ccf26aed;hpb=f099e0dfa8f438a84d8f1bce36f5e5bda60481e5;p=freeside.git

diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index 111810e4f..580a30751 100644
--- a/httemplate/view/cust_main/payment_history.html
+++ b/httemplate/view/cust_main/payment_history.html
@@ -1,43 +1,46 @@
+<TABLE>
+  <TR>
+    <TD ALIGN="left">
+
 %# payment links
 
 % my $s = 0;
 % if ( $payby{'BILL'} && $curuser->access_right(['Post payment', 'Post check payment' ]) ) { 
   <% $s++ ? ' | ' : '' %>
-  <% include('/elements/popup_link-cust_main.html',
-               'label'       => 'Enter check payment',
+  <& /elements/popup_link-cust_main.html,
+               'label'       => emt('Enter check payment'),
                'action'      => "${p}edit/cust_pay.cgi?popup=1;payby=BILL",
                'cust_main'   => $cust_main,
-               'actionlabel' => 'Enter check payment',
+               'actionlabel' => emt('Enter check payment'),
                'width'       => 392,
-               #default# 'height' => 336,
-            )
-  %>
+  &>
 % } 
 
 % if ( $payby{'CASH'} && $curuser->access_right(['Post payment', 'Post cash payment']) ) { 
   <% $s++ ? ' | ' : '' %>
-  <% include('/elements/popup_link-cust_main.html',
-               'label'       => 'Enter cash payment',
+  <& /elements/popup_link-cust_main.html,
+               'label'       => emt('Enter cash payment'),
                'action'      => "${p}edit/cust_pay.cgi?popup=1;payby=CASH",
                'cust_main'   => $cust_main,
-               'actionlabel' => 'Enter cash payment',
+               'actionlabel' => emt('Enter cash payment'),
                'width'       => 392,
-               #default# 'height' => 336,
-            )
-  %>
+  &>
 % } 
 
 % if ( $payby{'WEST'} && $curuser->access_right('Post payment') ) { 
   <% $s++ ? ' | ' : '' %>
-  <A HREF="<% $p %>edit/cust_pay.cgi?payby=WEST;custnum=<% $custnum %>">Enter Western Union payment</A>
+  <A HREF="<% $p %>edit/cust_pay.cgi?payby=WEST;custnum=<% $custnum %>"><% mt('Enter Western Union payment') |h %></A>
 % } 
 
+<BR>
+% $s=0;
+
 % if ( ( $payby{'CARD'} || $payby{'DCRD'} )
 %        && $curuser->access_right(['Process payment', 'Process credit card payment'])
 %        && ! $cust_main->is_encrypted($cust_main->payinfo)
 %      ) {
   <% $s++ ? ' | ' : '' %>
-  <A HREF="<% $p %>misc/payment.cgi?payby=CARD;custnum=<% $custnum %>">Process credit card payment</A>
+  <A HREF="<% $p %>misc/payment.cgi?payby=CARD;custnum=<% $custnum %>"><% mt('Process credit card payment') |h %></A>
 % } 
 
 % if ( ( $payby{'CHEK'} || $payby{'DCHK'} )
@@ -45,12 +48,12 @@
 %        && ! $cust_main->is_encrypted($cust_main->payinfo)
 %      ) {
   <% $s++ ? ' | ' : '' %>
-  <A HREF="<% $p %>misc/payment.cgi?payby=CHEK;custnum=<% $custnum %>">Process electronic check (ACH) payment</A>
+  <A HREF="<% $p %>misc/payment.cgi?payby=CHEK;custnum=<% $custnum %>"><% mt('Process electronic check (ACH) payment') |h %></A>
 % } 
 
 % if ( $payby{'MCRD'} && $curuser->access_right('Post payment') ) { 
   <% $s++ ? ' | ' : '' %>
-  <A HREF="<% $p %>edit/cust_pay.cgi?payby=MCRD;custnum=<% $custnum %>">Post manual (offline/POS) credit card payment</A>
+  <A HREF="<% $p %>edit/cust_pay.cgi?payby=MCRD;custnum=<% $custnum %>"><% mt('Post manual (offline/POS) credit card payment') |h %></A>
 % } 
 
 <BR>
@@ -58,15 +61,13 @@
 %# credit link
 
 % if ( $curuser->access_right('Post credit') ) { 
-  <% include('/elements/popup_link-cust_main.html',
-               'label'       => 'Enter credit',
+  <& /elements/popup_link-cust_main.html,
+               'label'       => emt('Enter credit'),
                'action'      => "${p}edit/cust_credit.cgi",
                'cust_main'   => $cust_main,
-               'actionlabel' => 'Enter credit',
+               'actionlabel' => emt('Enter credit'),
                'width'       => 616, #make room for reasons #540 default
-               #default# 'height' => 336,
-            )
-  %>
+  &>
   <BR>
 % } 
 
@@ -75,28 +76,24 @@
 % $s = 0;
 % if ( $payby{'BILL'} && $curuser->access_right(['Post refund', 'Post check refund']) ) { 
   <% $s++ ? ' | ' : '' %>
-  <% include('/elements/popup_link-cust_main.html',
-               'label'       => 'Enter check refund',
+  <& /elements/popup_link-cust_main.html,
+               'label'       => emt('Enter check refund'),
                'action'      => "${p}edit/cust_refund.cgi?popup=1;payby=BILL",
                'cust_main'   => $cust_main,
-               'actionlabel' => 'Enter check refund',
+               'actionlabel' => emt('Enter check refund'),
                'width'       => 392,
-               #default# 'height' => 336,
-            )
-  %>
+  &>
 % } 
 
 % if ( $payby{'CASH'} && $curuser->access_right(['Post refund', 'Post cash refund']) ) { 
   <% $s++ ? ' | ' : '' %>
-  <% include('/elements/popup_link-cust_main.html',
-               'label'       => 'Enter cash refund',
+  <& /elements/popup_link-cust_main.html,
+               'label'       => emt('Enter cash refund'),
                'action'      => "${p}edit/cust_refund.cgi?popup=1;payby=CASH",
                'cust_main'   => $cust_main,
-               'actionlabel' => 'Enter cash refund',
+               'actionlabel' => emt('Enter cash refund'),
                'width'       => 392,
-               #default# 'height' => 336,
-            )
-  %>
+  &>
 % } 
 
 %# someday, perhaps.  very few gateways let you do unlinked refunds at all.
@@ -120,11 +117,20 @@
 
 % if ( $payby{'MCRD'} && $curuser->access_right('Post refund') ) { 
   <% $s++ ? ' | ' : '' %>
-  <A HREF="<% $p %>edit/cust_refund.cgi?payby=MCRD;custnum=<% $custnum %>">Post manual (offline/POS) credit card refund</A>
+  <A HREF="<% $p %>edit/cust_refund.cgi?payby=MCRD;custnum=<% $custnum %>"><% mt('Post manual (offline/POS) credit card refund') |h %></A>
 % } 
 
+    </TD>
+    <TD ALIGN="right" VALIGN="top">
+
+%# invoice reports
+% if ( $curuser->access_right('List invoices') ) { 
+  <A HREF="<% $p %>search/report_cust_bill.html?custnum=<% $custnum %>"><% mt('Invoice reports') |h %></A>
+% } 
 <BR>
 
+%# XXX payments, credits, refund reports
+
 %# tax exemption link
 
 % my $view_exemptions = $curuser->access_right('View customer tax exemptions');
@@ -134,22 +140,20 @@
 % if ( $view_exemptions || $add_adjustment ) {
 
 %   if ( $view_exemptions ) {
-      <A HREF="<% $p %>search/cust_tax_exempt_pkg.cgi?custnum=<% $custnum %>">View tax exemptions</A>
+      <A HREF="<% $p %>search/cust_tax_exempt_pkg.cgi?custnum=<% $custnum %>"><% mt('View tax exemptions') |h %></A>
       <% $add_adjustment ? '|' : '' %>
 %   } 
 
 %   if ( $add_adjustment ) {
-      <% include('/elements/popup_link.html', {
+      <& /elements/popup_link.html, {
            'action' => $p.'edit/cust_tax_adjustment.html?custnum='. $cust_main->custnum,
-           'label'  => 'Add tax adjustment',
-           'actionlabel' => 'Add tax adjustment',
-           #'color'  => '#333399',
-           #'width' => 763,
+           'label'  => emt('Add tax adjustment'),
+           'actionlabel' => emt('Add tax adjustment'),
            'height' => 200,
-         })
-      %>
+         }
+      &>
       |
-      <A HREF="<% $p %>search/cust_tax_adjustment.html?custnum=<% $custnum %>">View tax adjustments</A>
+      <A HREF="<% $p %>search/cust_tax_adjustment.html?custnum=<% $custnum %>"><% mt('View tax adjustments') |h %></A>
 %   } 
 
   <BR>
@@ -161,9 +165,9 @@
 %      && $curuser->access_right('View customer batched payments')
 %    )
 % { 
-    View batched payments:
+    <% mt('View batched payments:') |h %> 
 %   foreach my $status (qw( Queued In-transit Complete All )) {
-      <A HREF="<% $p %>search/cust_pay_batch.cgi?status=<% $status{$status} %>;custnum=<% $custnum %>"><% $status %></A> 
+      <A HREF="<% $p %>search/cust_pay_batch.cgi?status=<% $status{$status} %>;custnum=<% $custnum %>"><% mt($status) |h %></A> 
       <% $status ne 'All' ? '|' : '' %>
 %   }
     <BR>
@@ -175,24 +179,29 @@
 %      && scalar($cust_main->cust_pay_pending)
 %    )
 % {
-    <A HREF="<% $p %>search/cust_pay_pending.html?magic=_date;statusNOT=done;custnum=<% $custnum %>">View pending payments</A><BR>
+    <A HREF="<% $p %>search/cust_pay_pending.html?magic=_date;statusNOT=done;custnum=<% $custnum %>"><% mt('View pending payments') |h %></A><BR>
 % }
 
+    </TD>
+  </TR>
+  <TR>
+    <TD COLSPAN=2>
+
 %# and now the table
 
-<% include("/elements/table-grid.html") %>
+<& /elements/table-grid.html &>
 % my $bgcolor1 = '#eeeeee';
 %   my $bgcolor2 = '#ffffff';
 %   my $bgcolor = '';
 
 <TR>
-  <TH CLASS="grid" BGCOLOR="#cccccc">Date</TH>
-  <TH CLASS="grid" BGCOLOR="#cccccc">Description</TH>
-  <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1>Invoice</FONT></TH>
-  <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1>Payment</FONT></TH>
-  <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1>In-house<BR>Credit</FONT></TH>
-  <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1>Refund</FONT></TH>
-  <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1>Balance</FONT></TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Date') |h %></TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Description') |h %></TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1><% mt('Invoice') |h %></FONT></TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1><% mt('Payment') |h %></FONT></TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1><% mt('In-house Credit') |h %></FONT></TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1><% mt('Refund') |h %></FONT></TH>
+  <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1><% mt('Balance') |h %></FONT></TH>
 </TR>
 
 %#display payment history
@@ -209,8 +218,8 @@
      </TD>
 
      <TD CLASS="grid" BGCOLOR="#dddddd">
-       <I>Starting balance on <% time2str($date_format, $date) %></I>
-       (<A HREF="javascript:void(0);" onClick="show_history();">show prior history</A>)
+       <I><% mt("Starting balance on [_1]", time2str($date_format, $date) ) |h %></I>
+       (<A HREF="javascript:void(0);" onClick="show_history();"><% mt('show prior history') |h %></A>)
      </TD>
 
      <TD CLASS="grid" BGCOLOR="#dddddd"></TD>
@@ -331,6 +340,9 @@
 %}
 
 </TABLE>
+    </TD>
+  </TR>
+</TABLE>
 
 <SCRIPT TYPE="text/javascript">
 
@@ -412,6 +424,16 @@ foreach my $cust_pay ($cust_main->cust_pay) {
   };
 }
 
+#pending payments 
+foreach my $cust_pay_pending ($cust_main->cust_pay_pending) {
+  push @history, {
+    'date'    => $cust_pay_pending->_date,
+    'desc'    => include('payment_history/pending_payment.html', $cust_pay_pending, %opt ),
+    'void_payment' => $cust_pay_pending->paid, 
+  };
+}
+
+
 #voided payments
 foreach my $cust_pay_void ($cust_main->cust_pay_void) {
   push @history, {
@@ -452,4 +474,56 @@ foreach my $cust_refund ($cust_main->cust_refund) {
 
 }
 
+sub translate_payby {
+    my ($payby,$payinfo) = (shift,shift);
+    my %payby = (
+        BILL    => $payinfo ? emt('Check #') : '',
+        CHEK    => emt('Electronic check '),
+        PREP    => emt('Prepaid card '),
+        CARD    => emt('Credit card #'),
+        COMP    => emt('Complimentary by '),
+        CASH    => emt('Cash'),
+        WEST    => emt('Western Union'),
+        MCRD    => emt('Manual credit card'),
+    );
+    $payby = (exists $payby{$payby}) ? $payby{$payby} : $payby; 
+    $payby;
+};
+
+sub translate_payby_refund {
+    my ($payby,$payinfo) = (shift,shift);
+    my %payby = (
+        BILL    => $payinfo ? emt('Check #') : emt('Check'),
+        CHEK    => emt('Electronic check '),
+        CARD    => emt('Credit card #'),
+        COMP    => emt('Complimentary by '),
+    );
+    $payby = (exists $payby{$payby}) ? $payby{$payby} : $payby; 
+    $payby;
+};
+
+sub translate_payinfo {
+    my $object = shift;
+    my $payby = $object->payby;
+    my $payinfo = $object->payinfo;
+
+    if ( $payby eq 'CARD' ) {
+        $payinfo = $object->paymask;
+    } elsif ( $payby eq 'CHEK' ) {
+        my( $account, $aba ) = split('@', $object->paymask );
+        if ( $conf->exists('echeck-no_routing') ) {
+          $payinfo = emt("Acct #[_1]", $account);
+        } else {
+          $payinfo = emt("ABA [_1], Acct #[_2]",$aba,$account);
+        }
+    }
+
+    ($payby,$payinfo);
+}
+
+sub areyousure_link {
+    my ($url,$msg,$title,$label) = (shift,shift,shift,shift);
+    ' (<A HREF="javascript:areyousure(\''.$url.'\',\''.$msg.'\')" TITLE="'.$title.'">'.$label.'</A>)';
+}
+
 </%init>