X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpayment_history.html;h=458469cb16799500ff0dbbb38aeb00f0708e54dc;hb=3e9a428cbc8abd4af6fea8eb828126519b43198b;hp=6630d12a5d115f2d46dc01a4634a6dfd42e35766;hpb=e513d7cb331d7c7d99d1ea7b5f0a5f8e08e0d725;p=freeside.git
diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index 6630d12a5..458469cb1 100644
--- a/httemplate/view/cust_main/payment_history.html
+++ b/httemplate/view/cust_main/payment_history.html
@@ -2,181 +2,6 @@
-%# payment links
-
-% my $s = 0;
-% if ( $payby{'BILL'} && $curuser->access_right(['Post payment', 'Post check payment' ]) ) {
- <% $s++ ? ' | ' : '' %>
- <& /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' => emt('Enter check payment'),
- 'width' => 392,
- 'height' => 392,
- &>
-% }
-
-% if ( $payby{'CASH'} && $curuser->access_right(['Post payment', 'Post cash payment']) ) {
- <% $s++ ? ' | ' : '' %>
- <& /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' => emt('Enter cash payment'),
- 'width' => 392,
- 'height' => 392,
- &>
-% }
-
-% if ( $payby{'WEST'} && $curuser->access_right('Post payment') ) {
- <% $s++ ? ' | ' : '' %>
- <% mt('Enter Western Union payment') |h %>
-% }
-
-
-% $s=0;
-
-% if ( ( $payby{'CARD'} || $payby{'DCRD'} )
-% && $curuser->access_right(['Process payment', 'Process credit card payment'])
-% && ! $cust_main->is_encrypted($cust_main->payinfo)
-% ) {
- <% $s++ ? ' | ' : '' %>
- <% mt('Process credit card payment') |h %>
-% }
-
-% if ( ( $payby{'CHEK'} || $payby{'DCHK'} )
-% && $curuser->access_right(['Process payment', 'Process Echeck payment'])
-% && ! $cust_main->is_encrypted($cust_main->payinfo)
-% ) {
- <% $s++ ? ' | ' : '' %>
- <% mt('Process electronic check (ACH) payment') |h %>
-% }
-
-% if ( $payby{'MCRD'} && $curuser->access_right('Post payment') ) {
- <% $s++ ? ' | ' : '' %>
- <% mt('Post manual (offline/POS) credit card payment') |h %>
-% }
-
-
-
-%# credit link
-
-% if ( $curuser->access_right('Post credit') ) {
- <& /elements/popup_link-cust_main.html,
- 'label' => emt('Enter credit'),
- 'action' => "${p}edit/cust_credit.cgi",
- 'cust_main' => $cust_main,
- 'actionlabel' => emt('Enter credit'),
- 'width' => 616, #make room for reasons #540 default
- &>
- |
- <& /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' => 884, #763,
- 'height' => 575,
- &>
-
-% }
-
-%# 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,
- &>
-% }
-
-% 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++ ? ' | ' : '' %>
-%# Process credit card refund
-%# % }
-%#
-%# % if ( ( $payby{'CHEK'} || $payby{'DCHK'} )
-%# % && $curuser->access_right('Process refund')
-%# % && ! $cust_main->is_encrypted($cust_main->payinfo)
-%# % ) {
-%# <% $s++ ? ' | ' : '' %>
-%# Process electronic check (ACH) refund
-%# % }
-
-% if ( $payby{'MCRD'} && $curuser->access_right('Post refund') ) {
- <% $s++ ? ' | ' : '' %>
- <% mt('Post manual (offline/POS) credit card refund') |h %>
-% }
-
- |
-
-
-%# invoice reports, combined statement
-% if ( $curuser->access_right('List invoices') ) {
-% if ( $conf->exists('cust_main-print_statement_link')
-% and $num_cust_bill > 0 ) {
- <%
- mt('Print a current statement') |h %>
-
-% }
- <% mt('Invoice reports') |h %>
-% }
-
-
-%# 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 ) {
- <% mt('View tax exemptions') |h %>
- <% $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,
- }
- &>
- |
- <% mt('View tax adjustments') |h %>
-% }
-
-
-% }
-
%# batched payment links
% if ( ( $conf->exists('batch-enable') || $conf->config('batch-enable_payby') )
@@ -191,15 +16,6 @@
% }
-%# pending payment links
-
-% if ( $curuser->access_right('View customer pending payments')
-% && scalar($cust_main->cust_pay_pending)
-% )
-% {
- <% mt('View pending payments') |h %>
-% }
-
|
>
@@ -355,11 +133,11 @@
<% $showbalance %>
|
-% }
-%if ( scalar(@history) && $hidden && ! $seen++ ) {
-% balance_forward_row($balance, $lastdate, $money_char);
-%}
+% if ( $item->{'balance_forward'} ) {
+<& .balance_forward_row, $item->{'balance'}, $item->{'date'} &>
+% }
+%} # foreach $item
@@ -382,14 +160,37 @@ function show_history () {
}
+<%def .balance_forward_row>
+% my( $b, $date ) = @_;
+% ( my $balance_forward = $money_char. $b ) =~ s/^\$\-/- \$/;
-<%init>
+