Catch embedded comments recipients

Author: xaviqv

src/Controllers/NotificationsController.php

@@ -155,10 +155,12 @@ public function newComment(Comment $comment, $request)
 
             }elseif($comment->type == 'note' or !$ticket->hidden){
                 // Selected recipients
-                $c_recipients = $comment->type == 'note' ? $request->note_recipients : $request->reply_recipients;
+                // $comment->a_recipients come from embedded comments i TicketsController
+                // $request recipients come from a comment modal in Ticket card
+                $a_recipients = isset($comment->a_recipients) ? $comment->a_recipients : ($comment->type == 'note' ? $request->note_recipients : $request->reply_recipients);
 
-                if (count($c_recipients) > 0){
-                    foreach($c_recipients as $member_id){
+                if (count($a_recipients) > 0){
+                    foreach($a_recipients as $member_id){
                         $recipient = Member::find($member_id);
                         if (count($recipient) == 1){
                             // Register the notified email

src/Controllers/TicketsController.php

@@ -1141,6 +1141,9 @@ public function add_embedded_comments($request, $ticket, $a_result_errors)
                     $comment->html = $a_content['html'];
             		$comment->save();
 
+                    // Comment recipients
+                    if($request->has('comment_' . $i . '_recipients')) $comment->a_recipients = $request->{'comment_' . $i . '_recipients'};
+
                     // Adds this as a $comment property to check it in NotificationsController
                     if($request->has('comment_' . $i . '_notification_text')) $comment->add_in_user_notification_text =  'yes';
 

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

@@ -27,7 +27,7 @@
         <div class="form-group row">
             <label class="col-lg-2 col-form-label">{{ trans('panichd::lang.show-ticket-add-comment-notificate') . trans('panichd::lang.colon') }}</label>
             <div class="col-lg-10">
-                <select class="form-control note_recipients" name="comment_x_note_recipients[]" multiple="multiple" style="display: none; width: 100%" disabled="disabled">
+                <select class="form-control note_recipients" name="comment_x_recipients[]" multiple="multiple" style="display: none; width: 100%" disabled="disabled">
                     @foreach ($c_members as $member)
                         <option value="{{ $member->id }}" {{ ((isset($ticket) && $member->id == $ticket->agent->id) || (!isset($ticket) && $a_current['agent_id'] != auth()->user()->id && $a_current['agent_id'] == $member->id)) ? 'selected="selected"' : '' }}>{{ $member->name . ($member->email == "" ? ' ' . trans('panichd::lang.ticket-owner-no-email') : ' - ' . $member->email) }}
                         @if ($setting->grab('departments_notices_feature'))
@@ -41,7 +41,7 @@
                     @endforeach
                 </select>
                 @php \Debugbar::info($a_current) @endphp
-                <select class="form-control reply_recipients" name="comment_x_reply_recipients[]" class="form-control" multiple="multiple" style="display: none; width: 100%" disabled="disabled">
+                <select class="form-control reply_recipients" name="comment_x_recipients[]" class="form-control" multiple="multiple" style="display: none; width: 100%" disabled="disabled">
                     @foreach ($c_members as $member)
                         <option value="{{ $member->id }}" {{ ((isset($ticket) && !is_null($ticket->owner) && $member->id == $ticket->owner->id) || (!isset($ticket) && $a_current['owner_id'] != auth()->user()->id && $a_current['owner_id'] == $member->id)) ? 'selected="selected"' : '' }}>{{ $member->name . ($member->email == "" ? ' ' . trans('panichd::lang.ticket-owner-no-email') : ' - ' . $member->email) }}
                         @if ($setting->grab('departments_notices_feature'))

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

@@ -9,8 +9,8 @@
        _cloned.prop('id', 'comment_' + _num);
        _cloned.find('.input_comment_num').val(_num);
        _cloned.find('.input_response_type').prop('disabled', false).attr('name', 'response_' + _num);
-       _cloned.find('.note_recipients').prop('disabled', false).attr('name', 'comment_' + _num + '_note_recipients[]');
-       _cloned.find('.reply_recipients').attr('name', 'comment_' + _num + '_reply_recipients[]');
+       _cloned.find('.note_recipients').prop('disabled', false).attr('name', 'comment_' + _num + '_recipients[]');
+       _cloned.find('.reply_recipients').attr('name', 'comment_' + _num + '_recipients[]');
 
        _cloned.find('.input_comment_text').prop('disabled', false).attr('name', 'comment_' + _num);