From 2a7e76bf51fea773d5caa0b85109b13506a03db6 Mon Sep 17 00:00:00 2001 From: Irka Date: Wed, 13 Aug 2014 23:31:26 +0200 Subject: [PATCH] Revert "MT#8491 Fix subscriber termination via API." This reverts commit 1b654d559a78402867310fad12d338f78237eb75. Real fix was done already as fix for the MT#8071 --- lib/NGCP/Panel/Role/API/Subscribers.pm | 5 +---- lib/NGCP/Panel/Utils/Subscriber.pm | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/NGCP/Panel/Role/API/Subscribers.pm b/lib/NGCP/Panel/Role/API/Subscribers.pm index d677d2314c..be7ab8f042 100644 --- a/lib/NGCP/Panel/Role/API/Subscribers.pm +++ b/lib/NGCP/Panel/Role/API/Subscribers.pm @@ -595,10 +595,7 @@ sub update_item { my $old_profile = $prov_subscriber->profile_id; $subscriber->update($billing_res); - #Can be deleted during termination, maybe others - if($subscriber->provisioning_voip_subscriber->in_storage){ - $subscriber->provisioning_voip_subscriber->update($provisioning_res); - } + $subscriber->provisioning_voip_subscriber->update($provisioning_res); $subscriber->discard_changes; if(($prov_subscriber->profile_id // 0) != ($old_profile // 0)) { diff --git a/lib/NGCP/Panel/Utils/Subscriber.pm b/lib/NGCP/Panel/Utils/Subscriber.pm index d88bf5aa4a..e370fe0318 100644 --- a/lib/NGCP/Panel/Utils/Subscriber.pm +++ b/lib/NGCP/Panel/Utils/Subscriber.pm @@ -348,7 +348,7 @@ sub update_preferences { foreach my $k(keys %{ $preferences } ) { my $pref = NGCP::Panel::Utils::Preferences::get_usr_preference_rs( c => $c, attribute => $k, prov_subscriber => $prov_subscriber); - if($pref && $pref->first && $pref->first->attribute->max_occur == 1) { + if($pref->first && $pref->first->attribute->max_occur == 1) { unless(defined $preferences->{$k}) { $pref->first->delete; } else {