Internal note update: Notify all users that where notified in note creation

Author: xaviqv

src/Controllers/NotificationsController.php

@@ -229,27 +229,21 @@ public function commentUpdate(Comment $original_comment, Comment $comment)
 				'notification_owner' => serialize($notification_owner)
 			];
 
-			$a_to=[];
-
-			// Email to ticket->agent
-			if ($ticket->agent->email != $notification_owner->email){
-				$a_to[] = [
-					'recipient' => $ticket->agent,
-					'subject'   => $subject,
-					'template'  => $template
-				];
-			}
-
-			// Email to comment->owner
-			if (!$ticket->hidden and !in_array($comment->owner->email, [$notification_owner->email, $ticket->agent->email])){
-				$a_to[] = [
-					'recipient' => $comment->owner,
-					'subject'   => $subject,
-					'template'  => $template
-				];
-			}
+            // Send notification to all comment notified users
+            foreach ($comment->notifications as $notification){
+                $recipient = Member::find($notification->member_id);
+                if (count($recipient) == 1){
+                    if ($recipient->email != $notification_owner->email){
+                        $a_to[] = [
+        					'recipient' => $recipient,
+        					'subject'   => $subject,
+        					'template'  => $template
+        				];
+                    }
+                }
+            }
 
-			$this->sendNotification($a_to, $data);
+			if(isset($a_to)) $this->sendNotification($a_to, $data);
 		}
     }
 

src/Views/emails/updated_comment.blade.php

@@ -1,4 +1,4 @@
-<?php 
+<?php
 	$notification_owner = unserialize($notification_owner);
 	$comment = unserialize($comment);
 	$original_comment = unserialize($original_comment);
@@ -16,8 +16,9 @@
 	@else
 		<p>{!! trans('panichd::email/globals.updated_other_note', ['user' => $notification_owner->name, 'other' => $comment->owner->name]) !!}</p>
 	@endif
-
-	@include('panichd::emails.partial.common_fields')
+	@if ($recipient->levelInCategory($ticket->category->id) > 1)
+		@include('panichd::emails.partial.common_fields')
+	@endif
 	<b>{{ trans('panichd::email/globals.original_note_title') }}</b>
 	<table border="0" cellpadding="10" cellspacing="0" style="border: 1px solid #ddd; border-radius: 5px;"><tr>
 		<td>@include('panichd::emails.partial.html_field', ['html_field' => $original_comment->html])</td>
@@ -26,5 +27,5 @@
 	<table border="0" cellpadding="10" cellspacing="0" style="border: 1px solid #ddd; border-radius: 5px;"><tr>
 		<td>@include('panichd::emails.partial.html_field', ['html_field' => $comment->html])</td>
 	</tr></table><br /><br />
-	
+
 @stop