X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_bill.cgi;h=ca0612d09cd0adacc2697f44b2967bba1dbcc091;hb=71c6e9e04a6faadedaf2238f7e7fcf607d4721cc;hp=6bc1568167223aaee2863988506f488d7d955723;hpb=8cbba53b09bb5b09355316b7ff8948500c3b4b76;p=freeside.git
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 6bc156816..ca0612d09 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -1,10 +1,11 @@
-
+
<%
#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;
@@ -20,12 +21,56 @@ print header('Invoice View', menubar(
print qq!Enter payments (check/cash) against this invoice | !
if $cust_bill->owed > 0;
-print qq!Reprint this invoice!.
-# "
(Printed $printed times)".
-#print cust_bill_events
- '
'. +print qq!Reprint this invoice!; +if ( grep { $_ ne 'POST' } $cust_bill->cust_main->invoicing_list ) { + print qq! | !. + qq!Re-email this invoice!; +} -print $cust_bill->print_text; +print '
'; + +my $conf = new FS::Conf; +if ( $conf->exists('invoice_latex') ) { + my $link = "${p}view/cust_bill-pdf.cgi?"; + $link .= "$templatename-" if $templatename; + $link .= "$invnum.pdf"; + print menubar( + 'View typeset invoice' => $link, + ), '
'; +} + +#false laziness with search/cust_bill_event.cgi + +unless ( $templatename ) { + print table(). ''; + 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; + print ' Event Date Status '; + } + print ' '. $part_bill_event->event; + + if ( + $part_bill_event->plan eq 'send_alternate' + && $part_bill_event->plandata =~ /^templatename (.*)$/m + ) { + my $templatename = $1; + print qq! ( !. + 'view text | '. + qq!!. + 'view typeset )'; + } + + print ' '. + time2str("%a %b %e %T %Y", $cust_bill_event->_date). ' '. + $status. '
'; +} + +print '', $cust_bill->print_text('', $templatename); #formatting print <