From 01a98254dcd1d35e96e58a232e62f4d196c028fb Mon Sep 17 00:00:00 2001
From: Rene Krenn <rkrenn@sipwise.com>
Date: Wed, 7 Dec 2016 05:49:31 +0100
Subject: [PATCH] TT#5559 end_ivr event for panel UI delete destinationset btn

Change-Id: I2980907ebb1076ac46ebce6836673b02086e3175
---
 lib/NGCP/Panel/Controller/Subscriber.pm | 26 +++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/lib/NGCP/Panel/Controller/Subscriber.pm b/lib/NGCP/Panel/Controller/Subscriber.pm
index 82b99c277c..b9bc172115 100644
--- a/lib/NGCP/Panel/Controller/Subscriber.pm
+++ b/lib/NGCP/Panel/Controller/Subscriber.pm
@@ -1605,10 +1605,18 @@ sub preferences_callforward_destinationset_delete :Chained('preferences_callforw
     try {
         my $schema = $c->model('DB');
         $schema->txn_do(sub {
+            my $autoattendant = NGCP::Panel::Utils::Subscriber::check_dset_autoattendant_status($set);
             foreach my $map($set->voip_cf_mappings->all) {
                 my $cf = $cf_preference->find({ value => $map->id });
                 $cf->delete if $cf;
                 $map->delete;
+                if ($autoattendant) {
+                    NGCP::Panel::Utils::Events::insert(
+                        schema => $schema,
+                        subscriber => $c->stash->{subscriber},
+                        type => 'end_ivr',
+                    );
+                }
             }
             if($cf_type eq "cft" &&
                $prov_subscriber->voip_cf_mappings->search_rs({ type => $cf_type})->count == 0) {
@@ -2194,22 +2202,20 @@ sub preferences_callforward_delete :Chained('base') :PathPart('preferences/callf
             foreach my $map($mapping_rs->all) {
                 $autoattendant_count += NGCP::Panel::Utils::Subscriber::check_dset_autoattendant_status($map->destination_set);
             }
-            $mapping_rs->delete;
+            $mapping_rs->delete_all;
             my $cf_pref = NGCP::Panel::Utils::Preferences::get_usr_preference_rs(
                 c => $c,
                 attribute => $cf_type,
                 prov_subscriber => $prov_subscriber,
             );
             $cf_pref->delete_all;
-            if ($autoattendant_count > 0) {
-                while ($autoattendant_count != 0) {
-                    $autoattendant_count--;
-                    NGCP::Panel::Utils::Events::insert(
-                        schema => $schema,
-                        subscriber => $c->stash->{subscriber},
-                        type => 'end_ivr',
-                    );
-                }
+            while ($autoattendant_count > 0) {
+                $autoattendant_count--;
+                NGCP::Panel::Utils::Events::insert(
+                    schema => $schema,
+                    subscriber => $c->stash->{subscriber},
+                    type => 'end_ivr',
+                );
             }
         });
         NGCP::Panel::Utils::Message::info(