X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpayment_history.html;h=3288f15a71371c6b6ce1b335f5f33d3730ff9fdf;hb=b1c1559dec0570bc401ccd0e29e66a9bf6f151e1;hp=750e59d2ff11d320c0336b95737ba5a1767ebd4f;hpb=15a02054fe0f91eda70003b8d1cf29497d19aa91;p=freeside.git
diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index 750e59d2f..3288f15a7 100644
--- a/httemplate/view/cust_main/payment_history.html
+++ b/httemplate/view/cust_main/payment_history.html
@@ -1,7 +1,11 @@
-
Payment History
+
+
+%# 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',
@@ -14,7 +18,7 @@
%>
% }
-% 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',
@@ -32,8 +36,11 @@
Enter Western Union payment
% }
+ +% $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++ ? ' | ' : '' %> @@ -41,7 +48,7 @@ % } % 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++ ? ' | ' : '' %> @@ -50,73 +57,180 @@ % if ( $payby{'MCRD'} && $curuser->access_right('Post payment') ) { <% $s++ ? ' | ' : '' %> - Post manual (offline) credit card payment + Post manual (offline/POS) credit card payment % } +%# credit link + % if ( $curuser->access_right('Post credit') ) { <% include('/elements/popup_link-cust_main.html', 'label' => 'Enter credit', 'action' => "${p}edit/cust_credit.cgi", 'cust_main' => $cust_main, 'actionlabel' => 'Enter credit', - 'width' => 392, + 'width' => 616, #make room for reasons #540 default #default# 'height' => 336, ) %> % } -% if ( $curuser->access_right('View customer tax exemptions') ) { - View tax exemptions - +%# refund links + +% $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', + 'action' => "${p}edit/cust_refund.cgi?popup=1;payby=BILL", + 'cust_main' => $cust_main, + 'actionlabel' => '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', + '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 +%# +%# % 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++ ? ' | ' : '' %> + Post manual (offline/POS) credit card refund % } -% if ( $conf->exists('batch-enable') + |
+
+
+%# invoice reports
+% if ( $curuser->access_right('List invoices') ) {
+ Invoice reports
+% }
+ + +%# 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 ) { + View tax exemptions + <% $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, + }) + %> + | + View tax adjustments +% } + + +% } + +%# batched payment links + +% if ( ( $conf->exists('batch-enable') || $conf->config('batch-enable_payby') ) % && $curuser->access_right('View customer batched payments') -% ) { - View batched payments: +% ) +% { + View batched payments: % foreach my $status (qw( Queued In-transit Complete All )) { <% $status %> <% $status ne 'All' ? '|' : '' %> % } - + % } +%# pending payment links + +% if ( $curuser->access_right('View customer pending payments') +% && scalar($cust_main->cust_pay_pending) +% ) +% { + View pending payments +% } + + |
+ |||||||||||
+ +%# and now the table <% include("/elements/table-grid.html") %> % my $bgcolor1 = '#eeeeee'; % my $bgcolor2 = '#ffffff'; % my $bgcolor = ''; -% - | ||||||||||||
Date | Description | -Charge | +Invoice | Payment | In-house Credit |
Refund | Balance | |||||
---|---|---|---|---|---|---|---|---|---|---|---|---|
- <% time2str("%D",$date) %> + <% time2str($date_format, $date) %> | - Starting balance on <% time2str("%D",$date) %> + Starting balance on <% time2str($date_format, $date) %> (show prior history) | @@ -124,17 +238,16 @@- | <% $balance_forward %> | +<% $balance_forward %> | ||||||||
+ | % unless ( !$target || $target{$target}++ ) { % } - <% time2str("%D",$item->{'date'}) %> + <% time2str($date_format, $item->{'date'}) %> % if ( $target && $target{$target} == 1 ) { @@ -216,29 +329,32 @@ | <% $item->{'desc'} %> | -+ | <% $charge %> | -+ | <% $payment %> | -+ | <% $credit %> | -+ | <% $refund %> | -+ | <% $showbalance %> |