RT# 78547 - Flag to disable email/print/fax/etc during tests or reports

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

index 4d1079a..1411019 100644 (file)
--- a/FS/FS/Template_Mixin.pm
+++ b/FS/FS/Template_Mixin.pm
@@ -2274,8 +2274,7 @@ sub generate_email {
        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 {
  
@@ -2291,7 +2290,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',
    );
  
@@ -2370,7 +2373,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>',
                         ],
@@ -2507,6 +2514,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;