projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
#34636: Add service address Lat and Long to Advanced customer report
[freeside.git]
/
FS
/
FS
/
msg_template.pm
diff --git
a/FS/FS/msg_template.pm
b/FS/FS/msg_template.pm
index
94d478f
..
c52b633
100644
(file)
--- a/
FS/FS/msg_template.pm
+++ b/
FS/FS/msg_template.pm
@@
-467,9
+467,11
@@
sub render {
# Graphics/stylesheets should probably go in /var/www on the Freeside
# machine.
# Graphics/stylesheets should probably go in /var/www on the Freeside
# machine.
+ my $script_path = `/usr/bin/which freeside-wkhtmltopdf`;
+ chomp $script_path;
my $kit = PDF::WebKit->new(\$html); #%options
# hack to use our wrapper script
my $kit = PDF::WebKit->new(\$html); #%options
# hack to use our wrapper script
- $kit->configure(sub { shift->wkhtmltopdf(
'freeside-wkhtmltopdf'
) });
+ $kit->configure(sub { shift->wkhtmltopdf(
$script_path
) });
$kit->to_pdf;
}
$kit->to_pdf;
}
@@
-601,8
+603,9
@@
sub substitutions {
_date
_date_pretty
due_date
_date
_date_pretty
due_date
- due_date2str
- )],
+ ),
+ [ due_date2str => sub { shift->due_date2str('short') } ],
+ ],
#XXX not really thinking about cust_bill substitutions quite yet
# for welcome and limit warning messages
#XXX not really thinking about cust_bill substitutions quite yet
# for welcome and limit warning messages