X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpayment_history.html;h=5586897fb4c4ab989d466cd5483fdb266482398e;hb=8be75d426dfc9125fa49dce625d40b7462b9be09;hp=43c55e8c9349d59f2626511a0137c669f82551ee;hpb=b89c7f126690704c8d1558dba06d5fabd7470528;p=freeside.git

diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index 43c55e8c9..5586897fb 100644
--- a/httemplate/view/cust_main/payment_history.html
+++ b/httemplate/view/cust_main/payment_history.html
@@ -1,14 +1,30 @@
-<BR><BR><A NAME="history"><FONT SIZE="+2">Payment History</FONT></A><BR>
+%# payment links
 
 % my $s = 0;
 % if ( $payby{'BILL'} && $curuser->access_right('Post payment') ) { 
   <% $s++ ? ' | ' : '' %>
-  <A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('<% $p %>edit/cust_pay.cgi?popup=1;payby=BILL;custnum=<% $custnum %>', 392, 336, 'cust_pay_popup' ), CAPTION, 'Enter check payment', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">Enter check payment</A>
+  <% include('/elements/popup_link-cust_main.html',
+               'label'       => 'Enter check payment',
+               'action'      => "${p}edit/cust_pay.cgi?popup=1;payby=BILL",
+               'cust_main'   => $cust_main,
+               'actionlabel' => 'Enter check payment',
+               'width'       => 392,
+               #default# 'height' => 336,
+            )
+  %>
 % } 
 
 % if ( $payby{'CASH'} && $curuser->access_right('Post payment') ) { 
   <% $s++ ? ' | ' : '' %>
-  <A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('<% $p %>edit/cust_pay.cgi?popup=1;payby=CASH;custnum=<% $custnum %>', 392, 336, 'cust_pay_popup' ), CAPTION, 'Enter cash payment', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">Enter cash payment</A>
+  <% include('/elements/popup_link-cust_main.html',
+               'label'       => 'Enter cash payment',
+               'action'      => "${p}edit/cust_pay.cgi?popup=1;payby=CASH",
+               'cust_main'   => $cust_main,
+               'actionlabel' => 'Enter cash payment',
+               'width'       => 392,
+               #default# 'height' => 336,
+            )
+  %>
 % } 
 
 % if ( $payby{'WEST'} && $curuser->access_right('Post payment') ) { 
@@ -34,401 +50,166 @@
 
 % 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 %>">Post manual (offline/POS) credit card payment</A>
 % } 
 
 <BR>
 
+%# credit link
+
 % if ( $curuser->access_right('Post credit') ) { 
-  <A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('<% $p %>edit/cust_credit.cgi?<% $custnum %>', 392, 336, 'cust_credit_popup' ), CAPTION, 'Enter credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">Enter credit</A>
+  <% include('/elements/popup_link-cust_main.html',
+               'label'       => 'Enter credit',
+               'action'      => "${p}edit/cust_credit.cgi",
+               'cust_main'   => $cust_main,
+               'actionlabel' => 'Enter credit',
+               'width'       => 616, #make room for reasons #540 default
+               #default# 'height' => 336,
+            )
+  %>
   <BR>
 % } 
 
-% if ( $curuser->access_right('View customer tax exemptions') ) { 
-  <A HREF="<% $p %>search/cust_tax_exempt_pkg.cgi?custnum=<% $custnum %>">View tax exemptions</A>
-  <BR>
+%# refund links
+
+% $s = 0;
+% if ( $payby{'BILL'} && $curuser->access_right('Post refund') ) { 
+  <% $s++ ? ' | ' : '' %>
+  <% include('/elements/popup_link-cust_main.html',
+               'label'       => 'Enter check refund',
+               'action'      => "${p}edit/cust_refund.cgi?popup=1;payby=BILL",
+               'cust_main'   => $cust_main,
+               'actionlabel' => 'Enter check refund',
+               'width'       => 392,
+               #default# 'height' => 336,
+            )
+  %>
 % } 
 
-%#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">!
-%               : '';
-%  push @history, {
-%    'date'   => $cust_bill->_date,
-%    'desc'   => $link. $pre.
-%                "Invoice #$invnum (Balance \$". $cust_bill->owed. ')'.
-%                $post. ( $link ? '</A>' : '' ),
-%    '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' && $cust_pay->payinfo =~ /^(\d+)\@(\d+)$/ ) {
-%    $payinfo = "ABA $2, Acct# $1";
-%  } 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>';
-%    $apply = qq! (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}edit/cust_bill_pay.cgi?!.
-%             $cust_pay->paynum.
-%             qq!', 392, 336, 'cust_bill_pay_popup' ), CAPTION, 'Apply payment', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!;
-%
-%  } 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>'.
-%               qq! (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}edit/cust_bill_pay.cgi?!.
-%               $cust_pay->paynum. 
-%               qq!', 392, 336, 'cust_bill_pay_popup' ), CAPTION, 'Apply payment', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!.
-%               '<BR>';
-%    }
-%  }
-%
-%  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>)!;
-%  }
-%
-%  push @history, {
-%    'date'    => $cust_pay->_date,
-%    'desc'    => $pre. "Payment$post$info$desc".
-%                 "$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>';
-%    $apply = qq! (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}edit/cust_credit_bill.cgi?!.
-%             $cust_credit->crednum.
-%             qq!', 392, 336, 'cust_credit_bill_popup' ), CAPTION, 'Apply credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!;
-%  } 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>'.
-%               qq! (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}edit/cust_credit_bill.cgi?!.
-%               $cust_credit->crednum.
-%               qq!', 392, 336, 'cust_credit_bill_popup' ), CAPTION, 'Apply credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!.
-%               '<BR>';
-%    }
-%  }
+% if ( $payby{'CASH'} && $curuser->access_right('Post refund') ) { 
+  <% $s++ ? ' | ' : '' %>
+  <% include('/elements/popup_link-cust_main.html',
+               'label'       => 'Enter cash refund',
+               'action'      => "${p}edit/cust_refund.cgi?popup=1;payby=CASH",
+               'cust_main'   => $cust_main,
+               'actionlabel' => 'Enter cash refund',
+               'width'       => 392,
+               #default# 'height' => 336,
+            )
+  %>
+% } 
+
+%# someday, perhaps.  very few gateways let you do unlinked refunds at all.
+%# Authorize.net makes you sign a special form
 %#
