RT# 81961 Repair broken links in POD documentation

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

index f197d00..76680d2 100644 (file)
--- a/FS/FS/Template_Mixin.pm
+++ b/FS/FS/Template_Mixin.pm
@@ -26,6 +26,7 @@ use FS::pkg_category;
  use FS::pkg_class;
  use FS::invoice_mode;
  use FS::L10N;
+use FS::Log;
  
  $DEBUG = 0;
  $me = '[FS::Template_Mixin]';
@@ -1088,7 +1089,7 @@ sub print_generic {
      }
    } else {
      # subtotal sectioning is the same as for the actual invoice sections
-    @summary_subtotals = grep $_->{subtotal}, @sections;
+    @summary_subtotals = @sections;
    }
  
    # Hereafter, push sections to both @sections and @summary_subtotals
@@ -2179,7 +2180,7 @@ notice name instead of "Invoice", optional
  
  =back
  
-Returns an argument list to be passed to L<FS::Misc::send_email>.
+Returns an argument list to be passed to L<FS::Misc/send_email>.
  
  =cut
  
@@ -2246,13 +2247,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 {
  
@@ -2268,7 +2268,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',
    );
  
@@ -2347,7 +2351,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>',
                         ],
@@ -2479,7 +2487,7 @@ use CAM::PDF;
  use IO::Socket::SSL;
  use LWP::UserAgent;
  use HTTP::Request::Common qw( POST );
-use JSON::XS;
+use Cpanel::JSON::XS;
  use MIME::Base64;
  sub postal_mail_fsinc {
    my ( $self, %opt ) = @_;
@@ -3468,6 +3476,27 @@ sub _items_cust_bill_pkg {
            if $DEBUG > 1;
   
          my $cust_pkg = $cust_bill_pkg->cust_pkg;
+
+        unless ( $cust_pkg ) {
+          # There is no related row in cust_pkg for this cust_bill_pkg.pkgnum.
+          # This invoice may have been broken by an unusual combination
+          # of manually editing package dates, and aborted package changes
+          # when the manually edited dates used are nonsensical.
+
+          my $error = sprintf
+            'cust_bill_pkg(billpkgnum:%s) '.
+            'is missing related row in cust_pkg(pkgnum:%s)! '.
+            'cust_bill(invnum:%s) is corrupted by bad database data, '.
+            'and should be investigated',
+              $cust_bill_pkg->billpkgnum,
+              $cust_bill_pkg->pkgnum,
+              $cust_bill_pkg->invnum;
+
+          FS::Log->new('FS::cust_bill_pkg')->critical( $error );
+          warn $error;
+          next;
+        }
+
          my $part_pkg = $cust_pkg->part_pkg;
  
          # which pkgpart to show for display purposes?