From cc37f38d5ba25a4b60f4504dabe10e7f27b3d52e Mon Sep 17 00:00:00 2001 From: Rene Krenn Date: Tue, 30 Jul 2019 11:55:24 +0200 Subject: [PATCH] TT#64001 .ama: accept also CFB for "callforward on ncgp" sceanrio Change-Id: I4e7bbe396b246548935fe0ada58e53992542ffa3 --- lib/NGCP/BulkProcessor/Dao/Trunk/accounting/cdr.pm | 2 ++ lib/NGCP/BulkProcessor/Projects/Export/Ama/Ccs/CDR.pm | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/NGCP/BulkProcessor/Dao/Trunk/accounting/cdr.pm b/lib/NGCP/BulkProcessor/Dao/Trunk/accounting/cdr.pm index 4fc6725..3936010 100644 --- a/lib/NGCP/BulkProcessor/Dao/Trunk/accounting/cdr.pm +++ b/lib/NGCP/BulkProcessor/Dao/Trunk/accounting/cdr.pm @@ -48,6 +48,7 @@ our @EXPORT_OK = qw( $OK_CALL_STATUS $CFU_CALL_TYPE + $CFB_CALL_TYPE ); #process_records @@ -154,6 +155,7 @@ push(@callid_suffixes,$XFERSUFFIX); our $OK_CALL_STATUS = 'ok'; our $CFU_CALL_TYPE = 'cfu'; +our $CFB_CALL_TYPE = 'cfb'; my $indexes = {}; diff --git a/lib/NGCP/BulkProcessor/Projects/Export/Ama/Ccs/CDR.pm b/lib/NGCP/BulkProcessor/Projects/Export/Ama/Ccs/CDR.pm index 273ec5a..66497b4 100644 --- a/lib/NGCP/BulkProcessor/Projects/Export/Ama/Ccs/CDR.pm +++ b/lib/NGCP/BulkProcessor/Projects/Export/Ama/Ccs/CDR.pm @@ -429,7 +429,8 @@ sub _export_cdrs_init_context { } elsif ((scalar @$parent_cdrs) == 2 and not $parent_cdrs->[0]->is_pbx() and $parent_cdrs->[1]->is_pbx() - and $parent_cdrs->[1]->{call_type} eq $NGCP::BulkProcessor::Dao::Trunk::accounting::cdr::CFU_CALL_TYPE + and ($parent_cdrs->[1]->{call_type} eq $NGCP::BulkProcessor::Dao::Trunk::accounting::cdr::CFU_CALL_TYPE + or $parent_cdrs->[1]->{call_type} eq $NGCP::BulkProcessor::Dao::Trunk::accounting::cdr::CFB_CALL_TYPE) and (scalar @{$parent_cdrs->[0]->{_correlated_cdrs}}) == 0 and (scalar @{$parent_cdrs->[1]->{_correlated_cdrs}}) == 0 and ($scenario->{ccs_subscriber} = NGCP::BulkProcessor::Dao::Trunk::provisioning::voip_subscribers::findby_uuid(undef,$parent_cdrs->[1]->{source_user_id}))