projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
actually a card masking fix for fibernetics, but can't find the ticket
[freeside.git]
/
FS
/
FS
/
cdr.pm
diff --git
a/FS/FS/cdr.pm
b/FS/FS/cdr.pm
index
756bc77
..
7f87462
100644
(file)
--- a/
FS/FS/cdr.pm
+++ b/
FS/FS/cdr.pm
@@
-28,10
+28,11
@@
use FS::rate_detail;
# LRN lookup
use LWP::UserAgent;
use HTTP::Request::Common qw(POST);
# LRN lookup
use LWP::UserAgent;
use HTTP::Request::Common qw(POST);
+use IO::Socket::SSL;
use JSON::XS qw(decode_json);
@ISA = qw(FS::Record);
use JSON::XS qw(decode_json);
@ISA = qw(FS::Record);
-@EXPORT_OK = qw( _cdr_date_parser_maker _cdr_min_parser_maker );
+@EXPORT_OK = qw( _cdr_date_parser_maker _cdr_min_parser_maker
_cdr_date_parse
);
$DEBUG = 0;
$me = '[FS::cdr]';
$DEBUG = 0;
$me = '[FS::cdr]';
@@
-1498,7
+1499,13
@@
sub get_lrn {
my $self = shift;
my $field = shift;
my $self = shift;
my $field = shift;
- my $ua = LWP::UserAgent->new;
+ my $ua = LWP::UserAgent->new(
+ 'ssl_opts' => {
+ verify_hostname => 0,
+ SSL_verify_mode => IO::Socket::SSL::SSL_VERIFY_NONE,
+ },
+ );
+
my $url = 'https://ws.freeside.biz/get_lrn';
my %content = ( 'support-key' => $support_key,
my $url = 'https://ws.freeside.biz/get_lrn';
my %content = ( 'support-key' => $support_key,
@@
-1857,9
+1864,12
@@
sub process_batch_import {
#
# Used by FS::Upgrade to migrate to a new database.
#
# Used by FS::Upgrade to migrate to a new database.
+use FS::upgrade_journal;
sub _upgrade_data {
my ($class, %opts) = @_;
sub _upgrade_data {
my ($class, %opts) = @_;
+ return if FS::upgrade_journal->is_done('cdr_cdrbatchnum');
+
warn "$me upgrading $class\n" if $DEBUG;
my $sth = dbh->prepare(
warn "$me upgrading $class\n" if $DEBUG;
my $sth = dbh->prepare(
@@
-1887,6
+1897,8
@@
sub _upgrade_data {
$sth->execute($cdrbatchnum{$cdrbatch}, $cdrbatch) or die $sth->errstr;
}
$sth->execute($cdrbatchnum{$cdrbatch}, $cdrbatch) or die $sth->errstr;
}
+ FS::upgrade_journal->set_done('cdr_cdrbatchnum');
+
}
=item ip_addr_sql FIELD RANGE
}
=item ip_addr_sql FIELD RANGE