X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fcust_bill.cgi;h=3772e8dd09b1f6ed4e8c2f62b843ee72aeedec37;hp=45e19d4365d47049d57d69b966086efec0fe3dd3;hb=3ce7691203a7737406bf2d4442f7fd84b81f847e;hpb=15e561850b61b10a92a46d8f3e316d53d4970087

diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 45e19d436..3772e8dd0 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -1,151 +1,155 @@
-<%
-
-#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(
+%
+%
+%#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,
   "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++ ? ' | ' : '' %>
-    <A HREF="<%= $p %>edit/cust_pay.cgi?payby=BILL;invnum=<%= $invnum %>">check</A>
-  
-  <% } %>
-  
-  <% if ( $payby{'CASH'} ) { %>
-  
-    <%= $s++ ? ' | ' : '' %>
-    <A HREF="<%= $p %>edit/cust_pay.cgi?payby=CASH;invnum=<%= $invnum %>">cash</A>
-  
-  <% } %>
-  
-  <% if ( $payby{'WEST'} ) { %>
   
-    <%= $s++ ? ' | ' : '' %>
-    <A HREF="<%= $p %>edit/cust_pay.cgi?payby=WEST;invnum=<%= $invnum %>">Western Union</A>
+    <% $s++ ? ' | ' : '' %>
+    <A HREF="<% $p %>edit/cust_pay.cgi?payby=BILL;invnum=<% $invnum %>">check</A>
+% } 
+% if ( $payby{'CASH'} ) { 
+
   
-  <% } %>
+    <% $s++ ? ' | ' : '' %>
+    <A HREF="<% $p %>edit/cust_pay.cgi?payby=CASH;invnum=<% $invnum %>">cash</A>
+% } 
+% if ( $payby{'WEST'} ) { 
 
-  <% if ( $payby{'MCRD'} ) { %>
   
-    <%= $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=WEST;invnum=<% $invnum %>">Western Union</A>
+% } 
+% if ( $payby{'MCRD'} ) { 
+
   
-  <% } %>
+    <% $s++ ? ' | ' : '' %>
+    <A HREF="<% $p %>edit/cust_pay.cgi?payby=MCRD;invnum=<% $invnum %>">manual credit card</A>
+% } 
+
 
   payment against this invoice<BR>
+% } 
 
-<% } %>
 
-<A HREF="<%= $p %>misc/print-invoice.cgi?<%= $link %>">Re-print this invoice</A>
+<A HREF="<% $p %>misc/print-invoice.cgi?<% $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
+  | <A HREF="<% $p %>misc/email-invoice.cgi?<% $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
+  | <A HREF="<% $p %>misc/fax-invoice.cgi?<% $link %>">Re-fax
       this invoice</A>
-<% } %>
+% } 
+
 
 <BR><BR>
+% if ( $conf->exists('invoice_latex') ) { 
 
-<% if ( $conf->exists('invoice_latex') ) { %>
-  <A HREF="<%= $p %>view/cust_bill-pdf.cgi?<%= $link %>.pdf">View typeset invoice</A>
+  <A HREF="<% $p %>view/cust_bill-pdf.cgi?<% $link %>.pdf">View typeset invoice</A>
   <BR><BR>
-<% } %>
+% } 
+% #false laziness with search/cust_bill_event.cgi
+%   unless ( $templatename ) { 
 
-<% #false laziness with search/cust_bill_event.cgi
-   unless ( $templatename ) { %>
 
-  <%= table() %>
+  <% table() %>
   <TR>
     <TH>Event</TH>
     <TH>Date</TH>
     <TH>Status</TH>
   </TR>
+% foreach my $cust_bill_event (
+%       sort { $a->_date <=> $b->_date } $cust_bill->cust_bill_event
+%     ) {
+%
+%    my $status = $cust_bill_event->status;
+%    $status .= ': '. encode_entities($cust_bill_event->statustext)
+%      if $cust_bill_event->statustext;
+%    my $part_bill_event = $cust_bill_event->part_bill_event;
+%  
 
-  <% foreach my $cust_bill_event (
-       sort { $a->_date <=> $b->_date } $cust_bill->cust_bill_event
-     ) {
-
-    my $status = $cust_bill_event->status;
-    $status .= ': '. encode_entities($cust_bill_event->statustext)
-      if $cust_bill_event->statustext;
-    my $part_bill_event = $cust_bill_event->part_bill_event;
-  %>
     <TR>
-      <TD><%= $part_bill_event->event %>
-  
-        <% if ( $part_bill_event->templatename ) {
-          my $alt_templatename = $part_bill_event->templatename;
-          my $alt_link = "$alt_templatename-$invnum";
-        %>
-          ( <A HREF="<%= $p %>view/cust_bill.cgi?<%= $alt_link %>">view</A>
-          | <A HREF="<%= $p %>view/cust_bill-pdf.cgi?<%= $alt_link %>.pdf">view
+      <TD><% $part_bill_event->event %>
+% if ( $part_bill_event->templatename ) {
+%          my $alt_templatename = $part_bill_event->templatename;
+%          my $alt_link = "$alt_templatename-$invnum";
+%        
+
+          ( <A HREF="<% $p %>view/cust_bill.cgi?<% $alt_link %>">view</A>
+          | <A HREF="<% $p %>view/cust_bill-pdf.cgi?<% $alt_link %>.pdf">view
               typeset</A>
-          | <A HREF="<%= $p %>misc/print-invoice.cgi?<%= $alt_link %>">re-print</A>
-          <% if ( grep { $_ ne 'POST' }
-                       $cust_bill->cust_main->invoicing_list ) { %>
-            | <A HREF="<%= $p %>misc/email-invoice.cgi?<%= $alt_link %>">re-email</A>
-          <% } %>
-                       
-          <% if ( $conf->exists('hylafax')
-                  && length($cust_bill->cust_main->fax) ) { %>
-            | <A HREF="<%= $p %>misc/fax-invoice.cgi?<%= $alt_link %>">re-fax</A>
-          <% } %>
+          | <A HREF="<% $p %>misc/print-invoice.cgi?<% $alt_link %>">re-print</A>
+% if ( grep { $_ ne 'POST' }
+%                       $cust_bill->cust_main->invoicing_list ) { 
+
+            | <A HREF="<% $p %>misc/email-invoice.cgi?<% $alt_link %>">re-email</A>
+% } 
+% if ( $conf->exists('hylafax')
+%                  && length($cust_bill->cust_main->fax) ) { 
+
+            | <A HREF="<% $p %>misc/fax-invoice.cgi?<% $alt_link %>">re-fax</A>
+% } 
+
 
           )
-        <% } %>
+% } 
+
   
       </TD>
-      <TD><%= time2str("%a %b %e %T %Y", $cust_bill_event->_date) %></TD>
-      <TD><%= $status %></TD>
+      <TD><% time2str("%a %b %e %T %Y", $cust_bill_event->_date) %></TD>
+      <TD><% $status %></TD>
     </TR>
-  <% } %>
+% } 
+
 
   </TABLE>
   <BR>
+% } 
+% if ( $conf->exists('invoice_html') ) { 
+
+  <% join('', $cust_bill->print_html('', $templatename) ) %>
+% } else { 
 
-<% } %>
+  <PRE><% join('', $cust_bill->print_text('', $templatename) ) %></PRE>
+% } 
 
-<% if ( $conf->exists('invoice_html') ) { %>
-  <%= join('', $cust_bill->print_html('', $templatename) ) %>
-<% } else { %>
-  <PRE><%= join('', $cust_bill->print_text('', $templatename) ) %></PRE>
-<% } %>
 
 </BODY></HTML>