X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpayment_history.html;h=5586897fb4c4ab989d466cd5483fdb266482398e;hb=8be75d426dfc9125fa49dce625d40b7462b9be09;hp=750e59d2ff11d320c0336b95737ba5a1767ebd4f;hpb=15a02054fe0f91eda70003b8d1cf29497d19aa91;p=freeside.git diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html index 750e59d2f..5586897fb 100644 --- a/httemplate/view/cust_main/payment_history.html +++ b/httemplate/view/cust_main/payment_history.html @@ -1,4 +1,4 @@ -

Payment History
+%# payment links % my $s = 0; % if ( $payby{'BILL'} && $curuser->access_right('Post payment') ) { @@ -50,73 +50,166 @@ % if ( $payby{'MCRD'} && $curuser->access_right('Post payment') ) { <% $s++ ? ' | ' : '' %> - Post manual (offline) credit card payment + Post manual (offline/POS) credit card payment % }
+%# credit link + % if ( $curuser->access_right('Post credit') ) { <% include('/elements/popup_link-cust_main.html', 'label' => 'Enter credit', 'action' => "${p}edit/cust_credit.cgi", 'cust_main' => $cust_main, 'actionlabel' => 'Enter credit', - 'width' => 392, + 'width' => 616, #make room for reasons #540 default #default# 'height' => 336, ) %>
% } -% if ( $curuser->access_right('View customer tax exemptions') ) { - View tax exemptions -
+%# refund links + +% $s = 0; +% if ( $payby{'BILL'} && $curuser->access_right('Post refund') ) { + <% $s++ ? ' | ' : '' %> + <% include('/elements/popup_link-cust_main.html', + 'label' => 'Enter check refund', + 'action' => "${p}edit/cust_refund.cgi?popup=1;payby=BILL", + 'cust_main' => $cust_main, + 'actionlabel' => 'Enter check refund', + 'width' => 392, + #default# 'height' => 336, + ) + %> +% } + +% if ( $payby{'CASH'} && $curuser->access_right('Post refund') ) { + <% $s++ ? ' | ' : '' %> + <% include('/elements/popup_link-cust_main.html', + 'label' => 'Enter cash refund', + 'action' => "${p}edit/cust_refund.cgi?popup=1;payby=CASH", + 'cust_main' => $cust_main, + 'actionlabel' => 'Enter cash refund', + 'width' => 392, + #default# 'height' => 336, + ) + %> +% } + +%# 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++ ? ' | ' : '' %> + Post manual (offline/POS) credit card refund % } -% if ( $conf->exists('batch-enable') +
+ +%# 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 ) { + View tax exemptions + <% $add_adjustment ? '|' : '' %> +% } + +% if ( $add_adjustment ) { + <% include('/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, + 'height' => 200, + }) + %> + | + View tax adjustments +% } + +
+% } + +%# batched payment links + +% if ( ( $conf->exists('batch-enable') || $conf->config('batch-enable_payby') ) % && $curuser->access_right('View customer batched payments') -% ) { - View batched payments: +% ) +% { + View batched payments: % foreach my $status (qw( Queued In-transit Complete All )) { <% $status %> <% $status ne 'All' ? '|' : '' %> % } -
+
% } +%# pending payment links + +% if ( $curuser->access_right('View customer pending payments') +% && scalar($cust_main->cust_pay_pending) +% ) +% { + View pending payments
+% } + +%# and now the table <% include("/elements/table-grid.html") %> % my $bgcolor1 = '#eeeeee'; % my $bgcolor2 = '#ffffff'; % my $bgcolor = ''; -% - Date Description - Charge + Invoice Payment In-house
Credit Refund Balance -% + %#display payment history + +%my $money_char = $conf->config('money_char') || '$'; % %sub balance_forward_row { -% my( $b, $date ) = @_; -% my $conf = new FS::Conf; -% my $money_char = $conf->config('money_char') || '$'; +% my( $b, $date, $money_char ) = @_; % ( my $balance_forward = $money_char. $b ) =~ s/^\$\-/- \$/; - <% time2str("%D",$date) %> + <% time2str($date_format, $date) %> - Starting balance on <% time2str("%D",$date) %> + Starting balance on <% time2str($date_format, $date) %> (show prior history) @@ -124,17 +217,16 @@ - <% $balance_forward %> + <% $balance_forward %> %} % %my $balance = 0; %my %target = (); -%my $money_char = $conf->config('money_char') || '$'; % %my $years = $conf->config('payment_history-years') || 2; -%my $older_than = time - $years * 31556736; #60*60*24*365.24 +%my $older_than = time - $years * 31556926; #60*60*24*365.2422 %my $hidden = 0; %my $seen = 0; %my $old_history = 0; @@ -153,7 +245,7 @@ % $display = ''; % % if ( $hidden && ! $seen++ ) { -% balance_forward_row($balance, $item->{'date'}); +% balance_forward_row($balance, $item->{'date'}, $money_char); % } % % } @@ -199,13 +291,13 @@ > - + % unless ( !$target || $target{$target}++ ) { % } - <% time2str("%D",$item->{'date'}) %> + <% time2str($date_format, $item->{'date'}) %> % if ( $target && $target{$target} == 1 ) { @@ -216,26 +308,26 @@ <% $item->{'desc'} %> - + <% $charge %> - + <% $payment %> - + <% $credit %> - + <% $refund %> - + <% $showbalance %> % } %if ( scalar(@history) && $hidden && ! $seen++ ) { -% balance_forward_row($balance, $lastdate); +% balance_forward_row($balance, $lastdate, $money_char); %} @@ -263,6 +355,7 @@ my( $cust_main ) = @_; my $custnum = $cust_main->custnum; my $conf = new FS::Conf; +my $date_format = $conf->config('date_format') || '%m/%d/%Y'; my $curuser = $FS::CurrentUser::CurrentUser; @@ -282,40 +375,78 @@ my %status = ( #get payment history my @history = (); +my %opt = ( + ( map { $_ => scalar($conf->config($_)) } + qw( card_refund-days date_format ) + ), + ( map { $_ => $conf->exists($_) } + qw( deleteinvoices deletepayments deleterefunds pkg-balances ) + ) +); + #invoices foreach my $cust_bill ($cust_main->cust_bill) { push @history, { 'date' => $cust_bill->_date, - 'desc' => include('payment_history/invoice.html', $cust_bill), + 'desc' => include('payment_history/invoice.html', $cust_bill, %opt ), 'charge' => $cust_bill->charged, }; } +#statements +foreach my $cust_statement ($cust_main->cust_statement) { + push @history, { + 'date' => $cust_statement->_date, + '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' => include('payment_history/payment.html', $cust_pay), + 'desc' => include('payment_history/payment.html', $cust_pay, %opt ), 'payment' => $cust_pay->paid, #'target' => $target, #XXX }; } +#pending payments +foreach my $cust_pay_pending ($cust_main->cust_pay_pending) { + push @history, { + 'date' => $cust_pay_pending->_date, + 'desc' => include('payment_history/pending_payment.html', $cust_pay_pending, %opt ), + 'void_payment' => $cust_pay_pending->paid, + }; +} + + #voided payments foreach my $cust_pay_void ($cust_main->cust_pay_void) { push @history, { 'date' => $cust_pay_void->_date, - 'desc' => include('payment_history/voided_payment.html', $cust_pay_void), + 'desc' => include('payment_history/voided_payment.html', $cust_pay_void, %opt ), 'void_payment' => $cust_pay_void->paid, }; } +#declined payments +foreach my $cust_pay_pending ($cust_main->cust_pay_pending_attempt) { + push @history, { + 'date' => $cust_pay_pending->_date, + 'desc' => include('payment_history/attempted_payment.html', $cust_pay_pending, %opt ), + 'void_payment' => $cust_pay_pending->paid, #?? + #'target' => $target, #XXX + }; +} + #credits (some false laziness w/payments) foreach my $cust_credit ($cust_main->cust_credit) { push @history, { 'date' => $cust_credit->_date, - 'desc' => include('payment_history/credit.html', $cust_credit), + 'desc' => include('payment_history/credit.html', $cust_credit, %opt ), 'credit' => $cust_credit->amount, };