A complete comment that has text is now of "completetx" type

Author: xaviqv

src/Controllers/CommentsController.php

@@ -113,7 +113,6 @@ public function store(Request $request)
 		// Create comment
 		DB::beginTransaction();
         $comment = new Models\Comment();
-		$comment->type = 'reply';
 
 		$ticket = Models\Ticket::findOrFail($request->get('ticket_id'));
 		$member = Member::findOrFail(\Auth::user()->id);
@@ -127,10 +126,15 @@ public function store(Request $request)
 			));
 		}
 
-		// Response: reply or note
 		if ($member->currentLevel() > 1 and $member->canManageTicket($request->get('ticket_id'))){
-			$comment->type = in_array($request->get('response_type'), ['note','reply']) ? $request->get('response_type') : 'note';
-		}
+			// Agent response types
+			if ($request->get('response_type') == 'reply' and $member->canCloseTicket($request->get('ticket_id')) and $request->has('complete_ticket')){
+				$comment->type = 'completetx';
+			}else{
+				$comment->type = in_array($request->get('response_type'), ['note','reply']) ? $request->get('response_type') : 'note';
+			}
+		}else
+			$comment->type = 'reply';
 
 		// Close ticket + new status
 		if ($member->canCloseTicket($request->get('ticket_id')) and $request->has('complete_ticket')){

src/Controllers/TicketsController.php

@@ -1290,12 +1290,11 @@ public function complete_change_actions($ticket, $member, $member_reason = false
 		$comment = new Models\Comment;
 
 		if ($ticket->completed_at != ''){
-			// Complete comment
-			$comment->type = "complete";
-		
 			if ($member->currentLevel()>1){ 
+				$comment->type = "complete";
 				$comment->content = $comment->html = trans('panichd::lang.comment-complete-title');
 			}else{
+				$comment->type = "completetx";
 				$comment->content = $comment->html = trans('panichd::lang.comment-complete-title') . ($member_reason ? trans('panichd::lang.colon').$member_reason : '');
 
 				if ($a_clarification and $a_clarification['content'] != ""){

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

@@ -8,7 +8,8 @@
 					$glyphicon = "glyphicon-pencil text-info";
 					$comment_header = trans('panichd::lang.comment-note-from-agent', ['agent' => $comment->owner->name]);
 					break;
-				case 'complete':
+				case 'complete': // Simple complete box
+				case 'completetx': // Complete with comment text
 					$glyphicon = "glyphicon-ok-circle text-success";
 					$comment_header = trans('panichd::lang.comment-complete-by', ['owner' => $comment->owner->name]);
 					break;