default to a session cookie instead of setting an explicit timeout, weird timezone...

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

index 51f89f7..953c6e1 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]';
@@ -596,6 +597,7 @@ sub print_generic {
      'amountenclosedsep'     => scalar($conf->config('invoice_latexcouponamountenclosedsep', $agentnum)),
      'coupontoaddresssep'    => scalar($conf->config('invoice_latexcoupontoaddresssep', $agentnum)),
      'addcompanytoaddress'   => $conf->exists('invoice_latexcouponaddcompanytoaddress', $agentnum),
+    'couponlocation'        => (scalar($conf->config('invoice_latexcouponlocation', $agentnum)) eq "top") ? 'top' : 'bottom',
  
      # better hang on to conf_dir for a while (for old templates)
      'conf_dir'        => "$FS::UID::conf_dir/conf.$FS::UID::datasrc",
@@ -1092,7 +1094,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
@@ -1417,13 +1419,12 @@ sub print_generic {
          $tax_section->{'description'} = $self->mt($tax_description);
          $tax_section->{'summarized'} = '';
  
-        if ( !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 {
@@ -2193,7 +2194,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
  
@@ -2269,13 +2270,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 {
  
@@ -2291,7 +2291,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 +2374,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 +2515,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;
@@ -3133,7 +3146,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) {
@@ -3448,6 +3463,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?