X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcdr.pm;h=f8eef017c33aaac1a49816dd36785a730d49ed24;hb=ad508340f946534f49c3050bee4dd704b0c945fa;hp=756bc77e9fba71ba0d00b07feb157a71d6ed790f;hpb=6949aa3633144ecf786bfa35355978d723b3c75e;p=freeside.git

diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index 756bc77e9..f8eef017c 100644
--- a/FS/FS/cdr.pm
+++ b/FS/FS/cdr.pm
@@ -3,7 +3,7 @@ package FS::cdr;
 use strict;
 use vars qw( @ISA @EXPORT_OK $DEBUG $me
              $conf $cdr_prerate %cdr_prerate_cdrtypenums
-             $use_lrn $support_key
+             $use_lrn $support_key $max_duration
            );
 use Exporter;
 use List::Util qw(first min);
@@ -28,10 +28,11 @@ use FS::rate_detail;
 # LRN lookup
 use LWP::UserAgent;
 use HTTP::Request::Common qw(POST);
-use JSON::XS qw(decode_json);
+use IO::Socket::SSL;
+use Cpanel::JSON::XS;
 
 @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]';
@@ -49,6 +50,8 @@ FS::UID->install_callback( sub {
   $support_key = $conf->config('support-key');
   $use_lrn = $conf->exists('cdr-lrn_lookup');
 
+  $max_duration = $conf->config('cdr-max_duration') || 0;
+
 });
 
 =head1 NAME
@@ -648,6 +651,10 @@ sub rate_prefix {
   my $part_pkg = $opt{'part_pkg'} or return "No part_pkg specified";
   my $cust_pkg = $opt{'cust_pkg'};
 
+  ###
+  # (Directory assistance) rewriting
+  ###
+
   my $da_rewrote = 0;
   # this will result in those CDRs being marked as done... is that 
   # what we want?
@@ -663,6 +670,10 @@ sub rate_prefix {
     $da_rewrote = 1;
   }
 
+  ###
+  # Checks to see if the CDR is chargeable
+  ###
+
   my $reason = $part_pkg->check_chargable( $self,
                                            'da_rewrote'   => $da_rewrote,
                                          );
@@ -699,6 +710,17 @@ sub rate_prefix {
     }
   }
 
+  my $rated_seconds = $part_pkg->option_cacheable('use_duration')
+                        ? $self->duration
+                        : $self->billsec;
+  if ( $max_duration > 0 && $rated_seconds > $max_duration ) {
+    return $self->set_status_and_rated_price(
+      'failed',
+      '',
+      $opt{'svcnum'},
+    );
+  }
+
   ###
   # look up rate details based on called station id
   # (or calling station id for toll free calls)
@@ -871,9 +893,6 @@ sub rate_prefix {
   # We don't round _anything_ (except granularizing) 
   # until the final $charge = sprintf("%.2f"...).
 
-  my $rated_seconds = $part_pkg->option_cacheable('use_duration')
-                        ? $self->duration
-                        : $self->billsec;
   my $seconds_left = $rated_seconds;
 
   #no, do this later so it respects (group) included minutes
@@ -1498,7 +1517,13 @@ sub get_lrn {
   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,
@@ -1857,9 +1882,12 @@ sub process_batch_import {
 #
 # Used by FS::Upgrade to migrate to a new database.
 
+use FS::upgrade_journal;
 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(
@@ -1887,6 +1915,8 @@ sub _upgrade_data {
     $sth->execute($cdrbatchnum{$cdrbatch}, $cdrbatch) or die $sth->errstr;
   }
 
+  FS::upgrade_journal->set_done('cdr_cdrbatchnum');
+
 }
 
 =item ip_addr_sql FIELD RANGE