fix MIME::Entity usage for perl 5.18+, RT#77890

[freeside.git] / FS / FS / Template_Mixin.pm
diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm

index eb14db0..c97e84e 100644 (file)
--- a/FS/FS/Template_Mixin.pm
+++ b/FS/FS/Template_Mixin.pm
@@ -1156,14 +1156,27 @@ sub print_generic {
        if ( $invoice_data{finance_section} &&
             $section->{'description'} eq $invoice_data{finance_section} );
  
-    $section->{'subtotal'} = $other_money_char.
-                             sprintf('%.2f', $section->{'subtotal'})
-      if $multisection;
+    if ( $multisection ) {
+
+      if ( ref($section->{'subtotal'}) ) {
+
+        $section->{'subtotal'} =
+          sprintf("$other_money_char%.2f to $other_money_char%.2f",
+                    $section->{'subtotal'}[0],
+                    $section->{'subtotal'}[1]
+                 );
+
+      } else {
+
+        $section->{'subtotal'} = $other_money_char.
+                                 sprintf('%.2f', $section->{'subtotal'})
  
-    # continue some normalization
-    $section->{'amount'}   = $section->{'subtotal'}
-      if $multisection;
+      }
  
+      # continue some normalization
+      $section->{'amount'}   = $section->{'subtotal'}
+
+    }
  
      if ( $section->{'description'} ) {
        push @buf, ( [ &$escape_function($section->{'description'}), '' ],
@@ -1362,7 +1375,16 @@ sub print_generic {
      foreach ( @new_total_items ) {
        my ($item, $amount) = ($_->{'total_item'}, $_->{'total_amount'});
        $_->{'total_item'}   = &$embolden_function( $item );
+
+      if ( ref($amount) ) {
+        $_->{'total_amount'} = &$embolden_function(
+                                 $other_money_char.$amount->[0]. ' to '.
+                                 $other_money_char.$amount->[1]
+                               );
+      } else {
        $_->{'total_amount'} = &$embolden_function( $other_money_char.$amount );
+      }
+
        # but if it's multisection, don't append to @total_items. the adjust
        # section has all this stuff
        push @total_items, $_ if !$multisection;
@@ -1641,24 +1663,24 @@ sub print_generic {
    die "no invoice_lines() functions in template?"
      if ( $format eq 'template' && !$wasfunc );
  
-  if ($format eq 'template') {
+  if ( $invoice_lines ) {
+    $invoice_data{'total_pages'} = int( scalar(@buf) / $invoice_lines );
+    $invoice_data{'total_pages'}++
+      if scalar(@buf) % $invoice_lines;
+  }
  
-    if ( $invoice_lines ) {
-      $invoice_data{'total_pages'} = int( scalar(@buf) / $invoice_lines );
-      $invoice_data{'total_pages'}++
-        if scalar(@buf) % $invoice_lines;
+  #setup subroutine for the template
+  $invoice_data{invoice_lines} = sub {
+    my $lines = shift || scalar(@buf);
+    map { 
+      scalar(@buf)
+        ? shift @buf
+        : [ '', '' ];
      }
+    ( 1 .. $lines );
+  };
  
-    #setup subroutine for the template
-    $invoice_data{invoice_lines} = sub {
-      my $lines = shift || scalar(@buf);
-      map { 
-        scalar(@buf)
-          ? shift @buf
-          : [ '', '' ];
-      }
-      ( 1 .. $lines );
-    };
+  if ($format eq 'template') {
  
      my $lines;
      my @collect;
@@ -2085,6 +2107,7 @@ Returns an argument list to be passed to L<FS::Misc::send_email>.
  =cut
  
  use MIME::Entity;
+use Encode;
  
  sub generate_email {
  
@@ -2152,7 +2175,7 @@ sub generate_email {
          if $DEBUG;
  
        # 'print_text' argument is no longer used
-      @text = $self->print_text(\%args);
+      @text = map Encode::encode_utf8($_), $self->print_text(\%args);
  
      } else {
  
@@ -2247,7 +2270,7 @@ sub generate_email {
                           '    </title>',
                           '  </head>',
                           '  <body bgcolor="#e8e8e8">',
-                         $html,
+                         Encode::encode_utf8($html),
                           '  </body>',
                           '</html>',
                         ],