self-service view usage customization and CDR display fixes, RT11761

[freeside.git] / FS / bin / freeside-cdrrewrited

diff --git a/FS/bin/freeside-cdrrewrited b/FS/bin/freeside-cdrrewrited
index 198fbb5..af06d5d 100644 (file)
--- a/FS/bin/freeside-cdrrewrited
+++ b/FS/bin/freeside-cdrrewrited
@@ -4,7 +4,7 @@ use strict;
 use vars qw( $conf );
 use FS::Daemon ':all'; #daemonize1 drop_root daemonize2 myexit logfile sig*
 use FS::UID qw( adminsuidsetup );
-use FS::Record qw( qsearch ); #qsearchs);
+use FS::Record qw( qsearch qsearchs );
 #use FS::cdr;
 #use FS::cust_pkg;
 #use FS::queue;
@@ -24,7 +24,8 @@ daemonize2();
 
 $conf = new FS::Conf;
 
-die "not running; cdr-asterisk_forward_rewrite conf is off\n"
+die "not running; cdr-asterisk_forward_rewrite, cdr-charged_party_rewrite ".
+    " and cdr-taqua-accountcode_rewrite conf options are all off\n"
   unless _shouldrun();
 
 #--
@@ -49,8 +50,10 @@ while (1) {
   ) {
 
     $found = 1;
+    my @status = ();
 
-    if ( $cdr->dstchannel =~ /^Local\/(\d+)/i && $1 ne $cdr->dst
+    if ( $conf->exists('cdr-asterisk_forward_rewrite')
+         && $cdr->dstchannel =~ /^Local\/(\d+)/i && $1 ne $cdr->dst
        )
     {
 
@@ -63,12 +66,51 @@ while (1) {
       $cdr->dst($dst);
       $cdr->amaflags(2);
 
-      $cdr->freesiderewritestatus('asterisk_forward');
+      push @status, 'asterisk_forward';
 
-    } else {
-      $cdr->freesiderewritestatus('skipped')
     }
 
+    if ( $conf->exists('cdr-charged_party_rewrite') && ! $cdr->charged_party ) {
+
+      $cdr->set_charged_party;
+      push @status, 'charged_party';
+
+    }
+
+    if ( $conf->exists('cdr-taqua-accountcode_rewrite')
+         && $cdr->lastapp eq 'acctcode' && $cdr->cdrtypenum == 1
+       )
+    {
+
+      #find the matching CDR
+      my $primary = qsearchs('cdr', {
+        'sessionnum'  => $cdr->sessionnum,
+        'src'         => $cdr->subscriber,
+        #'accountcode' => '',
+      });
+
+      unless ( $primary ) {
+        warn "WARNING: can't find primary CDR with session ". $cdr->sessionnum.
+             ", src ". $cdr->subscriber. "; will keep trying\n";
+        next;
+      }
+
+      $primary->accountcode( $cdr->lastdata );
+      #$primary->freesiderewritestatus( 'taqua-accountcode-primary' );
+      my $error = $primary->replace;
+      if ( $error ) {
+        warn "WARNING: error rewriting primary CDR (will retry): $error\n";
+        next;
+      }
+
+      push @status, 'taqua-accountcode';
+      $cdr->status('done'); #so it doesn't try to rate
+    }
+
+    $cdr->freesiderewritestatus(
+      scalar(@status) ? join('/', @status) : 'skipped'
+    );
+
     my $error = $cdr->replace;
 
     if ( $error ) {
@@ -77,6 +119,8 @@ while (1) {
       sleep 30; #i dunno, wait and see if the database comes back?
     }
 
+    last if sigterm() || sigint();
+
   }
 
   myexit() if sigterm() || sigint();
@@ -88,7 +132,9 @@ while (1) {
 #--
 
 sub _shouldrun {
-  $conf->exists('cdr-asterisk_forward_rewrite');
+     $conf->exists('cdr-asterisk_forward_rewrite')
+  || $conf->exists('cdr-charged_party_rewrite')
+  || $conf->exists('cdr-taqua-accountcode_rewrite');
 }
 
 sub usage { 
@@ -105,8 +151,9 @@ freeside-cdrrewrited - Real-time daemon for CDR rewriting
 
 =head1 DESCRIPTION
 
-Runs continuously, searches for CDRs and does forwarded-call rewriting if
-the "cdr-asterisk_forward_rewrite" option is enabled.
+Runs continuously, searches for CDRs and does forwarded-call rewriting if any
+of the "cdr-asterisk_forward_rewrite", "cdr-charged_party_rewrite" or
+"cdr-taqua-accountcode_rewrite" config options are enabled.
 
 =head1 SEE ALSO