projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
certificates ala communigate, RT#7515
[freeside.git]
/
httemplate
/
view
/
cust_bill.cgi
diff --git
a/httemplate/view/cust_bill.cgi
b/httemplate/view/cust_bill.cgi
index
5540221
..
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>
% }
@@
-60,14
+60,14
@@
% if ( $curuser->access_right('Resend invoices') ) {
% if ( $curuser->access_right('Resend invoices') ) {
- <A HREF="<% $p %>misc/
print-invoice.cgi?
<% $link %>">Re-print this invoice</A>
+ <A HREF="<% $p %>misc/
send-invoice.cgi?method=print;
<% $link %>">Re-print this invoice</A>
% if ( grep { $_ ne 'POST' } $cust_bill->cust_main->invoicing_list ) {
% if ( grep { $_ ne 'POST' } $cust_bill->cust_main->invoicing_list ) {
- | <A HREF="<% $p %>misc/
email-invoice.cgi?
<% $link %>">Re-email this invoice</A>
+ | <A HREF="<% $p %>misc/
send-invoice.cgi?method=email;
<% $link %>">Re-email this invoice</A>
% }
% if ( $conf->exists('hylafax') && length($cust_bill->cust_main->fax) ) {
% }
% if ( $conf->exists('hylafax') && length($cust_bill->cust_main->fax) ) {
- | <A HREF="<% $p %>misc/
fax-invoice.cgi?
<% $link %>">Re-fax this invoice</A>
+ | <A HREF="<% $p %>misc/
send-invoice.cgi?method=fax;
<% $link %>">Re-fax this invoice</A>
% }
<BR><BR>
% }
<BR><BR>
@@
-76,7
+76,7
@@
% if ( $conf->exists('invoice_latex') ) {
% if ( $conf->exists('invoice_latex') ) {
- <A HREF="<% $p %>view/cust_bill-pdf.cgi?<% $link %>
.pdf
">View typeset invoice PDF</A>
+ <A HREF="<% $p %>view/cust_bill-pdf.cgi?<% $link %>">View typeset invoice PDF</A>
<BR><BR>
% }
<BR><BR>
% }
@@
-92,11
+92,9
@@
<% $br ? '<BR><BR>' : '' %>
% if ( $conf->exists('invoice_html') ) {
<% $br ? '<BR><BR>' : '' %>
% if ( $conf->exists('invoice_html') ) {
-
- <% join('', $cust_bill->print_html('', $templatename) ) %>
+ <% join('', $cust_bill->print_html(\%opt) ) %>
% } else {
% } else {
-
- <PRE><% join('', $cust_bill->print_text('', $templatename) ) %></PRE>
+ <PRE><% join('', $cust_bill->print_text(\%opt) ) %></PRE>
% }
<% include('/elements/footer.html') %>
% }
<% include('/elements/footer.html') %>
@@
-107,14
+105,26
@@
my $curuser = $FS::CurrentUser::CurrentUser;
die "access denied"
unless $curuser->access_right('View invoices');
die "access denied"
unless $curuser->access_right('View invoices');
-#untaint invnum
+my( $invnum, $template, $notice_name );
my($query) = $cgi->keywords;
my($query) = $cgi->keywords;
-$query =~ /^((.+)-)?(\d+)$/;
-my $templatename = $2;
-my $invnum = $3;
+if ( $query =~ /^((.+)-)?(\d+)$/ ) {
+ $template = $2;
+ $invnum = $3;
+ $notice_name = 'Invoice';
+} else {
+ $invnum = $cgi->param('invnum');
+ $template = $cgi->param('template');
+ $notice_name = $cgi->param('notice_name');
+}
my $conf = new FS::Conf;
my $conf = new FS::Conf;
+my %opt = (
+ 'unsquelch_cdr' => $conf->exists('voip-cdr_email'),
+ 'template' => $template,
+ 'notice_name' => $notice_name,
+);
+
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 ))
@@
-135,6
+145,8
@@
my $display_custnum = $cust_bill->cust_main->display_custnum;
#my $printed = $cust_bill->printed;
#my $printed = $cust_bill->printed;
-my $link = $templatename ? "$templatename-$invnum" : $invnum;
+my $link = "invnum=$invnum";
+$link .= ';template='. uri_escape($template) if $template;
+$link .= ';notice_name='. $notice_name if $notice_name;
</%init>
</%init>