sipwise
/
ngcp-panel
mirror of https://github.com/sipwise/ngcp-panel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

MT#4657 Make ac an empty string if undef.

Browse Source
agranig/1_0_subfix
Andreas Granig 12 years ago
parent 8646de185d
commit a6962dce79
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File

10
lib/NGCP/Panel/Utils/Subscriber.pm
Unescape View File

@ -144,7 +144,7 @@ sub update_subscriber_numbers {
my $old_number = $schema->resultset('voip_numbers')->search({ my $old_number = $schema->resultset('voip_numbers')->search({
cc => $primary_number->{cc}, cc => $primary_number->{cc},
ac => $primary_number->{ac} || '', ac => $primary_number->{ac} // '',
sn => $primary_number->{sn}, sn => $primary_number->{sn},
subscriber_id => [undef, $subscriber_id], subscriber_id => [undef, $subscriber_id],
},{ },{
@ -161,7 +161,7 @@ sub update_subscriber_numbers {
} else { } else {
$number = $schema->resultset('voip_numbers')->create({ $number = $schema->resultset('voip_numbers')->create({
cc => $primary_number->{cc}, cc => $primary_number->{cc},
ac => $primary_number->{ac} || '', ac => $primary_number->{ac} // '',
sn => $primary_number->{sn}, sn => $primary_number->{sn},
status => 'active', status => 'active',
reseller_id => $reseller_id, reseller_id => $reseller_id,
@ -171,7 +171,7 @@ sub update_subscriber_numbers {
} }
if(defined $number) { if(defined $number) {
my $cli = $number->cc . ($number->ac || '') . $number->sn; my $cli = $number->cc . ($number->ac // '') . $number->sn;
if(defined $billing_subs->primary_number if(defined $billing_subs->primary_number
&& $billing_subs->primary_number_id != $number->id) { && $billing_subs->primary_number_id != $number->id) {
@ -222,12 +222,12 @@ sub update_subscriber_numbers {
for my $alias(@$alias_numbers) { for my $alias(@$alias_numbers) {
$num = $billing_subs->voip_numbers->create({ $num = $billing_subs->voip_numbers->create({
cc => $alias->{e164}{cc}, cc => $alias->{e164}{cc},
ac => $alias->{e164}{ac}, ac => $alias->{e164}{ac} // '',
sn => $alias->{e164}{sn}, sn => $alias->{e164}{sn},
reseller_id => $reseller_id, reseller_id => $reseller_id,
}); });
$schema->resultset('voip_dbaliases')->create({ $schema->resultset('voip_dbaliases')->create({
username => $num->cc . ($num->ac || '') . $num->sn, username => $num->cc . ($num->ac // '') . $num->sn,
subscriber_id => $prov_subs->id, subscriber_id => $prov_subs->id,
domain_id => $prov_subs->domain->id, domain_id => $prov_subs->domain->id,
}); });

Write Preview
Loading…
Cancel
Save