diff options
author | Ivan Kohler <ivan@freeside.biz> | 2013-02-12 02:12:56 -0800 |
---|---|---|
committer | Ivan Kohler <ivan@freeside.biz> | 2013-02-12 02:12:56 -0800 |
commit | ea877a775f49883683a26c01da366993804e840d (patch) | |
tree | facb8929be2c7efdc3fe012353c7aeb7208f574e /FS/FS/msg_template.pm | |
parent | 130b7fb03bc8fcc6c6a1b29b36f65d53333ec05a (diff) |
HATE #17349
Diffstat (limited to 'FS/FS/msg_template.pm')
-rw-r--r-- | FS/FS/msg_template.pm | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/FS/FS/msg_template.pm b/FS/FS/msg_template.pm index 011ce24..2f5e476 100644 --- a/FS/FS/msg_template.pm +++ b/FS/FS/msg_template.pm @@ -3,7 +3,7 @@ package FS::msg_template; use strict; use base qw( FS::Record ); use Text::Template; -use FS::Misc qw( generate_email send_email ); +use FS::Misc qw( generate_email send_email do_print ); use FS::Conf; use FS::Record qw( qsearch qsearchs ); use FS::UID qw( dbh ); @@ -457,24 +457,13 @@ sub render { my %hash = $self->prepare(%opt); my $html = $hash{'html_body'}; - my $tmp = 'msg'.$self->msgnum.'-'.time2str('%Y%m%d', time).'-XXXXXXXX'; - my $dir = "$FS::UID::cache_dir/cache.$FS::UID::datasrc"; - # Graphics/stylesheets should probably go in /var/www on the Freeside # machine. my $kit = PDF::WebKit->new(\$html); #%options # hack to use our wrapper script $kit->configure(sub { shift->wkhtmltopdf('freeside-wkhtmltopdf') }); - my $fh = File::Temp->new( - TEMPLATE => $tmp, - DIR => $dir, - UNLINK => 0, - SUFFIX => '.pdf' - ); - print $fh $kit->to_pdf; - close $fh; - return $fh->filename; + $kit->to_pdf; } =item print OPTIONS @@ -485,12 +474,7 @@ Render a PDF and send it to the printer. OPTIONS are as for 'render'. sub print { my( $self, %opt ) = @_; - my $file = $self->render(%opt); - - my $lpr = $conf->config('lpr', $opt{'cust_main'}->agentnum ); - - run ( $lpr, '<', $file) - or die "lpr error:\n$?\n"; + do_print( [ $self->render(%opt) ], agentnum=>$opt{cust_main}->agentnum ); } # helper sub for package dates |