fix missing plaintext invoice alternative, RT#81486

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

index edbb4d4..9320e90 100644 (file)
--- a/FS/FS/Template_Mixin.pm
+++ b/FS/FS/Template_Mixin.pm
@@ -1396,6 +1396,14 @@ sub print_generic {
        $other_money_char. sprintf('%.2f', $self->charged - $taxtotal );
  
      if ( $multisection ) {
+
+      if ( $conf->config_bool('invoice_sections_with_taxes', $cust_main->agentnum) ) {
+        # If all tax items are displayed in location/category sections,
+        # remove the empty tax section
+        @sections = grep{ $_ ne $tax_section } @sections
+          unless grep{ $_->{section} eq $tax_section } @detail_items;
+      }
+
        if ( $taxtotal > 0 ) {
          # there are taxes, so prepare the section to be displayed.
          # $taxtotal already includes any line items that were already in the
@@ -1409,20 +1417,12 @@ sub print_generic {
          $tax_section->{'description'} = $self->mt($tax_description);
          $tax_section->{'summarized'} = '';
  
-        if ( $conf->config_bool('invoice_sections_with_taxes', $cust_main->agentnum) ) {
-
-          # If all tax items are displayed in location/category sections,
-          # remove the empty tax section
-          @sections = grep{ $_ ne $tax_section } @sections
-            unless grep{ $_->{section} eq $tax_section } @detail_items;
-
-        } elsif ( !grep $tax_section, @sections ) {
+        # append tax section unless it's already there
+        push @sections, $tax_section
+          unless grep {$_ eq $tax_section} @sections;
  
-          # append it if it's not already there
-          push @sections, $tax_section;
-          push @summary_subtotals, $tax_section;
-
-        }
+        push @summary_subtotals, $tax_section
+          unless grep {$_ eq $tax_section} @summary_subtotals;
  
        }
      } else {
@@ -2268,13 +2268,12 @@ sub generate_email {
  
    if (!@text) {
  
-    if ( $conf->config($tc.'template') ) {
+    if ( $conf->exists($tc.'template') ) {
  
        warn "$me generating plain text invoice"
          if $DEBUG;
  
-      # 'print_text' argument is no longer used
-      @text = map Encode::encode_utf8($_), $self->print_text(\%args);
+      @text = $self->print_text(\%args);
  
      } else {
  
@@ -2290,7 +2289,11 @@ sub generate_email {
      'Encoding'    => 'quoted-printable',
      'Charset'     => 'UTF-8',
      #'Encoding'    => '7bit',
-    'Data'        => \@text,
+    'Data'        => [
+      map
+        { Encode::encode('UTF-8', $_, Encode::FB_WARN | Encode::LEAVE_SRC ) }
+        @text
+    ],
      'Disposition' => 'inline',
    );
  
@@ -2369,7 +2372,11 @@ sub generate_email {
                           '    </title>',
                           '  </head>',
                           '  <body bgcolor="#e8e8e8">',
-                         Encode::encode_utf8($html),
+                         Encode::encode(
+                           'UTF-8',
+                           $html,
+                           Encode::FB_WARN | Encode::LEAVE_SRC
+                         ),
                           '  </body>',
                           '</html>',
                         ],
@@ -2506,6 +2513,11 @@ use MIME::Base64;
  sub postal_mail_fsinc {
    my ( $self, %opt ) = @_;
  
+  if ( $FS::Misc::DISABLE_PRINT ) {
+    warn 'postal_mail_fsinc() disabled by $FS::Misc::DISABLE_PRINT' if $DEBUG;
+    return;
+  }
+
    my $url = 'https://ws.freeside.biz/print';
  
    my $cust_main = $self->cust_main;
@@ -3132,7 +3144,9 @@ sub _items_fee {
    my @cust_bill_pkg = grep { $_->feepart } $self->cust_bill_pkg;
    my $escape_function = $options{escape_function};
  
-  my $locale = $self->cust_main->locale;
+  my $locale = $self->cust_main
+             ? $self->cust_main->locale
+             : $self->prospect_main->locale;
  
    my @items;
    foreach my $cust_bill_pkg (@cust_bill_pkg) {
@@ -3196,6 +3210,7 @@ sub _items_fee {
  
      push @items,
        { feepart     => $cust_bill_pkg->feepart,
+        billpkgnum  => $cust_bill_pkg->billpkgnum,
          amount      => sprintf('%.2f', $cust_bill_pkg->setup + $cust_bill_pkg->recur),
          description => $desc,
          pkg_tax     => \@pkg_tax,