View comment recipients

Author: xaviqv

src/Models/Comment.php

@@ -2,6 +2,7 @@
 
 namespace PanicHD\PanicHD\Models;
 
+use DB;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use PanicHD\PanicHD\Traits\ContentEllipse;
@@ -11,7 +12,7 @@ class Comment extends Model
     use ContentEllipse;
 
     protected $table = 'panichd_comments';
-	
+
 	/**
      * All of the relationships to be touched.
      *
@@ -25,18 +26,21 @@ class Comment extends Model
 	public function delete()
 	{
 		$a_errors = [];
-		foreach($this->attachments()->get() as $att){
+        // Delete attachments
+        foreach($this->attachments()->get() as $att){
 			$error = $att->delete();
 			if($error) $a_errors[] = $error;
 		}
-		
+
+        // Delete notifications
+        \DB::table('panichd_comment_email')->where('comment_id', $this->id)->delete();
+
 		$error = $a_errors ? implode('. ', $a_errors) : null;
 		if ($error != "") return $error;
-		
+
 		parent::delete();
 	}
-	
-	
+
     /**
      * Get related ticket.
      *
@@ -57,7 +61,7 @@ public function user()
     {
         return $this->belongsTo('\PanicHDMember', 'user_id');
     }
-	
+
 	/**
      * Get Comment owner as PanicHDMember model
      *
@@ -72,24 +76,34 @@ public function attachments()
     {
         return $this->hasMany(Attachment::class, 'comment_id')->orderByRaw('CASE when mimetype LIKE "image/%" then 1 else 2 end');
     }
-	
+
 	/**
 	 * Filter visible comments depending on member level
 	*/
 	public function scopeForLevel($query, $level)
 	{
 		// User level
 		if ($level < 2) return $query->whereIN('type', ['reply', 'complete', 'completetx', 'reopen']);
-		
+
 		// For agent or admin
 		return $query;
 	}
-	
+
 	/**
 	 * Filter comment entries that are countable as real comments (complete and reopen comments are excluded)
 	*/
 	public function scopeCountable($query)
 	{
 		return $query->whereIN('type', ['reply', 'note', 'completetx']);
 	}
+
+    /**
+     * Get emails | members whom notifications have been sent.
+     *
+     * Return @collection
+     */
+    public function getNotifications()
+    {
+        return \DB::table('panichd_comment_email')->where('comment_id', $this->id)->orderBy('name')->get();
+    }
 }

src/Translations/ca/lang.php

@@ -297,12 +297,13 @@
   // Comentaris
   'comment'                    => 'Comentari',
   'note'                       => 'Nota interna',
-  'comment-reply-title'        => 'Missatges entre el propietari i els tècnics',
+  'comment-reply-title'        => 'Missatge visibles pels usuaris',
   'comment-reply-from-owner'   => 'Resposta de <b>:owner</b>',
-  'reply-from-owner-to-owner'  => 'Resposta de <b>:owner1</b> a <b>:owner2</b>',
+  'reply-from-owner-to'        => 'Resposta de <b>:owner</b> a <b>:recipients</b>',
 
   'comment-note-title'         => 'Nota oculta per a l\'usuari',
   'comment-note-from-agent'    => 'Nota de <b>:agent</b>',
+  'comment-note-from-agent-to' => 'Nota de <b>:agent</b> a <b>:recipients</b>',
 
   'comment-completetx-title'   => 'Tiquet tancat',
   'comment-complete-by'        => 'Tancat per <b>:owner</b>',

src/Translations/en/lang.php

@@ -297,12 +297,13 @@
   // Comments
   'comment'                    => 'Comment',
   'note'                       => 'Internal note',
-  'comment-reply-title'        => 'Messages between owner and agents',
+  'comment-reply-title'        => 'Message visible for users',
   'comment-reply-from-owner'   => 'Reply from <b>:owner</b>',
-  'reply-from-owner-to-owner'  => 'Reply from <b>:owner1</b> to <b>:owner2</b>',
+  'reply-from-owner-to'        => 'Reply from <b>:owner</b> to <b>:recipients</b>',
 
   'comment-note-title'         => 'User hidden note',
   'comment-note-from-agent'    => 'Note from <b>:agent</b>',
+  'comment-note-from-agent-to' => 'Note from <b>:agent</b> to <b>:recipients</b>',
 
   'comment-completetx-title'   => 'Ticket complete',
   'comment-complete-by'        => 'Tancat per <b>:owner</b>',

src/Translations/pt_BR/lang.php

@@ -2,7 +2,7 @@
 
 return [
 
-    
+
     'nav-new-tickets' => 'Novo',
 
     'nav-new-tickets-title' => 'Novos tickets',
@@ -167,10 +167,10 @@
     'date-format' => 'Y-m-d',
 
     'datetime-format' => 'Y-m-d H: i',
-	
+
 	'datetimepicker-format' => 'YYYY-MM-DD HH: mm',
 
-    
+
     'department' => 'Departamento',
 
     'department-shortening' => 'Dept.',
@@ -360,11 +360,11 @@
 
     'ticket-hidden-1-comment' => 'O boletim é agora <b> escondido </b> para proprietário',
 
-    'comment-reply-title' => 'Mensagens entre dono e agentes',
+    'comment-reply-title' => 'Mensage visível para usuários',
 
     'comment-reply-from-owner' => 'Responda do <b>:owner </b>',
 
-    'reply-from-owner-to-owner' => 'Responda de <b>:owner1 </b> para <b>:owner2 </b>',
+    'reply-from-owner-to'    => 'Responda de <b>:owner</b> para <b>:recipients</b>',
 
     'comment-note-title' => 'Nota escondida do usuário',
 

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

@@ -3,10 +3,27 @@
         <?php
 			$comment_title = trans('panichd::lang.comment-'.$comment->type.'-title');
 
+            if (in_array($comment->type, ['reply', 'note'])){
+                $c_recipients = $comment->getNotifications();
+                if (count($c_recipients) > 0){
+                    foreach ($c_recipients as $recipient){
+                        $a_recipients[] = $recipient->name;
+                    }
+                    $recipients = implode(', ', $a_recipients);
+                }
+            }
+
 			switch ($comment->type){
 				case 'note':
 					$icon_class = "fa fa-pencil-alt text-info";
-					$comment_header = trans('panichd::lang.comment-note-from-agent', ['agent' => $comment->owner->name]);
+                    if (count($c_recipients) == 0){
+                        $comment_header = trans('panichd::lang.comment-note-from-agent', ['agent' => $comment->owner->name]);
+                    }else{
+                        $comment_header = trans('panichd::lang.comment-note-from-agent-to', [
+                            'agent' => $comment->owner->name,
+                            'recipients' => $recipients
+                        ]);
+                    }
 					break;
 				case 'complete': // Simple complete box
 				case 'completetx': // Complete with comment text
@@ -33,12 +50,12 @@
 					}else{
 						$icon_class .= "text-warning";
 					}
-					if ($ticket->owner->id == $comment->owner->id){
+					if (count($c_recipients) == 0){
 						$comment_header = trans('panichd::lang.comment-reply-from-owner', ['owner' => $comment->owner->name]);
 					}else{
-						$comment_header = trans('panichd::lang.reply-from-owner-to-owner', [
-							'owner1' => $comment->owner->name,
-							'owner2' => $ticket->owner->name
+						$comment_header = trans('panichd::lang.reply-from-owner-to', [
+							'owner' => $comment->owner->name,
+							'recipients' => $recipients
 						]);
 					}
 					break;