move header() to include(/elements/header.html) so it can be changed in one place...

[freeside.git] / httemplate / view / cust_bill.cgi

diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 39c1a19..45e19d4 100755 (executable)
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -8,6 +8,12 @@ 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');
@@ -17,16 +23,53 @@ my $custnum = $cust_bill->getfield('custnum');
 my $link = $templatename ? "$templatename-$invnum" : $invnum;
 
 %>
-<%= header('Invoice View', menubar(
+<%= 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 ) { %>
-  <A HREF="<%= $p %>edit/cust_pay.cgi?<%= $invnum %>">Enter payments (check/cash) against this invoice</A> |
+<% if ( $cust_bill->owed > 0
+        && ( $payby{'BILL'} || $payby{'CASH'} || $payby{'WEST'} || $payby{'MCRD'} )
+      )
+   {
+     my $s = 0;
+%>
+
+  Post 
+
+  <% 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>
+  
+  <% } %>
+
+  <% 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 %>">Reprint 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 ) { %>
   | <A HREF="<%= $p %>misc/email-invoice.cgi?<%= $link %>">Re-email
@@ -67,11 +110,8 @@ my $link = $templatename ? "$templatename-$invnum" : $invnum;
     <TR>
       <TD><%= $part_bill_event->event %>
   
-        <% if (
-          $part_bill_event->plan eq 'send_alternate'
-          && $part_bill_event->plandata =~ /^(agent_)?templatename (.*)$/m
-        ) {
-          my $alt_templatename = $2;
+        <% 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>
@@ -103,9 +143,9 @@ my $link = $templatename ? "$templatename-$invnum" : $invnum;
 <% } %>
 
 <% if ( $conf->exists('invoice_html') ) { %>
-  <%= $cust_bill->print_html('', $templatename) %>
+  <%= join('', $cust_bill->print_html('', $templatename) ) %>
 <% } else { %>
-  <PRE><%= $cust_bill->print_text('', $templatename) %></PRE>
+  <PRE><%= join('', $cust_bill->print_text('', $templatename) ) %></PRE>
 <% } %>
 
 </BODY></HTML>