X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpayment_history.html;h=9c18fbc15d90db83ea43d7bf83e289c44b7a563c;hb=11bbf29de447fe39e9d7155fe280a0df70fa8c3c;hp=04e427f9d363ff480417933ee01115c6f260f8fc;hpb=7b40e0e045368d350529d78208be0e6124f94b5a;p=freeside.git diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html index 04e427f9d..9c18fbc15 100644 --- a/httemplate/view/cust_main/payment_history.html +++ b/httemplate/view/cust_main/payment_history.html @@ -2,194 +2,6 @@ -%# payment links - -% my $s = 0; -% if ( $payby{'BILL'} && $curuser->access_right(['Post payment', 'Post check payment' ]) ) { - <% $s++ ? ' | ' : '' %> - <& /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' => 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' => emt('Enter cash payment'), - 'action' => "${p}edit/cust_pay.cgi?popup=1;payby=CASH", - 'cust_main' => $cust_main, - 'actionlabel' => emt('Enter cash payment'), - 'width' => ( $opt{'pkg-balances'} ? 763 : 392), - 'height' => 392, - &> -% } - -% if ( $payby{'WEST'} && $curuser->access_right('Post payment') ) { - <% $s++ ? ' | ' : '' %> - <% 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) -% ) { - <% $s++ ? ' | ' : '' %> - <% mt('Process credit card payment') |h %> -% } - -% if ( ( $payby{'CHEK'} || $payby{'DCHK'} ) -% && $curuser->access_right(['Process payment', 'Process Echeck payment']) -% && ! $cust_main->is_encrypted($cust_main->payinfo) -% ) { - <% $s++ ? ' | ' : '' %> - <% mt('Process electronic check (ACH) payment') |h %> -% } - -% if ( $payby{'MCRD'} && $curuser->access_right('Post payment') ) { - <% $s++ ? ' | ' : '' %> - <% 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 links - -% $s=0; -% if ( $curuser->access_right('Post credit') ) { - <% $s++ ? ' | ' : '' %> - <& /elements/popup_link-cust_main.html, - 'label' => emt('Enter credit'), - 'action' => "${p}edit/cust_credit.cgi", - 'cust_main' => $cust_main, - '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 - -% $s = 0; -% if ( $payby{'BILL'} && $curuser->access_right(['Post refund', 'Post check refund']) ) { - <% $s++ ? ' | ' : '' %> - <& /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' => emt('Enter check refund'), - 'width' => 440, - &> -% } - -% if ( $payby{'CASH'} && $curuser->access_right(['Post refund', 'Post cash refund']) ) { - <% $s++ ? ' | ' : '' %> - <& /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' => emt('Enter cash refund'), - 'width' => 392, - &> -% } - -%# 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++ ? ' | ' : '' %> - <% 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'); -% 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') ) @@ -204,15 +16,6 @@
% } -%# pending payment links - -% if ( $curuser->access_right('View customer pending payments') -% && scalar($cust_main->cust_pay_pending) -% ) -% { - <% mt('View pending payments') |h %>
-% } - @@ -225,6 +28,7 @@ % my $bgcolor2 = '#ffffff'; % my $bgcolor = ''; + <% mt('Date') |h %> <% mt('Description') |h %> @@ -234,6 +38,7 @@ <% mt('Refund') |h %> <% mt('Balance') |h %> + %#display payment history @@ -331,29 +136,43 @@ % if ( $item->{'balance_forward'} ) { <& .balance_forward_row, $item->{'balance'}, $item->{'date'} &> -% } +% } %} # foreach $item +% if ( $old_history ) { +<& .hide_history_row, $old_history++ &> +% } + + <%def .balance_forward_row> % my( $b, $date ) = @_; @@ -366,7 +185,7 @@ function show_history () { <% mt("Starting balance on [_1]", time2str($date_format, $date) ) |h %> - (<% mt('show prior history') |h %>) + (<% mt('show prior history') |h %>) @@ -377,6 +196,17 @@ function show_history () { +<%def .hide_history_row> +% my $num = shift; + + + + (<% mt('hide prior history') |h %>) + + + + + <%shared> my $conf = new FS::Conf; my $date_format = $conf->config('date_format') || '%m/%d/%Y'; @@ -389,12 +219,6 @@ my $custnum = $cust_main->custnum; my $curuser = $FS::CurrentUser::CurrentUser; -my @payby = grep /\w/, $conf->config('payby'); -#@payby = (qw( CARD DCRD CHEK DCHK LECB BILL CASH WEST COMP )) -@payby = (qw( CARD DCRD CHEK DCHK LECB BILL CASH COMP )) - unless @payby; -my %payby = map { $_=>1 } @payby; - my %status = ( 'Queued' => 'O', #Open 'In-transit' => 'I', @@ -412,7 +236,7 @@ my %opt = ( qw( card_refund-days date_format ) ), ( map { $_ => $conf->exists($_) } - qw( deleteinvoices deletepayments deleterefunds pkg-balances + qw( deletepayments deleterefunds pkg-balances cust_credit_bill_pkg-manual cust_bill_pay_pkg-manual ) ), @@ -421,11 +245,12 @@ my %opt = ( #rights ( map { $_ => $curuser->access_right($_) } ( - 'View invoices', 'Void invoices', 'Unvoid invoices', 'Delete invoices', + 'View invoices', 'Void invoices', 'Unvoid invoices', 'Resend invoices', 'Apply payment', 'Refund credit card payment', 'Refund Echeck payment', + 'Post refund', 'Post check refund', 'Post cash refund ', 'Refund payment', 'Credit card void', 'Echeck void', 'Void payments', 'Unvoid payments', - 'Delete payment', 'Unapply payment', - 'Apply credit', 'Delete credit', 'Unapply credit', 'Void credit', 'Unvoid credit', + 'Unapply payment', + 'Apply credit', 'Unapply credit', 'Void credit', 'Unvoid credit', 'Delete refund', 'Billing event reports', 'View customer billing events', ) @@ -434,6 +259,7 @@ my %opt = ( #customer information 'total_owed' => $cust_main->total_owed, 'total_unapplied_refunds' => $cust_main->total_unapplied_refunds, + 'has_email_address' => scalar($cust_main->invoicing_list_emailonly), ); $opt{'date_format'} ||= '%m/%d/%Y'; @@ -678,7 +504,7 @@ sub translate_payinfo { sub areyousure_link { my ($url,$msg,$title,$label) = (shift,shift,shift,shift); - ' ('.$label.')'; + ' ('.$label.')'; }