diff --git a/lib/NGCP/Panel/Controller/Callflow.pm b/lib/NGCP/Panel/Controller/Callflow.pm index 86be3ef5ec..4838a677c0 100644 --- a/lib/NGCP/Panel/Controller/Callflow.pm +++ b/lib/NGCP/Panel/Controller/Callflow.pm @@ -61,6 +61,7 @@ sub callflow_base :Chained('root') :PathPart('') :CaptureArgs(1) { my $decoder = URI::Encode->new; $c->stash->{callid} = $decoder->decode($callid) =~ s/_b2b-1$//r; + $c->stash->{callid} = $decoder->decode($callid) =~ s/_pbx-1$//r; } sub get_pcap :Chained('callflow_base') :PathPart('pcap') :Args(0) { @@ -68,7 +69,7 @@ sub get_pcap :Chained('callflow_base') :PathPart('pcap') :Args(0) { my $cid = $c->stash->{callid}; my $packet_rs = $c->model('DB')->resultset('packets')->search({ - 'message.call_id' => { -in => [ $cid, $cid.'_b2b-1' ] }, + 'message.call_id' => { -in => [ $cid, $cid.'_b2b-1', $cid.'_pbx-1' ] }, }, { join => { message_packets => 'message' }, }); @@ -86,7 +87,7 @@ sub get_png :Chained('callflow_base') :PathPart('png') :Args(0) { my $cid = $c->stash->{callid}; my $calls_rs = $c->model('DB')->resultset('messages')->search({ - 'me.call_id' => { -in => [ $cid, $cid.'_b2b-1' ] }, + 'me.call_id' => { -in => [ $cid, $cid.'_b2b-1', $cid.'_pbx-1' ] }, }, { order_by => { -asc => 'timestamp' }, }); @@ -104,7 +105,7 @@ sub get_callmap :Chained('callflow_base') :PathPart('callmap') :Args(0) { my $cid = $c->stash->{callid}; my $calls_rs = $c->model('DB')->resultset('messages')->search({ - 'me.call_id' => { -in => [ $cid, $cid.'_b2b-1' ] }, + 'me.call_id' => { -in => [ $cid, $cid.'_b2b-1', $cid.'_pbx-1' ] }, }, { order_by => { -asc => 'timestamp' }, }); @@ -123,7 +124,7 @@ sub get_packet :Chained('callflow_base') :PathPart('packet') :Args() { my $cid = $c->stash->{callid}; my $packet = $c->model('DB')->resultset('messages')->find({ - 'me.call_id' => { -in => [ $cid, $cid.'_b2b-1' ] }, + 'me.call_id' => { -in => [ $cid, $cid.'_b2b-1', $cid.'_pbx-1' ] }, 'me.id' => $packet_id, }, { order_by => { -asc => 'timestamp' }, diff --git a/lib/NGCP/Panel/Controller/Subscriber.pm b/lib/NGCP/Panel/Controller/Subscriber.pm index d284997904..21453cf65f 100644 --- a/lib/NGCP/Panel/Controller/Subscriber.pm +++ b/lib/NGCP/Panel/Controller/Subscriber.pm @@ -2769,7 +2769,7 @@ sub get_pcap :Chained('callflow_base') :PathPart('pcap') :Args(0) { my $cid = $c->stash->{callid}; my $packet_rs = $c->model('DB')->resultset('packets')->search({ - 'message.call_id' => { -in => [ $cid, $cid.'_b2b-1' ] }, + 'message.call_id' => { -in => [ $cid, $cid.'_b2b-1', $cid.'_pbx-1' ] }, }, { join => { message_packets => 'message' }, }); @@ -2787,7 +2787,7 @@ sub get_png :Chained('callflow_base') :PathPart('png') :Args(0) { my $cid = $c->stash->{callid}; my $calls_rs = $c->model('DB')->resultset('messages')->search({ - 'me.call_id' => { -in => [ $cid, $cid.'_b2b-1' ] }, + 'me.call_id' => { -in => [ $cid, $cid.'_b2b-1', $cid.'_pbx-1' ] }, }, { order_by => { -asc => 'timestamp' }, }); @@ -2805,7 +2805,7 @@ sub get_callmap :Chained('callflow_base') :PathPart('callmap') :Args(0) { my $cid = $c->stash->{callid}; my $calls_rs = $c->model('DB')->resultset('messages')->search({ - 'me.call_id' => { -in => [ $cid, $cid.'_b2b-1' ] }, + 'me.call_id' => { -in => [ $cid, $cid.'_b2b-1', $cid.'_pbx-1' ] }, }, { order_by => { -asc => 'timestamp' }, }); @@ -2824,7 +2824,7 @@ sub get_packet :Chained('callflow_base') :PathPart('packet') :Args() { my $cid = $c->stash->{callid}; my $packet = $c->model('DB')->resultset('messages')->find({ - 'me.call_id' => { -in => [ $cid, $cid.'_b2b-1' ] }, + 'me.call_id' => { -in => [ $cid, $cid.'_b2b-1', $cid.'_pbx-1' ] }, 'me.id' => $packet_id, }, { order_by => { -asc => 'timestamp' },