[freeside-commits] freeside/httemplate/search/elements search-xls.html, 1.3, 1.3.6.1

[Mark Wells]

Update of /home/cvs/cvsroot/freeside/httemplate/search/elements
In directory wavetail.420.am:/tmp/cvs-serv5651/httemplate/search/elements

Modified Files:
      Tag: FREESIDE_2_3_BRANCH
	search-xls.html 
Log Message:
Excel currency format, #1313

Index: search-xls.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/elements/search-xls.html,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -u -w -d -r1.3 -r1.3.6.1
--- search-xls.html	14 Dec 2009 03:36:34 -0000	1.3
+++ search-xls.html	23 Nov 2011 22:16:02 -0000	1.3.6.1
@@ -37,8 +37,30 @@
   bg_color => 55, #22,
   bottom   => 3,
 );
+my $default_format = $workbook->add_format(locked => 0);
 
-$worksheet->write($r, $c++, $_, $header_format ) foreach @$header;
+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);
+};
+
+$writer->( $r, $c++, $_, $header_format ) foreach @$header;
 
 foreach my $row ( @$rows ) {
   $r++;
@@ -53,27 +75,31 @@
 
     foreach my $field ( @{$opt{'fields'}} ) {
 
-      my $format = shift @$formats;
+      my $xls_format = $default_format;
+
+      if ( my $format = shift @$formats ) {
       $format = &{$format}($row) if ref($format) eq 'CODE';
       $format ||= {};
-      my $xls_format = $workbook->add_format(locked=>0, %$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;
   }
 
 }