X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Felements%2Fsearch-xls.html;h=0b5636c0ed4e5996316c4231763699b1a752870d;hp=8a05e477c2964e21eabcb7b3218300122313b952;hb=79483e997907fbf8c185bdc283df0775040c76bd;hpb=9f73c5d4c0954b3a03bfcb5e010fc288a7071209

diff --git a/httemplate/search/elements/search-xls.html b/httemplate/search/elements/search-xls.html
index 8a05e477c..0b5636c0e 100644
--- a/httemplate/search/elements/search-xls.html
+++ b/httemplate/search/elements/search-xls.html
@@ -13,7 +13,9 @@ my %opt    = %{ $args{'opt'} };
 
 #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://support.microsoft.com/kb/812935
 #http://support.microsoft.com/kb/323308
 $HTML::Mason::Commands::r->headers_out->{'Cache-control'} = 'max-age=0';
@@ -35,8 +37,30 @@ my $header_format = $workbook->add_format(
   bg_color => 55, #22,
   bottom   => 3,
 );
+my $default_format = $workbook->add_format(locked => 0);
+
+my %money_format;
+my $money_char = FS::Conf->new->config('money_char') || '$';
+
+my $writer = sub {
+  # Wrapper for $worksheet->write.
+  # Do any massaging of the value/format here.
+  my ($r, $c, $value, $format) = @_;
+  if ( $value =~ /^\Q$money_char\E(\d+\.?\d*)$/ ) {
+    # Currency: strip the symbol, clone the requested format,
+    # and format it for currency
+    $value = $1;
+    if ( !exists($money_format{$format}) ) {
+      $money_format{$format} = $workbook->add_format();
+      $money_format{$format}->copy($format);
+      $money_format{$format}->set_num_format($money_char.'#0.00#');
+    }
+    $format = $money_format{$format};
+  }
+  $worksheet->write($r, $c, $value, $format);
+};
 
-$worksheet->write($r, $c++, $_, $header_format ) foreach @$header;
+$writer->( $r, $c++, $_, $header_format ) foreach @$header;
 
 foreach my $row ( @$rows ) {
   $r++;
@@ -51,27 +75,31 @@ foreach my $row ( @$rows ) {
 
     foreach my $field ( @{$opt{'fields'}} ) {
 
-      my $format = shift @$formats;
-      $format = &{$format}($row) if ref($format) eq 'CODE';
-      $format ||= {};
-      my $xls_format = $workbook->add_format(locked=>0, %$format);
+      my $xls_format = $default_format;
+
+      if ( my $format = shift @$formats ) {
+        $format = &{$format}($row) if ref($format) eq 'CODE';
+        $format ||= {};
+        $xls_format = $workbook->add_format(locked=>0, %$format);
+      }
 
       if ( ref($field) eq 'CODE' ) {
         foreach my $value ( &{$field}($row) ) {
           if ( ref($value) eq 'ARRAY' ) { 
-            $worksheet->write($r, $c++, '(N/A)' ); #unimplemented
+            $writer->($r, $c++, '(N/A)' ); #unimplemented
           } else {
-            $worksheet->write($r, $c++, $value, $xls_format );
+            $writer->($r, $c++, $value, $xls_format );
           }
         }
       } else {
-        $worksheet->write($r, $c++, $row->$field(), $xls_format );
+        $writer->( $r, $c++, $row->$field(), $xls_format );
       }
     }
 
   } else {
-    my $xls_format = $workbook->add_format(locked=>0);
-    $worksheet->write($r, $c++, $_, $xls_format ) foreach @$row;
+    # no need for each row to need a new format
+    #my $xls_format = $workbook->add_format(locked=>0);
+    $writer->( $r, $c++, $_, $default_format ) foreach @$row;
   }
 
 }
@@ -79,5 +107,5 @@ foreach my $row ( @$rows ) {
 $workbook->close();# or die "Error creating .xls file: $!";
 
 http_header('Content-Length' => length($data) );
- 
+
 </%init>