-%  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,
-%  };
-%
-%}
-%
-%
+%#    % 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 %>">Post manual (offline/POS) credit card refund</A>
+% } 
+
+<BR>
+
+%# 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 %>">View tax exemptions</A>
+      <% $add_adjustment ? '|' : '' %>
+%   } 
+
+%   if ( $add_adjustment ) {
+      <% include('/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,
+           'height' => 200,
+         })
+      %>
+      |
+      <A HREF="<% $p %>search/cust_tax_adjustment.html?custnum=<% $custnum %>">View tax adjustments</A>
+%   } 
+
+  <BR>
+% }
+
+%# batched payment links
+
+% if ( ( $conf->exists('batch-enable') || $conf->config('batch-enable_payby') )
+%      && $curuser->access_right('View customer batched payments')
+%    )
+% { 
+    View batched payments:
+%   foreach my $status (qw( Queued In-transit Complete All )) {
+      <A HREF="<% $p %>search/cust_pay_batch.cgi?status=<% $status{$status} %>;custnum=<% $custnum %>"><% $status %></A> 
+      <% $status ne 'All' ? '|' : '' %>
+%   }
+    <BR>
+% } 
+
+%# 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 %>">View pending payments</A><BR>
+% }
 
+%# and now the table
 
 <% include("/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>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>
 </TR>
-%
+
 %#display payment history
+
+%my $money_char = $conf->config('money_char') || '$';
 %
 %sub balance_forward_row {
-%  my( $b, $date ) = @_;
-%  my $conf = new FS::Conf;
-%  my $money_char = $conf->config('money_char') || '$';
+%  my( $b, $date, $money_char ) = @_;
 %  ( my $balance_forward = $money_char. $b ) =~ s/^\$\-/-&nbsp;\$/;
 
    <TR ID="balance_forward_row">
      <TD CLASS="grid" BGCOLOR="#dddddd">
-       <% time2str("%D",$date) %>
+       <% time2str($date_format, $date) %>
      </TD>
 
      <TD CLASS="grid" BGCOLOR="#dddddd">
-       <I>Starting balance on <% time2str("%D",$date) %></I>
+       <I>Starting balance on <% time2str($date_format, $date) %></I>
        (<A HREF="javascript:void(0);" onClick="show_history();">show prior history</A>)
      </TD>
 
@@ -436,17 +217,16 @@
      <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>
+     <TD CLASS="grid" BGCOLOR="#dddddd" ALIGN="right"><I><% $balance_forward %></I></TD>
 
    </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 $older_than = time - $years * 31556926; #60*60*24*365.2422
 %my $hidden = 0;
 %my $seen = 0;
 %my $old_history = 0;
@@ -465,7 +245,7 @@
 %    $display = '';
 %
 %    if ( $hidden && ! $seen++ ) {
-%      balance_forward_row($balance, $item->{'date'});
+%      balance_forward_row($balance, $item->{'date'}, $money_char);
 %    }
 %
 %  }
@@ -511,13 +291,13 @@
 
 
   <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>
@@ -528,26 +308,26 @@
     <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);
+%  balance_forward_row($balance, $lastdate, $money_char);
 %}
 
 </TABLE>
@@ -575,6 +355,7 @@ my( $cust_main ) = @_;
 my $custnum = $cust_main->custnum;
 
 my $conf = new FS::Conf;
+my $date_format = $conf->config('date_format') || '%m/%d/%Y';
 
 my $curuser = $FS::CurrentUser::CurrentUser;
 
@@ -584,4 +365,101 @@ my @payby = grep /\w/, $conf->config('payby');
   unless @payby;
 my %payby = map { $_=>1 } @payby;
 
+my %status = (
+  'Queued'     => 'O', #Open
+  'In-transit' => 'I',
+  'Complete'   => 'R', #Resolved
+  '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 )
+  )
+);
+
+#invoices
+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,
+  };
+}
+
+#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
+  };
+}
+
+#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),
+    'refund' => $cust_refund->refund,
+  };
+
+}
+
 </%init>