X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpayment_history.html;h=63708e63cf99ac0c3f80f5c402dd619a6dfad41c;hb=c3da5cf1caa244937d280e0f406927103beef148;hp=64a7089768cab4c5ed3bcd105a31790b74c41214;hpb=c6fb9a26030c82d4c25618046230db463ff95950;p=freeside.git diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html index 64a708976..63708e63c 100644 --- a/httemplate/view/cust_main/payment_history.html +++ b/httemplate/view/cust_main/payment_history.html @@ -267,7 +267,9 @@ % % my $charge = exists($item->{'charge'}) % ? sprintf("$money_char\%.2f", $item->{'charge'}) -% : ''; +% : exists($item->{'charge_nobal'}) +% ? sprintf("$money_char\%.2f", $item->{'charge_nobal'}) +% : ''; % % my $payment = exists($item->{'payment'}) % ? sprintf("- $money_char\%.2f", $item->{'payment'}) @@ -396,6 +398,17 @@ my %opt = ( ) ); +$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, + 'desc' => include('payment_history/legacy_invoice.html', $legacy_cust_bill, %opt ), + 'charge_nobal' => $legacy_cust_bill->charged, + }; +} + #invoices foreach my $cust_bill ($cust_main->cust_bill) { push @history, {