X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpayment_history.html;h=d79d8436577e05113ad1f2077a491b6d743904bf;hb=76d2bd33f0b9dd003457fc40c97f253ce1aaf5d1;hp=4a49bfddb8ae9476e0d4b32c725d4900120d52a4;hpb=93519f9371b41ded713a93fba031ed7a361be04c;p=freeside.git diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html index 4a49bfddb..d79d84365 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'),
- 'width' => 392,
+ 'actionlabel' => emt('Enter check payment'),
+ 'width' => ( $opt{'pkg-balances'} ? 763 : 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'),
- 'width' => 392,
+ 'actionlabel' => emt('Enter cash payment'),
+ 'width' => ( $opt{'pkg-balances'} ? 763 : 392),
+ 'height' => 392,
&>
% }
@@ -28,6 +34,9 @@
<% mt('Enter Western Union payment') |h %>
% }
+<% $s ? ' ' : '' %> +% $s=0; + % if ( ( $payby{'CARD'} || $payby{'DCRD'} ) % && $curuser->access_right(['Process payment', 'Process credit card payment']) % && ! $cust_main->is_encrypted($cust_main->payinfo) @@ -49,20 +58,39 @@ <% mt('Post manual (offline/POS) credit card payment') |h %> % } - +% if ( $payby{'MCRD'} && $curuser->access_right('Post payment') ) { + <% $s++ ? ' | ' : '' %> + <% mt('Post manual (offline) electronic check payment') |h %> +% } + +<% $s ? ' ' : '' %> -%# credit link +%# credit links +% $s=0; % if ( $curuser->access_right('Post credit') ) { + <% $s++ ? ' | ' : '' %> <& /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'), - 'width' => 616, #make room for reasons #540 default + 'actionlabel' => emt('Enter credit'), + 'width' => ( $opt{'pkg-balances'} ? 763 : 616), + &> +% } +% if ( $curuser->access_right('Credit line items') ) { + <% $s++ ? ' | ' : '' %> + <& /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' => 968, #763, + 'height' => 575, &> - % } +<% $s ? ' ' : '' %> %# refund links @@ -70,10 +98,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 +109,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 +141,27 @@ <% mt('Post manual (offline/POS) credit card refund') |h %> % } +% if ( $payby{'MCHK'} && $curuser->access_right('Post refund') ) { + <% $s++ ? ' | ' : '' %> + <% mt('Post manual (offline) electronic check refund') |h %> +% } + + |
+
+
+%# invoice reports, combined statement
+% if ( $curuser->access_right('List invoices') ) {
+% if ( $num_cust_bill > 0 ) {
+ <%
+ mt('Download typeset statement PDF') |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 +178,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 +213,11 @@ <% mt('View pending payments') |h %> % } + |
+ |||||
+ %# and now the table <& /elements/table-grid.html &> @@ -185,57 +237,20 @@ %#display payment history -%my $money_char = $conf->config('money_char') || '$'; -% -%sub balance_forward_row { -% my( $b, $date, $money_char ) = @_; -% ( my $balance_forward = $money_char. $b ) =~ s/^\$\-/- \$/; - - | ||||||
- <% time2str($date_format, $date) %> - | - -- <% mt("Starting balance on [_1]", time2str($date_format, $date) ) |h %> - (<% mt('show prior history') |h %>) - | - -- | - | - | - | <% $balance_forward %> | - -
@@ -312,13 +328,16 @@ <% $showbalance %> |