X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fview%2Fcust_bill.cgi;h=5dd8a8d71ecdf5a0857f33210256460f71e97294;hb=3081639bd119c6d281ef23139649b2e73ba62754;hp=7906af65b224d64bb932c3383b13d8b5b85c6a89;hpb=ea72b6b09a472a989e60fe5bba1884a629907e37;p=freeside.git
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 7906af65b..5dd8a8d71 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -3,8 +3,11 @@
#untaint invnum
my($query) = $cgi->keywords;
-$query =~ /^(\d+)$/;
-my $invnum = $1;
+$query =~ /^((.+)-)?(\d+)$/;
+my $templatename = $2;
+my $invnum = $3;
+
+my $conf = new FS::Conf;
my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
die "Invoice #$invnum not found!" unless $cust_bill;
@@ -26,34 +29,60 @@ if ( grep { $_ ne 'POST' } $cust_bill->cust_main->invoicing_list ) {
qq!Re-email this invoice!;
}
+print qq! | Refax this invoice!
+ if ($conf->exists('hylafax'));
+
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(). '
'; -print $cust_bill->print_text; +if ( $conf->exists('invoice_html') ) { + print $cust_bill->print_html('', $templatename); +} else { + print '', $cust_bill->print_text('', $templatename), ''; +} #formatting print <+