X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fcust_bill.cgi;h=116cd6dcc347f3a9441e90ffb0c17fb434981a4e;hp=50ee8b36c075ac92528f530260cd7dcfbf38ca80;hb=e6b504f1d05efe176bb91c40cca089b41d2d2f49;hpb=f4ffa3596c3b8bfc9e862c2a7e8efc68f86207ab

diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 50ee8b36c..116cd6dcc 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -3,8 +3,9 @@
 
 #untaint invnum
 my($query) = $cgi->keywords;
-$query =~ /^(\d+)$/;
-my $invnum = $1;
+$query =~ /^((.+)-)?(\d+)$/;
+my $templatename = $2;
+my $invnum = $3;
 
 my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
 die "Invoice #$invnum not found!" unless $cust_bill;
@@ -31,7 +32,7 @@ print '<BR><BR>';
 my $conf = new FS::Conf;
 if ( $conf->exists('invoice_latex') ) {
   print menubar(
-    'View typeset invoice' => "${p}view/cust_bill-pdf.cgi?$invnum",
+    'View typeset invoice' => "${p}view/cust_bill-pdf.cgi?$invnum.pdf",
   ), '<BR><BR>';
 }
 
@@ -43,13 +44,27 @@ foreach my $cust_bill_event (
 ) {
   my $status = $cust_bill_event->status;
   $status .= ': '. $cust_bill_event->statustext if $cust_bill_event->statustext;
-  print '<TR><TD>'. $cust_bill_event->part_bill_event->event. '</TD><TD>'.
+  my $part_bill_event = $cust_bill_event->part_bill_event;
+  print '<TR><TD>'. $part_bill_event->event;
+
+  if (
+    $part_bill_event->plan eq 'send_alternate'
+    && $part_bill_event->plandata =~ /^templatename (.*)$/m
+  ) {
+    my $templatename = $1;
+    print qq! ( <A HREF="${p}view/cust_bill.cgi?$templatename-$invnum">!.
+          'view text</A> | '.
+          qq!<A HREF="${p}view/cust_bill-pdf.cgi?$templatename-$invnum.pdf">!.
+          'view typeset</A> )';
+  }
+
+  print '</TD><TD>'.
         time2str("%a %b %e %T %Y", $cust_bill_event->_date). '</TD><TD>'.
         $status. '</TD></TR>';
 }
 print '</TABLE><BR><PRE>';
 
-print $cust_bill->print_text;
+print $cust_bill->print_text('', $templatename);
 
 	#formatting
 	print <<END;