update v1.0.7.9
This commit is contained in:
@@ -31,7 +31,7 @@ class CreateTicketRequest extends Request
|
|||||||
return [
|
return [
|
||||||
|
|
||||||
'email' => 'required|email|max:60',
|
'email' => 'required|email|max:60',
|
||||||
'user_name' => 'required|min:3|max:40',
|
'first_name' => 'required|min:3|max:40',
|
||||||
'helptopic' => 'required',
|
'helptopic' => 'required',
|
||||||
// 'dept' => 'required',
|
// 'dept' => 'required',
|
||||||
'sla' => 'required',
|
'sla' => 'required',
|
||||||
|
@@ -112,26 +112,27 @@ class="active"
|
|||||||
<!-- /.box-header -->
|
<!-- /.box-header -->
|
||||||
<div class="box-body">
|
<div class="box-body">
|
||||||
<ul class="todo-list">
|
<ul class="todo-list">
|
||||||
@if(count($notifications))
|
<?php $notifications123 = $notifications; ?>
|
||||||
|
@if(count($notifications123))
|
||||||
|
|
||||||
@foreach($notifications as $notification)
|
@foreach($notifications123 as $notification123)
|
||||||
<?php $user = App\User::whereId($notification->user_id)->first(); ?>
|
<?php $user = App\User::whereId($notification123->user_id)->first(); ?>
|
||||||
@if($notification->type == 'registration')
|
@if($notification123->type == 'registration')
|
||||||
@if($notification->is_read == 1)
|
@if($notification123->is_read == 1)
|
||||||
<li class="task">
|
<li class="task">
|
||||||
<!-- drag handle -->
|
<!-- drag handle -->
|
||||||
|
|
||||||
<!-- checkbox -->
|
<!-- checkbox -->
|
||||||
<input type="checkbox" value="" name="cc" class="noti_User clickfun" id="{{$notification -> notification_id}}">
|
<input type="checkbox" value="" name="cc" class="noti_User clickfun" id="{{$notification123 -> notification_id}}">
|
||||||
<label for='cl' data-toggle="tooltip" data-placement="top" title="Mark Read"><span></span> <img src="{{$user->profile_pic}}" class="img-circle" style="width:25px;height: 25px" alt="User Image" />
|
<label for='cl' data-toggle="tooltip" data-placement="top" title="Mark Read"><span></span> <img src="{{$user->profile_pic}}" class="img-circle" style="width:25px;height: 25px" alt="User Image" />
|
||||||
<!-- todo text -->
|
<!-- todo text -->
|
||||||
<h6 class="textcontent marginzero"><a href="{!! route('user.show', $notification->notification_id) !!}" id="{{$notification -> notification_id}}" class='noti_User'>{!! $notification->message !!}</a></h6>
|
<h6 class="textcontent marginzero"><a href="{!! route('user.show', $notification123->notification_id) !!}" id="{{$notification123 -> notification_id}}" class='noti_User'>{!! $notification123->message !!}</a></h6>
|
||||||
<small class="label label-danger"><i class="fa fa-clock-o"></i> {{ $notification -> created_at }}</small></label> <!-- Emphasis label -->
|
<small class="label label-danger"><i class="fa fa-clock-o"></i> {{ $notification123 -> created_at }}</small></label> <!-- Emphasis label -->
|
||||||
|
|
||||||
<!-- General tools such as edit or delete-->
|
<!-- General tools such as edit or delete-->
|
||||||
<div class="tools">
|
<div class="tools">
|
||||||
<a href="{!! route('user.show', $notification->notification_id) !!}" data-toggle="tooltip" data-placement="top" title="View" id="{{$notification -> notification_id}}" class='noti_User'><i class="fa fa-eye"></i></a>
|
<a href="{!! route('user.show', $notification123->notification_id) !!}" data-toggle="tooltip" data-placement="top" title="View" id="{{$notification123-> notification_id}}" class='noti_User'><i class="fa fa-eye"></i></a>
|
||||||
<a href="#" id='{{ $notification->notification_id }}' data-toggle="tooltip" data-placement="top" title="Delete" class='notification-delete clickfun'><i class="fa fa-trash-o"></i></a>
|
<a href="#" id='{{ $notification123->notification_id }}' data-toggle="tooltip" data-placement="top" title="Delete" class='notification-delete clickfun'><i class="fa fa-trash-o"></i></a>
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
@else
|
@else
|
||||||
@@ -139,42 +140,42 @@ class="active"
|
|||||||
<!-- drag handle -->
|
<!-- drag handle -->
|
||||||
|
|
||||||
<!-- checkbox -->
|
<!-- checkbox -->
|
||||||
<input type="checkbox" value="" name="cc" class="noti_User clickfun" id="{{$notification -> notification_id}}">
|
<input type="checkbox" value="" name="cc" class="noti_User clickfun" id="{{$notification123-> notification_id}}">
|
||||||
<label for='cl' data-toggle="tooltip" data-placement="top" title="Mark Read"><span></span> <img src="{{$user->profile_pic}}" class="img-circle" style="width:25px;height: 25px" alt="User Image" />
|
<label for='cl' data-toggle="tooltip" data-placement="top" title="Mark Read"><span></span> <img src="{{$user->profile_pic}}" class="img-circle" style="width:25px;height: 25px" alt="User Image" />
|
||||||
<!-- todo text -->
|
<!-- todo text -->
|
||||||
<h6 class="textcontent marginzero"><a href="{!! route('user.show', $notification->notification_id) !!}" id="{{$notification -> notification_id}}" class='noti_User'>{!! $notification->message !!}</a></h6>
|
<h6 class="textcontent marginzero"><a href="{!! route('user.show', $notification123->notification_id) !!}" id="{{$notification123-> notification_id}}" class='noti_User'>{!! $notification123->message !!}</a></h6>
|
||||||
<small class="label label-danger"><i class="fa fa-clock-o"></i> {{ $notification -> created_at }}</small></label> <!-- Emphasis label -->
|
<small class="label label-danger"><i class="fa fa-clock-o"></i> {{ $notification123-> created_at }}</small></label> <!-- Emphasis label -->
|
||||||
|
|
||||||
<!-- General tools such as edit or delete-->
|
<!-- General tools such as edit or delete-->
|
||||||
<div class="tools">
|
<div class="tools">
|
||||||
<a href="{!! route('user.show', $notification->notification_id) !!}" data-toggle="tooltip" data-placement="top" title="View" id="{{$notification -> notification_id}}" class='noti_User'><i class="fa fa-eye"></i></a>
|
<a href="{!! route('user.show', $notification123->notification_id) !!}" data-toggle="tooltip" data-placement="top" title="View" id="{{$notification123-> notification_id}}" class='noti_User'><i class="fa fa-eye"></i></a>
|
||||||
<a href="#" id='{{ $notification->notification_id }}' data-toggle="tooltip" data-placement="top" title="Delete" class='notification-delete clickfun'><i class="fa fa-trash-o"></i></a>
|
<a href="#" id='{{ $notification123->notification_id }}' data-toggle="tooltip" data-placement="top" title="Delete" class='notification-delete clickfun'><i class="fa fa-trash-o"></i></a>
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
@endif
|
@endif
|
||||||
@else
|
@else
|
||||||
@if($notification->is_read == 1)
|
@if($notification123->is_read == 1)
|
||||||
<li class="task">
|
<li class="task">
|
||||||
<?php $ticket_number = App\Model\helpdesk\Ticket\Tickets::whereId($notification -> model_id)->first(); ?>
|
<?php $ticket_number = App\Model\helpdesk\Ticket\Tickets::whereId($notification123-> model_id)->first(); ?>
|
||||||
<input type="checkbox" value="" name="cc" data-toggle="tooltip" data-placement="top" title="Mark Read" class="noti_User clickfun" id="{{$notification -> notification_id}}">
|
<input type="checkbox" value="" name="cc" data-toggle="tooltip" data-placement="top" title="Mark Read" class="noti_User clickfun" id="{{$notification123-> notification_id}}">
|
||||||
<label for='cl'><span></span> <img src="{{$user->profile_pic}}" class="img-circle" style="width:25px;height: 25px" alt="User Image" />
|
<label for='cl'><span></span> <img src="{{$user->profile_pic}}" class="img-circle" style="width:25px;height: 25px" alt="User Image" />
|
||||||
<h6 class="textcontent marginzero"><a href="{!! route('ticket.thread', $notification->model_id) !!}" id='{{ $notification->notification_id }}' class='noti_User'>{!! $notification->message !!} with id "{!!$ticket_number->ticket_number!!}"</a></h6>
|
<h6 class="textcontent marginzero"><a href="{!! route('ticket.thread', $notification123->model_id) !!}" id='{{ $notification123->notification_id }}' class='noti_User'>{!! $notification123->message !!} with id "{!!$ticket_number->ticket_number!!}"</a></h6>
|
||||||
<small class="label label-info"><i class="fa fa-clock-o"></i> {{ $notification -> created_at }}</small>
|
<small class="label label-info"><i class="fa fa-clock-o"></i> {{ $notification123-> created_at }}</small>
|
||||||
</label><div class="tools">
|
</label><div class="tools">
|
||||||
<a href="{!! route('ticket.thread', $notification->model_id) !!}" id='{{ $notification->notification_id }}' data-toggle="tooltip" data-placement="top" title="View" class='noti_User'><i class="fa fa-eye"></i></a>
|
<a href="{!! route('ticket.thread', $notification123->model_id) !!}" id='{{ $notification123->notification_id }}' data-toggle="tooltip" data-placement="top" title="View" class='noti_User'><i class="fa fa-eye"></i></a>
|
||||||
<a href="#" id='{{ $notification->notification_id }}' data-toggle="tooltip" data-placement="top" title="Delete" class='notification-delete clickfun'><i class="fa fa-trash-o"></i></a>
|
<a href="#" id='{{ $notification123->notification_id }}' data-toggle="tooltip" data-placement="top" title="Delete" class='notification-delete clickfun'><i class="fa fa-trash-o"></i></a>
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
@else
|
@else
|
||||||
<li>
|
<li>
|
||||||
<?php $ticket_number = App\Model\helpdesk\Ticket\Tickets::whereId($notification -> model_id)->first(); ?>
|
<?php $ticket_number = App\Model\helpdesk\Ticket\Tickets::whereId($notification123 -> model_id)->first(); ?>
|
||||||
<input type="checkbox" value="" name="cc" data-toggle="tooltip" data-placement="top" title="Mark Read" class="noti_User clickfun" id="{{$notification -> notification_id}}">
|
<input type="checkbox" value="" name="cc" data-toggle="tooltip" data-placement="top" title="Mark Read" class="noti_User clickfun" id="{{$notification123-> notification_id}}">
|
||||||
<label for='cl'><span></span> <img src="{{$user->profile_pic}}" class="img-circle" style="width:25px;height: 25px" alt="User Image" />
|
<label for='cl'><span></span> <img src="{{$user->profile_pic}}" class="img-circle" style="width:25px;height: 25px" alt="User Image" />
|
||||||
<h6 class="textcontent marginzero"><a href="{!! route('ticket.thread', $notification->model_id) !!}" id='{{ $notification->notification_id }}' class='noti_User'>{!! $notification->message !!} with id "{!!$ticket_number->ticket_number!!}"</a></h6>
|
<h6 class="textcontent marginzero"><a href="{!! route('ticket.thread', $notification123->model_id) !!}" id='{{ $notification123->notification_id }}' class='noti_User'>{!! $notification123->message !!} with id "{!!$ticket_number->ticket_number!!}"</a></h6>
|
||||||
<small class="label label-info"><i class="fa fa-clock-o"></i> {{ $notification -> created_at }}</small>
|
<small class="label label-info"><i class="fa fa-clock-o"></i> {{ $notification123-> created_at }}</small>
|
||||||
</label><div class="tools">
|
</label><div class="tools">
|
||||||
<a href="{!! route('ticket.thread', $notification->model_id) !!}" id='{{ $notification->notification_id }}' data-toggle="tooltip" data-placement="top" title="View" class='noti_User'><i class="fa fa-eye"></i></a>
|
<a href="{!! route('ticket.thread', $notification123->model_id) !!}" id='{{ $notification123->notification_id }}' data-toggle="tooltip" data-placement="top" title="View" class='noti_User'><i class="fa fa-eye"></i></a>
|
||||||
<a href="#" id='{{ $notification->notification_id }}' data-toggle="tooltip" data-placement="top" title="Delete" class='notification-delete clickfun'><i class="fa fa-trash-o"></i></a>
|
<a href="#" id='{{ $notification123->notification_id }}' data-toggle="tooltip" data-placement="top" title="Delete" class='notification-delete clickfun'><i class="fa fa-trash-o"></i></a>
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
@endif
|
@endif
|
||||||
@@ -189,7 +190,7 @@ class="active"
|
|||||||
|
|
||||||
</li>
|
</li>
|
||||||
@endif
|
@endif
|
||||||
{!!$notifications->render()!!}
|
{!!$notifications123->render()!!}
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user