X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_bill.cgi;h=34f533196d57dbea008dbd761e83453ceac6683a;hb=6a953c149c5f4423cafc510e34c60b41bd7d0ef9;hp=95f1a0af813282b8c3f3dd0984ff547bff3c9737;hpb=6a37289c12238d48ea864b8177216ca276b33a40;p=freeside.git
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 95f1a0af8..34f533196 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;
@@ -20,21 +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!. '
';
-
-print table(). '
'; -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 .= ': '. $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 <