X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_bill.cgi;h=ca0612d09cd0adacc2697f44b2967bba1dbcc091;hb=71c6e9e04a6faadedaf2238f7e7fcf607d4721cc;hp=5860ffd110ad8cf3163a3d132411a2fdcc1d338e;hpb=c828daa905491e65deb30a2ed34af609cdb96b99;p=freeside.git diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi index 5860ffd11..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,17 +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 qq!Reprint this invoice!; +if ( grep { $_ ne 'POST' } $cust_bill->cust_main->invoicing_list ) { + print qq! | !. + qq!Re-email this invoice!; +} + +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 -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. '
'; +unless ( $templatename ) { + 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 .= ': '. encode_entities($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 '
'; } -print '
';
 
-print $cust_bill->print_text;
+print '
', $cust_bill->print_text('', $templatename);
 
 	#formatting
 	print <