X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpayment_history.html;h=fcc4470a0a210a8bb9ec30b975e2d6dc4f4fc09e;hb=149719dd87d1f0d2208a94dcd7e9072c378d872a;hp=aef5fb8f87d6bfbdd07206a20e81a73f996ea6df;hpb=8e3dfb380406e145494a5fffa7a0e4aab7b38253;p=freeside.git diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html index aef5fb8f8..fcc4470a0 100644 --- a/httemplate/view/cust_main/payment_history.html +++ b/httemplate/view/cust_main/payment_history.html @@ -1,388 +1,558 @@ -<% - my( $cust_main ) = @_; - my $custnum = $cust_main->custnum; + + + + + + + + + + + + + + + -<% } %> +%#display payment history + +%my %target = (); +% +%my $hidden = 0; +%my $seen = 0; +%my $old_history = 0; +%my $lastdate = 0; +% +%foreach my $item ( @history ) { +% +% $lastdate = $item->{'date'}; +% +% my $display = ''; +% if ( $item->{'hide'} ) { +% $display = ' STYLE="display:none" '; +% } +% +% if ( $bgcolor eq $bgcolor1 ) { +% $bgcolor = $bgcolor2; +% } else { +% $bgcolor = $bgcolor1; +% } +% +% 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'}) +% : ''; +% +% $payment ||= sprintf( "- $money_char\%.2f", +% $item->{'void_payment'} +% ) +% if exists($item->{'void_payment'}); +% +% my $credit = exists($item->{'credit'}) +% ? sprintf("- $money_char\%.2f", $item->{'credit'}) +% : ''; +% +% $credit ||= sprintf( "- $money_char\%.2f", +% $item->{'void_credit'} +% ) +% if exists($item->{'void_credit'}); +% +% my $refund = exists($item->{'refund'}) +% ? sprintf("$money_char\%.2f", $item->{'refund'}) +% : ''; +% +% my $target = exists($item->{'target'}) ? $item->{'target'} : ''; +% +% my $showbalance = $money_char . $item->{'balance'}; +% $showbalance =~ s/^\$\-/- \$/; + + > + + + + + + + + -<% } %> +% if ( $item->{'balance_forward'} ) { +<& .balance_forward_row, $item->{'balance'}, $item->{'date'} &> +% } +%} # foreach $item -<% if ( ( $payby{'CHEK'} || $payby{'DCHK'} ) - && $curuser->access_right('Process payment') - ) { -%> +
+ +%# 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 %> +% } + +<% $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' => 392, + &> +% } + +% 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 %> +% } - my $conf = new FS::Conf; - - 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 $s = 0; - -%> - -

