From b740db94f284cc882958fa6e78f73c8017783578 Mon Sep 17 00:00:00 2001 From: ivan Date: Tue, 5 Oct 2004 13:52:28 +0000 Subject: [PATCH] links to show alternate invoices also --- httemplate/view/cust_bill.cgi | 55 ++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi index 116cd6dcc..bda5d769b 100755 --- a/httemplate/view/cust_bill.cgi +++ b/httemplate/view/cust_bill.cgi @@ -31,40 +31,47 @@ 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' => "${p}view/cust_bill-pdf.cgi?$invnum.pdf", + 'View typeset invoice' => $link, ), '

'; } #false laziness with search/cust_bill_event.cgi -print table(). 'EventDateStatus'; -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 ''. $part_bill_event->event; - - if ( - $part_bill_event->plan eq 'send_alternate' - && $part_bill_event->plandata =~ /^templatename (.*)$/m +unless ( $templatename ) { + print table(). 'EventDateStatus'; + foreach my $cust_bill_event ( + sort { $a->_date <=> $b->_date } $cust_bill->cust_bill_event ) { - my $templatename = $1; - print qq! ( !. - 'view text | '. - qq!!. - 'view typeset )'; + 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 ''. $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 ''. - time2str("%a %b %e %T %Y", $cust_bill_event->_date). ''. - $status. ''; + print '
'; } -print '
';
 
-print $cust_bill->print_text('', $templatename);
+
+print '
'. $cust_bill->print_text('', $templatename);
 
 	#formatting
 	print <