X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpayment_history.html;h=c7bf3748c8b138b7eaa2fefade3f5e07bb37a9c7;hp=11c0d36a7867270c1833308c1b60b4c8cd15f678;hb=67d6d7a6c446837af1855eef8495c286a58a9ac1;hpb=27b9e55c701ed2c8e6594083f06d5d4c7f3ee1cd

diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index 11c0d36a7..c7bf3748c 100644
--- a/httemplate/view/cust_main/payment_history.html
+++ b/httemplate/view/cust_main/payment_history.html
@@ -1,563 +1,246 @@
-<BR><BR><A NAME="history"><FONT SIZE="+2">Payment History</FONT></A><BR>
+<TABLE>
+  <TR>
+    <TD ALIGN="left">
+
+%# payment links
 
 % my $s = 0;
-% if ( $payby{'BILL'} && $curuser->access_right('Post payment') ) { 
+% 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,
-            )
-  %>
+               'height'      => 392,
+  &>
 % } 
 
-% if ( $payby{'CASH'} && $curuser->access_right('Post payment') ) { 
+% 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,
-            )
-  %>
+               'height'      => 392,
+  &>
 % } 
 
 % 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>
 % } 
 
+<% $s ? '<BR>' : '' %>
+% $s=0;
+
 % if ( ( $payby{'CARD'} || $payby{'DCRD'} )
-%        && $curuser->access_right('Process payment')
+%        && $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'} )
-%        && $curuser->access_right('Process payment')
+%        && $curuser->access_right(['Process payment', 'Process Echeck payment'])
 %        && ! $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) 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>
+<% $s ? '<BR>' : '' %>
 
+%# credit links
+
+% $s=0;
 % if ( $curuser->access_right('Post credit') ) { 
-  <% include('/elements/popup_link-cust_main.html',
-               'label'       => 'Enter credit',
+  <% $s++ ? ' | ' : '' %>
+  <& /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
+  &>
+% }
+% if ( $curuser->access_right('Credit line items') ) { 
+  <% $s++ ? ' | ' : '' %>
+  <& /elements/popup_link-cust_main.html,
+               'label'       => emt('Credit line items'),
+               #'action'      => "${p}search/cust_bill_pkg.cgi?nottax=1;type=select",
+               'action'      => "${p}edit/credit-cust_bill_pkg.html",
+               'cust_main'   => $cust_main,
+               'actionlabel' => emt('Credit line items'),
+               'width'       => 968, #763,
+               'height'      => 575,
+  &>
+% } 
+<% $s ? '<BR>' : '' %>
+
+%# refund links
+
+% $s = 0;
+% if ( $payby{'BILL'} && $curuser->access_right(['Post refund', 'Post check refund']) ) { 
+  <% $s++ ? ' | ' : '' %>
+  <& /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' => emt('Enter check refund'),
                'width'       => 392,
-               #default# 'height' => 336,
-            )
-  %>
-  <BR>
+  &>
+% } 
+
+% if ( $payby{'CASH'} && $curuser->access_right(['Post refund', 'Post cash refund']) ) { 
+  <% $s++ ? ' | ' : '' %>
+  <& /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' => emt('Enter cash refund'),
+               'width'       => 392,
+  &>
+% } 
+
+%# someday, perhaps.  very few gateways let you do unlinked refunds at all.
+%# Authorize.net makes you sign a special form
+%#
+%#    % if ( ( $payby{'CARD'} || $payby{'DCRD'} )
+%#    %        && $curuser->access_right('Process refund')
+%#    %        && ! $cust_main->is_encrypted($cust_main->payinfo)
+%#    %      ) {
+%#      <% $s++ ? ' | ' : '' %>
+%#      <A HREF="<% $p %>misc/refund.cgi?payby=CARD;custnum=<% $custnum %>">Process credit card refund</A>
+%#    % } 
+%#    
+%#    % if ( ( $payby{'CHEK'} || $payby{'DCHK'} )
+%#    %        && $curuser->access_right('Process refund')
+%#    %        && ! $cust_main->is_encrypted($cust_main->payinfo)
+%#    %      ) {
+%#      <% $s++ ? ' | ' : '' %>
+%#      <A HREF="<% $p %>misc/refund.cgi?payby=CHEK;custnum=<% $custnum %>">Process electronic check (ACH) refund</A>
+%#    % } 
+
+% if ( $payby{'MCRD'} && $curuser->access_right('Post refund') ) { 
+  <% $s++ ? ' | ' : '' %>
+  <A HREF="<% $p %>edit/cust_refund.cgi?payby=MCRD;custnum=<% $custnum %>"><% mt('Post manual (offline/POS) credit card refund') |h %></A>
 % } 
 
