X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fview%2Fcust_main%2Fpayment_history.html;h=580a30751a4355be052ca694804773715ddb1b91;hb=3d62ec9362d0b22c17a17da6197f8b2fc219a54e;hp=c3a9019c615007301daf7a10fb376292d6a3bfb6;hpb=626dbc1a49b6b1dfba94584670a0a0b11ac52148;p=freeside.git
diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index c3a9019c6..580a30751 100644
--- a/httemplate/view/cust_main/payment_history.html
+++ b/httemplate/view/cust_main/payment_history.html
@@ -1,58 +1,59 @@
-
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',
+ <& /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') ) {
+% 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++ ? ' | ' : '' %>
- Enter Western Union payment
+ <% mt('Enter Western Union payment') |h %>
% }
+ +% $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++ ? ' | ' : '' %> - Process credit card payment + <% mt('Process credit card payment') |h %> % } % 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++ ? ' | ' : '' %> - Process electronic check (ACH) payment + <% mt('Process electronic check (ACH) payment') |h %> % } % if ( $payby{'MCRD'} && $curuser->access_right('Post payment') ) { <% $s++ ? ' | ' : '' %> - Post manual (offline/POS) credit card payment + <% mt('Post manual (offline/POS) credit card payment') |h %> % } @@ -60,45 +61,39 @@ %# 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', - 'width' => 392, - #default# 'height' => 336, - ) - %> + 'actionlabel' => emt('Enter credit'), + 'width' => 616, #make room for reasons #540 default + &> % } %# refund links % $s = 0; -% if ( $payby{'BILL'} && $curuser->access_right('Post refund') ) { +% 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') ) { +% 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. @@ -122,81 +117,125 @@ % if ( $payby{'MCRD'} && $curuser->access_right('Post refund') ) { <% $s++ ? ' | ' : '' %> - Post manual (offline/POS) credit card refund + <% mt('Post manual (offline/POS) credit card refund') |h %> % } + |
+
+
+%# invoice reports
+% if ( $curuser->access_right('List invoices') ) {
+ <% mt('Invoice reports') |h %>
+% }
+%# XXX payments, credits, refund reports + %# tax exemption link -% if ( $curuser->access_right('View customer tax exemptions') ) { - View tax exemptions +% 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') ) % && $curuser->access_right('View customer batched payments') -% ) { - View batched payments: +% ) +% { + <% mt('View batched payments:') |h %> % foreach my $status (qw( Queued In-transit Complete All )) { - <% $status %> + <% mt($status) |h %> <% $status ne 'All' ? '|' : '' %> % } - + % } +%# pending payment links + +% if ( $curuser->access_right('View customer pending payments') +% && scalar($cust_main->cust_pay_pending) +% ) +% { + <% mt('View pending payments') |h %> +% } + + |
+ ||||||||||||
+ %# and now the table -<% include("/elements/table-grid.html") %> +<& /elements/table-grid.html &> % my $bgcolor1 = '#eeeeee'; % my $bgcolor2 = '#ffffff'; % my $bgcolor = ''; | |||||||||||||
Date | -Description | -Charge | -Payment | -In-house Credit |
- Refund | -Balance | +<% mt('Date') |h %> | +<% mt('Description') |h %> | +<% mt('Invoice') |h %> | +<% mt('Payment') |h %> | +<% mt('In-house Credit') |h %> | +<% mt('Refund') |h %> | +<% mt('Balance') |h %> |
---|---|---|---|---|---|---|---|---|---|---|---|---|---|
- <% time2str("%D",$date) %> + <% time2str($date_format, $date) %> | - Starting balance on <% time2str("%D",$date) %> - (show prior history) + <% mt("Starting balance on [_1]", time2str($date_format, $date) ) |h %> + (<% mt('show prior history') |h %>) | - | <% $balance_forward %> | +<% $balance_forward %> | |||||||||
+ | % unless ( !$target || $target{$target}++ ) { % } - <% time2str("%D",$item->{'date'}) %> + <% time2str($date_format, $item->{'date'}) %> % if ( $target && $target{$target} == 1 ) { @@ -278,28 +317,31 @@ | <% $item->{'desc'} %> | -+ | <% $charge %> | -+ | <% $payment %> | -+ | <% $credit %> | -+ | <% $refund %> | -+ | <% $showbalance %> |