Payment History
- -<% if ( $payby{'BILL'} && $curuser->access_right('Post payment') ) { %> + 		- <%= $s++ ? ' | ' : '' %> - Enter check payment +%# 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 %> +% } -<% if ( $payby{'CASH'} && $curuser->access_right('Post payment') ) { %> +
+% } + +%# batched payment links + +% if ( ( $conf->exists('batch-enable') || $conf->config('batch-enable_payby') ) +% && $curuser->access_right('View customer batched payments') +% ) +% { + <% mt('View batched payments:') |h %> +% foreach my $status (qw( Queued In-transit Complete All )) { + <% 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 %>
+% } - <%= $s++ ? ' | ' : '' %> - Enter cash payment +
-<% } %> +%# and now the table -<% if ( $payby{'WEST'} && $curuser->access_right('Post payment') ) { %> +<& /elements/table-grid.html &> +% my $bgcolor1 = '#eeeeee'; +% my $bgcolor2 = '#ffffff'; +% my $bgcolor = ''; - <%= $s++ ? ' | ' : '' %> - Enter Western Union payment +
<% mt('Date') |h %><% mt('Description') |h %><% mt('Invoice') |h %><% mt('Payment') |h %><% mt('In-house Credit') |h %><% mt('Refund') |h %><% mt('Balance') |h %>
+% unless ( !$target || $target{$target}++ ) { + + +% } + + <% time2str($date_format, $item->{'date'}) %> +% if ( $target && $target{$target} == 1 ) { -<% if ( ( $payby{'CARD'} || $payby{'DCRD'} ) - && $curuser->access_right('Process payment') - ) { -%> + +% } - <%= $s++ ? ' | ' : '' %> - Process credit card payment + + + <% $item->{'desc'} %> + + <% $charge %> + + <% $payment %> + + <% $credit %> + + <% $refund %> + + <% $showbalance %> +
+ + + - <%= $s++ ? ' | ' : '' %> - Process electronic check (ACH) payment + +<%def .balance_forward_row> +% my( $b, $date ) = @_; +% ( 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 %> + + + +<%shared> +my $conf = new FS::Conf; +my $date_format = $conf->config('date_format') || '%m/%d/%Y'; +my $money_char = $conf->config('money_char') || '$'; + +<%init> -<% if ( $curuser->access_right('Post credit') ) { %> +my( $cust_main ) = @_; +my $custnum = $cust_main->custnum; - Enter credit +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', + 'Complete' => 'R', #Resolved + 'All' => '', +); -<% #get payment history my @history = (); +my %opt = ( + + #config + ( map { $_ => scalar($conf->config($_)) } + qw( card_refund-days date_format ) + ), + ( map { $_ => $conf->exists($_) } + qw( deleteinvoices deletepayments deleterefunds pkg-balances + cust_credit_bill_pkg-manual cust_bill_pay_pkg-manual + ) + ), + 'money_char ' => $money_char, + + #rights + ( map { $_ => $curuser->access_right($_) } + ( + 'View invoices', 'Void invoices', 'Unvoid invoices', 'Delete invoices', + 'Apply payment', 'Refund credit card payment', 'Refund Echeck payment', + 'Credit card void', 'Echeck void', 'Void payments', 'Unvoid payments', + 'Delete payment', 'Unapply payment', + 'Apply credit', 'Delete credit', 'Unapply credit', + 'Delete refund', + 'Billing event reports', 'View customer billing events', + ) + ), + + #customer information + 'total_owed' => $cust_main->total_owed, + 'total_unapplied_refunds' => $cust_main->total_unapplied_refunds, +); + +$opt{'date_format'} ||= '%m/%d/%Y'; + +#legacy invoices +foreach my $legacy_cust_bill ($cust_main->legacy_cust_bill) { + push @history, { + 'date' => $legacy_cust_bill->_date, + 'order' => 1, + 'num' => $legacy_cust_bill->legacyid, + 'desc' => include('payment_history/legacy_invoice.html', $legacy_cust_bill, %opt ), + 'charge_nobal' => $legacy_cust_bill->charged, + }; +} + #invoices +my $num_cust_bill = 0; foreach my $cust_bill ($cust_main->cust_bill) { - my $pre = ( $cust_bill->owed > 0 ) - ? 'Open ' - : ''; - my $post = ( $cust_bill->owed > 0 ) ? '' : ''; - my $invnum = $cust_bill->invnum; - my $link = $curuser->access_right('View invoices') - ? qq!! - : ''; push @history, { 'date' => $cust_bill->_date, - 'desc' => $link. $pre. - "Invoice #$invnum (Balance \$". $cust_bill->owed. ')'. - $post. ( $link ? '' : '' ), + 'order' => 1, + 'num' => $cust_bill->invnum, + 'desc' => include('payment_history/invoice.html', $cust_bill, %opt ), 'charge' => $cust_bill->charged, }; + $num_cust_bill++; } -#payments (some false laziness w/credits) -foreach my $cust_pay ($cust_main->cust_pay) { - - my $payby = $cust_pay->payby; - - my $payinfo; - if ( $payby eq 'CARD' ) { - $payinfo = $cust_pay->payinfo_masked; - } elsif ( $payby eq 'CHEK' && $cust_pay->payinfo =~ /^(\d+)\@(\d+)$/ ) { - $payinfo = "ABA $2, Acct# $1"; - } else { - $payinfo = $cust_pay->payinfo; - } - my @cust_bill_pay = $cust_pay->cust_bill_pay; - my @cust_pay_refund = $cust_pay->cust_pay_refund; - - my $target = "$payby$payinfo"; - $payby =~ s/^BILL$/Check #/ if $payinfo; - $payby =~ s/^CHEK$/Electronic check /; - $payby =~ s/^PREP$/Prepaid card /; - $payby =~ s/^CARD$/Credit card #/; - $payby =~ s/^COMP$/Complimentary by /; - $payby =~ s/^CASH$/Cash/; - $payby =~ s/^WEST$/Western Union/; - $payby =~ s/^MCRD$/Manual credit card/; - $payby =~ s/^BILL$//; - my $info = $payby ? " ($payby$payinfo)" : ''; - - my( $pre, $post, $desc, $apply, $ext ) = ( '', '', '', '', '' ); - if ( scalar(@cust_bill_pay) == 0 - && scalar(@cust_pay_refund) == 0 ) { - #completely unapplied - $pre = 'Unapplied '; - $post = ''; - $apply = qq! (apply)!; - - } elsif ( scalar(@cust_bill_pay) == 1 - && scalar(@cust_pay_refund) == 0 - && $cust_pay->unapplied == 0 ) { - #applied to one invoice, the usual situation - $desc = ' applied to Invoice #'. $cust_bill_pay[0]->invnum; - } elsif ( scalar(@cust_bill_pay) == 0 - && scalar(@cust_pay_refund) == 1 - && $cust_pay->unapplied == 0 ) { - #applied to one refund - $desc = ' refunded on '. time2str("%D", $cust_pay_refund[0]->_date); - } else { - #complicated - $desc = '
'; - foreach my $app ( sort { $a->_date <=> $b->_date } - ( @cust_bill_pay, @cust_pay_refund ) ) { - if ( $app->isa('FS::cust_bill_pay') ) { - $desc .= '  '. - '$'. $app->amount. - ' applied to Invoice #'. $app->invnum. - '
'; - #' on '. time2str("%D", $cust_bill_pay->_date). - } elsif ( $app->isa('FS::cust_pay_refund') ) { - $desc .= '  '. - '$'. $app->amount. - ' refunded on '. time2str("%D", $app->_date). - '
'; - } else { - die "$app is not a FS::cust_bill_pay or FS::cust_pay_refund"; - } - } - if ( $cust_pay->unapplied > 0 ) { - $desc .= '  '. - '$'. - $cust_pay->unapplied. ' unapplied'. - qq! (apply)!. - '
'; - } - } - - my $refund = ''; - my $refund_days = $conf->config('card_refund-days') || 120; - if ( $cust_pay->closed !~ /^Y/i - && $cust_pay->payby =~ /^(CARD|CHEK)$/ - && time-$cust_pay->_date < $refund_days*86400 - && $cust_pay->unrefunded > 0 - && $curuser->access_right('Refund payment') - ) { - $refund = qq! (refund)!; - } - - my $void = ''; - if ( $cust_pay->closed !~ /^Y/i - && ( ( $cust_pay->payby eq 'CARD' - && $curuser->access_right('Credit card void') - ) - || ( $cust_pay->payby eq 'CHEK' - && $curuser->access_right('Echeck void') - ) - || ( $cust_pay->payby !~ /^(CARD|CHEK)$/ - && $curuser->access_right('Regular void') - ) - ) - ) - { - $void = qq! (void)!; - } - - my $delete = ''; - if ( $cust_pay->closed !~ /^Y/i - && $conf->exists('deletepayments') - && $curuser->access_right('Delete payment') - ) - { - $delete = qq! (delete)!; - } +#voided invoices +foreach my $cust_bill_void ($cust_main->cust_bill_void) { + push @history, { + 'date' => $cust_bill_void->_date, + 'order' => 0, + 'num' => $cust_bill_void->invnum, + 'desc' => include('payment_history/voided_invoice.html', $cust_bill_void, %opt ), + 'void_charge' => $cust_bill_void->charged, + }; +} - my $unapply = ''; - if ( $cust_pay->closed !~ /^Y/i - && scalar(@cust_bill_pay) - && $curuser->access_right('Unapply payment') - ) - { - $unapply = qq! (unapply)!; - } +#statements +foreach my $cust_statement ($cust_main->cust_statement) { + push @history, { + 'date' => $cust_statement->_date, + 'order' => 2, + 'num' => $cust_statement->statementnum, + 'desc' => include('payment_history/statement.html', $cust_statement, %opt ), + #'charge' => $cust_bill->charged, + }; +} +#payments (some false laziness w/credits) +foreach my $cust_pay ($cust_main->cust_pay) { push @history, { 'date' => $cust_pay->_date, - 'desc' => $pre. "Payment$post$info$desc". - "$apply$refund$void$delete$unapply", + 'order' => 6, + 'num' => $cust_pay->paynum, + 'desc' => include('payment_history/payment.html', $cust_pay, %opt ), 'payment' => $cust_pay->paid, - 'target' => $target, + #'target' => $target, #XXX }; } -#voided payments -foreach my $cust_pay_void ($cust_main->cust_pay_void) { +#pending payments +foreach my $cust_pay_pending ($cust_main->cust_pay_pending) { + push @history, { + 'date' => $cust_pay_pending->_date, + 'order' => 4, + 'num' => $cust_pay_pending->paypendingnum, + 'desc' => include('payment_history/pending_payment.html', $cust_pay_pending, %opt ), + 'void_payment' => $cust_pay_pending->paid, + }; +} - my $payby = $cust_pay_void->payby; - my $payinfo = $payby eq 'CARD' - ? $cust_pay_void->payinfo_masked - : $cust_pay_void->payinfo; - - $payby =~ s/^BILL$/Check #/ if $payinfo; - $payby =~ s/^CHEK$/Electronic check /; - $payby =~ s/^BILL$//; - $payby =~ s/^(CARD|COMP)$/$1 /; - my $info = $payby ? " ($payby$payinfo)" : ''; - - my $unvoid = ''; - if ( $cust_pay_void->closed !~ /^Y/i - && $curuser->access_right('Unvoid') - ) - { - $unvoid = qq! (unvoid)!; - } +#voided payments +foreach my $cust_pay_void ($cust_main->cust_pay_void) { push @history, { 'date' => $cust_pay_void->_date, - 'desc' => "Payment $info voided ". - time2str("%D", $cust_pay_void->void_date). - " by ". $cust_pay_void->otaker. ''. $unvoid, + 'order' => 3, + 'num' => $cust_pay_void->paynum, + 'desc' => include('payment_history/voided_payment.html', $cust_pay_void, %opt ), 'void_payment' => $cust_pay_void->paid, }; } +#voided credits +foreach my $cust_credit_void ($cust_main->cust_credit_void) { + push @history, { + 'date' => $cust_credit_void->_date, + 'order' => 7, + 'num' => $cust_credit_void->paynum, + 'desc' => include('payment_history/voided_credit.html', $cust_credit_void, %opt ), + 'void_credit' => $cust_credit_void->amount, + }; +} + +#declined payments +foreach my $cust_pay_pending ($cust_main->cust_pay_pending_attempt) { + push @history, { + 'date' => $cust_pay_pending->_date, + 'order' => 5, + 'num' => $cust_pay_pending->paypendingnum, + 'desc' => include('payment_history/attempted_payment.html', $cust_pay_pending, %opt ), + 'void_payment' => $cust_pay_pending->paid, #?? + #'target' => $target, #XXX + }; +} +#declined batch payments +foreach my $cust_pay_batch ( + $cust_main->cust_pay_batch(hashref => {status => 'Declined'}) +) { + my $pay_batch = $cust_pay_batch->pay_batch; + push @history, { + 'date' => $pay_batch->upload, + 'order' => 5, + 'num' => $cust_pay_batch->paybatchnum, + 'desc' => include('payment_history/attempted_batch_payment.html', $cust_pay_batch, %opt), + 'void_payment' => $cust_pay_batch->amount, + }; +} + #credits (some false laziness w/payments) foreach my $cust_credit ($cust_main->cust_credit) { - - my @cust_credit_bill = $cust_credit->cust_credit_bill; - my @cust_credit_refund = $cust_credit->cust_credit_refund; - - my( $pre, $post, $desc, $apply, $ext ) = ( '', '', '', '', '' ); - if ( scalar(@cust_credit_bill) == 0 - && scalar(@cust_credit_refund) == 0 ) { - #completely unapplied - $pre = 'Unapplied '; - $post = ''; - $apply = qq! (apply)!; - } elsif ( scalar(@cust_credit_bill) == 1 - && scalar(@cust_credit_refund) == 0 - && $cust_credit->credited == 0 ) { - #applied to one invoice, the usual situation - $desc = ' applied to Invoice #'. $cust_credit_bill[0]->invnum; - } elsif ( scalar(@cust_credit_bill) == 0 - && scalar(@cust_credit_refund) == 1 - && $cust_credit->credited == 0 ) { - #applied to one refund - $desc = ' refunded on '. time2str("%D", $cust_credit_refund[0]->_date); - } else { - #complicated - $desc = '
'; - foreach my $app ( sort { $a->_date <=> $b->_date } - ( @cust_credit_bill, @cust_credit_refund ) ) { - if ( $app->isa('FS::cust_credit_bill') ) { - $desc .= '  '. - '$'. $app->amount. - ' applied to Invoice #'. $app->invnum. - '
'; - #' on '. time2str("%D", $app->_date). - } elsif ( $app->isa('FS::cust_credit_refund') ) { - $desc .= '  '. - '$'. $app->amount. - ' refunded on '. time2str("%D", $app->_date). - '
'; - } else { - die "$app is not a FS::cust_credit_bill or a FS::cust_credit_refund"; - } - } - if ( $cust_credit->credited > 0 ) { - $desc .= '  $'. - $cust_credit->credited. ' unapplied'. - qq! (apply)!. - '
'; - } - } -# - my $delete = ''; - if ( $cust_credit->closed !~ /^Y/i - - #s'pose deleting a credit isn't bad like deleting a payment - # and this needs to be generally available until we have credit voiding.. - #&& $conf->exists('deletecredits') - - && $curuser->access_right('Delete credit') - ) - { - $delete = qq! (!. - qq!delete)!; - } - - my $unapply = ''; - if ( $cust_credit->closed !~ /^Y/i - && scalar(@cust_credit_bill) - && $curuser->access_right('Unapply credit') - ) - { - $unapply = qq! (!. - qq!unapply)!; - } - push @history, { 'date' => $cust_credit->_date, - 'desc' => $pre. "Credit$post by ". $cust_credit->otaker. - ( $cust_credit->reason - ? ' ('. $cust_credit->reason. ')' - : '' - ). - "$desc$apply$delete$unapply", + 'order' => 8, + 'num' => $cust_credit->crednum, + 'desc' => include('payment_history/credit.html', $cust_credit, %opt ), 'credit' => $cust_credit->amount, }; @@ -390,181 +560,115 @@ foreach my $cust_credit ($cust_main->cust_credit) { #refunds foreach my $cust_refund ($cust_main->cust_refund) { - - my $payby = $cust_refund->payby; - my $payinfo = $payby eq 'CARD' - ? $cust_refund->payinfo_masked - : $cust_refund->payinfo; - - $payby =~ s/^BILL$/Check #/ if $payinfo; - $payby =~ s/^CHEK$/Electronic check /; - $payby =~ s/^(CARD|COMP)$/$1 /; - push @history, { 'date' => $cust_refund->_date, - 'desc' => "Refund ($payby$payinfo) by ". $cust_refund->otaker, + 'order' => 9, + 'num' => $cust_refund->refundnum, + 'desc' => include('payment_history/refund.html', $cust_refund, %opt), 'refund' => $cust_refund->refund, }; } -%> - -<%= include("/elements/table-grid.html") %> - -<% my $bgcolor1 = '#eeeeee'; - my $bgcolor2 = '#ffffff'; - my $bgcolor = ''; -%> - - - Date - Description - Charge - Payment - In-house
Credit - Refund - Balance - - -<% -#display payment history - -my $balance = 0; -my %target = (); -my $money_char = $conf->config('money_char') || '$'; - +# sort in forward order first, and calculate running balances my $years = $conf->config('payment_history-years') || 2; -my $older_than = time - $years * 31556736; #60*60*24*365.24 -my $hidden = 0; -my $seen = 0; -my $old_history = 0; - -foreach my $item ( sort { $a->{'date'} <=> $b->{'date'} } @history ) { - - my $display; - if ( $item->{'date'} < $older_than ) { - $display = ' STYLE="display:none" '; - $hidden = 1; - } else { - - $display = ''; - - if ( $hidden && ! $seen++ ) { - ( my $balance_forward = $money_char. $balance ) =~ s/^\$\-/- \$/; - %> - - - - <%= time2str("%D",$item->{'date'}) %> - - - - Starting balance on <%= time2str("%D",$item->{'date'}) %> - (show prior history) - - - - - - - <%= $balance_forward %> - - - - <% - } - - } - - if ( $bgcolor eq $bgcolor1 ) { - $bgcolor = $bgcolor2; - } else { - $bgcolor = $bgcolor1; - } - - my $charge = exists($item->{'charge'}) - ? sprintf("$money_char\%.2f", $item->{'charge'}) - : ''; - - my $payment = exists($item->{'payment'}) - ? sprintf("- $money_char\%.2f", $item->{'payment'}) - : ''; - - $payment ||= sprintf( "- $money_char\%.2f", - $item->{'void_payment'} - ) - if exists($item->{'void_payment'}); - - my $credit = exists($item->{'credit'}) - ? sprintf("- $money_char\%.2f", $item->{'credit'}) - : ''; - - my $refund = exists($item->{'refund'}) - ? sprintf("$money_char\%.2f", $item->{'refund'}) - : ''; +my $older_than = time - $years * 31556926; #60*60*24*365.2422 +my $balance = 0; - my $target = exists($item->{'target'}) ? $item->{'target'} : ''; +@history = sort { $a->{date} <=> $b->{date} + or $a->{order} <=> $b->{order} + or $a->{num} <=> $b->{num} + } + @history; +my $i = 0; +my $balance_forward; +foreach my $item (@history) { $balance += $item->{'charge'} if exists $item->{'charge'}; $balance -= $item->{'payment'} if exists $item->{'payment'}; $balance -= $item->{'credit'} if exists $item->{'credit'}; $balance += $item->{'refund'} if exists $item->{'refund'}; $balance = sprintf("%.2f", $balance); - $balance =~ s/^\-0\.00$/0.00/; #yay ieee fp - ( my $showbalance = $money_char. $balance ) =~ s/^\$\-/- \$/; - -%> - - > - - <% unless ( !$target || $target{$target}++ ) { %> - - <% } %> - <%= time2str("%D",$item->{'date'}) %> - <% if ( $target && $target{$target} == 1 ) { %> - - <% } %> - - - - <%= $item->{'desc'} %> - - - <%= $charge %> - - - <%= $payment %> - - - <%= $credit %> - - - <%= $refund %> - - - <%= $showbalance %> - - + $balance =~ s/^\-0\.00$/0.00/; + $item->{'balance'} = $balance; -<% } %> - - - - +sub areyousure_link { + my ($url,$msg,$title,$label) = (shift,shift,shift,shift); + ' ('.$label.')'; +} +