From 79c995c1e0f66d333bc7738894c0b2359489078f Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Wed, 2 Aug 2017 11:54:48 -0700 Subject: VoIP innovations CDR import using SSL, RT#76784 --- FS/bin/freeside-voipinnovations-cdrimport | 8 ++++++-- debian/control | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/FS/bin/freeside-voipinnovations-cdrimport b/FS/bin/freeside-voipinnovations-cdrimport index 23ea6bbdc..10c4bcacb 100755 --- a/FS/bin/freeside-voipinnovations-cdrimport +++ b/FS/bin/freeside-voipinnovations-cdrimport @@ -4,7 +4,8 @@ use strict; use Getopt::Std; use Date::Format; use File::Temp 'tempdir'; -use Net::FTP; +use Net::SSLGlue::FTP; #at least until the Deb 9 transition is done, then + # regular Net::FTP has SSL support use FS::UID qw(adminsuidsetup datasrc dbh); use FS::cdr; use FS::cdr_batch; @@ -42,8 +43,11 @@ my $hostname = 'customercdr.voipinnovations.com'; my $ftp = Net::FTP->new($hostname, Debug => $opt_d) or die "Can't connect to $hostname: $@\n"; +$ftp->starttls() + or die "TLS initialization failed: ". $ftp->message. "\n"; + $ftp->login($login, $password) - or die "Login failed: ".$ftp->message."\n"; + or die "Login failed: ". $ftp->message. "\n"; ### # get the file list diff --git a/debian/control b/debian/control index a268ffdad..615b7645d 100644 --- a/debian/control +++ b/debian/control @@ -99,7 +99,7 @@ Depends: aspell-en,gnupg,ghostscript,gsfonts,gzip,latex-xcolor, libxml-writer-perl, libio-socket-ssl-perl, libmap-splat-perl, libdatetime-format-ical-perl, librest-client-perl, libgeo-streetaddress-us-perl, libbusiness-onlinepayment-perl, - libnet-vitelity-perl (>= 0.05) + libnet-vitelity-perl (>= 0.05), libnet-sslglue-perl Conflicts: libparams-classify-perl (>= 0.013-6) Replaces: freeside (<<4) Breaks: freeside (<<4) -- cgit v1.2.1 From 39cf034d6ae1c20de21028933aff05cae6dc4f77 Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Thu, 3 Aug 2017 08:47:45 -0700 Subject: fix agent-specific invoice_default_terms on new customer add, RT#76862 --- httemplate/edit/cust_main.cgi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi index e58441d24..05bf4377a 100755 --- a/httemplate/edit/cust_main.cgi +++ b/httemplate/edit/cust_main.cgi @@ -296,8 +296,13 @@ if ( $cgi->param('error') ) { $custnum=''; $cust_main = new FS::cust_main ( {} ); + + my @agentnums = $curuser->agentnums; + $cust_main->agentnum( $agentnums[0] ) + if scalar(@agentnums) == 1; $cust_main->agentnum( $conf->config('default_agentnum') ) if $conf->exists('default_agentnum'); + $cust_main->referral_custnum( $cgi->param('referral_custnum') ); $cust_main->set('postal_invoice', 'Y') unless $conf->exists('disablepostalinvoicedefault'); -- cgit v1.2.1 From b6c5d35cc215c18d3fb1d9aeb0239a610eb68c32 Mon Sep 17 00:00:00 2001 From: Christopher Burger Date: Mon, 7 Aug 2017 16:21:09 -0400 Subject: RT# 76992 - Added 3 new import formats that combine Location and Phone Service --- FS/FS/cust_pkg/Import.pm | 20 +++++++++++++------- httemplate/misc/cust_pkg-import.html | 24 ++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/FS/FS/cust_pkg/Import.pm b/FS/FS/cust_pkg/Import.pm index 63a9909e5..27fced195 100644 --- a/FS/FS/cust_pkg/Import.pm +++ b/FS/FS/cust_pkg/Import.pm @@ -283,17 +283,23 @@ sub batch_import { }; } - my $formatfields = _formatfields(); + #probably can delete below - moved to line 292 + #my $formatfields = _formatfields(); - die "unknown format $format" unless $formatfields->{$format}; + my @formats = split /-/, $format; + foreach my $f (@formats){ - foreach my $field ( @{ $formatfields->{$format} } ) { + my $formatfields = _formatfields(); + die "unknown format $format" unless $formatfields->{$f}; - push @fields, sub { - my( $self, $value, $conf, $param ) = @_; - $param->{"$format.$field"} = $value; - }; + foreach my $field ( @{ $formatfields->{$f} } ) { + push @fields, sub { + my( $self, $value, $conf, $param ) = @_; + $param->{"$f.$field"} = $value; + }; + + } } $opt->{'fields'} = \@fields; diff --git a/httemplate/misc/cust_pkg-import.html b/httemplate/misc/cust_pkg-import.html index 2ed3c48f1..ac25e9314 100644 --- a/httemplate/misc/cust_pkg-import.html +++ b/httemplate/misc/cust_pkg-import.html @@ -48,6 +48,9 @@ Import a file containing customer packages.