TT#139550 fix vmnotify play/delete

* fix vmnotify play from the UI regression
* fix vmnotify DELETE API method
* fix vmnotify DELETE UI method

Change-Id: Id1224eb425c75be9325b707311ed3d0ac82ef2b7
(cherry picked from commit e4cfb19a38)

lib/NGCP/Panel/Controller/API/VoicemailsItem.pm

@@ -123,10 +123,11 @@ sub DELETE :Allow {
         my $item = $self->item_by_id($c, $id);
         last unless $self->resource_exists($c, voicemail => $item);
 
+        my $cli  = $item->mailboxuser->provisioning_voip_subscriber->username;
+        my $uuid = $item->mailboxuser->provisioning_voip_subscriber->uuid;
+
         $item->delete;
 
-        my $cli  = $item->mailboxuser->provisioning_voip_subscriber->username;
-        my $uuid = $item->mailboxuser->provisioning_voip_subscriber->username;
         NGCP::Panel::Utils::Subscriber::vmnotify(c => $c, cli => $cli, uuid => $uuid);
 
         $guard->commit;

lib/NGCP/Panel/Controller/Subscriber.pm

@@ -4189,7 +4189,6 @@ sub play_voicemail :Chained('voicemail') :PathPart('play') :Args(0) {
     my $file = $c->stash->{voicemail};
     my $cli  = $file->mailboxuser->provisioning_voip_subscriber->username;
     my $uuid = $file->mailboxuser->provisioning_voip_subscriber->uuid;
-    my $dir  = $file->dir;
 
     my $data_ref;
 
@@ -4206,7 +4205,7 @@ sub play_voicemail :Chained('voicemail') :PathPart('play') :Args(0) {
             $c->uri_for_action('/subscriber/details', [$c->req->captures->[0]]));
     }
 
-    NGCP::Panel::Utils::Subscriber::mark_voicemail_read(c => $c, dir => $dir);
+    NGCP::Panel::Utils::Subscriber::mark_voicemail_read(c => $c, voicemail => $c->stash->{voicemail});
     NGCP::Panel::Utils::Subscriber::vmnotify(c => $c, cli => $cli, uuid => $uuid);
 
     my $filename = NGCP::Panel::Utils::Subscriber::get_voicemail_filename($c, $file);
@@ -4218,12 +4217,17 @@ sub play_voicemail :Chained('voicemail') :PathPart('play') :Args(0) {
 sub delete_voicemail :Chained('voicemail') :PathPart('delete') :Args(0) {
     my ($self, $c) = @_;
 
+    my $file = $c->stash->{voicemail};
+    my $cli  = $file->mailboxuser->provisioning_voip_subscriber->username;
+    my $uuid = $file->mailboxuser->provisioning_voip_subscriber->uuid;
+
     $c->detach('/denied_page')
         if(($c->user->roles eq "admin" || $c->user->roles eq "reseller" ||
             $c->user->roles eq "ccareadmin" || $c->user->roles eq "ccare") && $c->user->read_only);
 
     try {
         $c->stash->{voicemail}->delete;
+        NGCP::Panel::Utils::Subscriber::vmnotify(c => $c, cli => $cli, uuid => $uuid);
         NGCP::Panel::Utils::Message::info(
             c    => $c,
             data => { $c->stash->{voicemail}->get_inflated_columns },
@@ -4236,7 +4240,6 @@ sub delete_voicemail :Chained('voicemail') :PathPart('delete') :Args(0) {
             desc  => $c->loc('Failed to delete voicemail message'),
         );
     }
-    NGCP::Panel::Utils::Subscriber::vmnotify( c => $c, voicemail => $c->stash->{voicemail} );
     NGCP::Panel::Utils::Navigation::back_or($c,
         $c->uri_for_action('/subscriber/details', [$c->req->captures->[0]]));
 }