diff --git a/lib/NGCP/Panel/Controller/API/SMS.pm b/lib/NGCP/Panel/Controller/API/SMS.pm index cd3a9a8f09..12692a1111 100644 --- a/lib/NGCP/Panel/Controller/API/SMS.pm +++ b/lib/NGCP/Panel/Controller/API/SMS.pm @@ -117,7 +117,7 @@ sub create_item { } my $test_mode = $c->request->params->{test_mode} // ''; my $session; - my $smsc_peer = ''; + my $smsc_peer = 'default'; try { my $parts = NGCP::Panel::Utils::SMS::get_number_of_parts($resource->{text}); $session = NGCP::Panel::Utils::SMS::init_prepaid_billing(c => $c, @@ -138,7 +138,7 @@ sub create_item { prov_domain => $subscriber->domain, ); if ($smsc_peer_rs && $smsc_peer_rs->first && $smsc_peer_rs->first->value) { - my $smsc_peer = $smsc_peer_rs->first->value; + $smsc_peer = $smsc_peer_rs->first->value; } if ( 'dont_send_sms' ne $test_mode ) { diff --git a/lib/NGCP/Panel/Controller/InternalSms.pm b/lib/NGCP/Panel/Controller/InternalSms.pm index fbfeb6a7b0..5ea6d8edef 100644 --- a/lib/NGCP/Panel/Controller/InternalSms.pm +++ b/lib/NGCP/Panel/Controller/InternalSms.pm @@ -78,7 +78,7 @@ sub receive :Chained('list') :PathPart('receive') :Args(0) { my $pcc_timeout = $c->config->{pcc}->{timeout}; my $pcc_enabled = 0; my ($pcc_uuid, $pcc_token); - my $smsc_peer = ''; + my $smsc_peer = 'default'; UUID::generate($pcc_uuid); UUID::unparse($pcc_uuid, $pcc_token); my $fwd_pref_rs = NGCP::Panel::Utils::Preferences::get_usr_preference_rs( @@ -103,7 +103,7 @@ sub receive :Chained('list') :PathPart('receive') :Args(0) { prov_domain => $prov_dbalias->domain, ); if ($smsc_peer_rs && $smsc_peer_rs->first && $smsc_peer_rs->first->value) { - my $smsc_peer = $smsc_peer_rs->first->value; + $smsc_peer = $smsc_peer_rs->first->value; } my $created_item = NGCP::Panel::Utils::SMS::add_journal_record( @@ -113,10 +113,12 @@ sub receive :Chained('list') :PathPart('receive') :Args(0) { caller => $from, callee => $to, text => $text, - pcc_status => "none", + pcc_status => "pending", pcc_token => $pcc_token, coding => $coding, smsc_peer => $smsc_peer, + reason => "accepted", + status => "received", ); # check for cfs @@ -210,6 +212,8 @@ sub receive :Chained('list') :PathPart('receive') :Args(0) { pcc_token => $pcc_token, coding => $coding, smsc_peer => $smsc_peer, + reason => "forwarded", + status => $pcc_status, ); if($pcc_enabled && $pcc_url) { diff --git a/lib/NGCP/Panel/Utils/SMS.pm b/lib/NGCP/Panel/Utils/SMS.pm index 242677d001..0bd905bdaf 100644 --- a/lib/NGCP/Panel/Utils/SMS.pm +++ b/lib/NGCP/Panel/Utils/SMS.pm @@ -355,6 +355,8 @@ sub add_journal_record { $cli = defined $pref_rs_cli->first ? $pref_rs_cli->first->value : ''; } + $args{cli} = $cli; + return $c->model('DB')->resultset('sms_journal')->create(\%args); }