-% if ( $curuser->access_right('View customer tax exemptions') ) { 
-  <A HREF="<% $p %>search/cust_tax_exempt_pkg.cgi?custnum=<% $custnum %>">View tax exemptions</A>
+    </TD>
+    <TD ALIGN="right" VALIGN="top">
+
+%# invoice reports, combined statement
+% if ( $curuser->access_right('List invoices') ) { 
+%   if ( $num_cust_bill > 0 ) {
+  <A HREF="<% $p %>view/cust_main_statement-pdf.cgi?<% $custnum %>"><%
+  mt('Download typeset statement PDF') |h %></A>
   <BR>
+%   }
+  <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');
+% my $add_adjustment = ( $conf->exists('enable_tax_adjustments')
+%                       && $curuser->access_right('Add customer tax adjustment')
+%                      );
+% if ( $view_exemptions || $add_adjustment ) {
+
+%   if ( $view_exemptions ) {
+      <A HREF="<% $p %>search/cust_tax_exempt_pkg.cgi?custnum=<% $custnum %>"><% mt('View tax exemptions') |h %></A>
+      <% $add_adjustment ? '|' : '' %>
+%   } 
+
+%   if ( $add_adjustment ) {
+      <& /elements/popup_link.html, {
+           'action' => $p.'edit/cust_tax_adjustment.html?custnum='. $cust_main->custnum,
+           'label'  => emt('Add tax adjustment'),
+           'actionlabel' => emt('Add tax adjustment'),
+           'height' => 200,
+         }
+      &>
+      |
+      <A HREF="<% $p %>search/cust_tax_adjustment.html?custnum=<% $custnum %>"><% mt('View tax adjustments') |h %></A>
+%   } 
 
-% if ( $conf->exists('batch-enable')
+  <BR>
+% }
+
+%# batched payment links
+
+% if ( ( $conf->exists('batch-enable') || $conf->config('batch-enable_payby') )
 %      && $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>
+    <BR>
 % } 
 
-%#get payment history
-%my @history = ();
-%
-%#invoices
-%foreach my $cust_bill ($cust_main->cust_bill) {
-%  my $pre = ( $cust_bill->owed > 0 )
-%              ? '<B><FONT SIZE="+1" COLOR="#FF0000">Open '
-%              : '';
-%  my $post = ( $cust_bill->owed > 0 ) ? '</FONT></B>' : '';
-%  my $invnum = $cust_bill->invnum;
-%  my $link = $curuser->access_right('View invoices')
-%               ? qq!<A HREF="${p}view/cust_bill.cgi?$invnum">!
-%               : '';
-%  my $events = '';
-%  if ( $cust_bill->num_cust_event
-%       && (    $curuser->access_right('Billing event reports')
-%            || $curuser->access_right('View customer billing events')
-%          )
-%     ) {
-%    $events =
-%      qq!<BR><FONT SIZE="-1"><A HREF="${p}search/cust_event.html?invnum=!.
-%      $cust_bill->invnum. '">(&nbsp;View invoice events&nbsp;)</A></FONT>';
-%  }
-%  push @history, {
-%    'date'   => $cust_bill->_date,
-%    'desc'   => $link. $pre.
-%                "Invoice #$invnum (Balance \$". $cust_bill->owed. ')'.
-%                $post. ( $link ? '</A>' : '' ). $events,
-%    'charge' => $cust_bill->charged,
-%  };
-%}
-%
-%#payments (some false laziness w/credits)
-%foreach my $cust_pay ($cust_main->cust_pay) {
-%
-%  my $payby = $cust_pay->payby;
-%
-%  my $payinfo;
-%  if ( $payby eq 'CARD' ) {
-%    $payinfo = $cust_pay->paymask;
-%  } elsif ( $payby eq 'CHEK' ) {
-%    my( $account, $aba ) = split('@', $cust_pay->paymask );
-%    $payinfo = "ABA $aba, Acct #$account";
-%  } else {
-%    $payinfo = $cust_pay->payinfo;
-%  }
-%  my @cust_bill_pay = $cust_pay->cust_bill_pay;
-%  my @cust_pay_refund = $cust_pay->cust_pay_refund;
-%
-%  my $target = "$payby$payinfo";
-%  $payby =~ s/^BILL$/Check #/ if $payinfo;
-%  $payby =~ s/^CHEK$/Electronic check /;
-%  $payby =~ s/^PREP$/Prepaid card /;
-%  $payby =~ s/^CARD$/Credit card #/; 
-%  $payby =~ s/^COMP$/Complimentary by /; 
-%  $payby =~ s/^CASH$/Cash/;
-%  $payby =~ s/^WEST$/Western Union/;
-%  $payby =~ s/^MCRD$/Manual credit card/;
-%  $payby =~ s/^BILL$//;
-%  my $info = $payby ? "($payby$payinfo)" : '';
-%
-%  my( $pre, $post, $desc, $apply, $ext ) = ( '', '', '', '', '' );
-%  if (    scalar(@cust_bill_pay)   == 0
-%       && scalar(@cust_pay_refund) == 0 ) {
-%    #completely unapplied
-%    $pre = '<B><FONT COLOR="#FF0000">Unapplied ';
-%    $post = '</FONT></B>';
-%    if ( $curuser->access_right('Apply payment') ) {
-%      $apply = ' ('. include( '/elements/popup_link.html',
-%                                'label'       => 'apply',
-%                                'action'      => "${p}edit/cust_bill_pay.cgi?".
-%                                                 $cust_pay->paynum,
-%                                'actionlabel' => 'Apply payment',
-%                                'width'       => 392,
-%                                #default# 'height' => 336,
-%                            ).
-%                ')';
-%    }
-%  } elsif (    scalar(@cust_bill_pay)   == 1
-%            && scalar(@cust_pay_refund) == 0
-%            && $cust_pay->unapplied == 0     ) {
-%    #applied to one invoice, the usual situation
-%    $desc = ' applied to Invoice #'. $cust_bill_pay[0]->invnum;
-%  } elsif (    scalar(@cust_bill_pay)   == 0
-%            && scalar(@cust_pay_refund) == 1
-%            && $cust_pay->unapplied == 0     ) {
-%    #applied to one refund
-%    $desc = ' refunded on '. time2str("%D", $cust_pay_refund[0]->_date);
-%  } else {
-%    #complicated
-%    $desc = '<BR>';
-%    foreach my $app ( sort { $a->_date <=> $b->_date }
-%                           ( @cust_bill_pay, @cust_pay_refund ) ) {
-%      if ( $app->isa('FS::cust_bill_pay') ) {
-%        $desc .= '&nbsp;&nbsp;'.
-%                 '$'. $app->amount.
-%                 ' applied to Invoice #'. $app->invnum.
-%                 '<BR>';
-%                 #' on '. time2str("%D", $cust_bill_pay->_date).
-%      } elsif ( $app->isa('FS::cust_pay_refund') ) {
-%        $desc .= '&nbsp;&nbsp;'.
-%                 '$'. $app->amount.
-%                 ' refunded on '. time2str("%D", $app->_date).
-%                 '<BR>';
-%      } else {
-%        die "$app is not a FS::cust_bill_pay or FS::cust_pay_refund";
-%      }
-%    }
-%    if ( $cust_pay->unapplied > 0 ) {
-%      $desc .= '&nbsp;&nbsp;'.
-%               '<B><FONT COLOR="#FF0000">$'.
-%               $cust_pay->unapplied. ' unapplied</FONT></B>';
-%      if ( $curuser->access_right('Apply payment') ) {
-%        $desc = ' ('. include( '/elements/popup_link.html',
-%                                 'label'      => 'apply',
-%                                 'action'     => "${p}edit/cust_bill_pay.cgi?".
-%                                                 $cust_pay->paynum,
-%                                 'actionlabel' => 'Apply payment',
-%                                 'width'      => 392,
-%                                 #default# 'height' => 336,
-%                            ).
-%                ')';
-%      }
-%      $desc .= '<BR>';
-%    }
-%  }
-%
-%  my $view =
-%    ' ('. include('/elements/popup_link.html',
-%                    'label'     => 'view receipt',
-%                    'action'    => "${p}view/cust_pay.html?link=popup;paynum=".
-%                                    $cust_pay->paynum,
-%                    'actionlabel' => 'Payment Receipt',
-%                 ).
-%     ')';
-%
-%  my $refund = '';
-%  my $refund_days = $conf->config('card_refund-days') || 120;
-%  if (    $cust_pay->closed !~ /^Y/i
-%       && $cust_pay->payby =~ /^(CARD|CHEK)$/
-%       && time-$cust_pay->_date < $refund_days*86400
-%       && $cust_pay->unrefunded > 0
-%       && $curuser->access_right('Refund payment')
-%  ) {
-%    $refund = qq! (<A HREF="${p}edit/cust_refund.cgi?payby=$1;!.
-%              qq!paynum=!. $cust_pay->paynum. '"'.
-%              qq! TITLE="Send a refund for this payment to the payment gateway"!.
-%              qq!>refund</A>)!;
-%  }
-%
-%  my $void = '';
-%  if (    $cust_pay->closed !~ /^Y/i
-%       && (    ( $cust_pay->payby eq 'CARD'
-%                 && $curuser->access_right('Credit card void')
-%               )
-%            || ( $cust_pay->payby eq 'CHEK'
-%                 && $curuser->access_right('Echeck void')
-%               )
-%            || ( $cust_pay->payby !~ /^(CARD|CHEK)$/
-%                 && $curuser->access_right('Regular void')
-%               )
-%          )
-%     )
-%  {
-%    $void = qq! (<A HREF="javascript:areyousure('!.
-%            qq!${p}misc/void-cust_pay.cgi?!. $cust_pay->paynum.
-%            qq!', 'Are you sure you want to void this payment?')"!.
-%            qq! TITLE="Void this payment from the database!.
-%              ( $cust_pay->payby =~ /^(CARD|CHEK)$/
-%                ? ' (do not send anything to the payment gateway)'
-%                : '' 
-%              ). '"'.
-%            qq!>void</A>)!;
-%  }
-%
-%  my $delete = '';
-%  if ( $cust_pay->closed !~ /^Y/i
-%       && $conf->exists('deletepayments')
-%       && $curuser->access_right('Delete payment')
-%     )
-%  {
-%    $delete = qq! (<A HREF="javascript:areyousure('!.
-%              qq!${p}misc/delete-cust_pay.cgi?!. $cust_pay->paynum.
-%              qq!', 'Are you sure you want to delete this payment?')"!.
-%              qq! TITLE="Delete this payment from the database completely - not recommended"!.
-%              qq!>delete</A>)!;
-%  }
-%
-%  my $unapply = '';
-%  if (    $cust_pay->closed !~ /^Y/i
-%       && scalar(@cust_bill_pay)           
-%       && $curuser->access_right('Unapply payment')
-%     )
-%  {
-%    $unapply = qq! (<A HREF="javascript:areyousure('!.
-%               qq!${p}misc/unapply-cust_pay.cgi?!. $cust_pay->paynum.
-%               qq!', 'Are you sure you want to unapply this payment?')"!.
-%               qq! TITLE="Keep this payment, but dissociate it from the invoices it is currently applied against"!.
-%               qq!>unapply</A>)!;
-%  }
-%
-%  my $otaker = $cust_pay->otaker;
-%  $otaker = '<i>auto billing</i>'          if $otaker eq 'fs_daily';
-%  $otaker = '<i>customer self-service</i>' if $otaker eq 'fs_selfservice';
-%
-%  push @history, {
-%    'date'    => $cust_pay->_date,
-%    'desc'    => $pre. "Payment$post by $otaker $info$desc".
-%                 "$view$apply$refund$void$delete$unapply",
-%    'payment' => $cust_pay->paid,
-%    'target'  => $target,
-%  };
-%}
-%
-%#voided payments
-%foreach my $cust_pay_void ($cust_main->cust_pay_void) {
-%
-%  my $payby = $cust_pay_void->payby;
-%  my $payinfo = $payby eq 'CARD'
-%                  ? $cust_pay_void->paymask
-%                  : $cust_pay_void->payinfo;
-%
-%  $payby =~ s/^BILL$/Check #/ if $payinfo;
-%  $payby =~ s/^CHEK$/Electronic check /;
-%  $payby =~ s/^BILL$//;
-%  $payby =~ s/^(CARD|COMP)$/$1 /;
-%  my $info = $payby ? " ($payby$payinfo)" : '';
-%
-%  my $unvoid = '';
-%  if ( $cust_pay_void->closed !~ /^Y/i
-%       && $curuser->access_right('Unvoid')
-%     )
-%  {
-%    $unvoid = qq! (<A HREF="javascript:areyousure('!.
-%              qq!${p}misc/unvoid-cust_pay_void.cgi?!. $cust_pay_void->paynum.
-%              qq!', 'Are you sure you want to unvoid this payment?')"!.
-%              qq! TITLE="Unvoid this payment from the database!.
-%                ( $cust_pay_void->payby =~ /^(CARD|CHEK)$/
-%                  ? ' (do not send anything to the payment gateway)'
-%                  : '' 
-%                ). '"'.
-%              qq!>unvoid</A>)!;
-%  }
-%
-%  push @history, {
-%    'date'   => $cust_pay_void->_date,
-%    'desc'   => "<DEL>Payment $info</DEL> <I>voided ".
-%                time2str("%D", $cust_pay_void->void_date).
-%                " by ". $cust_pay_void->otaker. '</i>'. $unvoid,
-%    'void_payment' => $cust_pay_void->paid,
-%  };
-%
-%}
-%
-%#credits (some false laziness w/payments)
-%foreach my $cust_credit ($cust_main->cust_credit) {
-%
-%  my @cust_credit_bill = $cust_credit->cust_credit_bill;
-%  my @cust_credit_refund = $cust_credit->cust_credit_refund;
-%
-%  my( $pre, $post, $desc, $apply, $ext ) = ( '', '', '', '', '' );
-%  if (    scalar(@cust_credit_bill)   == 0
-%       && scalar(@cust_credit_refund) == 0 ) {
-%    #completely unapplied
-%    $pre = '<B><FONT COLOR="#FF0000">Unapplied ';
-%    $post = '</FONT></B>';
-%    if ( $curuser->access_right('Apply credit') ) {
-%      $apply = ' ('. include( '/elements/popup_link.html',
-%                                'label'    => 'apply',
-%                                'action'   => "${p}edit/cust_credit_bill.cgi?".
-%                                              $cust_credit->crednum,
-%                                'actionlabel' => 'Apply credit',
-%                                'width'    => 392,
-%                                #default# 'height' => 336,
-%                            ).
-%                ')';
-%    }
-%  } elsif (    scalar(@cust_credit_bill)   == 1
-%            && scalar(@cust_credit_refund) == 0
-%            && $cust_credit->credited == 0      ) {
-%    #applied to one invoice, the usual situation
-%    $desc = ' applied to Invoice #'. $cust_credit_bill[0]->invnum;
-%  } elsif (    scalar(@cust_credit_bill)   == 0
-%            && scalar(@cust_credit_refund) == 1
-%            && $cust_credit->credited == 0      ) {
-%    #applied to one refund
-%    $desc = ' refunded on '.  time2str("%D", $cust_credit_refund[0]->_date);
-%  } else {
-%    #complicated
-%    $desc = '<BR>';
-%    foreach my $app ( sort { $a->_date <=> $b->_date }
-%                           ( @cust_credit_bill, @cust_credit_refund ) ) {
-%      if ( $app->isa('FS::cust_credit_bill') ) {
-%        $desc .= '&nbsp;&nbsp;'.
-%                 '$'. $app->amount.
-%                 ' applied to Invoice #'. $app->invnum.
-%                 '<BR>';
-%                 #' on '. time2str("%D", $app->_date).
-%      } elsif ( $app->isa('FS::cust_credit_refund') ) {
-%        $desc .= '&nbsp;&nbsp;'.
-%                 '$'. $app->amount.
-%                 ' refunded on '. time2str("%D", $app->_date).
-%                 '<BR>';
-%      } else {
-%        die "$app is not a FS::cust_credit_bill or a FS::cust_credit_refund";
-%      }
-%    }
-%    if ( $cust_credit->credited > 0 ) {
-%      $desc .= '&nbsp;&nbsp;<B><FONT COLOR="#FF0000">$'.
-%               $cust_credit->credited. ' unapplied</FONT></B>';
-%      if ( $curuser->access_right('Apply credit') ) {
-%        $desc = ' ('. include( '/elements/popup_link.html',
-%                                'label'       => 'apply',
-%                                'action'      => "${p}edit/cust_credit_bill.cgi?".
-%                                                 $cust_credit->crednum,
-%                                'actionlabel' => 'Apply credit',
-%                                'width'       => 392,
-%                                #default# 'height' => 336,
-%                            ).
-%                ')';
-%      }
-%      $desc .= '<BR>';
-%    }
-%  }
-%#
-%  my $delete = '';
-%  if ( $cust_credit->closed !~ /^Y/i
-%
-%       #s'pose deleting a credit isn't bad like deleting a payment
-%       # and this needs to be generally available until we have credit voiding..
-%       #&& $conf->exists('deletecredits')
-%
-%       && $curuser->access_right('Delete credit')
-%     )
-%  {
-%    $delete = qq! (<A HREF="javascript:areyousure('!.
-%              qq!${p}misc/delete-cust_credit.cgi?!. $cust_credit->crednum.
-%              qq!', 'Are you sure you want to delete this credit?')">!.
-%              qq!delete</A>)!;
-%  }
-%  
-%  my $unapply = '';
-%  if (    $cust_credit->closed !~ /^Y/i
-%       && scalar(@cust_credit_bill)
-%       && $curuser->access_right('Unapply credit')
-%     )
-%  {
-%    $unapply = qq! (<A HREF="javascript:areyousure('!.
-%               qq!${p}misc/unapply-cust_credit.cgi?!. $cust_credit->crednum.
-%               qq!', 'Are you sure you want to unapply this credit?')">!.
-%               qq!unapply</A>)!;
-%  }
-%  
-%  push @history, {
-%    'date'   => $cust_credit->_date,
-%    'desc'   => $pre. "Credit$post by ". $cust_credit->otaker.
-%                ( $cust_credit->reason
-%		    ? ' ('. $cust_credit->reason. ')'
-%		    : ''
-%		).
-%                "$desc$apply$delete$unapply",
-%    'credit' => $cust_credit->amount,
-%  };
-%
-%}
-%
-%#refunds
-%foreach my $cust_refund ($cust_main->cust_refund) {
-%
-%  my $payby = $cust_refund->payby;
-%  my $payinfo = $payby eq 'CARD'
-%                  ? $cust_refund->paymask
-%                  : $cust_refund->payinfo;
-%
-%  $payby =~ s/^BILL$/Check #/ if $payinfo;
-%  $payby =~ s/^CHEK$/Electronic check /;
-%  $payby =~ s/^(CARD|COMP)$/$1 /;
-%
-%  my $delete = '';
-%  if ( $cust_refund->closed !~ /^Y/i
-%       && $conf->exists('deleterefunds')
-%       && $curuser->access_right('Delete refund')
-%     )
-%  {
-%    $delete = qq! (<A HREF="javascript:areyousure('!.
-%              qq!${p}misc/delete-cust_refund.cgi?!. $cust_refund->refundnum.
-%              qq!', 'Are you sure you want to delete this refund?')"!.
-%              qq! TITLE="Delete this refund from the database completely - not recommended"!.
-%              qq!>delete</A>)!;
-%  }
-%
-%  push @history, {
-%    'date'   => $cust_refund->_date,
-%    'desc'   => "Refund ($payby$payinfo) by ". $cust_refund->otaker. "<BR>".
-%                $delete,
-%    'refund' => $cust_refund->refund,
-%  };
-%
-%}
-%
-%
+%# pending payment links
+
+% if ( $curuser->access_right('View customer pending payments')
+%      && scalar($cust_main->cust_pay_pending)
+%    )
+% {
+    <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>Charge</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
-%
-%sub balance_forward_row {
-%  my( $b, $date ) = @_;
-%  my $conf = new FS::Conf;
-%  my $money_char = $conf->config('money_char') || '$';
-%  ( my $balance_forward = $money_char. $b ) =~ s/^\$\-/-&nbsp;\$/;
-
-   <TR ID="balance_forward_row">
-     <TD CLASS="grid" BGCOLOR="#dddddd">
-       <% time2str("%D",$date) %>
-     </TD>
-
-     <TD CLASS="grid" BGCOLOR="#dddddd">
-       <I>Starting balance on <% time2str("%D",$date) %></I>
-       (<A HREF="javascript:void(0);" onClick="show_history();">show prior history</A>)
-     </TD>
 
-     <TD CLASS="grid" BGCOLOR="#dddddd"></TD>
-     <TD CLASS="grid" BGCOLOR="#dddddd"></TD>
-     <TD CLASS="grid" BGCOLOR="#dddddd"></TD>
-     <TD CLASS="grid" BGCOLOR="#dddddd"></TD>
-     <TD CLASS="grid" BGCOLOR="#dddddd"><I><% $balance_forward %></I></TD>
+%#display payment history
 
-   </TR>
-%}
-%
-%my $balance = 0;
 %my %target = ();
-%my $money_char = $conf->config('money_char') || '$';
 %
-%my $years =  $conf->config('payment_history-years') || 2;
-%my $older_than = time - $years * 31556736; #60*60*24*365.24
 %my $hidden = 0;
 %my $seen = 0;
 %my $old_history = 0;
 %my $lastdate = 0;
 %
-%foreach my $item ( sort { $a->{'date'} <=> $b->{'date'} } @history ) {
+%foreach my $item ( @history ) {
 %
 %  $lastdate = $item->{'date'};
 %
-%  my $display;
-%  if ( $item->{'date'} < $older_than ) {
+%  my $display = '';
+%  if ( $item->{'hide'} ) {
 %    $display = ' STYLE="display:none" ';
-%    $hidden = 1;
-%  } else {
-%
-%    $display = '';
-%
-%    if ( $hidden && ! $seen++ ) {
-%      balance_forward_row($balance, $item->{'date'});
-%    }
-%
 %  }
 %
 %  if ( $bgcolor eq $bgcolor1 ) {
@@ -568,7 +251,11 @@
 %
 %  my $charge  = exists($item->{'charge'})
 %                  ? sprintf("$money_char\%.2f", $item->{'charge'})
-%                  : '';
+%                  : exists($item->{'charge_nobal'})
+%                    ? sprintf("$money_char\%.2f", $item->{'charge_nobal'})
+%                    : exists($item->{'void_charge'})
+%                      ? sprintf("<DEL>$money_char\%.2f</DEL>", $item->{'void_charge'})
+%                      : '';
 %
 %  my $payment = exists($item->{'payment'})
 %                  ? sprintf("-&nbsp;$money_char\%.2f", $item->{'payment'})
@@ -589,25 +276,17 @@
 %
 %  my $target = exists($item->{'target'}) ? $item->{'target'} : '';
 %
-%  $balance += $item->{'charge'}  if exists $item->{'charge'};
-%  $balance -= $item->{'payment'} if exists $item->{'payment'};
-%  $balance -= $item->{'credit'}  if exists $item->{'credit'};
-%  $balance += $item->{'refund'}  if exists $item->{'refund'};
-%  $balance = sprintf("%.2f", $balance);
-%  $balance =~ s/^\-0\.00$/0.00/; #yay ieee fp
-%  ( my $showbalance = $money_char. $balance ) =~ s/^\$\-/-&nbsp;\$/;
-%
-%
-
+%  my $showbalance = $money_char . $item->{'balance'};
+%  $showbalance =~ s/^\$\-/-&nbsp;\$/;
 
   <TR <% $display ? $display.' ID="old_history'.$old_history++.'"'  : ''%>>
-    <TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
+    <TD VALIGN="top" CLASS="grid" BGCOLOR="<% $bgcolor %>">
 % unless ( !$target || $target{$target}++ ) { 
 
         <A NAME="<% $target %>">
 % } 
 
-      <% time2str("%D",$item->{'date'}) %>
+      <% time2str($date_format, $item->{'date'}) %>
 % if ( $target && $target{$target} == 1 ) { 
 
         </A>
@@ -618,29 +297,32 @@
     <TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
       <% $item->{'desc'} %>
     </TD>
-    <TD ALIGN="right" CLASS="grid" BGCOLOR="<% $bgcolor %>">
+    <TD VALIGN="top" ALIGN="right" CLASS="grid" BGCOLOR="<% $bgcolor %>">
       <% $charge  %>
     </TD>
-    <TD ALIGN="right" CLASS="grid" BGCOLOR="<% $bgcolor %>">
+    <TD VALIGN="top" ALIGN="right" CLASS="grid" BGCOLOR="<% $bgcolor %>">
       <% $payment %>
     </TD>
-    <TD ALIGN="right" CLASS="grid" BGCOLOR="<% $bgcolor %>">
+    <TD VALIGN="top" ALIGN="right" CLASS="grid" BGCOLOR="<% $bgcolor %>">
       <% $credit  %>
     </TD>
-    <TD ALIGN="right" CLASS="grid" BGCOLOR="<% $bgcolor %>">
+    <TD VALIGN="top" ALIGN="right" CLASS="grid" BGCOLOR="<% $bgcolor %>">
       <% $refund  %>
     </TD>
-    <TD ALIGN="right" CLASS="grid" BGCOLOR="<% $bgcolor %>">
+    <TD VALIGN="top" ALIGN="right" CLASS="grid" BGCOLOR="<% $bgcolor %>">
       <% $showbalance %>
     </TD>
   </TR>
-% } 
 
-%if ( scalar(@history) && $hidden && ! $seen++ ) {
-%  balance_forward_row($balance, $lastdate);
-%}
+% if ( $item->{'balance_forward'} ) {
+<& .balance_forward_row, $item->{'balance'}, $item->{'date'} &>
+% } 
+%} # foreach $item
 
 </TABLE>
+    </TD>
+  </TR>
+</TABLE>
 
 <SCRIPT TYPE="text/javascript">
 
@@ -658,14 +340,38 @@ function show_history () {
 }
 
 </SCRIPT>
+<%def .balance_forward_row>
+%  my( $b, $date ) = @_;
+%  ( my $balance_forward = $money_char. $b ) =~ s/^\$\-/-&nbsp;\$/;
+
+   <TR ID="balance_forward_row">
+     <TD CLASS="grid" BGCOLOR="#dddddd">
+       <% time2str($date_format, $date) %>
+     </TD>
 
+     <TD CLASS="grid" BGCOLOR="#dddddd">
+       <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>
+     <TD CLASS="grid" BGCOLOR="#dddddd"></TD>
+     <TD CLASS="grid" BGCOLOR="#dddddd"></TD>
+     <TD CLASS="grid" BGCOLOR="#dddddd"></TD>
+     <TD CLASS="grid" BGCOLOR="#dddddd" ALIGN="right"><I><% $balance_forward %></I></TD>
+
+   </TR>
+</%def>
+<%shared>
+my $conf = new FS::Conf;
+my $date_format = $conf->config('date_format') || '%m/%d/%Y';
+my $money_char = $conf->config('money_char') || '$';
+</%shared>
 <%init>
 
 my( $cust_main ) = @_;
 my $custnum = $cust_main->custnum;
 
-my $conf = new FS::Conf;
-
 my $curuser = $FS::CurrentUser::CurrentUser;
 
 my @payby = grep /\w/, $conf->config('payby');
@@ -681,4 +387,214 @@ my %status = (
   'All'        => '',
 );
 
+#get payment history
+my @history = ();
+
+my %opt = (
+  ( map { $_ => scalar($conf->config($_)) }
+        qw( card_refund-days date_format )
+  ),
+  ( map { $_ => $conf->exists($_) } 
+        qw( deleteinvoices deletepayments deleterefunds pkg-balances )
+  )
+);
+
+$opt{'date_format'} ||= '%m/%d/%Y';
+
+#legacy invoices
+foreach my $legacy_cust_bill ($cust_main->legacy_cust_bill) {
+  push @history, {
+    'date'   => $legacy_cust_bill->_date,
+    'desc'   => include('payment_history/legacy_invoice.html', $legacy_cust_bill, %opt ),
+    'charge_nobal' => $legacy_cust_bill->charged,
+  };
+}
+
+#invoices
+my $num_cust_bill = 0;
+foreach my $cust_bill ($cust_main->cust_bill) {
+  push @history, {
+    'date'   => $cust_bill->_date,
+    'desc'   => include('payment_history/invoice.html', $cust_bill, %opt ),
+    'charge' => $cust_bill->charged,
+  };
+  $num_cust_bill++;
+}
+
+#voided invoices
+foreach my $cust_bill_void ($cust_main->cust_bill_void) {
+  push @history, {
+    'date'        => $cust_bill_void->_date,
+    'desc'        => include('payment_history/voided_invoice.html', $cust_bill_void, %opt ),
+    'void_charge' => $cust_bill_void->charged,
+  };
+}
+
+#statements
+foreach my $cust_statement ($cust_main->cust_statement) {
+  push @history, {
+    'date'   => $cust_statement->_date,
+    'desc'   => include('payment_history/statement.html', $cust_statement, %opt ),
+    #'charge' => $cust_bill->charged,
+  };
+}
+
+#payments (some false laziness w/credits)
+foreach my $cust_pay ($cust_main->cust_pay) {
+  push @history, {
+    'date'    => $cust_pay->_date,
+    'desc'    => include('payment_history/payment.html', $cust_pay, %opt ),
+    'payment' => $cust_pay->paid,
+    #'target'  => $target, #XXX
+  };
+}
+
+#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, {
+    'date'   => $cust_pay_void->_date,
+    'desc'   => include('payment_history/voided_payment.html', $cust_pay_void, %opt ),
+    'void_payment' => $cust_pay_void->paid,
+  };
+
+}
+
+#declined payments
+foreach my $cust_pay_pending ($cust_main->cust_pay_pending_attempt) {
+  push @history, {
+    'date'    => $cust_pay_pending->_date,
+    'desc'    => include('payment_history/attempted_payment.html', $cust_pay_pending, %opt ),
+    'void_payment' => $cust_pay_pending->paid, #??
+    #'target'  => $target, #XXX
+  };
+}
+#declined batch payments
+foreach my $cust_pay_batch (
+  $cust_main->cust_pay_batch(hashref => {status => 'Declined'})
+) {
+  my $pay_batch = $cust_pay_batch->pay_batch;
+  push @history, {
+    'date'    => $pay_batch->upload,
+    'desc'    => include('payment_history/attempted_batch_payment.html', $cust_pay_batch, %opt),
+    'void_payment' => $cust_pay_batch->amount,
+  };
+}
+
+#credits (some false laziness w/payments)
+foreach my $cust_credit ($cust_main->cust_credit) {
+  push @history, {
+    'date'   => $cust_credit->_date,
+    'desc'   => include('payment_history/credit.html', $cust_credit, %opt ),
+    'credit' => $cust_credit->amount,
+  };
+
+}
+
+#refunds
+foreach my $cust_refund ($cust_main->cust_refund) {
+  push @history, {
+    'date'   => $cust_refund->_date,
+    'desc'   => include('payment_history/refund.html', $cust_refund, %opt),
+    'refund' => $cust_refund->refund,
+  };
+
+}
+
+# sort in forward order first, and calculate running balances
+my $years =  $conf->config('payment_history-years') || 2;
+my $older_than = time - $years * 31556926; #60*60*24*365.2422
+my $balance = 0;
+
+@history = sort { $a->{date} <=> $b->{date} } @history;
+my $i = 0;
+my $balance_forward;
+foreach my $item (@history) {
+  $balance += $item->{'charge'}  if exists $item->{'charge'};
+  $balance -= $item->{'payment'} if exists $item->{'payment'};
+  $balance -= $item->{'credit'}  if exists $item->{'credit'};
+  $balance += $item->{'refund'}  if exists $item->{'refund'};
+  $balance = sprintf("%.2f", $balance);
+  $balance =~ s/^\-0\.00$/0.00/;
+  $item->{'balance'} = $balance;
+
+  if ( $item->{'date'} < $older_than ) {
+    $item->{'hide'} = 1;
+  } elsif ( $history[$i-1]->{'hide'} ) {
+    # this is the end of the hidden section
+    $history[$i-1]->{'balance_forward'} = 1;
+  }
+  $i++;
+}
+if ( @history and $history[-1]->{'hide'} ) {
+  # then everything is hidden
+  $history[-1]->{'balance_forward'} = 1;
+}
+
+# then sort in user-pref order
+if ( $curuser->option('history_order') eq 'newest' ) {
+  @history = sort { $b->{date} <=> $a->{date} } @history;
+} # else it's already oldest-first, and there are no other options yet
+
+sub translate_payby {
+    my ($payby,$payinfo) = (shift,shift);
+    my %payby = (
+        FS::payby->payby2shortname,
+        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 = (
+        FS::payby->payby2shortname,
+        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;
+
+    my $conf = new FS::Conf;
+
+    if ( $payby eq 'CARD' ) {
+        $payinfo = $object->paymask;
+    } elsif ( $payby eq 'CHEK' ) {
+        my( $account, $aba ) = split('@', $object->paymask );
+        $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>