X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_bill.cgi;h=951725531bf950411f9950c9794c6f26ae8ec893;hb=c648976f0b7975f2328ebd7ba8c711fad0ca4195;hp=45e19d4365d47049d57d69b966086efec0fe3dd3;hpb=c1bb4ddb71147d0571bd301a6d8c452fdf0e1bc9;p=freeside.git
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 45e19d436..951725531 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -1,151 +1,119 @@
-<%
-
-#untaint invnum
-my($query) = $cgi->keywords;
-$query =~ /^((.+)-)?(\d+)$/;
-my $templatename = $2;
-my $invnum = $3;
-
-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 ))
- unless @payby;
-my %payby = map { $_=>1 } @payby;
-
-my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
-die "Invoice #$invnum not found!" unless $cust_bill;
-my $custnum = $cust_bill->getfield('custnum');
-
-#my $printed = $cust_bill->printed;
-
-my $link = $templatename ? "$templatename-$invnum" : $invnum;
-
-%>
-<%= include("/elements/header.html",'Invoice View', menubar(
- "Main Menu" => $p,
+<% include("/elements/header.html",'Invoice View', menubar(
"View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
)) %>
-<% if ( $cust_bill->owed > 0
- && ( $payby{'BILL'} || $payby{'CASH'} || $payby{'WEST'} || $payby{'MCRD'} )
- )
- {
- my $s = 0;
-%>
+
+% if ( $cust_bill->owed > 0
+% && ( $payby{'BILL'} || $payby{'CASH'} || $payby{'WEST'} || $payby{'MCRD'} )
+% )
+% {
+% my $s = 0;
Post
+% if ( $payby{'BILL'} ) {
- <% if ( $payby{'BILL'} ) { %>
-
- <%= $s++ ? ' | ' : '' %>
- check
-
- <% } %>
- <% if ( $payby{'CASH'} ) { %>
-
- <%= $s++ ? ' | ' : '' %>
- cash
-
- <% } %>
-
- <% if ( $payby{'WEST'} ) { %>
-
- <%= $s++ ? ' | ' : '' %>
- Western Union
+ <% $s++ ? ' | ' : '' %>
+ check
+% }
+% if ( $payby{'CASH'} ) {
+
- <% } %>
+ <% $s++ ? ' | ' : '' %>
+ cash
+% }
+% if ( $payby{'WEST'} ) {
- <% if ( $payby{'MCRD'} ) { %>
- <%= $s++ ? ' | ' : '' %>
- manual credit card
+ <% $s++ ? ' | ' : '' %>
+ Western Union
+% }
+% if ( $payby{'MCRD'} ) {
+
- <% } %>
+ <% $s++ ? ' | ' : '' %>
+ manual credit card
+% }
+
payment against this invoice
+% }
-<% } %>
-Re-print this invoice
+Re-print this invoice
+% if ( grep { $_ ne 'POST' } $cust_bill->cust_main->invoicing_list ) {
-<% if ( grep { $_ ne 'POST' } $cust_bill->cust_main->invoicing_list ) { %>
- | Re-email
+ | Re-email
this invoice
-<% } %>
+% }
+% if ( $conf->exists('hylafax') && length($cust_bill->cust_main->fax) ) {
-<% if ( $conf->exists('hylafax') && length($cust_bill->cust_main->fax) ) { %>
- | Re-fax
+ | Re-fax
this invoice
-<% } %>
+% }
+
+% if ( $conf->exists('invoice_latex') ) {
-<% if ( $conf->exists('invoice_latex') ) { %>
- View typeset invoice
+ View typeset invoice
-<% } %>
-
-<% #false laziness with search/cust_bill_event.cgi
- unless ( $templatename ) { %>
-
- <%= table() %>
-
<% join('', $cust_bill->print_text('', $templatename) ) %>+% } + +<% include('/elements/footer.html') %> +<%init> + +die "access denied" + unless $FS::CurrentUser::CurrentUser->access_right('View invoices'); + +#untaint invnum +my($query) = $cgi->keywords; +$query =~ /^((.+)-)?(\d+)$/; +my $templatename = $2; +my $invnum = $3; + +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 )) + unless @payby; +my %payby = map { $_=>1 } @payby; + +my $cust_bill = qsearchs({ + 'select' => 'cust_bill.*', + 'table' => 'cust_bill', + 'addl_from' => 'LEFT JOIN cust_main USING ( custnum )', + 'hashref' => { 'invnum' => $invnum }, + 'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql, +}); +die "Invoice #$invnum not found!" unless $cust_bill; + +my $custnum = $cust_bill->custnum; + +#my $printed = $cust_bill->printed; + +my $link = $templatename ? "$templatename-$invnum" : $invnum; -<% } %> +%init> -<% if ( $conf->exists('invoice_html') ) { %> - <%= join('', $cust_bill->print_html('', $templatename) ) %> -<% } else { %> -
<%= join('', $cust_bill->print_text('', $templatename) ) %>-<% } %> -