X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_bill.cgi;h=6c8afe74d1b5c91179f3e07a8521d9434c26d577;hb=1dc2f078842e5c2d28acd8e50b9066d217179a5f;hp=7c2af06a77755da1ffff16751e3549c2cadab1e8;hpb=a4c96748eb6eab29a70f3a944c6520283a635c78;p=freeside.git

diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 7c2af06a7..6c8afe74d 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -1,10 +1,12 @@
-<!-- mason kludge -->
 <%
 
 #untaint invnum
 my($query) = $cgi->keywords;
-$query =~ /^(\d+)$/;
-my $invnum = $1;
+$query =~ /^((.+)-)?(\d+)$/;
+my $templatename = $2;
+my $invnum = $3;
+
+my $conf = new FS::Conf;
 
 my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
 die "Invoice #$invnum not found!" unless $cust_bill;
@@ -12,31 +14,98 @@ my $custnum = $cust_bill->getfield('custnum');
 
 #my $printed = $cust_bill->printed;
 
-print header('Invoice View', menubar(
+my $link = $templatename ? "$templatename-$invnum" : $invnum;
+
+%>
+<%= header('Invoice View', menubar(
   "Main Menu" => $p,
   "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
-));
+)) %>
 
-print qq!<A HREF="${p}edit/cust_pay.cgi?$invnum">Enter payments (check/cash) against this invoice</A> | !
-  if $cust_bill->owed > 0;
+<% if ( $cust_bill->owed > 0 ) { %>
+  <A HREF="<%= $p %>edit/cust_pay.cgi?<%= $invnum %>">Enter payments (check/cash) against this invoice</A> |
+<% } %>
 
-print qq!<A HREF="${p}misc/print-invoice.cgi?$invnum">Reprint this invoice</A>!.      '<BR><BR>';
+<A HREF="<%= $p %>misc/print-invoice.cgi?<%= $link %>">Reprint this invoice</A>
 
-foreach my $cust_bill_event (
-  sort { $a->_date <=> $b->_date } $cust_bill->cust_bill_event
-) {
-  print time2str("%a %b %e %T %Y", $cust_bill_event->_date). ' - '.
-        $cust_bill_event->part_bill_event->event. '<BR>';
-}
-print '<BR><PRE>';
+<% if ( grep { $_ ne 'POST' } $cust_bill->cust_main->invoicing_list ) { %>
+  | <A HREF="<%= $p %>misc/email-invoice.cgi?<%= $link %>">Re-email
+      this invoice</A>
+<% } %>
 
-print $cust_bill->print_text;
+<% if ( $conf->exists('hylafax') && length($cust_bill->cust_main->fax) ) { %>
+  | <A HREF="<%= $p %>misc/fax-invoice.cgi?<%= $link %>">Re-fax
+      this invoice</A>
+<% } %>
 
-	#formatting
-	print <<END;
-    </PRE></FONT>
-  </BODY>
-</HTML>
-END
+<BR><BR>
 
-%>
+<% if ( $conf->exists('invoice_latex') ) { %>
+  <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 ) { %>
+
+  <%= 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;
+  %>
+    <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;
+          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>
+          <% } %>
+
+          )
+        <% } %>
+  
+      </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("\n", $cust_bill->print_html('', $templatename) ) %>
+<% } else { %>
+  <PRE><%= join("\n", $cust_bill->print_text('', $templatename) ) %></PRE>
+<% } %>
+
+</BODY></HTML>