X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpayment_history.html;h=141a0790e437d078905ffe3f59331dd3a9cb51f5;hb=b1cd043555e332d70d686f3011f3f8a64c30a779;hp=915be49e528c71233403f8d5c12bb45455b1fa76;hpb=f3e0ac2b009c4edd5692cb587ff709dac2223ebe;p=freeside.git
diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index 915be49e5..141a0790e 100644
--- a/httemplate/view/cust_main/payment_history.html
+++ b/httemplate/view/cust_main/payment_history.html
@@ -12,7 +12,7 @@
'action' => "${p}edit/cust_pay.cgi?popup=1;payby=BILL",
'cust_main' => $cust_main,
'actionlabel' => emt('Enter check payment'),
- 'width' => 392,
+ 'width' => ( $opt{'pkg-balances'} ? 763 : 392),
'height' => 392,
&>
% }
@@ -24,7 +24,7 @@
'action' => "${p}edit/cust_pay.cgi?popup=1;payby=CASH",
'cust_main' => $cust_main,
'actionlabel' => emt('Enter cash payment'),
- 'width' => 392,
+ 'width' => ( $opt{'pkg-balances'} ? 763 : 392),
'height' => 392,
&>
% }
@@ -70,7 +70,7 @@
'action' => "${p}edit/cust_credit.cgi",
'cust_main' => $cust_main,
'actionlabel' => emt('Enter credit'),
- 'width' => 616, #make room for reasons #540 default
+ 'width' => ( $opt{'pkg-balances'} ? 763 : 616),
&>
% }
% if ( $curuser->access_right('Credit line items') ) {
@@ -141,10 +141,9 @@
%# invoice reports, combined statement
% if ( $curuser->access_right('List invoices') ) {
-% if ( $conf->exists('cust_main-print_statement_link')
-% and $num_cust_bill > 0 ) {
+% if ( $num_cust_bill > 0 ) {
<%
- mt('Print a current statement') |h %>
+ mt('Download typeset statement PDF') |h %>
% }
<% mt('Invoice reports') |h %>
@@ -271,6 +270,11 @@
% ? 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'})
% : '';
@@ -392,12 +396,34 @@ my %status = (
my @history = ();
my %opt = (
+
+ #config
( map { $_ => scalar($conf->config($_)) }
qw( card_refund-days date_format )
),
( map { $_ => $conf->exists($_) }
- qw( deleteinvoices deletepayments deleterefunds pkg-balances )
- )
+ 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';
@@ -470,6 +496,15 @@ foreach my $cust_pay_void ($cust_main->cust_pay_void) {
}
+#voided credits
+foreach my $cust_credit_void ($cust_main->cust_credit_void) {
+ push @history, {
+ 'date' => $cust_credit_void->_date,
+ '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, {
@@ -581,13 +616,18 @@ sub translate_payinfo {
my $payby = $object->payby;
my $payinfo = $object->payinfo;
- my $conf = new FS::Conf;
-
if ( $payby eq 'CARD' ) {
$payinfo = $object->paymask;
} elsif ( $payby eq 'CHEK' ) {
+ #false laziness w/payinfo_Mixin::payby_payinfo_pretty, should use that
my( $account, $aba ) = split('@', $object->paymask );
- $payinfo = emt("ABA [_1], Acct #[_2]",$aba,$account);
+ if ( $aba =~ /^(\d{5})\.(\d{3})$/ ) { #blame canada
+ my($branch, $routing) = ($1, $2);
+ $payinfo = emt("Routing [_1], Branch [_2], Acct [_3]",
+ $routing, $branch, $account);
+ } else {
+ $payinfo = emt("Routing [_1], Acct [_2]", $aba, $account);
+ }
}
($payby,$payinfo);