Member may comment any ticket where he has received notifications from

Author: xaviqv

src/Controllers/NotificationsController.php

@@ -150,8 +150,21 @@ public function newComment(Comment $comment, $request)
     		$permission_level = ($member->currentLevel() > 1 and $category_level > 1) ? $category_level : 1;
 
             if ($permission_level < 2){
-                // Notificate assigned agent
-                $a_to = $this->defaultRecipients($ticket, $notification_owner, $subject, $template);
+                // Get defaults
+                $a_defaults = $this->defaultRecipients($ticket, $notification_owner, $subject, $template);
+
+                // Add recipients for each default one
+                foreach ($a_defaults as $default){
+                    $a_recipients[] = $default['recipient']->id;
+                }
+
+                // Add all members notified previously
+                $a_recipients = array_unique(array_merge($a_recipients, $ticket->commentNotifications()->where('member_id', '!=', $member->id)->groupBy('member_id')->pluck('member_id')->toArray()));
+                
+                if (!is_null($ticket->owner) and $member->id != $ticket->owner->id and !in_array($ticket->owner->id, $a_recipients)){
+                    // Add ticket owner if it's not the same as who comments
+                    $a_recipients[] = $ticket->owner->id;
+                }
 
             }elseif($comment->type == 'note' or !$ticket->hidden){
                 // Selected recipients
@@ -160,26 +173,6 @@ public function newComment(Comment $comment, $request)
                 $a_recipients = isset($comment->a_recipients) ? $comment->a_recipients : ($comment->type == 'note' ? $request->note_recipients : $request->reply_recipients);
 
                 if (count($a_recipients) > 0){
-                    foreach($a_recipients as $member_id){
-                        $recipient = Member::find($member_id);
-                        if (count($recipient) == 1){
-                            // Register the notified email
-                            $notification = CommentNotification::create([
-                               'comment_id' => $comment->id,
-                                'name' => $recipient->name,
-                                'email' => $recipient->email,
-                                'member_id' => $member_id
-                            ]);
-
-                            // Add email to actual mail recipients
-                            $a_to[] = [
-            					'recipient' => $recipient,
-            					'subject'   => $subject,
-            					'template'  => $template
-            				];
-                        }
-                    }
-
                     if ($request->has('add_in_user_notification_text') or (isset($comment->add_in_user_notification_text))){
                         // Element in request comes from Comment modal
                         // $comment property comes from an embedded comment when editing or creating a ticket
@@ -188,6 +181,28 @@ public function newComment(Comment $comment, $request)
                 }
             }
 
+            if (count($a_recipients) > 0){
+                foreach($a_recipients as $member_id){
+                    $recipient = Member::find($member_id);
+                    if (count($recipient) == 1){
+                        // Register the notified email
+                        $notification = CommentNotification::create([
+                           'comment_id' => $comment->id,
+                            'name' => $recipient->name,
+                            'email' => $recipient->email,
+                            'member_id' => $member_id
+                        ]);
+
+                        // Add email to actual mail recipients
+                        $a_to[] = [
+                            'recipient' => $recipient,
+                            'subject'   => $subject,
+                            'template'  => $template
+                        ];
+                    }
+                }
+            }
+
 			// Send notifications
 			if(isset($a_to)) $this->sendNotification($a_to, $data);
 		}

src/Middleware/UserAccessMiddleware.php

@@ -48,12 +48,12 @@ public function handle($request, Closure $next)
 			}
 		}
 
-		if ($this->mod_route_prefix == 'ticket') {
-            // Notified users may access the ticket
-            if ($ticket->commentNotifications()->where('member_id', $member->id)->count() > 0){
-                return $next($request);
-            }
+        // Notified users may access the ticket
+        if ($ticket->commentNotifications()->where('member_id', $member->id)->count() > 0){
+            return $next($request);
+        }
 
+		if ($this->mod_route_prefix == 'ticket') {
             // Tickets from users in a visible ticketit_department value for current user
 			if (in_array($ticket->user_id, $member->getMyNoticesUsers())){
 				return $next($request);

src/Models/Member.php

@@ -250,19 +250,22 @@ public static function canCloseTicket($id)
 	/**
      * Check if user can make a comment on a ticket.
      *
-     * @param int $id ticket id
+     * @param $ticket instance of PanicHD\PanicHD\Models\Ticket
      *
      * @return bool
      */
-	public static function canCommentTicket($id)
+	public static function canCommentTicket($ticket)
 	{
 		if (!auth()->check()) return false;
 
-		if (\PanicHDMember::canManageTicket($id)){
-			return true;
-		}else{
-			return \PanicHDMember::isTicketOwner($id);
+		if (\PanicHDMember::canManageTicket($ticket->id)
+            or \PanicHDMember::isTicketOwner($ticket->id)
+            or $ticket->commentNotifications()->where('member_id', auth()->user()->id)->count() > 0){
+
+            return true;
 		}
+
+        return false;
 	}
 
 	/**

src/Views/tickets/partials/comments/index.blade.php

@@ -1,9 +1,9 @@
 @section('content')
     @if(isset($ticket))
-        @if($u->canCommentTicket($ticket->id) || ( !$comments->isEmpty() && $ticket->comments()->forLevel(1)->count() ) )
+        @if($u->canCommentTicket($ticket) || ( !$comments->isEmpty() && $ticket->comments()->forLevel(1)->count() ) )
             <div style="margin-top: 2em;">
                 <h3 style="margin-top: 0em;">{{ trans('panichd::lang.comments') }}
-                    @if ($menu == 'show' && $u->canCommentTicket($ticket->id))
+                    @if ($menu == 'show' && $u->canCommentTicket($ticket))
                         <button type="button" class="btn btn-light btn-default" data-toggle="modal" data-target="#modal-comment-new" data-add-comment="{{ $ticket->hidden ? 'no' : 'yes' }}">{{ $ticket->hidden ? trans('panichd::lang.show-ticket-add-note') : trans('panichd::lang.show-ticket-add-comment') }}</button>
                     @endif
                 </h3>