Different notification resend modal for each reply

Author: xaviqv

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

@@ -84,9 +84,6 @@
             <div class="card-body">
                 <div class="row">
                     <div class="{{ $setting->grab('ticket_attachments_feature') && $comment->attachments->count() > 0 ? 'col-sm-7' : 'col-sm-12' }}"><div id="jquery_comment_edit_{{$comment->id}}" class="summernote-text-wrapper"> {!! $comment->html !!} </div>
-					@if ($u->currentLevel() > 1 && $u->canManageTicket($ticket->id))
-						@include('panichd::tickets.partials.comments.modal_edit')
-					@endif
 					</div>
 					@if($setting->grab('ticket_attachments_feature') && $comment->attachments->count() > 0)
 						<div class="col-sm-5 attached_list">
@@ -98,9 +95,11 @@
                 </div>
 				@if ($u->currentLevel() > 1 && $u->canManageTicket($ticket->id))
 					@if ($comment->type=='note')
-						<button type="button" class="btn btn-default btn-sm" data-toggle="modal" data-target="#comment-modal-edit-{{$comment->id}}">{{ trans('panichd::lang.btn-edit') }}</button>
+                        @include('panichd::tickets.partials.comments.modal_edit')
+                        <button type="button" class="btn btn-default btn-sm" data-toggle="modal" data-target="#comment-modal-edit-{{$comment->id}}">{{ trans('panichd::lang.btn-edit') }}</button>
 					@elseif($comment->type=='reply')
-						<button type="button" class="btn btn-default btn-sm" data-toggle="modal" data-target="#email-resend-modal" data-id="{{$comment->id}}" data-owner="{{$ticket->user->name}}">{{ trans('panichd::lang.show-ticket-email-resend') }}</button>
+                        @include('panichd::tickets.partials.comments.modal_resend_emails')
+                        <button type="button" class="btn btn-default btn-sm" data-toggle="modal" data-target="#email-resend-modal-{{$comment->id}}">{{ trans('panichd::lang.show-ticket-email-resend') }}</button>
 					@endif
 
 				@endif
@@ -121,6 +120,5 @@
 		])
 	!!}
 	{!! CollectiveForm::close() !!}
-	@include('panichd::tickets.partials.comments.modal_resend_emails')
 	@include('panichd::tickets.partials.comments.modal_delete')
 @endif

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

@@ -1,6 +1,6 @@
-<div class="modal fade jquery_panel_hightlight" id="email-resend-modal" tabindex="-1" role="dialog" >
+<div id="email-resend-modal-{{$comment->id}}" class="modal fade jquery_panel_hightlight notification-resend-modal" tabindex="-1" role="dialog" >
     <div class="modal-dialog model-lg" role="document">
-        <div class="modal-content">			
+        <div class="modal-content">
 			{!! CollectiveForm::open(['method' => 'POST', 'route' => $setting->grab('main_route').'-notification.resend']) !!}
 			{!! CollectiveForm::hidden('comment_id', $comment->id, ['id'=>'comment_id']) !!}
 			<div class="modal-header">
@@ -30,4 +30,4 @@
 			{!! CollectiveForm::close() !!}
         </div>
     </div>
-</div>
+</div>

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

@@ -88,10 +88,8 @@
 
 
     // Comment (reply) notifications resend modal
-    $( "#email-resend-modal" ).on('show.bs.modal', function (e) {
+    $( ".notification-resend-modal" ).on('show.bs.modal', function (e) {
         var button = $(e.relatedTarget);
-        $(this).find('#owner').text($(button).attr('data-owner'));
-        $(this).find('#comment_id').val($(button).attr('data-id'))
     });
 });
 </script>