projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'patch-1' of https://github.com/gjones2/Freeside
[freeside.git]
/
httemplate
/
search
/
elements
/
search-xls.html
diff --git
a/httemplate/search/elements/search-xls.html
b/httemplate/search/elements/search-xls.html
index
a3a8226
..
26a51c4
100644
(file)
--- a/
httemplate/search/elements/search-xls.html
+++ b/
httemplate/search/elements/search-xls.html
@@
-1,4
+1,3
@@
-<% $data %>
<%init>
my %args = @_;
<%init>
my %args = @_;
@@
-7,14
+6,20
@@
my $header = $args{'header'};
my $rows = $args{'rows'};
my %opt = %{ $args{'opt'} };
my $rows = $args{'rows'};
my %opt = %{ $args{'opt'} };
+my $override = scalar(@$rows) >= 65536 ? 'XLSX' : '';
+
+my $format = $FS::CurrentUser::CurrentUser->spreadsheet_format($override);
+
+my $filename = $opt{'name'} || PL($opt{'name_singular'});
+$filename .= $format->{extension};
+
#http_header('Content-Type' => 'application/excel' ); #eww
#http_header('Content-Type' => 'application/msexcel' ); #alas
#http_header('Content-Type' => 'application/x-msexcel' ); #?
#http://support.microsoft.com/kb/199841
#http_header('Content-Type' => 'application/excel' ); #eww
#http_header('Content-Type' => 'application/msexcel' ); #alas
#http_header('Content-Type' => 'application/x-msexcel' ); #?
#http://support.microsoft.com/kb/199841
-http_header('Content-Type' => 'application/vnd.ms-excel' );
-http_header('Content-Disposition' =>
- 'attachment;filename="'.($opt{'name'} || PL($opt{'name_singular'}) ).'.xls"');
+http_header('Content-Type' => $format->{mime_type} );
+http_header('Content-Disposition' => qq!attachment;filename="$filename"! );
#http://support.microsoft.com/kb/812935
#http://support.microsoft.com/kb/323308
#http://support.microsoft.com/kb/812935
#http://support.microsoft.com/kb/323308
@@
-22,8
+27,8
@@
$HTML::Mason::Commands::r->headers_out->{'Cache-control'} = 'max-age=0';
my $data = '';
my $XLS = new IO::Scalar \$data;
my $data = '';
my $XLS = new IO::Scalar \$data;
-my $workbook =
Spreadsheet::WriteExcel
->new($XLS)
- or die "Error opening
.xls
file: $!";
+my $workbook =
$format->{class}
->new($XLS)
+ or die "Error opening
Excel
file: $!";
my $worksheet = $workbook->add_worksheet(substr($opt{'title'},0,31));
my $worksheet = $workbook->add_worksheet(substr($opt{'title'},0,31));
@@
-49,6
+54,10
@@
my $writer = sub {
# Wrapper for $worksheet->write.
# Do any massaging of the value/format here.
my ($r, $c, $value, $format) = @_;
# Wrapper for $worksheet->write.
# Do any massaging of the value/format here.
my ($r, $c, $value, $format) = @_;
+ # convert HTML entities
+ # both Spreadsheet::WriteExcel and Excel::Writer::XLSX accept UTF-8 strings
+ $value = decode_entities($value);
+
if ( $value =~ /^\Q$money_char\E(-?\d+\.?\d*)$/ ) {
# Currency: strip the symbol, clone the requested format,
# and format it for currency
if ( $value =~ /^\Q$money_char\E(-?\d+\.?\d*)$/ ) {
# Currency: strip the symbol, clone the requested format,
# and format it for currency
@@
-124,8
+133,20
@@
foreach my $row ( @$rows ) {
}
}
+if ( $opt{'footer'} ) {
+ $r++;
+ $c = 0;
+ foreach my $item (@{ $opt{'footer'} }) {
+ if ( ref($item) eq 'CODE' ) {
+ $item = &{$item}();
+ }
+ $writer->( $r, $c++, $item, $header_format );
+ }
+}
+
$workbook->close();# or die "Error creating .xls file: $!";
http_header('Content-Length' => length($data) );
$workbook->close();# or die "Error creating .xls file: $!";
http_header('Content-Length' => length($data) );
+$m->print($data);
</%init>
</%init>