[freeside-commits] branch FREESIDE_3_BRANCH updated. e440bae0f6f832117318b241e93f91d22995013f
Ivan
ivan at 420.am
Tue Feb 2 12:45:37 PST 2016
The branch, FREESIDE_3_BRANCH has been updated
via e440bae0f6f832117318b241e93f91d22995013f (commit)
from f78628bc9d1bdca7b55508b99596502336ce5d6f (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 e440bae0f6f832117318b241e93f91d22995013f
Author: Ivan Kohler <ivan at freeside.biz>
Date: Tue Feb 2 12:45:32 2016 -0800
zip email CDRs, RT#40112
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 8fac978..0e89008 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -3741,18 +3741,29 @@ and customer address. Include units.',
{
'key' => 'voip-cdr_email',
'section' => 'telephony',
- 'description' => 'Include the call details on emailed invoices (and HTML invoices viewed in the backend), even if the customer is configured for not printing them on the invoices.',
+ 'description' => 'Include the call details inline on emailed invoices (and HTML invoices viewed in the backend), even if the customer is configured for not printing them on the invoices. Useful for including these details in electronic delivery but omitting them when printing.',
'type' => 'checkbox',
},
{
'key' => 'voip-cust_email_csv_cdr',
- 'section' => 'telephony',
- 'description' => 'Enable the per-customer option for including CDR information as a CSV attachment on emailed invoices.',
+ 'section' => 'deprecated',
+ 'description' => 'Deprecated, see voip-cdr_email_attach instead. Used to enable the per-customer option for including CDR information as a CSV attachment on emailed invoices.',
'type' => 'checkbox',
},
{
+ 'key' => 'voip-cdr_email_attach',
+ 'section' => 'telephony',
+ 'description' => 'Enable the per-customer option for including CDR information as an attachment on emailed invoices.',
+ 'type' => 'select',
+ 'select_hash' => [ '' => 'Disabled',
+ 'csv' => 'Text (CSV) attachment',
+ 'zip' => 'Zip attachment',
+ ],
+ },
+
+ {
'key' => 'cgp_rule-domain_templates',
'section' => '',
'description' => 'Communigate Pro rule templates for domains, one per line, "svcnum Name"',
diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm
index 679f4c7..4daa637 100644
--- a/FS/FS/Template_Mixin.pm
+++ b/FS/FS/Template_Mixin.pm
@@ -12,6 +12,8 @@ use Date::Format;
use Date::Language;
use Text::Template 1.20;
use File::Temp 0.14;
+use Archive::Zip qw( :ERROR_CODES :CONSTANTS );
+use IO::Scalar;
use HTML::Entities;
use Cwd;
use FS::UID;
@@ -2249,15 +2251,41 @@ sub generate_email {
my @otherparts = ();
if ( ref($self) eq 'FS::cust_bill' && $cust_main->email_csv_cdr ) {
- push @otherparts, build MIME::Entity
- 'Type' => 'text/csv',
- 'Encoding' => '7bit',
- 'Data' => [ map { "$_\n" }
- $self->call_details('prepend_billed_number' => 1)
- ],
- 'Disposition' => 'attachment',
- 'Filename' => 'usage-'. $self->invnum. '.csv',
- ;
+ if ( $conf->exists('voip-cust_email_csv_cdr_zip') ) {
+
+ my $data = join('', map "$_\n",
+ $self->call_details(prepend_billed_number=>1)
+ );
+
+ my $zip = new Archive::Zip;
+ my $file = $zip->addString( $data, 'usage-'.$self->invnum.'.csv' );
+ $file->desiredCompressionMethod( COMPRESSION_DEFLATED );
+
+ my $zipdata = '';
+ my $SH = IO::Scalar->new(\$zipdata);
+ my $status = $zip->writeToFileHandle($SH);
+ die "Error zipping CDR attachment: $!" unless $status == AZ_OK;
+
+ push @otherparts, build MIME::Entity
+ 'Type' => 'application/zip',
+ 'Encoding' => 'base64',
+ 'Data' => $zipdata,
+ 'Filename' => 'usage-'. $self->invnum. '.zip',
+ ;
+
+ } else {
+
+ push @otherparts, build MIME::Entity
+ 'Type' => 'text/csv',
+ 'Encoding' => '7bit',
+ 'Data' => [ map { "$_\n" }
+ $self->call_details('prepend_billed_number' => 1)
+ ],
+ 'Disposition' => 'attachment',
+ 'Filename' => 'usage-'. $self->invnum. '.csv',
+ ;
+
+ }
}
diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm
index f508685..d86238c 100644
--- a/FS/FS/Upgrade.pm
+++ b/FS/FS/Upgrade.pm
@@ -145,6 +145,11 @@ If you need to continue using the old Form 477 report, turn on the
$conf->set('previous_balance-exclude_from_total', '');
}
+ if ( $conf->exists('voip-cust_email_csv_cdr') ) {
+ $conf->set('voip_cdr_email_attach', 'csv');
+ $conf->delete('voip-cust_email_csv_cdr') ;
+ }
+
}
sub upgrade_overlimit_groups {
diff --git a/httemplate/edit/cust_main/billing.html b/httemplate/edit/cust_main/billing.html
index 7508627..c4b66c8 100644
--- a/httemplate/edit/cust_main/billing.html
+++ b/httemplate/edit/cust_main/billing.html
@@ -597,7 +597,7 @@ function toggle(obj) {
<INPUT TYPE="hidden" NAME="squelch_cdr" VALUE="<% $cust_main->squelch_cdr %>">
% }
-% if ( $conf->exists('voip-cust_email_csv_cdr') ) {
+% if ( $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>
</TR>
diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index cc58cd7..39f0324 100644
--- a/httemplate/view/cust_main/billing.html
+++ b/httemplate/view/cust_main/billing.html
@@ -385,7 +385,7 @@
</TR>
% }
-% if ( $conf->exists('voip-cust_email_csv_cdr') ) {
+% if ( $conf->config('voip-cdr_email_attach') ) {
<TR>
<TD ALIGN="right"><% mt('Email CDRs as CSV') |h %></TD>
<TD BGCOLOR="#ffffff"><% $cust_main->email_csv_cdr ? $yes : $no %></TD>
-----------------------------------------------------------------------
Summary of changes:
FS/FS/Conf.pm | 17 +++++++++---
FS/FS/Template_Mixin.pm | 46 +++++++++++++++++++++++++-------
FS/FS/Upgrade.pm | 5 ++++
httemplate/edit/cust_main/billing.html | 2 +-
httemplate/view/cust_main/billing.html | 2 +-
5 files changed, 58 insertions(+), 14 deletions(-)
More information about the freeside-commits
mailing list