CommentNotification model

Author: xaviqv

src/Controllers/NotificationsController.php

@@ -8,6 +8,7 @@
 use PanicHD\PanicHD\Helpers\LaravelVersion;
 use PanicHD\PanicHD\Models\Category;
 use PanicHD\PanicHD\Models\Comment;
+use PanicHD\PanicHD\Models\CommentNotification;
 use PanicHD\PanicHD\Models\Member;
 use PanicHD\PanicHD\Models\Setting;
 use PanicHD\PanicHD\Models\Ticket;
@@ -160,12 +161,11 @@ public function newComment(Comment $comment, $request)
                     $recipient = Member::find($member_id);
                     if (count($recipient) == 1){
                         // Register the notified email
-                        \DB::table('panichd_comment_email')->insert([
-                           ['comment_id' => $comment->id,
+                        $notification = CommentNotification::create([
+                           'comment_id' => $comment->id,
                             'name' => $recipient->name,
                             'email' => $recipient->email,
                             'member_id' => $member_id
-                            ]
                         ]);
 
                         // Add email to actual mail recipients

src/Controllers/TicketsController.php

@@ -1255,7 +1255,7 @@ public function show($id)
 
         $agent_lists = $this->agentList($ticket->category_id);
 
-        $comments = $ticket->comments()->forLevel($member->levelInCategory($ticket->category_id))->orderBy('id','desc')->paginate(Setting::grab('paginate_items'));
+        $comments = $ticket->comments()->with('notifications')->forLevel($member->levelInCategory($ticket->category_id))->orderBy('id','desc')->paginate(Setting::grab('paginate_items'));
 
         $c_members = \PanicHDMember::with('userDepartment')->where('email', '!=', auth()->user()->email);
         if ($member->currentLevel() > 1){

src/Models/Comment.php

@@ -2,8 +2,6 @@
 
 namespace PanicHD\PanicHD\Models;
 
-use DB;
-use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use PanicHD\PanicHD\Traits\ContentEllipse;
 
@@ -34,13 +32,24 @@ public function delete()
 
         // 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 emails | members whom notifications have been sent.
+     *
+     * Return @collection
+     */
+    public function notifications()
+    {
+        return $this->hasMany('PanicHD\PanicHD\Models\CommentNotification')->orderBy('name');
+    }
+
     /**
      * Get related ticket.
      *
@@ -96,14 +105,4 @@ 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/Models/CommentNotification.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace PanicHD\PanicHD\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class CommentNotification extends Model
+{
+    protected $table = 'panichd_comment_email';
+
+    protected $fillable = ['comment_id', 'name', 'email', 'member_id'];
+
+    /**
+     * primaryKey
+     *
+     * @var integer
+     * @access protected
+     */
+    protected $primaryKey = null;
+
+    /**
+     * Indicates if the IDs are auto-incrementing.
+     *
+     * @var bool
+     */
+    public $incrementing = false;
+
+    public $timestamps = false;
+
+}

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

@@ -4,9 +4,9 @@
 			$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){
+                if (count($comment->notifications) > 0){
+                    $a_recipients = [];
+                    foreach ($comment->notifications as $recipient){
                         $a_recipients[] = $recipient->name;
                     }
                     $recipients = implode(', ', $a_recipients);
@@ -16,7 +16,7 @@
 			switch ($comment->type){
 				case 'note':
 					$icon_class = "fa fa-pencil-alt text-info";
-                    if (count($c_recipients) == 0){
+                    if (count($comment->notifications) == 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', [
@@ -50,7 +50,7 @@
 					}else{
 						$icon_class .= "text-warning";
 					}
-					if (count($c_recipients) == 0){
+					if (count($comment->notifications) == 0){
 						$comment_header = trans('panichd::lang.comment-reply-from-owner', ['owner' => $comment->owner->name]);
 					}else{
 						$comment_header = trans('panichd::lang.reply-from-owner-to', [