From 79cc29d86a3fa23c252b54a122d477be17ae4c32 Mon Sep 17 00:00:00 2001
From: Sujit Prasad <sujit.prasad@ladybirdweb.com>
Date: Fri, 5 Aug 2016 15:48:28 +0530
Subject: [PATCH] update v1.0.7.9

---
 .../Requests/helpdesk/CreateTicketRequest.php |  2 +-
 resources/views/notifications-all.blade.php   | 59 ++++++++++---------
 2 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/app/Http/Requests/helpdesk/CreateTicketRequest.php b/app/Http/Requests/helpdesk/CreateTicketRequest.php
index c3322d22b..d4f95ad4e 100644
--- a/app/Http/Requests/helpdesk/CreateTicketRequest.php
+++ b/app/Http/Requests/helpdesk/CreateTicketRequest.php
@@ -31,7 +31,7 @@ class CreateTicketRequest extends Request
         return [
 
             'email'     => 'required|email|max:60',
-            'user_name'  => 'required|min:3|max:40',
+            'first_name'  => 'required|min:3|max:40',
             'helptopic' => 'required',
             // 'dept' => 'required',
             'sla'      => 'required',
diff --git a/resources/views/notifications-all.blade.php b/resources/views/notifications-all.blade.php
index 0cc93937d..89b79deea 100644
--- a/resources/views/notifications-all.blade.php
+++ b/resources/views/notifications-all.blade.php
@@ -112,26 +112,27 @@ class="active"
                             <!-- /.box-header -->
                             <div class="box-body">
                                 <ul class="todo-list">
-                                    @if(count($notifications))
+                                <?php $notifications123 = $notifications; ?>
+                                    @if(count($notifications123))
                            
-                                    @foreach($notifications as $notification)
-                                    <?php $user = App\User::whereId($notification->user_id)->first(); ?>
-                                    @if($notification->type == 'registration')
-                                    @if($notification->is_read == 1)
+                                    @foreach($notifications123 as $notification123)
+                                    <?php $user = App\User::whereId($notification123->user_id)->first(); ?>
+                                    @if($notification123->type == 'registration')
+                                    @if($notification123->is_read == 1)
                                     <li class="task">
                                         <!-- drag handle -->
 
                                         <!-- 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>&nbsp<img src="{{$user->profile_pic}}" class="img-circle" style="width:25px;height: 25px" alt="User Image" />
                                             <!-- 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>
-                                            <small class="label label-danger"><i class="fa fa-clock-o"></i> {{ $notification -> created_at }}</small></label> <!-- Emphasis label -->
+                                            <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> {{ $notification123 -> created_at }}</small></label> <!-- Emphasis label -->
 
                                         <!-- General tools such as edit or delete-->
                                         <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="#" 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="{!! 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='{{ $notification123->notification_id }}' data-toggle="tooltip"  data-placement="top" title="Delete" class='notification-delete clickfun'><i class="fa fa-trash-o"></i></a>
                                         </div>
                                     </li>
                                     @else
@@ -139,42 +140,42 @@ class="active"
                                         <!-- drag handle -->
 
                                         <!-- 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>&nbsp<img src="{{$user->profile_pic}}" class="img-circle"  style="width:25px;height: 25px"  alt="User Image" />
                                             <!-- 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>
-                                            <small class="label label-danger"><i class="fa fa-clock-o"></i> {{ $notification -> created_at }}</small></label> <!-- Emphasis label -->
+                                            <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> {{ $notification123-> created_at }}</small></label> <!-- Emphasis label -->
 
                                         <!-- General tools such as edit or delete-->
                                         <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="#" 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="{!! 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='{{ $notification123->notification_id }}' data-toggle="tooltip"  data-placement="top" title="Delete" class='notification-delete clickfun'><i class="fa fa-trash-o"></i></a>
                                         </div>
                                     </li>
                                     @endif
                                     @else
-                                           @if($notification->is_read == 1)
+                                           @if($notification123->is_read == 1)
                                     <li class="task">
-<?php $ticket_number = App\Model\helpdesk\Ticket\Tickets::whereId($notification -> 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}}">
+<?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="{{$notification123-> notification_id}}">
                                         <label for='cl'><span></span>&nbsp<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>
-                                            <small class="label label-info"><i class="fa fa-clock-o"></i> {{ $notification -> created_at }}</small>
+                                            <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> {{ $notification123-> created_at }}</small>
                                         </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="#" 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="{!! 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='{{ $notification123->notification_id }}' data-toggle="tooltip"  data-placement="top" title="Delete" class='notification-delete clickfun'><i class="fa fa-trash-o"></i></a>
                                         </div>
                                     </li>
                                     @else
                                                                         <li>
-<?php $ticket_number = App\Model\helpdesk\Ticket\Tickets::whereId($notification -> 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}}">
+<?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="{{$notification123-> notification_id}}">
                                         <label for='cl'><span></span>&nbsp<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>
-                                            <small class="label label-info"><i class="fa fa-clock-o"></i> {{ $notification -> created_at }}</small>
+                                            <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> {{ $notification123-> created_at }}</small>
                                         </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="#" 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="{!! 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='{{ $notification123->notification_id }}' data-toggle="tooltip"  data-placement="top" title="Delete" class='notification-delete clickfun'><i class="fa fa-trash-o"></i></a>
                                         </div>
                                     </li>
                                     @endif
@@ -189,7 +190,7 @@ class="active"
 
                                     </li>
                                     @endif
-{!!$notifications->render()!!}
+{!!$notifications123->render()!!}
                                 </ul>
                             </div>