[freeside-commits] branch FREESIDE_4_BRANCH updated. 98e8d9afc3c08ed903de3aea7a817ac4bcbebc86

[Ivan]

The branch, FREESIDE_4_BRANCH has been updated
       via  98e8d9afc3c08ed903de3aea7a817ac4bcbebc86 (commit)
      from  ff233f6e686a81b6591b0605c8a729cd01cd86c5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 98e8d9afc3c08ed903de3aea7a817ac4bcbebc86
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Feb 5 05:32:02 2016 -0800

    zip email CDRs, RT#40112

diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm
index 6d661f1..1f67792 100644
--- a/FS/FS/Template_Mixin.pm
+++ b/FS/FS/Template_Mixin.pm
@@ -2257,7 +2257,7 @@ sub generate_email {
   my @otherparts = ();
   if ( ref($self) eq 'FS::cust_bill' && $cust_main->email_csv_cdr ) {
 
-    if ( $conf->exists('voip-cust_email_csv_cdr_zip') ) {
+    if ( $conf->config('voip-cdr_email_attach') eq 'zip' ) {
 
       my $data = join('', map "$_\n",
                    $self->call_details(prepend_billed_number=>1)
@@ -2273,13 +2273,14 @@ sub generate_email {
       die "Error zipping CDR attachment: $!" unless $status == AZ_OK;
 
       push @otherparts, build MIME::Entity
-        'Type'       => 'application/zip',
-        'Encoding'   => 'base64',
-        'Data'       => $zipdata,
+        'Type'        => 'application/zip',
+        'Encoding'    => 'base64',
+        'Data'        => $zipdata,
+        'Disposition' => 'attachment',
         'Filename'    => 'usage-'. $self->invnum. '.zip',
       ;
 
-    } else {
+    } else { # } elsif ( $conf->config('voip-cdr_email_attach') eq 'csv' ) {
  
       push @otherparts, build MIME::Entity
         'Type'        => 'text/csv',
diff --git a/httemplate/edit/cust_main/billing.html b/httemplate/edit/cust_main/billing.html
index fcb44a5..50262e8 100644
--- a/httemplate/edit/cust_main/billing.html
+++ b/httemplate/edit/cust_main/billing.html
@@ -234,9 +234,9 @@ function toggle(obj) {
       <INPUT TYPE="hidden" NAME="squelch_cdr" VALUE="<% $cust_main->squelch_cdr %>">
 % }
 
-% if ( $conf->config('voip-cdr_email_attach') ) { 
+% if ( my $attach = $conf->config('voip-cdr_email_attach') ) {
       <TR>
-       <TD COLSPAN="2"><INPUT TYPE="checkbox" NAME="email_csv_cdr" VALUE="Y" <% $cust_main->email_csv_cdr eq "Y" ? 'CHECKED' : '' %>> <% mt('Attach CDRs as CSV to emailed invoices') |h %></TD>
+       <TD COLSPAN="2"><INPUT TYPE="checkbox" NAME="email_csv_cdr" VALUE="Y" <% $cust_main->email_csv_cdr eq "Y" ? 'CHECKED' : '' %>> <% mt('Attach CDRs as '. uc($attach). ' to emailed invoices') |h %></TD>
       </TR>
 % } else { 
       <INPUT TYPE="hidden" NAME="email_csv_cdr" VALUE="<% $cust_main->email_csv_cdr %>">
diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index cca140b..08b4323 100644
--- a/httemplate/view/cust_main/billing.html
+++ b/httemplate/view/cust_main/billing.html
@@ -242,9 +242,9 @@
    </TR>
 % }
 
-% if ( $conf->config('voip-cdr_email_attach') ) { 
+% if ( my $attach = $conf->config('voip-cdr_email_attach') ) { 
   <TR>
-    <TH ALIGN="right"><% mt('Email CDRs as CSV') |h %></TH>
+    <TH ALIGN="right"><% mt('Email CDRs as '.uc($attach)) |h %></TH>
     <TD><% $cust_main->email_csv_cdr ? $yes : $no %></TD>
   </TR>
 % } 

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Template_Mixin.pm                |   11 ++++++-----
 httemplate/edit/cust_main/billing.html |    4 ++--
 httemplate/view/cust_main/billing.html |    4 ++--
 3 files changed, 10 insertions(+), 9 deletions(-)