projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix bulk for all provision links showing up after first bulk link
[freeside.git]
/
httemplate
/
view
/
cust_main
/
payment_history.html
diff --git
a/httemplate/view/cust_main/payment_history.html
b/httemplate/view/cust_main/payment_history.html
index
f29ae16
..
24988ea
100644
(file)
--- a/
httemplate/view/cust_main/payment_history.html
+++ b/
httemplate/view/cust_main/payment_history.html
@@
-1,3
+1,7
@@
+<TABLE>
+ <TR>
+ <TD ALIGN="left">
+
%# payment links
% my $s = 0;
%# payment links
% my $s = 0;
@@
-28,6
+32,9
@@
<A HREF="<% $p %>edit/cust_pay.cgi?payby=WEST;custnum=<% $custnum %>"><% mt('Enter Western Union payment') |h %></A>
% }
<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)
% if ( ( $payby{'CARD'} || $payby{'DCRD'} )
% && $curuser->access_right(['Process payment', 'Process credit card payment'])
% && ! $cust_main->is_encrypted($cust_main->payinfo)
@@
-113,8
+120,17
@@
<A HREF="<% $p %>edit/cust_refund.cgi?payby=MCRD;custnum=<% $custnum %>"><% mt('Post manual (offline/POS) credit card refund') |h %></A>
% }
<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
+% if ( $curuser->access_right('List invoices') ) {
+ <A HREF="<% $p %>search/report_cust_bill.html?custnum=<% $custnum %>"><% mt('Invoice reports') |h %></A>
+% }
<BR>
<BR>
+%# XXX payments, credits, refund reports
+
%# tax exemption link
% my $view_exemptions = $curuser->access_right('View customer tax exemptions');
%# tax exemption link
% my $view_exemptions = $curuser->access_right('View customer tax exemptions');
@@
-166,6
+182,11
@@
<A HREF="<% $p %>search/cust_pay_pending.html?magic=_date;statusNOT=done;custnum=<% $custnum %>"><% mt('View pending payments') |h %></A><BR>
% }
<A HREF="<% $p %>search/cust_pay_pending.html?magic=_date;statusNOT=done;custnum=<% $custnum %>"><% mt('View pending payments') |h %></A><BR>
% }
+ </TD>
+ </TR>
+ <TR>
+ <TD COLSPAN=2>
+
%# and now the table
<& /elements/table-grid.html &>
%# and now the table
<& /elements/table-grid.html &>
@@
-318,6
+339,9
@@
% balance_forward_row($balance, $lastdate, $money_char);
%}
% balance_forward_row($balance, $lastdate, $money_char);
%}
+</TABLE>
+ </TD>
+ </TR>
</TABLE>
<SCRIPT TYPE="text/javascript">
</TABLE>
<SCRIPT TYPE="text/javascript">
@@
-483,11
+507,17
@@
sub translate_payinfo {
my $payby = $object->payby;
my $payinfo = $object->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' ) {
my( $account, $aba ) = split('@', $object->paymask );
if ( $payby eq 'CARD' ) {
$payinfo = $object->paymask;
} elsif ( $payby eq 'CHEK' ) {
my( $account, $aba ) = split('@', $object->paymask );
- $payinfo = emt("ABA [_1], Acct #[_2]",$aba,$account);
+ if ( $conf->exists('echeck-no_routing') ) {
+ $payinfo = emt("Acct #[_1]", $account);
+ } else {
+ $payinfo = emt("ABA [_1], Acct #[_2]",$aba,$account);
+ }
}
($payby,$payinfo);
}
($payby,$payinfo);