X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpayment_history.html;h=6630d12a5d115f2d46dc01a4634a6dfd42e35766;hb=a72a10f754f7465121d6137bb3dcee0a21ea6443;hp=0dc4c41d57980590e9b0d15c4eb53156795f9cc7;hpb=624b2d44625f69d71175c3348cae635d580c890b;p=freeside.git diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html index 0dc4c41d5..6630d12a5 100644 --- a/httemplate/view/cust_main/payment_history.html +++ b/httemplate/view/cust_main/payment_history.html @@ -1,56 +1,61 @@ + + + + + + + - - - - - - - + + + + + + + %#display payment history @@ -209,8 +236,8 @@ @@ -258,7 +285,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("$money_char\%.2f", $item->{'void_charge'}) +% : ''; % % my $payment = exists($item->{'payment'}) % ? sprintf("- $money_char\%.2f", $item->{'payment'}) @@ -291,7 +322,7 @@ > - - - - - - @@ -331,6 +362,9 @@ %}
+ %# 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++ ? ' | ' : '' %> - 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 %> % }
@@ -58,45 +63,49 @@ %# 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', + 'actionlabel' => emt('Enter credit'), 'width' => 616, #make room for reasons #540 default - #default# 'height' => 336, - ) - %> + &> + | + <& /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') ) { +% 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. @@ -120,11 +129,26 @@ % 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, 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'); @@ -134,22 +158,20 @@ % if ( $view_exemptions || $add_adjustment ) { % if ( $view_exemptions ) { - View tax exemptions + <% mt('View tax exemptions') |h %> <% $add_adjustment ? '|' : '' %> % } % if ( $add_adjustment ) { - <% include('/elements/popup_link.html', { + <& /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, + 'label' => emt('Add tax adjustment'), + 'actionlabel' => emt('Add tax adjustment'), 'height' => 200, - }) - %> + } + &> | - View tax adjustments + <% mt('View tax adjustments') |h %> % }
@@ -161,9 +183,9 @@ % && $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' ? '|' : '' %> % }
@@ -175,24 +197,29 @@ % && scalar($cust_main->cust_pay_pending) % ) % { - View pending payments
+ <% 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 = '';
DateDescriptionInvoicePaymentIn-house
Credit		RefundBalance<% mt('Date') |h %><% mt('Description') |h %><% mt('Invoice') |h %><% mt('Payment') |h %><% mt('In-house Credit') |h %><% mt('Refund') |h %><% mt('Balance') |h %>
- Starting balance on <% time2str($date_format, $date) %> - (show prior history) + <% mt("Starting balance on [_1]", time2str($date_format, $date) ) |h %> + (<% mt('show prior history') |h %>)
+ % unless ( !$target || $target{$target}++ ) { @@ -308,19 +339,19 @@ <% $item->{'desc'} %> + <% $charge %> + <% $payment %> + <% $credit %> + <% $refund %> + <% $showbalance %>
+ + +