X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpayment_history.html;h=6630d12a5d115f2d46dc01a4634a6dfd42e35766;hb=e513d7cb331d7c7d99d1ea7b5f0a5f8e08e0d725;hp=a3b9b508b6e3bf95129202cfc082e0bc3517d799;hpb=5d5e197dd0c74b419a4c4cb0791bf23e68e4c3bb;p=freeside.git diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html index a3b9b508b..6630d12a5 100644 --- a/httemplate/view/cust_main/payment_history.html +++ b/httemplate/view/cust_main/payment_history.html @@ -1,25 +1,31 @@ +
+
%# payment links
% my $s = 0;
% if ( $payby{'BILL'} && $curuser->access_right(['Post payment', 'Post check payment' ]) ) {
<% $s++ ? ' | ' : '' %>
<& /elements/popup_link-cust_main.html,
- 'label' => mt('Enter check payment'),
+ 'label' => emt('Enter check payment'),
'action' => "${p}edit/cust_pay.cgi?popup=1;payby=BILL",
'cust_main' => $cust_main,
- 'actionlabel' => mt('Enter check payment'),
+ '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' => mt('Enter cash payment'),
+ 'label' => emt('Enter cash payment'),
'action' => "${p}edit/cust_pay.cgi?popup=1;payby=CASH",
'cust_main' => $cust_main,
- 'actionlabel' => mt('Enter cash payment'),
+ 'actionlabel' => emt('Enter cash payment'),
'width' => 392,
+ 'height' => 392,
&>
% }
@@ -28,6 +34,9 @@
<% 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) @@ -55,12 +64,22 @@ % if ( $curuser->access_right('Post credit') ) { <& /elements/popup_link-cust_main.html, - 'label' => mt('Enter credit'), + 'label' => emt('Enter credit'), 'action' => "${p}edit/cust_credit.cgi", 'cust_main' => $cust_main, - 'actionlabel' => mt('Enter credit'), + '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, + &> % } @@ -70,10 +89,10 @@ % if ( $payby{'BILL'} && $curuser->access_right(['Post refund', 'Post check refund']) ) { <% $s++ ? ' | ' : '' %> <& /elements/popup_link-cust_main.html, - 'label' => mt('Enter check refund'), + 'label' => emt('Enter check refund'), 'action' => "${p}edit/cust_refund.cgi?popup=1;payby=BILL", 'cust_main' => $cust_main, - 'actionlabel' => mt('Enter check refund'), + 'actionlabel' => emt('Enter check refund'), 'width' => 392, &> % } @@ -81,10 +100,10 @@ % if ( $payby{'CASH'} && $curuser->access_right(['Post refund', 'Post cash refund']) ) { <% $s++ ? ' | ' : '' %> <& /elements/popup_link-cust_main.html, - 'label' => mt('Enter cash refund'), + 'label' => emt('Enter cash refund'), 'action' => "${p}edit/cust_refund.cgi?popup=1;payby=CASH", 'cust_main' => $cust_main, - 'actionlabel' => mt('Enter cash refund'), + 'actionlabel' => emt('Enter cash refund'), 'width' => 392, &> % } @@ -113,8 +132,23 @@ <% 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'); @@ -131,8 +165,8 @@ % if ( $add_adjustment ) { <& /elements/popup_link.html, { 'action' => $p.'edit/cust_tax_adjustment.html?custnum='. $cust_main->custnum, - 'label' => mt('Add tax adjustment'), - 'actionlabel' => mt('Add tax adjustment'), + 'label' => emt('Add tax adjustment'), + 'actionlabel' => emt('Add tax adjustment'), 'height' => 200, } &> @@ -166,6 +200,11 @@ <% mt('View pending payments') |h %> % } + |
+
+
%# and now the table
<& /elements/table-grid.html &>
@@ -246,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(" |