<TR>
<TD ALIGN="left">
-%# 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' => 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' => 392,
- &>
-% }
-
-% if ( $payby{'WEST'} && $curuser->access_right('Post payment') ) {
- <% $s++ ? ' | ' : '' %>
- <A HREF="<% $p %>edit/cust_pay.cgi?payby=WEST;custnum=<% $custnum %>"><% mt('Enter Western Union payment') |h %></A>
-% }
-
-<BR>
-% $s=0;
-
-% if ( ( $payby{'CARD'} || $payby{'DCRD'} )
-% && $curuser->access_right(['Process payment', 'Process credit card payment'])
-% && ! $cust_main->is_encrypted($cust_main->payinfo)
-% ) {
- <% $s++ ? ' | ' : '' %>
- <A HREF="<% $p %>misc/payment.cgi?payby=CARD;custnum=<% $custnum %>"><% mt('Process credit card payment') |h %></A>
-% }
-
-% if ( ( $payby{'CHEK'} || $payby{'DCHK'} )
-% && $curuser->access_right(['Process payment', 'Process Echeck payment'])
-% && ! $cust_main->is_encrypted($cust_main->payinfo)
-% ) {
- <% $s++ ? ' | ' : '' %>
- <A HREF="<% $p %>misc/payment.cgi?payby=CHEK;custnum=<% $custnum %>"><% mt('Process electronic check (ACH) payment') |h %></A>
-% }
-
-% if ( $payby{'MCRD'} && $curuser->access_right('Post payment') ) {
- <% $s++ ? ' | ' : '' %>
- <A HREF="<% $p %>edit/cust_pay.cgi?payby=MCRD;custnum=<% $custnum %>"><% mt('Post manual (offline/POS) credit card payment') |h %></A>
-% }
-
-<BR>
-
-%# credit link
-
-% if ( $curuser->access_right('Post credit') ) {
- <& /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' => 616, #make room for reasons #540 default
- &>
- <BR>
-% }
-
-%# 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++ ? ' | ' : '' %>
-%# <A HREF="<% $p %>misc/refund.cgi?payby=CARD;custnum=<% $custnum %>">Process credit card refund</A>
-%# % }
-%#
-%# % if ( ( $payby{'CHEK'} || $payby{'DCHK'} )
-%# % && $curuser->access_right('Process refund')
-%# % && ! $cust_main->is_encrypted($cust_main->payinfo)
-%# % ) {
-%# <% $s++ ? ' | ' : '' %>
-%# <A HREF="<% $p %>misc/refund.cgi?payby=CHEK;custnum=<% $custnum %>">Process electronic check (ACH) refund</A>
-%# % }
-
-% if ( $payby{'MCRD'} && $curuser->access_right('Post refund') ) {
- <% $s++ ? ' | ' : '' %>
- <A HREF="<% $p %>edit/cust_refund.cgi?payby=MCRD;custnum=<% $custnum %>"><% mt('Post manual (offline/POS) credit card refund') |h %></A>
-% }
-
- </TD>
- <TD ALIGN="right" VALIGN="top">
-
-%# invoice reports, combined statement
-% if ( $curuser->access_right('List invoices') ) {
-% if ( $conf->exists('cust_main-print_statement_link')
-% and $num_cust_bill > 0 ) {
- <A HREF="<% $p %>view/cust_main_statement-pdf.cgi?<% $custnum %>"><%
- mt('Print a current statement') |h %></A>
- <BR>
-% }
- <A HREF="<% $p %>search/report_cust_bill.html?custnum=<% $custnum %>"><% mt('Invoice reports') |h %></A>
-% }
-<BR>
-
-%# 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 ) {
- <A HREF="<% $p %>search/cust_tax_exempt_pkg.cgi?custnum=<% $custnum %>"><% mt('View tax exemptions') |h %></A>
- <% $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,
- }
- &>
- |
- <A HREF="<% $p %>search/cust_tax_adjustment.html?custnum=<% $custnum %>"><% mt('View tax adjustments') |h %></A>
-% }
-
- <BR>
-% }
-
%# batched payment links
% if ( ( $conf->exists('batch-enable') || $conf->config('batch-enable_payby') )
<BR>
% }
-%# pending payment links
-
-% if ( $curuser->access_right('View customer pending payments')
-% && scalar($cust_main->cust_pay_pending)
-% )
-% {
- <A HREF="<% $p %>search/cust_pay_pending.html?magic=_date;statusNOT=done;custnum=<% $custnum %>"><% mt('View pending payments') |h %></A><BR>
-% }
-
</TD>
</TR>
<TR>
% my $bgcolor2 = '#ffffff';
% my $bgcolor = '';
+<THEAD>
<TR>
<TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Date') |h %></TH>
<TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Description') |h %></TH>
<TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1><% mt('Refund') |h %></FONT></TH>
<TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1><% mt('Balance') |h %></FONT></TH>
</TR>
+</THEAD>
%#display payment history
-%my $money_char = $conf->config('money_char') || '$';
-%
-%sub balance_forward_row {
-% my( $b, $date, $money_char ) = @_;
-% ( my $balance_forward = $money_char. $b ) =~ s/^\$\-/- \$/;
-
- <TR ID="balance_forward_row">
- <TD CLASS="grid" BGCOLOR="#dddddd">
- <% time2str($date_format, $date) %>
- </TD>
-
- <TD CLASS="grid" BGCOLOR="#dddddd">
- <I><% mt("Starting balance on [_1]", time2str($date_format, $date) ) |h %></I>
- (<A HREF="javascript:void(0);" onClick="show_history();"><% mt('show prior history') |h %></A>)
- </TD>
-
- <TD CLASS="grid" BGCOLOR="#dddddd"></TD>
- <TD CLASS="grid" BGCOLOR="#dddddd"></TD>
- <TD CLASS="grid" BGCOLOR="#dddddd"></TD>
- <TD CLASS="grid" BGCOLOR="#dddddd"></TD>
- <TD CLASS="grid" BGCOLOR="#dddddd" ALIGN="right"><I><% $balance_forward %></I></TD>
-
- </TR>
-%}
-%
-%my $balance = 0;
%my %target = ();
%
-%my $years = $conf->config('payment_history-years') || 2;
-%my $older_than = time - $years * 31556926; #60*60*24*365.2422
%my $hidden = 0;
%my $seen = 0;
%my $old_history = 0;
%my $lastdate = 0;
%
-%foreach my $item ( sort { $a->{'date'} <=> $b->{'date'} } @history ) {
+%foreach my $item ( @history ) {
%
% $lastdate = $item->{'date'};
%
-% my $display;
-% if ( $item->{'date'} < $older_than ) {
+% my $display = '';
+% if ( $item->{'hide'} ) {
% $display = ' STYLE="display:none" ';
-% $hidden = 1;
-% } else {
-%
-% $display = '';
-%
-% if ( $hidden && ! $seen++ ) {
-% balance_forward_row($balance, $item->{'date'}, $money_char);
-% }
-%
% }
%
% if ( $bgcolor eq $bgcolor1 ) {
% ? sprintf("$money_char\%.2f", $item->{'charge'})
% : exists($item->{'charge_nobal'})
% ? sprintf("$money_char\%.2f", $item->{'charge_nobal'})
-% : '';
+% : exists($item->{'void_charge'})
+% ? sprintf("<DEL>$money_char\%.2f</DEL>", $item->{'void_charge'})
+% : '';
%
% my $payment = exists($item->{'payment'})
% ? sprintf("- $money_char\%.2f", $item->{'payment'})
% ? sprintf("- $money_char\%.2f", $item->{'credit'})
% : '';
%
+% $credit ||= sprintf( "<DEL>- $money_char\%.2f</DEL>",
+% $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'} : '';
%
-% $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/^\$\-/- \$/;
-%
-%
-
+% my $showbalance = $money_char . $item->{'balance'};
+% $showbalance =~ s/^\$\-/- \$/;
<TR <% $display ? $display.' ID="old_history'.$old_history++.'"' : ''%>>
<TD VALIGN="top" CLASS="grid" BGCOLOR="<% $bgcolor %>">
<% $showbalance %>
</TD>
</TR>
-% }
-%if ( scalar(@history) && $hidden && ! $seen++ ) {
-% balance_forward_row($balance, $lastdate, $money_char);
-%}
+% if ( $item->{'balance_forward'} ) {
+<& .balance_forward_row, $item->{'balance'}, $item->{'date'} &>
+% }
+%} # foreach $item
+
+% if ( $old_history ) {
+<& .hide_history_row, $old_history++ &>
+% }
</TABLE>
</TD>
</TR>
</TABLE>
+<SCRIPT SRC="<% $fsurl %>elements/page_pref.js"></SCRIPT>
<SCRIPT TYPE="text/javascript">
-function show_history () {
- //alert('showing history!');
-
+function show_history(show) { // but don't update pref
var balance_forward_row = document.getElementById('balance_forward_row');
- balance_forward_row.style.display = 'none';
+ balance_forward_row.style.display = show ? 'none' : '';
for ( var i = 0; i < <% $old_history %>; i++ ) {
var oldRow = document.getElementById('old_history'+i);
- oldRow.style.display = '';
+ oldRow.style.display = show ? '' : 'none';
}
+}
+function update_show_history (show) {
+
+ show = show ? 1 : 0;
+ show_history(show);
+ // update user pref (blind post, don't care about the output here)
+ set_page_pref('expand_old_history', '<% $custnum %>', show);
}
+$().ready(function() {
+ show_history(<% get_page_pref('expand_old_history', $custnum) %>);
+});
+
</SCRIPT>
+<%def .balance_forward_row>
+% my( $b, $date ) = @_;
+% ( my $balance_forward = $money_char. $b ) =~ s/^\$\-/- \$/;
-<%init>
+ <TR ID="balance_forward_row">
+ <TD CLASS="grid" BGCOLOR="#dddddd">
+ <% time2str($date_format, $date) %>
+ </TD>
-my( $cust_main ) = @_;
-my $custnum = $cust_main->custnum;
+ <TD CLASS="grid" BGCOLOR="#dddddd">
+ <I><% mt("Starting balance on [_1]", time2str($date_format, $date) ) |h %></I>
+ (<A HREF="javascript:void(0);" onClick="update_show_history(true);"><% mt('show prior history') |h %></A>)
+ </TD>
+
+ <TD CLASS="grid" BGCOLOR="#dddddd"></TD>
+ <TD CLASS="grid" BGCOLOR="#dddddd"></TD>
+ <TD CLASS="grid" BGCOLOR="#dddddd"></TD>
+ <TD CLASS="grid" BGCOLOR="#dddddd"></TD>
+ <TD CLASS="grid" BGCOLOR="#dddddd" ALIGN="right"><I><% $balance_forward %></I></TD>
+ </TR>
+</%def>
+<%def .hide_history_row>
+% my $num = shift;
+ <TR ID="old_history<% $num %>" STYLE="display: none">
+ <TD CLASS="grid" BGCOLOR="#dddddd"></TD>
+ <TD CLASS="grid" BGCOLOR="#dddddd">
+ <I>(<A HREF="#" onclick="update_show_history(false)"><% mt('hide prior history') |h %></A>)</I>
+ </TD>
+ <TD CLASS="grid" BGCOLOR="#dddddd" COLSPAN=5></TD>
+ </TR>
+</%def>
+
+<%shared>
my $conf = new FS::Conf;
my $date_format = $conf->config('date_format') || '%m/%d/%Y';
+my $money_char = $conf->config('money_char') || '$';
+</%shared>
+<%init>
-my $curuser = $FS::CurrentUser::CurrentUser;
+my( $cust_main ) = @_;
+my $custnum = $cust_main->custnum;
-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 $curuser = $FS::CurrentUser::CurrentUser;
my %status = (
'Queued' => 'O', #Open
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( 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', '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',
+ 'Unapply payment',
+ 'Apply credit', 'Unapply credit', 'Void credit', 'Unvoid 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,
+ 'has_email_address' => scalar($cust_main->invoicing_list_emailonly),
);
$opt{'date_format'} ||= '%m/%d/%Y';
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,
};
foreach my $cust_bill ($cust_main->cust_bill) {
push @history, {
'date' => $cust_bill->_date,
+ 'order' => 1,
+ 'num' => $cust_bill->invnum,
'desc' => include('payment_history/invoice.html', $cust_bill, %opt ),
'charge' => $cust_bill->charged,
};
$num_cust_bill++;
}
+#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,
+ };
+}
+
#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,
};
foreach my $cust_pay ($cust_main->cust_pay) {
push @history, {
'date' => $cust_pay->_date,
+ 'order' => 6,
+ 'num' => $cust_pay->paynum,
'desc' => include('payment_history/payment.html', $cust_pay, %opt ),
'payment' => $cust_pay->paid,
#'target' => $target, #XXX
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,
};
foreach my $cust_pay_void ($cust_main->cust_pay_void) {
push @history, {
'date' => $cust_pay_void->_date,
+ '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) {
push @history, {
'date' => $cust_credit->_date,
+ 'order' => 8,
+ 'num' => $cust_credit->crednum,
'desc' => include('payment_history/credit.html', $cust_credit, %opt ),
'credit' => $cust_credit->amount,
};
foreach my $cust_refund ($cust_main->cust_refund) {
push @history, {
'date' => $cust_refund->_date,
- 'desc' => include('payment_history/refund.html', $cust_refund),
+ 'order' => 9,
+ 'num' => $cust_refund->refundnum,
+ 'desc' => include('payment_history/refund.html', $cust_refund, %opt),
'refund' => $cust_refund->refund,
};
}
+# sort in forward order first, and calculate running balances
+my $years = $conf->config('payment_history-years') || 2;
+my $older_than = time - $years * 31556926; #60*60*24*365.2422
+my $balance = 0;
+
+@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/;
+ $item->{'balance'} = $balance;
+
+ if ( $item->{'date'} < $older_than ) {
+ $item->{'hide'} = 1;
+ } elsif ( $history[$i-1]->{'hide'} ) {
+ # this is the end of the hidden section
+ $history[$i-1]->{'balance_forward'} = 1;
+ }
+ $i++;
+}
+if ( @history and $history[-1]->{'hide'} ) {
+ # then everything is hidden
+ $history[-1]->{'balance_forward'} = 1;
+}
+
+# then sort in user-pref order
+if ( $curuser->option('history_order') eq 'newest' ) {
+ @history = sort { $b->{date} <=> $a->{date}
+ or $b->{order} <=> $a->{order} #or still forward here?
+ or $b->{num} <=> $a->{num}
+ }
+ @history;
+} # else it's already oldest-first, and there are no other options yet
+
sub translate_payby {
my ($payby,$payinfo) = (shift,shift);
my %payby = (
+ FS::payby->payby2shortname,
BILL => $payinfo ? emt('Check #') : '',
CHEK => emt('Electronic check '),
PREP => emt('Prepaid card '),
CARD => emt('Credit card #'),
COMP => emt('Complimentary by '),
- CASH => emt('Cash'),
- WEST => emt('Western Union'),
- MCRD => emt('Manual credit card'),
+ #CASH => emt('Cash'),
+ #WEST => emt('Western Union'),
+ #MCRD => emt('Manual credit card'),
);
$payby = (exists $payby{$payby}) ? $payby{$payby} : $payby;
$payby;
sub translate_payby_refund {
my ($payby,$payinfo) = (shift,shift);
my %payby = (
+ FS::payby->payby2shortname,
BILL => $payinfo ? emt('Check #') : emt('Check'),
CHEK => emt('Electronic check '),
CARD => emt('Credit card #'),
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);
sub areyousure_link {
my ($url,$msg,$title,$label) = (shift,shift,shift,shift);
- ' (<A HREF="javascript:areyousure(\''.$url.'\',\''.$msg.'\')" TITLE="'.$title.'">'.$label.'</A>)';
+ ' (<A HREF="javascript:areyousure(\''.$url.'\',\''.$msg.'\')" TITLE="'.$title.'" STYLE="white-space: nowrap;">'.$label.'</A>)';
}
</%init>