projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
manual batch approval and TD EFT fixes, RT#10545
[freeside.git]
/
httemplate
/
view
/
cust_bill.cgi
diff --git
a/httemplate/view/cust_bill.cgi
b/httemplate/view/cust_bill.cgi
index
ce8d96a
..
0928d04
100755
(executable)
--- a/
httemplate/view/cust_bill.cgi
+++ b/
httemplate/view/cust_bill.cgi
@@
-26,7
+26,7
@@
% if ( $cust_bill->owed > 0
% && scalar( grep $payby{$_}, qw(BILL CASH WEST MCRD) )
% if ( $cust_bill->owed > 0
% && scalar( grep $payby{$_}, qw(BILL CASH WEST MCRD) )
-% && $curuser->access_right(
'Post payment'
)
+% && $curuser->access_right(
['Post payment', 'Post check payment', 'Post cash payment']
)
% && ! $conf->exists('pkg-balances')
% )
% {
% && ! $conf->exists('pkg-balances')
% )
% {
@@
-34,22
+34,22
@@
Post
Post
-% if ( $payby{'BILL'} ) {
+% if ( $payby{'BILL'}
&& $curuser->access_right(['Post payment', 'Post check payment'])
) {
<% $s++ ? ' | ' : '' %>
<A HREF="<% $p %>edit/cust_pay.cgi?payby=BILL;invnum=<% $invnum %>">check</A>
% }
<% $s++ ? ' | ' : '' %>
<A HREF="<% $p %>edit/cust_pay.cgi?payby=BILL;invnum=<% $invnum %>">check</A>
% }
-% if ( $payby{'CASH'} ) {
+% if ( $payby{'CASH'}
&& $curuser->access_right(['Post payment', 'Post cash payment'])
) {
<% $s++ ? ' | ' : '' %>
<A HREF="<% $p %>edit/cust_pay.cgi?payby=CASH;invnum=<% $invnum %>">cash</A>
% }
<% $s++ ? ' | ' : '' %>
<A HREF="<% $p %>edit/cust_pay.cgi?payby=CASH;invnum=<% $invnum %>">cash</A>
% }
-% if ( $payby{'WEST'} ) {
+% if ( $payby{'WEST'}
&& $curuser->access_right(['Post payment'])
) {
<% $s++ ? ' | ' : '' %>
<A HREF="<% $p %>edit/cust_pay.cgi?payby=WEST;invnum=<% $invnum %>">Western Union</A>
% }
<% $s++ ? ' | ' : '' %>
<A HREF="<% $p %>edit/cust_pay.cgi?payby=WEST;invnum=<% $invnum %>">Western Union</A>
% }
-% if ( $payby{'MCRD'} ) {
+% if ( $payby{'MCRD'}
&& $curuser->access_right(['Post payment'])
) {
<% $s++ ? ' | ' : '' %>
<A HREF="<% $p %>edit/cust_pay.cgi?payby=MCRD;invnum=<% $invnum %>">manual credit card</A>
% }
<% $s++ ? ' | ' : '' %>
<A HREF="<% $p %>edit/cust_pay.cgi?payby=MCRD;invnum=<% $invnum %>">manual credit card</A>
% }
@@
-117,13
+117,14
@@
if ( $query =~ /^((.+)-)?(\d+)$/ ) {
$notice_name = $cgi->param('notice_name');
}
$notice_name = $cgi->param('notice_name');
}
+my $conf = new FS::Conf;
+
my %opt = (
my %opt = (
- 'template' => $template,
- 'notice_name' => $notice_name,
+ 'unsquelch_cdr' => $conf->exists('voip-cdr_email'),
+ 'template' => $template,
+ 'notice_name' => $notice_name,
);
);
-my $conf = new FS::Conf;
-
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 ))
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 ))