X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fcust_bill.cgi;h=3c23d60a8458c7739c0a28877e46903d503392ad;hp=7906af65b224d64bb932c3383b13d8b5b85c6a89;hb=97c0616b60819a23dbc6d7d6ebf2ff1dc3446e91;hpb=0247c39288b477060509240ef23a5e7b6bfcd8f8 diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi index 7906af65b..3c23d60a8 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 = $1; +my $invnum = $3; my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum}); die "Invoice #$invnum not found!" unless $cust_bill; @@ -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 ''. $cust_bill_event->part_bill_event->event. ''. + 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 $cust_bill->print_text;
+print $cust_bill->print_text('', $templatename);
 
 	#formatting
 	print <